From aa3b922721c813ddf7122dba20bdd4a5edefedb7 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Sun, 21 Oct 2012 18:28:29 +0200 Subject: [PATCH] Current state --- .etckeeper | 6 ++-- apache2/modules.d/00_apache_manual.conf | 4 +-- cron.monthly/update-pciids | 2 -- cron.monthly/update-usbids | 2 -- elinks/keybind.conf.sample | 16 +++++----- eselect/boost/active | 2 +- gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules | 2 +- host.conf | 2 +- init.d/nrpe | 31 ++++++++++--------- init.d/nscd | 2 +- init.d/udev-mount | 1 + nagios/nrpe.cfg | 2 +- php/embed-php5.3/ext-active/imagick.ini | 1 + php/embed-php5.3/ext/imagick.ini | 1 + portage/savedconfig/sys-apps/busybox-1.20.2 | 8 ++--- xinetd.d/nrpe | 5 +++ ...app-text_build-docbook-catalog-0 => .keep} | 0 xml/catalog | 5 +-- xml/docbook | 2 +- 19 files changed, 51 insertions(+), 43 deletions(-) delete mode 100755 cron.monthly/update-pciids delete mode 100755 cron.monthly/update-usbids create mode 120000 php/embed-php5.3/ext-active/imagick.ini create mode 100644 php/embed-php5.3/ext/imagick.ini create mode 100644 xinetd.d/nrpe rename xml/{.keep_app-text_build-docbook-catalog-0 => .keep} (100%) diff --git a/.etckeeper b/.etckeeper index ddc6cad..6f976b2 100755 --- a/.etckeeper +++ b/.etckeeper @@ -614,8 +614,6 @@ maybe chmod 0644 './cron.hourly/.keep_sys-process_cronbase-0' maybe chmod 0755 './cron.hourly/sysstat' maybe chmod 0750 './cron.monthly' maybe chmod 0644 './cron.monthly/.keep_sys-process_cronbase-0' -maybe chmod 0755 './cron.monthly/update-pciids' -maybe chmod 0755 './cron.monthly/update-usbids' maybe chmod 0750 './cron.weekly' maybe chmod 0644 './cron.weekly/.keep_sys-process_cronbase-0' maybe chmod 0644 './crontab' @@ -1265,6 +1263,7 @@ maybe chmod 0755 './php/embed-php5.3/ext' maybe chmod 0755 './php/embed-php5.3/ext-active' maybe chmod 0644 './php/embed-php5.3/ext/crack.ini' maybe chmod 0644 './php/embed-php5.3/ext/http.ini' +maybe chmod 0644 './php/embed-php5.3/ext/imagick.ini' maybe chmod 0644 './php/embed-php5.3/ext/mailparse.ini' maybe chmod 0644 './php/embed-php5.3/php.ini' maybe chmod 0755 './php/embed-php5.4' @@ -1623,10 +1622,11 @@ maybe chmod 0644 './xdg/autostart/gnome-keyring-ssh.desktop' maybe chmod 0644 './xdg/autostart/gsettings-data-convert.desktop' maybe chmod 0755 './xinetd.d' maybe chmod 0644 './xinetd.d/cvspserver' +maybe chmod 0644 './xinetd.d/nrpe' maybe chmod 0644 './xinetd.d/rsyncd' maybe chmod 0644 './xinetd.d/svnserve' maybe chmod 0755 './xml' -maybe chmod 0644 './xml/.keep_app-text_build-docbook-catalog-0' +maybe chmod 0644 './xml/.keep' maybe chmod 0644 './xml/.keep_app-text_docbook-xml-dtd-4.1.2' maybe chmod 0644 './xml/.keep_app-text_docbook-xml-dtd-4.2' maybe chmod 0644 './xml/.keep_app-text_docbook-xml-dtd-4.3' diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf index c08b2a6..db1f06d 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-r1/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.23/manual$1" - + Options Indexes AllowOverride None Order allow,deny diff --git a/cron.monthly/update-pciids b/cron.monthly/update-pciids deleted file mode 100755 index 4c69423..0000000 --- a/cron.monthly/update-pciids +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/sbin/update-pciids -q diff --git a/cron.monthly/update-usbids b/cron.monthly/update-usbids deleted file mode 100755 index 1018546..0000000 --- a/cron.monthly/update-usbids +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/sbin/update-usbids -q diff --git a/elinks/keybind.conf.sample b/elinks/keybind.conf.sample index 3dded9c..a5270c3 100644 --- a/elinks/keybind.conf.sample +++ b/elinks/keybind.conf.sample @@ -4,12 +4,12 @@ # "elinks.conf" to include it. # vi-like navigation keys -bind "main" "j" = "down" -bind "main" "k" = "up" -bind "main" "h" = "back" -bind "main" "l" = "enter" -bind "main" "g" = "home" -bind "main" "G" = "end" +bind "main" "j" = "move-link-next" +bind "main" "k" = "move-link-prev" +bind "main" "h" = "history-move-back" +bind "main" "l" = "link-follow" +bind "main" "g" = "move-document-start" +bind "main" "G" = "move-document-end" # Keys close to the above bind "main" "i" = "scroll-up" @@ -22,8 +22,8 @@ bind "main" "Alt-o" = "goto-url" # Emacs-like paging keys # Ctrl prefixed keys must be capital :-( -bind "main" "Alt-v" = "page-up" -bind "main" "Ctrl-V" = "page-down" +bind "main" "Alt-v" = "move-page-up" +bind "main" "Ctrl-V" = "move-page-down" # Emacs-like editing keys bind "edit" "Ctrl-B" = "left" diff --git a/eselect/boost/active b/eselect/boost/active index 313b2f3..18df6a0 120000 --- a/eselect/boost/active +++ b/eselect/boost/active @@ -1 +1 @@ -//usr/share/boost-eselect/profiles/1.48/default \ No newline at end of file +//usr/share/boost-eselect/profiles/1.49/default \ No newline at end of file diff --git a/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules b/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules index 96b72ad..6cf3b95 100644 --- a/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules +++ b/gtk-2.0/x86_64-pc-linux-gnu/gtk.immodules @@ -1,6 +1,6 @@ # GTK+ Input Method Modules file # Automatically generated file, do not edit -# Created by gtk-query-immodules-2.0 from gtk+-2.24.10 +# Created by gtk-query-immodules-2.0 from gtk+-2.24.12 # # ModulesPath = /root/.gtk-2.0/2.10.0/x86_64-pc-linux-gnu/immodules:/root/.gtk-2.0/2.10.0/immodules:/root/.gtk-2.0/x86_64-pc-linux-gnu/immodules:/root/.gtk-2.0/immodules:/usr/lib64/gtk-2.0/2.10.0/x86_64-pc-linux-gnu/immodules:/usr/lib64/gtk-2.0/2.10.0/immodules:/usr/lib64/gtk-2.0/x86_64-pc-linux-gnu/immodules:/usr/lib64/gtk-2.0/immodules # diff --git a/host.conf b/host.conf index 4c58e52..887ab37 100644 --- a/host.conf +++ b/host.conf @@ -21,4 +21,4 @@ order hosts, bind # default, as it may cause a substantial performance loss at sites # with large hosts files. # -multi off +multi on diff --git a/init.d/nrpe b/init.d/nrpe index 8032a30..55c4eb0 100755 --- a/init.d/nrpe +++ b/init.d/nrpe @@ -1,22 +1,25 @@ #!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nrpe/files/nrpe.init,v 1.1 2012/08/23 23:07:05 flameeyes Exp $ -extra_started_commands="reload" +: ${CFGFILE:=/etc/nagios/nrpe.cfg} -command="/usr/bin/nrpe" -command_args="-c /etc/nagios/nrpe.cfg --daemon" -pidfile="${pidfile:-/var/run/nrpe/nrpe.pid}" -start_stop_daemon_args="--user nagios --group nagios" +get_config() { + [ -f ${CFGFILE} ] || return 1 -depend() { - need net + sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' \ + ${CFGFILE} } -start_pre() { - checkpath -d -m 0750 -o nagios:nagios /var/run/nrpe -} +extra_started_commands="" + +command=/usr/libexec/${SVCNAME} +command_args="-c ${CFGFILE} --daemon" +pidfile=$(get_config pid_file) -reload() { - ebegin "Reloading nrpe" - kill -HUP $(head -n1 ${pidfile}) - eend $? "Failed to reload nrpe" +depend() { + config ${CFGFILE} + need net } + diff --git a/init.d/nscd b/init.d/nscd index 339d03d..ebff59c 100755 --- a/init.d/nscd +++ b/init.d/nscd @@ -51,7 +51,7 @@ start() { start-stop-daemon --start --quiet --background \ --exec /usr/sbin/nscd --pidfile ${pidfile} \ - -- --foreground $secure + -- $secure eend $? } diff --git a/init.d/udev-mount b/init.d/udev-mount index 62742bd..f870039 100755 --- a/init.d/udev-mount +++ b/init.d/udev-mount @@ -6,6 +6,7 @@ description="mount devtmpfs or tmpfs on /dev" depend() { + provide dev-mount keyword -vserver -lxc } diff --git a/nagios/nrpe.cfg b/nagios/nrpe.cfg index d33b46b..513d753 100644 --- a/nagios/nrpe.cfg +++ b/nagios/nrpe.cfg @@ -23,7 +23,7 @@ log_facility=daemon # number. The file is only written if the NRPE daemon is started by the root # user and is running in standalone mode. -pid_file=/var/run/nrpe/nrpe.pid +pid_file=/var/run/nrpe.pid diff --git a/php/embed-php5.3/ext-active/imagick.ini b/php/embed-php5.3/ext-active/imagick.ini new file mode 120000 index 0000000..70c17ad --- /dev/null +++ b/php/embed-php5.3/ext-active/imagick.ini @@ -0,0 +1 @@ +/etc/php/embed-php5.3/ext/imagick.ini \ No newline at end of file diff --git a/php/embed-php5.3/ext/imagick.ini b/php/embed-php5.3/ext/imagick.ini new file mode 100644 index 0000000..d7513f1 --- /dev/null +++ b/php/embed-php5.3/ext/imagick.ini @@ -0,0 +1 @@ +extension=imagick.so diff --git a/portage/savedconfig/sys-apps/busybox-1.20.2 b/portage/savedconfig/sys-apps/busybox-1.20.2 index a326ed5..4e4fd7a 100644 --- a/portage/savedconfig/sys-apps/busybox-1.20.2 +++ b/portage/savedconfig/sys-apps/busybox-1.20.2 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.20.2 -# Tue Sep 18 21:56:35 2012 +# Sat Oct 20 10:15:57 2012 # CONFIG_HAVE_DOT_CONFIG=y @@ -15,7 +15,7 @@ CONFIG_HAVE_DOT_CONFIG=y CONFIG_DESKTOP=y CONFIG_EXTRA_COMPAT=y CONFIG_INCLUDE_SUSv2=y -CONFIG_USE_PORTABLE_CODE=y +# CONFIG_USE_PORTABLE_CODE is not set CONFIG_PLATFORM_LINUX=y CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set @@ -38,7 +38,7 @@ CONFIG_UNICODE_WIDE_WCHARS=y CONFIG_UNICODE_PRESERVE_BROKEN=y CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y -CONFIG_FEATURE_CLEAN_UP=y +# CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y CONFIG_FEATURE_PIDFILE=y @@ -92,7 +92,7 @@ CONFIG_PREFIX="./_install" # # Busybox Library Tuning # -CONFIG_FEATURE_SYSTEMD=y +# CONFIG_FEATURE_SYSTEMD is not set CONFIG_FEATURE_RTMINMAX=y CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 diff --git a/xinetd.d/nrpe b/xinetd.d/nrpe new file mode 100644 index 0000000..d9f226e --- /dev/null +++ b/xinetd.d/nrpe @@ -0,0 +1,5 @@ +/nrpe + server_args = -c /etc/nagios/nrpe.cfg --inetd +# only_from = 127.0.0.1 + disabled = yes +} diff --git a/xml/.keep_app-text_build-docbook-catalog-0 b/xml/.keep similarity index 100% rename from xml/.keep_app-text_build-docbook-catalog-0 rename to xml/.keep diff --git a/xml/catalog b/xml/catalog index 82584f3..f149b2d 100644 --- a/xml/catalog +++ b/xml/catalog @@ -4,8 +4,9 @@ - - + + + diff --git a/xml/docbook b/xml/docbook index a05b38c..a0742bc 100644 --- a/xml/docbook +++ b/xml/docbook @@ -9,7 +9,7 @@ - + -- 2.39.5