saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 0b1767561c6383b6a82d4844297044d605ac1def..863f46e4f9c5e5a038b60d35ef6db448d2e6c87a 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -56,7 +56,6 @@ maybe chmod 0755 './apache2'
 maybe chmod 0644 './apache2/httpd.conf'
 maybe chmod 0644 './apache2/magic'
 maybe chmod 0755 './apache2/modules.d'
-maybe chmod 0644 './apache2/modules.d/._cfg0000_00_apache_manual.conf'
 maybe chmod 0644 './apache2/modules.d/.keep_dev-vcs_subversion-0'
 maybe chmod 0644 './apache2/modules.d/.keep_www-servers_apache-2'
 maybe chmod 0644 './apache2/modules.d/00_apache_manual.conf'
@@ -208,6 +207,7 @@ maybe chmod 0644 './config-archive/etc/ImageMagick/type-ghostscript.xml.dist'
 maybe chmod 0755 './config-archive/etc/apache2'
 maybe chmod 0755 './config-archive/etc/apache2/modules.d'
 maybe chmod 0644 './config-archive/etc/apache2/modules.d/00_apache_manual.conf'
+maybe chmod 0644 './config-archive/etc/apache2/modules.d/00_apache_manual.conf.1'
 maybe chmod 0644 './config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist'
 maybe chmod 0755 './config-archive/etc/bash'
 maybe chmod 0644 './config-archive/etc/bash/bashrc'
@@ -274,6 +274,8 @@ maybe chmod 0755 './config-archive/etc/init.d/net.lo.1'
 maybe chmod 0755 './config-archive/etc/init.d/net.lo.dist'
 maybe chmod 0755 './config-archive/etc/init.d/network'
 maybe chmod 0755 './config-archive/etc/init.d/network.dist'
+maybe chmod 0755 './config-archive/etc/init.d/nscd'
+maybe chmod 0755 './config-archive/etc/init.d/nscd.dist'
 maybe chmod 0755 './config-archive/etc/init.d/numlock'
 maybe chmod 0755 './config-archive/etc/init.d/numlock.dist'
 maybe chmod 0755 './config-archive/etc/init.d/postgresql-9.1'
@@ -727,7 +729,6 @@ maybe chmod 0644 './idn.conf.sample'
 maybe chmod 0644 './idnalias.conf'
 maybe chmod 0644 './idnalias.conf.sample'
 maybe chmod 0755 './init.d'
-maybe chmod 0755 './init.d/._cfg0000_nscd'
 maybe chmod 0755 './init.d/acpid'
 maybe chmod 0755 './init.d/amavisd'
 maybe chmod 0755 './init.d/apache2'

diff --git a/apache2/modules.d/._cfg0000_00_apache_manual.conf b/apache2/modules.d/._cfg0000_00_apache_manual.conf
deleted file mode 100644 (file)
index c08b2a6..0000000
--- a/apache2/modules.d/._cfg0000_00_apache_manual.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Provide access to the documentation on your server as
-#  http://yourserver.example.com/manual/
-# The documentation is always available at
-#  http://httpd.apache.org/docs/2.2/
-<IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22-r1/manual$1"
-
-<Directory "/usr/share/doc/apache-2.2.22-r1/manual">
-       Options Indexes
-       AllowOverride None
-       Order allow,deny
-       Allow from all
-
-       <Files *.html>
-               SetHandler type-map
-       </Files>
-
-       SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br)/ prefer-language=$1
-       RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br)){2,}(/.*)?$ /manual/$1$2
-
-       LanguagePriority en de es fr ja ko pt-br
-       ForceLanguagePriority Prefer Fallback
-</Directory>
-</IfDefine>
-
-# vim: ts=4 filetype=apache

diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf
index 25de5d121d068eb42d643275572cc7319bf9c896..c08b2a62d709b6b2a7121732dfb14872b92cec89 100644 (file)
--- a/apache2/modules.d/00_apache_manual.conf
+++ b/apache2/modules.d/00_apache_manual.conf
@@ -3,9 +3,9 @@
 # The documentation is always available at
 #  http://httpd.apache.org/docs/2.2/
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22-r1/manual$1"
 
-<Directory "/usr/share/doc/apache-2.2.22/manual">
+<Directory "/usr/share/doc/apache-2.2.22-r1/manual">
        Options Indexes
        AllowOverride None
        Order allow,deny

diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf b/config-archive/etc/apache2/modules.d/00_apache_manual.conf
index a1bfed251be54d22294447a68b394bddabdfefdc..25de5d121d068eb42d643275572cc7319bf9c896 100644 (file)
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf
@@ -3,9 +3,9 @@
 # The documentation is always available at
 #  http://httpd.apache.org/docs/2.2/
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.21-r1/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22/manual$1"
 
-<Directory "/usr/share/doc/apache-2.2.21-r1/manual">
+<Directory "/usr/share/doc/apache-2.2.22/manual">
        Options Indexes
        AllowOverride None
        Order allow,deny

diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1
new file mode 100644 (file)
index 0000000..a1bfed2
--- /dev/null
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1
@@ -0,0 +1,26 @@
+# Provide access to the documentation on your server as
+#  http://yourserver.example.com/manual/
+# The documentation is always available at
+#  http://httpd.apache.org/docs/2.2/
+<IfDefine MANUAL>
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.21-r1/manual$1"
+
+<Directory "/usr/share/doc/apache-2.2.21-r1/manual">
+       Options Indexes
+       AllowOverride None
+       Order allow,deny
+       Allow from all
+
+       <Files *.html>
+               SetHandler type-map
+       </Files>
+
+       SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br)/ prefer-language=$1
+       RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br)){2,}(/.*)?$ /manual/$1$2
+
+       LanguagePriority en de es fr ja ko pt-br
+       ForceLanguagePriority Prefer Fallback
+</Directory>
+</IfDefine>
+
+# vim: ts=4 filetype=apache

diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist
index 25de5d121d068eb42d643275572cc7319bf9c896..c08b2a62d709b6b2a7121732dfb14872b92cec89 100644 (file)
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist
@@ -3,9 +3,9 @@
 # The documentation is always available at
 #  http://httpd.apache.org/docs/2.2/
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22-r1/manual$1"
 
-<Directory "/usr/share/doc/apache-2.2.22/manual">
+<Directory "/usr/share/doc/apache-2.2.22-r1/manual">
        Options Indexes
        AllowOverride None
        Order allow,deny

diff --git a/config-archive/etc/init.d/nscd b/config-archive/etc/init.d/nscd
new file mode 100755 (executable)
index 0000000..70fb3ea
--- /dev/null
+++ b/config-archive/etc/init.d/nscd
@@ -0,0 +1,63 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nscd,v 1.3 2009/09/18 12:29:46 flameeyes Exp $
+
+depend() {
+       use dns ldap net slapd
+}
+
+checkconfig() {
+       if [ ! -d /var/run/nscd ] ; then
+               mkdir -p /var/run/nscd
+               chmod 755 /var/run/nscd
+       fi
+       if [ -z "${NSCD_PERMS_OK}" ] && [ "$(stat -c %a /var/run/nscd)" != "755" ] ; then
+               echo ""
+               ewarn "nscd run dir is not world readable, you should reset the perms:"
+               ewarn "chmod 755 /var/run/nscd"
+               ewarn "chmod a+rw /var/run/nscd/socket"
+               echo ""
+               ewarn "To disable this warning, set 'NSCD_PERMS_OK' in /etc/conf.d/nscd"
+               echo ""
+       fi
+}
+
+start() {
+       checkconfig
+
+       ebegin "Starting Name Service Cache Daemon"
+       local secure=`while read curline ; do
+               table=${curline%:*}
+               entries=${curline##$table:}
+               table=${table%%[^a-z]*}
+               case $table in
+                       passwd*|group*|hosts)
+                       for entry in $entries ; do
+                       case $entry in
+                               nisplus*)
+                                       /usr/sbin/nscd_nischeck $table || \
+                                       /echo "-S $table,yes"
+                               ;;
+                       esac
+                       done
+               ;;
+               esac
+               done < /etc/nsswitch.conf`
+       local pidfile=/var/run/nscd/nscd.pid
+       mkdir -p "$(dirname ${pidfile})"
+       start-stop-daemon --start --quiet \
+               --exec /usr/sbin/nscd --pidfile ${pidfile} \
+               -- $secure
+       eend $?
+}
+
+stop() {
+       local pidfile=/var/run/nscd/nscd.pid
+       ebegin "Shutting down Name Service Cache Daemon"
+       start-stop-daemon --stop --quiet \
+               --exec /usr/sbin/nscd --pidfile ${pidfile}
+       eend $?
+}
+
+# vim:ts=4

diff --git a/config-archive/etc/init.d/nscd.dist b/config-archive/etc/init.d/nscd.dist
new file mode 100755 (executable)
index 0000000..e613715
--- /dev/null
+++ b/config-archive/etc/init.d/nscd.dist
@@ -0,0 +1,66 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nscd,v 1.5 2011/08/29 05:21:40 vapier Exp $
+
+depend() {
+       use dns ldap net slapd
+}
+
+checkconfig() {
+       if [ ! -d /var/run/nscd ] ; then
+               checkpath -d -m 755 /var/run/nscd
+       fi
+       if [ -z "${NSCD_PERMS_OK}" ] && [ "$(stat -c %a /var/run/nscd)" != "755" ] ; then
+               ewarn "nscd run dir is not world readable, you should reset the perms:"
+               ewarn "chmod 755 /var/run/nscd"
+               ewarn "chmod a+rw /var/run/nscd/socket"
+               ewarn "To disable this warning, set 'NSCD_PERMS_OK' in /etc/conf.d/nscd"
+       fi
+
+       if grep -qs '^[[:space:]]*persistent\>' /etc/nscd.conf ; then
+               checkpath -d -m 700 /var/db/nscd
+       fi
+}
+
+start() {
+       checkconfig
+
+       ebegin "Starting Name Service Cache Daemon"
+
+       local secure=`while read curline ; do
+               table=${curline%:*}
+               entries=${curline##$table:}
+               table=${table%%[^a-z]*}
+               case $table in
+                       passwd*|group*|hosts)
+                       for entry in $entries ; do
+                       case $entry in
+                               nisplus*)
+                                       /usr/sbin/nscd_nischeck $table || \
+                                       /echo "-S $table,yes"
+                               ;;
+                       esac
+                       done
+               ;;
+               esac
+               done < /etc/nsswitch.conf`
+
+       local pidfile="/var/run/nscd/nscd.pid"
+       mkdir -p "${pidfile%/*}"
+
+       start-stop-daemon --start --quiet \
+               --exec /usr/sbin/nscd --pidfile ${pidfile} \
+               -- $secure
+       eend $?
+}
+
+stop() {
+       local pidfile="/var/run/nscd/nscd.pid"
+       ebegin "Shutting down Name Service Cache Daemon"
+       start-stop-daemon --stop --quiet \
+               --exec /usr/sbin/nscd --pidfile ${pidfile}
+       eend $?
+}
+
+# vim:ts=4

diff --git a/init.d/._cfg0000_nscd b/init.d/._cfg0000_nscd
deleted file mode 100755 (executable)
index e613715..0000000
--- a/init.d/._cfg0000_nscd
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nscd,v 1.5 2011/08/29 05:21:40 vapier Exp $
-
-depend() {
-       use dns ldap net slapd
-}
-
-checkconfig() {
-       if [ ! -d /var/run/nscd ] ; then
-               checkpath -d -m 755 /var/run/nscd
-       fi
-       if [ -z "${NSCD_PERMS_OK}" ] && [ "$(stat -c %a /var/run/nscd)" != "755" ] ; then
-               ewarn "nscd run dir is not world readable, you should reset the perms:"
-               ewarn "chmod 755 /var/run/nscd"
-               ewarn "chmod a+rw /var/run/nscd/socket"
-               ewarn "To disable this warning, set 'NSCD_PERMS_OK' in /etc/conf.d/nscd"
-       fi
-
-       if grep -qs '^[[:space:]]*persistent\>' /etc/nscd.conf ; then
-               checkpath -d -m 700 /var/db/nscd
-       fi
-}
-
-start() {
-       checkconfig
-
-       ebegin "Starting Name Service Cache Daemon"
-
-       local secure=`while read curline ; do
-               table=${curline%:*}
-               entries=${curline##$table:}
-               table=${table%%[^a-z]*}
-               case $table in
-                       passwd*|group*|hosts)
-                       for entry in $entries ; do
-                       case $entry in
-                               nisplus*)
-                                       /usr/sbin/nscd_nischeck $table || \
-                                       /echo "-S $table,yes"
-                               ;;
-                       esac
-                       done
-               ;;
-               esac
-               done < /etc/nsswitch.conf`
-
-       local pidfile="/var/run/nscd/nscd.pid"
-       mkdir -p "${pidfile%/*}"
-
-       start-stop-daemon --start --quiet \
-               --exec /usr/sbin/nscd --pidfile ${pidfile} \
-               -- $secure
-       eend $?
-}
-
-stop() {
-       local pidfile="/var/run/nscd/nscd.pid"
-       ebegin "Shutting down Name Service Cache Daemon"
-       start-stop-daemon --stop --quiet \
-               --exec /usr/sbin/nscd --pidfile ${pidfile}
-       eend $?
-}
-
-# vim:ts=4

diff --git a/init.d/nscd b/init.d/nscd
index 70fb3ea56acc9774851c9b98d8897cb016d49e18..e613715cae8a28f6fdfbb9853eceee99be2c2737 100755 (executable)
--- a/init.d/nscd
+++ b/init.d/nscd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nscd,v 1.3 2009/09/18 12:29:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nscd,v 1.5 2011/08/29 05:21:40 vapier Exp $
 
 depend() {
        use dns ldap net slapd
@@ -9,17 +9,17 @@ depend() {
 
 checkconfig() {
        if [ ! -d /var/run/nscd ] ; then
-               mkdir -p /var/run/nscd
-               chmod 755 /var/run/nscd
+               checkpath -d -m 755 /var/run/nscd
        fi
        if [ -z "${NSCD_PERMS_OK}" ] && [ "$(stat -c %a /var/run/nscd)" != "755" ] ; then
-               echo ""
                ewarn "nscd run dir is not world readable, you should reset the perms:"
                ewarn "chmod 755 /var/run/nscd"
                ewarn "chmod a+rw /var/run/nscd/socket"
-               echo ""
                ewarn "To disable this warning, set 'NSCD_PERMS_OK' in /etc/conf.d/nscd"
-               echo ""
+       fi
+
+       if grep -qs '^[[:space:]]*persistent\>' /etc/nscd.conf ; then
+               checkpath -d -m 700 /var/db/nscd
        fi
 }
 
@@ -27,6 +27,7 @@ start() {
        checkconfig
 
        ebegin "Starting Name Service Cache Daemon"
+
        local secure=`while read curline ; do
                table=${curline%:*}
                entries=${curline##$table:}
@@ -44,8 +45,10 @@ start() {
                ;;
                esac
                done < /etc/nsswitch.conf`
-       local pidfile=/var/run/nscd/nscd.pid
-       mkdir -p "$(dirname ${pidfile})"
+
+       local pidfile="/var/run/nscd/nscd.pid"
+       mkdir -p "${pidfile%/*}"
+
        start-stop-daemon --start --quiet \
                --exec /usr/sbin/nscd --pidfile ${pidfile} \
                -- $secure
@@ -53,7 +56,7 @@ start() {
 }
 
 stop() {
-       local pidfile=/var/run/nscd/nscd.pid
+       local pidfile="/var/run/nscd/nscd.pid"
        ebegin "Shutting down Name Service Cache Daemon"
        start-stop-daemon --stop --quiet \
                --exec /usr/sbin/nscd --pidfile ${pidfile}