From bdaa80b6689a114c91bed551eeb280c51dc2cf8c Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Sat, 16 Mar 2013 21:33:59 +0100 Subject: [PATCH] Current state --- apache2/modules.d/00_apache_manual.conf | 4 +- chromium/default | 2 +- config-archive/etc/inittab | 59 ++++++++ config-archive/etc/inittab.dist.new | 59 ++++++++ cups/subscriptions.conf | 10 +- gconf/gconf.xml.defaults/%gconf-tree-de.xml | 1 - .../gconf.xml.defaults/%gconf-tree-en_GB.xml | 1 - gconf/gconf.xml.defaults/%gconf-tree-ru.xml | 1 - gconf/gconf.xml.defaults/%gconf-tree-vi.xml | 1 - gconf/gconf.xml.defaults/%gconf-tree.xml | 132 +++++++----------- init.d/mit-krb5kadmind | 3 +- init.d/mit-krb5kdc | 2 +- init.d/mit-krb5kpropd | 3 +- revdep-rebuild/61-sun-jdk-1.6 | 2 +- revdep-rebuild/61-sun-jre-bin-1.6 | 2 +- 15 files changed, 176 insertions(+), 106 deletions(-) create mode 100644 config-archive/etc/inittab create mode 100644 config-archive/etc/inittab.dist.new diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf index db1f06d8..a0e5c830 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.23/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.24/manual$1" - + Options Indexes AllowOverride None Order allow,deny diff --git a/chromium/default b/chromium/default index 45f1f386..c140cdeb 100644 --- a/chromium/default +++ b/chromium/default @@ -2,4 +2,4 @@ # the chromium launcher. # Options to pass to chromium. -CHROMIUM_FLAGS="" +#CHROMIUM_FLAGS="" diff --git a/config-archive/etc/inittab b/config-archive/etc/inittab new file mode 100644 index 00000000..fe9bd62d --- /dev/null +++ b/config-archive/etc/inittab @@ -0,0 +1,59 @@ +# +# /etc/inittab: This file describes how the INIT process should set up +# the system in a certain run-level. +# +# Author: Miquel van Smoorenburg, +# Modified by: Patrick J. Volkerding, +# Modified by: Daniel Robbins, +# Modified by: Martin Schlemmer, +# Modified by: Mike Frysinger, +# Modified by: Robin H. Johnson, +# +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.1 2010/01/08 16:55:07 williamh Exp $ + +# Default runlevel. +id:3:initdefault: + +# System initialization, mount local filesystems, etc. +si::sysinit:/sbin/rc sysinit + +# Further system initialization, brings up the boot runlevel. +rc::bootwait:/sbin/rc boot + +l0:0:wait:/sbin/rc shutdown +l0s:0:wait:/sbin/halt -dhp +l1:1:wait:/sbin/rc single +l2:2:wait:/sbin/rc nonetwork +l3:3:wait:/sbin/rc default +l4:4:wait:/sbin/rc default +l5:5:wait:/sbin/rc default +l6:6:wait:/sbin/rc reboot +l6r:6:wait:/sbin/reboot -dk +#z6:6:respawn:/sbin/sulogin + +# new-style single-user +su0:S:wait:/sbin/rc single +su1:S:wait:/sbin/sulogin + +# TERMINALS +c1:12345:respawn:/sbin/agetty --noclear 38400 tty1 linux +c2:2345:respawn:/sbin/agetty 38400 tty2 linux +c3:2345:respawn:/sbin/agetty 38400 tty3 linux +c4:2345:respawn:/sbin/agetty 38400 tty4 linux +c5:2345:respawn:/sbin/agetty 38400 tty5 linux +c6:2345:respawn:/sbin/agetty 38400 tty6 linux + +# SERIAL CONSOLES +#s0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100 +#s1:12345:respawn:/sbin/agetty 9600 ttyS1 vt100 + +# What to do at the "Three Finger Salute". +ca:12345:ctrlaltdel:/sbin/shutdown -r now + +# Used by /etc/init.d/xdm to control DM startup. +# Read the comments in /etc/init.d/xdm for more +# info. Do NOT remove, as this will start nothing +# extra at boot if /etc/init.d/xdm is not added +# to the "default" runlevel. +x:a:once:/etc/X11/startDM.sh + diff --git a/config-archive/etc/inittab.dist.new b/config-archive/etc/inittab.dist.new new file mode 100644 index 00000000..2f6af664 --- /dev/null +++ b/config-archive/etc/inittab.dist.new @@ -0,0 +1,59 @@ +# +# /etc/inittab: This file describes how the INIT process should set up +# the system in a certain run-level. +# +# Author: Miquel van Smoorenburg, +# Modified by: Patrick J. Volkerding, +# Modified by: Daniel Robbins, +# Modified by: Martin Schlemmer, +# Modified by: Mike Frysinger, +# Modified by: Robin H. Johnson, +# +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.1 2010/01/08 16:55:07 williamh Exp $ + +# Default runlevel. +id:3:initdefault: + +# System initialization, mount local filesystems, etc. +si::sysinit:/sbin/rc sysinit + +# Further system initialization, brings up the boot runlevel. +rc::bootwait:/sbin/rc boot + +l0:0:wait:/sbin/rc shutdown +l0s:0:wait:/sbin/halt -dhp +l1:1:wait:/sbin/rc single +l2:2:wait:/sbin/rc nonetwork +l3:3:wait:/sbin/rc default +l4:4:wait:/sbin/rc default +l5:5:wait:/sbin/rc default +l6:6:wait:/sbin/rc reboot +l6r:6:wait:/sbin/reboot -dk +#z6:6:respawn:/sbin/sulogin + +# new-style single-user +su0:S:wait:/sbin/rc single +su1:S:wait:/sbin/sulogin + +# TERMINALS +c1:12345:respawn:/sbin/agetty 38400 tty1 linux +c2:2345:respawn:/sbin/agetty 38400 tty2 linux +c3:2345:respawn:/sbin/agetty 38400 tty3 linux +c4:2345:respawn:/sbin/agetty 38400 tty4 linux +c5:2345:respawn:/sbin/agetty 38400 tty5 linux +c6:2345:respawn:/sbin/agetty 38400 tty6 linux + +# SERIAL CONSOLES +#s0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100 +#s1:12345:respawn:/sbin/agetty 115200 ttyS1 vt100 + +# What to do at the "Three Finger Salute". +ca:12345:ctrlaltdel:/sbin/shutdown -r now + +# Used by /etc/init.d/xdm to control DM startup. +# Read the comments in /etc/init.d/xdm for more +# info. Do NOT remove, as this will start nothing +# extra at boot if /etc/init.d/xdm is not added +# to the "default" runlevel. +x:a:once:/etc/X11/startDM.sh + diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index fa269933..8dc5c844 100644 --- a/cups/subscriptions.conf +++ b/cups/subscriptions.conf @@ -1,11 +1,3 @@ # Subscription configuration file for CUPS v1.5.2 -# Written by cupsd on 2013-03-12 22:05 +# Written by cupsd on 2013-03-13 22:04 NextSubscriptionId 143 - -Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress -Owner frank -LeaseDuration 86400 -Interval 0 -ExpirationTime 1363208640 -NextEventId 11 - diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml index 9a047bad..b823f4db 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -379,7 +379,6 @@ - Zeichenkodierung für Untertitel diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml index cef9a034..e9cd16ca 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -379,7 +379,6 @@ - Encoding charset for subtitle diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml index 353f6776..60bb2fc8 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -379,7 +379,6 @@ - Кодировка символов для субтитров diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml index 1ba8af0b..d3048d63 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml @@ -373,7 +373,6 @@ - Bảng mã ký tự cho phụ đề diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index f3b9333c..90b417a3 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2884,39 +2884,39 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -2989,9 +2989,9 @@ - - - + + + @@ -17821,13 +17821,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17837,13 +17835,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17853,13 +17849,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17869,13 +17863,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17885,13 +17877,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17901,13 +17891,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17917,13 +17905,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17933,13 +17919,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17949,13 +17933,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17965,13 +17947,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17981,13 +17961,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -17997,13 +17975,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18013,13 +17989,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18029,13 +18003,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18045,13 +18017,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18061,13 +18031,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18077,13 +18045,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18093,13 +18059,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -19827,13 +19791,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19841,7 +19805,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "ymsgr" URLs, if enabled. - + True if the command specified in the "command" key should handle "ymsgr" URLs. @@ -19849,13 +19813,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19863,7 +19827,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "xmpp" URLs, if enabled. - + True if the command specified in the "command" key should handle "xmpp" URLs. @@ -19871,13 +19835,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19885,7 +19849,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "sip" URLs, if enabled. - + True if the command specified in the "command" key should handle "sip" URLs. @@ -19893,13 +19857,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19907,7 +19871,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "msnim" URLs, if enabled. - + True if the command specified in the "command" key should handle "msnim" URLs. @@ -19915,13 +19879,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19929,7 +19893,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "irc" URLs, if enabled. - + True if the command specified in the "command" key should handle "irc" URLs. @@ -19937,13 +19901,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19951,7 +19915,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "icq" URLs, if enabled. - + True if the command specified in the "command" key should handle "icq" URLs. @@ -19959,13 +19923,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19973,7 +19937,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "gg" URLs, if enabled. - + True if the command specified in the "command" key should handle "gg" URLs. @@ -20259,13 +20223,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20273,7 +20237,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "aim" URLs, if enabled. - + True if the command specified in the "command" key should handle "aim" URLs. diff --git a/init.d/mit-krb5kadmind b/init.d/mit-krb5kadmind index 75d411c2..7b28fb2a 100755 --- a/init.d/mit-krb5kadmind +++ b/init.d/mit-krb5kadmind @@ -8,7 +8,8 @@ daemon="MIT Kerberos 5 Admin daemon" exec="/usr/sbin/kadmind" depend() { - need net mit-krb5kdc + need mit-krb5kdc + use net } start() { diff --git a/init.d/mit-krb5kdc b/init.d/mit-krb5kdc index d0ab859d..94f1f793 100755 --- a/init.d/mit-krb5kdc +++ b/init.d/mit-krb5kdc @@ -8,7 +8,7 @@ daemon="MIT Kerberos 5 KDC" exec="/usr/sbin/krb5kdc" depend() { - need net + use net } start() { diff --git a/init.d/mit-krb5kpropd b/init.d/mit-krb5kpropd index 76841da8..d800d666 100755 --- a/init.d/mit-krb5kpropd +++ b/init.d/mit-krb5kpropd @@ -8,8 +8,7 @@ daemon="MIT Kerberos 5 kpropd" exec="/usr/sbin/kpropd" depend() { - need net - use mit-krb5kdc mit-krb5kadmind + use net mit-krb5kdc mit-krb5kadmind } start() { diff --git a/revdep-rebuild/61-sun-jdk-1.6 b/revdep-rebuild/61-sun-jdk-1.6 index 530aeea4..181da182 100644 --- a/revdep-rebuild/61-sun-jdk-1.6 +++ b/revdep-rebuild/61-sun-jdk-1.6 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/sun-jdk-1.6.0.38" +SEARCH_DIRS_MASK="/opt/sun-jdk-1.6.0.43" diff --git a/revdep-rebuild/61-sun-jre-bin-1.6 b/revdep-rebuild/61-sun-jre-bin-1.6 index 2e3ee7f5..8e7401fa 100644 --- a/revdep-rebuild/61-sun-jre-bin-1.6 +++ b/revdep-rebuild/61-sun-jre-bin-1.6 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/sun-jre-bin-1.6.0.38" +SEARCH_DIRS_MASK="/opt/sun-jre-bin-1.6.0.43" -- 2.39.5