From 531f5d1060e4c59f5b673446503364e801cff69b Mon Sep 17 00:00:00 2001 From: fbrehm Date: Wed, 30 May 2012 22:42:03 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 5 ++- .../savedconfig/sys-apps/busybox-1.19.3-r1 | 2 +- .../savedconfig/sys-apps/busybox-1.19.3-r1.1 | 2 +- .../sys-apps/busybox-1.19.3-r1.dist | 2 +- config-archive/etc/request-key.conf | 37 +++++++++++++++++++ .../etc/request-key.conf.dist | 0 .../savedconfig/sys-apps/busybox-1.19.3-r1 | 2 +- request-key.conf | 4 ++ 8 files changed, 48 insertions(+), 6 deletions(-) rename portage/savedconfig/sys-apps/._cfg0000_busybox-1.19.3-r1 => config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.1 (99%) create mode 100644 config-archive/etc/request-key.conf rename ._cfg0000_request-key.conf => config-archive/etc/request-key.conf.dist (100%) diff --git a/.etckeeper b/.etckeeper index 103bcdc..17e2305 100755 --- a/.etckeeper +++ b/.etckeeper @@ -37,7 +37,6 @@ mkdir -p './texmf/dvipdfm/config' mkdir -p './texmf/dvips.d' mkdir -p './unixODBC/ODBCDataSources' maybe chmod 0755 '.' -maybe chmod 0644 './._cfg0000_request-key.conf' maybe chmod 0700 './.etckeeper' maybe chmod 0600 './.gitignore' maybe chmod 0600 './.pwd.lock' @@ -485,6 +484,7 @@ maybe chmod 0755 './config-archive/etc/portage' maybe chmod 0755 './config-archive/etc/portage/savedconfig' maybe chmod 0755 './config-archive/etc/portage/savedconfig/sys-apps' maybe chmod 0644 './config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1' +maybe chmod 0644 './config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.1' maybe chmod 0644 './config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.dist' maybe chmod 0755 './config-archive/etc/postfix' maybe chmod 0644 './config-archive/etc/postfix/main.cf' @@ -501,6 +501,8 @@ maybe chmod 0644 './config-archive/etc/pulse/default.pa' maybe chmod 0644 './config-archive/etc/pulse/default.pa.dist' maybe chmod 0644 './config-archive/etc/pulse/system.pa' maybe chmod 0644 './config-archive/etc/pulse/system.pa.dist' +maybe chmod 0644 './config-archive/etc/request-key.conf' +maybe chmod 0644 './config-archive/etc/request-key.conf.dist' maybe chmod 0755 './config-archive/etc/ssh' maybe chmod 0644 './config-archive/etc/ssh/ssh_config' maybe chmod 0644 './config-archive/etc/ssh/ssh_config.dist' @@ -1512,7 +1514,6 @@ maybe chmod 0755 './portage/postsync.d' maybe chmod 0644 './portage/postsync.d/q-reinitialize' maybe chmod 0755 './portage/savedconfig' maybe chmod 0755 './portage/savedconfig/sys-apps' -maybe chmod 0644 './portage/savedconfig/sys-apps/._cfg0000_busybox-1.19.3-r1' maybe chmod 0644 './portage/savedconfig/sys-apps/busybox-1.19.3-r1' maybe chmod 0755 './postfix' maybe chmod 0644 './postfix/.keep_mail-mta_postfix-0' diff --git a/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1 b/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1 index 96fa8d1..ccd9c06 100644 --- a/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1 +++ b/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.19.3 -# Thu Feb 9 11:29:48 2012 +# Thu Feb 16 11:27:15 2012 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/portage/savedconfig/sys-apps/._cfg0000_busybox-1.19.3-r1 b/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.1 similarity index 99% rename from portage/savedconfig/sys-apps/._cfg0000_busybox-1.19.3-r1 rename to config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.1 index d2e29fd..96fa8d1 100644 --- a/portage/savedconfig/sys-apps/._cfg0000_busybox-1.19.3-r1 +++ b/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.1 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.19.3 -# Wed May 30 20:51:38 2012 +# Thu Feb 9 11:29:48 2012 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.dist b/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.dist index ccd9c06..d2e29fd 100644 --- a/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.dist +++ b/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.dist @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.19.3 -# Thu Feb 16 11:27:15 2012 +# Wed May 30 20:51:38 2012 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/config-archive/etc/request-key.conf b/config-archive/etc/request-key.conf new file mode 100644 index 0000000..e482c96 --- /dev/null +++ b/config-archive/etc/request-key.conf @@ -0,0 +1,37 @@ +############################################################################### +# +# Copyright (C) 2005 Red Hat, Inc. All Rights Reserved. +# Written by David Howells (dhowells@redhat.com) +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version +# 2 of the License, or (at your option) any later version. +# +############################################################################### + + +############################################################################### +# +# We can run programs or scripts +# - Macro substitutions in arguments: +# %%... %... +# %o operation name +# %k ID of key being operated upon +# %t type of key being operated upon +# %d description of key being operated upon +# %c callout info +# %u UID of requestor +# %g GID of requestor +# %T thread keyring of requestor (may be 0) +# %P process keyring of requestor (may be 0) +# %S session keyring of requestor (may be the user's default session) +# +################################################################################ + +#OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... +#====== ======= =============== =============== =============================== +create user debug:* negate /bin/keyctl negate %k 30 %S +create user debug:loop:* * |/bin/cat +create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S +negate * * * /bin/keyctl negate %k 30 %S diff --git a/._cfg0000_request-key.conf b/config-archive/etc/request-key.conf.dist similarity index 100% rename from ._cfg0000_request-key.conf rename to config-archive/etc/request-key.conf.dist diff --git a/portage/savedconfig/sys-apps/busybox-1.19.3-r1 b/portage/savedconfig/sys-apps/busybox-1.19.3-r1 index ccd9c06..d2e29fd 100644 --- a/portage/savedconfig/sys-apps/busybox-1.19.3-r1 +++ b/portage/savedconfig/sys-apps/busybox-1.19.3-r1 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.19.3 -# Thu Feb 16 11:27:15 2012 +# Wed May 30 20:51:38 2012 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/request-key.conf b/request-key.conf index e482c96..ff16a95 100644 --- a/request-key.conf +++ b/request-key.conf @@ -31,7 +31,11 @@ #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... #====== ======= =============== =============== =============================== +create dns_resolver * * /sbin/key.dns_resolver %k create user debug:* negate /bin/keyctl negate %k 30 %S +create user debug:* rejected /bin/keyctl reject %k 30 %c %S +create user debug:* expired /bin/keyctl reject %k 30 %c %S +create user debug:* revoked /bin/keyctl reject %k 30 %c %S create user debug:loop:* * |/bin/cat create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S negate * * * /bin/keyctl negate %k 30 %S -- 2.39.5