From 80024496c96e7b752aebdaa7ccb8462ed3a11e49 Mon Sep 17 00:00:00 2001 From: frank Date: Mon, 23 Apr 2012 23:36:06 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- apache2/modules.d/00_apache_manual.conf | 4 +- .../apache2/modules.d/00_apache_manual.conf | 4 +- .../apache2/modules.d/00_apache_manual.conf.1 | 4 +- .../modules.d/00_apache_manual.conf.dist | 4 +- .../etc/cupshelpers/preferreddrivers.xml | 309 ++++++++++++++++++ .../etc/cupshelpers/preferreddrivers.xml.dist | 0 config-archive/etc/init.d/nscd | 63 ++++ .../etc/init.d/nscd.dist | 0 .../xdg/autostart/Gentoo-print-applet.desktop | 22 ++ .../Gentoo-print-applet.desktop.dist | 0 cups/printers.conf | 2 +- cupshelpers/preferreddrivers.xml | 7 - init.d/nscd | 21 +- xdg/autostart/Gentoo-print-applet.desktop | 4 +- 14 files changed, 417 insertions(+), 27 deletions(-) rename apache2/modules.d/._cfg0000_00_apache_manual.conf => config-archive/etc/apache2/modules.d/00_apache_manual.conf.1 (88%) create mode 100644 config-archive/etc/cupshelpers/preferreddrivers.xml rename cupshelpers/._cfg0000_preferreddrivers.xml => config-archive/etc/cupshelpers/preferreddrivers.xml.dist (100%) create mode 100755 config-archive/etc/init.d/nscd rename init.d/._cfg0000_nscd => config-archive/etc/init.d/nscd.dist (100%) create mode 100644 config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop rename xdg/autostart/._cfg0000_Gentoo-print-applet.desktop => config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop.dist (100%) diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf index 25de5d12..c08b2a62 100644 --- 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/ -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" - + 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 a1bfed25..25de5d12 100644 --- 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/ -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" - + Options Indexes AllowOverride None Order allow,deny diff --git a/apache2/modules.d/._cfg0000_00_apache_manual.conf b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1 similarity index 88% rename from apache2/modules.d/._cfg0000_00_apache_manual.conf rename to config-archive/etc/apache2/modules.d/00_apache_manual.conf.1 index c08b2a62..a1bfed25 100644 --- a/apache2/modules.d/._cfg0000_00_apache_manual.conf +++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1 @@ -3,9 +3,9 @@ # The documentation is always available at # http://httpd.apache.org/docs/2.2/ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22-r1/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.21-r1/manual$1" - + Options Indexes AllowOverride None Order allow,deny 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 25de5d12..c08b2a62 100644 --- 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/ -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" - + Options Indexes AllowOverride None Order allow,deny diff --git a/config-archive/etc/cupshelpers/preferreddrivers.xml b/config-archive/etc/cupshelpers/preferreddrivers.xml new file mode 100644 index 00000000..e8097feb --- /dev/null +++ b/config-archive/etc/cupshelpers/preferreddrivers.xml @@ -0,0 +1,309 @@ + + + + + + + + + + + generic + + + + + + + generic + none + + + + + + + generic + none + + + + + + + generic + none + + + + + + + generic + none + + + + + + + generic + none + + + + + + + generic + none + + + + + + + generic + none + + + + + + generic + none + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + exact-cmd + + + + + + + + + + + + + + + + + + + + + gutenprint* + + + + + + + + + + + manufacturer-ricoh-ps + manufacturer-ricoh-pxl + + + + + + + + + + + + *-postscript + + + + + + + + + + + + gutenprint* + + + + + + + manufacturer-cmd + foomatic-recommended-hpijs + foomatic-recommended-nonpostscript + manufacturer* + foomatic-recommended-postscript + foomatic-postscript + hpcups + hpijs + + + + + + + + + + + foomatic-hpijs + + + + + + + splix + gutenprint-simplified + gutenprint-expert + foomatic-hpijs + foomatic-gutenprint + foomatic + cups + + + generic-postscript + generic-foomatic-recommended + generic-pcl6 + generic-pcl5c + generic-pcl5e + generic-pcl5 + generic-pcl + foomatic-pxlmono + generic-escp + ghostscript + generic + + + hpcups-plugin + hpijs-plugin + turboprint + + + + diff --git a/cupshelpers/._cfg0000_preferreddrivers.xml b/config-archive/etc/cupshelpers/preferreddrivers.xml.dist similarity index 100% rename from cupshelpers/._cfg0000_preferreddrivers.xml rename to config-archive/etc/cupshelpers/preferreddrivers.xml.dist diff --git a/config-archive/etc/init.d/nscd b/config-archive/etc/init.d/nscd new file mode 100755 index 00000000..70fb3ea5 --- /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/init.d/._cfg0000_nscd b/config-archive/etc/init.d/nscd.dist similarity index 100% rename from init.d/._cfg0000_nscd rename to config-archive/etc/init.d/nscd.dist diff --git a/config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop b/config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop new file mode 100644 index 00000000..f343de11 --- /dev/null +++ b/config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop @@ -0,0 +1,22 @@ + +[Desktop Entry] +Encoding=UTF-8 +Name=Print Queue Applet +Name[de]=Applet für Druckerwarteschlange +Name[en_GB]=Print Queue Applet +Name[ru]=Апплет очереди печати +Name[vi]=Tiểu dụng hàng đợi in +Comment=System tray icon for managing print jobs +Comment[de]=Symbol für Benachrichtigungsfeld zur Verwaltung von Druckaufträgen +Comment[en_GB]=System tray icon for managing print jobs +Comment[ru]=Иконка области уведомления для управления заданиями печати +Comment[vi]=Biểu tượng khay hệ thống để quản lý các công việc in +Exec=system-config-printer-applet +Terminal=false +Type=Application +Icon=printer +NotShowIn=KDE; +StartupNotify=false +X-GNOME-Autostart-Delay=30 +X-Desktop-File-Install-Version=0.18 +Categories=GTK;Monitor;System; diff --git a/xdg/autostart/._cfg0000_Gentoo-print-applet.desktop b/config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop.dist similarity index 100% rename from xdg/autostart/._cfg0000_Gentoo-print-applet.desktop rename to config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop.dist diff --git a/cups/printers.conf b/cups/printers.conf index 441752f5..3ed341df 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.4.8 -# Written by cupsd on 2012-04-23 07:26 +# Written by cupsd on 2012-04-23 17:35 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING Info Kyocera FS-1020D diff --git a/cupshelpers/preferreddrivers.xml b/cupshelpers/preferreddrivers.xml index e8097feb..31052b9e 100644 --- a/cupshelpers/preferreddrivers.xml +++ b/cupshelpers/preferreddrivers.xml @@ -122,12 +122,6 @@ - - - - - @@ -294,7 +288,6 @@ generic-pcl5e generic-pcl5 generic-pcl - foomatic-pxlmono generic-escp ghostscript generic diff --git a/init.d/nscd b/init.d/nscd index 70fb3ea5..e613715c 100755 --- 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} diff --git a/xdg/autostart/Gentoo-print-applet.desktop b/xdg/autostart/Gentoo-print-applet.desktop index f343de11..36a58e6c 100644 --- a/xdg/autostart/Gentoo-print-applet.desktop +++ b/xdg/autostart/Gentoo-print-applet.desktop @@ -18,5 +18,5 @@ Icon=printer NotShowIn=KDE; StartupNotify=false X-GNOME-Autostart-Delay=30 -X-Desktop-File-Install-Version=0.18 -Categories=GTK;Monitor;System; +X-Desktop-File-Install-Version=0.20 +Categories=System;Monitor;GTK; -- 2.39.5