From: Frank Brehm Date: Thu, 3 Jul 2014 09:07:34 +0000 (+0200) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=3075544667b586c07b1fe5c2ac29374d16324bb4;p=config%2Fuhu1%2Fetc.git Current state --- diff --git a/.etckeeper b/.etckeeper index 700d927..06ac253 100755 --- a/.etckeeper +++ b/.etckeeper @@ -576,7 +576,7 @@ maybe chmod 0600 'config-archive/etc/ssh/sshd_config.3' maybe chmod 0600 'config-archive/etc/ssh/sshd_config.dist' maybe chmod 0755 'config-archive/etc/stunnel' maybe chmod 0644 'config-archive/etc/stunnel/stunnel.conf' -maybe chmod 0644 'config-archive/etc/stunnel/stunnel.conf.dist.new' +maybe chmod 0644 'config-archive/etc/stunnel/stunnel.conf.dist' maybe chmod 0440 'config-archive/etc/sudoers' maybe chmod 0440 'config-archive/etc/sudoers.dist.new' maybe chmod 0755 'config-archive/etc/syslog-ng' @@ -1523,6 +1523,7 @@ maybe chmod 0644 'sandbox.conf' maybe chmod 0755 'sandbox.d' maybe chmod 0644 'sandbox.d/00default' maybe chmod 0644 'sandbox.d/10openssl' +maybe chmod 0644 'sandbox.d/20icedtea-bin-6' maybe chmod 0644 'sandbox.d/37fontconfig' maybe chmod 0755 'sasl2' maybe chmod 0644 'sasl2/.keep_dev-libs_cyrus-sasl-2' diff --git a/config-archive/etc/stunnel/stunnel.conf.dist b/config-archive/etc/stunnel/stunnel.conf.dist new file mode 100644 index 0000000..547ee96 --- /dev/null +++ b/config-archive/etc/stunnel/stunnel.conf.dist @@ -0,0 +1,61 @@ +# Sample stunnel configuration file by Michal Trojnara 2002-2005 +# Some options used here may not be adequate for your particular configuration +# Please make sure you understand them (especially the effect of chroot jail) + +# Certificate/key is needed in server mode and optional in client mode +# cert = /etc/stunnel/stunnel.pem +# key = /etc/stunnel/stunnel.pem + +# Some security enhancements for UNIX systems - comment them out on Win32 +# chroot = /chroot/stunnel/ +setuid = stunnel +setgid = stunnel +# PID is created inside chroot jail +pid = /run/stunnel/stunnel.pid + +# Some performance tunings +socket = l:TCP_NODELAY=1 +socket = r:TCP_NODELAY=1 +#compression = rle + +# Workaround for Eudora bug +#options = DONT_INSERT_EMPTY_FRAGMENTS + +# Authentication stuff +#verify = 2 +# Don't forget to c_rehash CApath +# CApath is located inside chroot jail: +#CApath = /certs +# It's often easier to use CAfile: +#CAfile = /etc/stunnel/certs.pem +# Don't forget to c_rehash CRLpath +# CRLpath is located inside chroot jail: +#CRLpath = /crls +# Alternatively you can use CRLfile: +#CRLfile = /etc/stunnel/crls.pem + +# Some debugging stuff useful for troubleshooting +#debug = 7 +#output = stunnel.log + +# Use it for client mode +#client = yes + +# Service-level configuration + +#[pop3s] +#accept = 995 +#connect = 110 + +#[imaps] +#accept = 993 +#connect = 143 + +#[ssmtp] +#accept = 465 +#connect = 25 + +#[https] +#accept = 443 +#connect = 80 +#TIMEOUTclose = 0 diff --git a/config-archive/etc/stunnel/stunnel.conf.dist.new b/config-archive/etc/stunnel/stunnel.conf.dist.new deleted file mode 100644 index 4aa8b8c..0000000 --- a/config-archive/etc/stunnel/stunnel.conf.dist.new +++ /dev/null @@ -1,61 +0,0 @@ -# Sample stunnel configuration file by Michal Trojnara 2002-2005 -# Some options used here may not be adequate for your particular configuration -# Please make sure you understand them (especially the effect of chroot jail) - -# Certificate/key is needed in server mode and optional in client mode -# cert = /etc/stunnel/stunnel.pem -# key = /etc/stunnel/stunnel.pem - -# Some security enhancements for UNIX systems - comment them out on Win32 -# chroot = /chroot/stunnel/ -setuid = stunnel -setgid = stunnel -# PID is created inside chroot jail -pid = /var/run/stunnel/stunnel.pid - -# Some performance tunings -socket = l:TCP_NODELAY=1 -socket = r:TCP_NODELAY=1 -#compression = rle - -# Workaround for Eudora bug -#options = DONT_INSERT_EMPTY_FRAGMENTS - -# Authentication stuff -#verify = 2 -# Don't forget to c_rehash CApath -# CApath is located inside chroot jail: -#CApath = /certs -# It's often easier to use CAfile: -#CAfile = /etc/stunnel/certs.pem -# Don't forget to c_rehash CRLpath -# CRLpath is located inside chroot jail: -#CRLpath = /crls -# Alternatively you can use CRLfile: -#CRLfile = /etc/stunnel/crls.pem - -# Some debugging stuff useful for troubleshooting -#debug = 7 -#output = stunnel.log - -# Use it for client mode -#client = yes - -# Service-level configuration - -#[pop3s] -#accept = 995 -#connect = 110 - -#[imaps] -#accept = 993 -#connect = 143 - -#[ssmtp] -#accept = 465 -#connect = 25 - -#[https] -#accept = 443 -#connect = 80 -#TIMEOUTclose = 0 diff --git a/dbus-1/session.conf b/dbus-1/session.conf index dde5ef6..66d46b8 100644 --- a/dbus-1/session.conf +++ b/dbus-1/session.conf @@ -49,7 +49,7 @@ 1000000000 250000000 1000000000 - 4096 + 1024 120000 240000 100000 diff --git a/init.d/stunnel b/init.d/stunnel index 4d3202b..531f244 100755 --- a/init.d/stunnel +++ b/init.d/stunnel @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.initd-start-stop-daemon,v 1.3 2013/06/16 16:04:11 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc7,v 1.1 2014/06/10 11:39:33 blueness Exp $ SERVICENAME=${SVCNAME#*.} SERVICENAME=${SERVICENAME:-stunnel} @@ -20,13 +20,13 @@ get_config() { CHROOT=$(grep "^chroot" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;") [ -n "${CHROOT}" ] && CHROOT="--chroot ${CHROOT}" PIDFILE=$(grep "^pid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;") - PIDFILE=${PIDFILE:-/var/run/stunnel/${SERVICENAME}.pid} + PIDFILE=${PIDFILE:-/run/stunnel/${SERVICENAME}.pid} } start() { get_config || return 1 - checkpath -d -m 0775 -o root:stunnel /var/run/stunnel - if [ "$(dirname ${PIDFILE})" != "/var/run" ]; then + checkpath -d -m 0775 -o root:stunnel /run/stunnel + if [ "$(dirname ${PIDFILE})" != "/run" ]; then checkpath -d -m 0755 -o stunnel:stunnel -q $(dirname ${PIDFILE}) fi ebegin "Starting ${SVCNAME}" diff --git a/php/apache2-php5.5/php.ini b/php/apache2-php5.5/php.ini index f631c71..717f4f9 100644 --- a/php/apache2-php5.5/php.ini +++ b/php/apache2-php5.5/php.ini @@ -573,7 +573,7 @@ html_errors = On ; http://php.net/error-log ; Example: ;error_log = php_errors.log -; Log errors to syslog (Event Log on NT, not valid in Windows 95). +; Log errors to syslog (Event Log on Windows). ;error_log = syslog ;windows.show_crt_warning @@ -1014,7 +1014,7 @@ mail.add_x_header = On ; The path to a log file that will log all mail() calls. Log entries include ; the full path of the script, line number, To address and headers. ;mail.log = -; Log mail to syslog (Event Log on NT, not valid in Windows 95). +; Log mail to syslog (Event Log on Windows). ;mail.log = syslog [SQL] diff --git a/php/cgi-php5.5/php.ini b/php/cgi-php5.5/php.ini index f631c71..717f4f9 100644 --- a/php/cgi-php5.5/php.ini +++ b/php/cgi-php5.5/php.ini @@ -573,7 +573,7 @@ html_errors = On ; http://php.net/error-log ; Example: ;error_log = php_errors.log -; Log errors to syslog (Event Log on NT, not valid in Windows 95). +; Log errors to syslog (Event Log on Windows). ;error_log = syslog ;windows.show_crt_warning @@ -1014,7 +1014,7 @@ mail.add_x_header = On ; The path to a log file that will log all mail() calls. Log entries include ; the full path of the script, line number, To address and headers. ;mail.log = -; Log mail to syslog (Event Log on NT, not valid in Windows 95). +; Log mail to syslog (Event Log on Windows). ;mail.log = syslog [SQL] diff --git a/php/cli-php5.5/php.ini b/php/cli-php5.5/php.ini index f631c71..717f4f9 100644 --- a/php/cli-php5.5/php.ini +++ b/php/cli-php5.5/php.ini @@ -573,7 +573,7 @@ html_errors = On ; http://php.net/error-log ; Example: ;error_log = php_errors.log -; Log errors to syslog (Event Log on NT, not valid in Windows 95). +; Log errors to syslog (Event Log on Windows). ;error_log = syslog ;windows.show_crt_warning @@ -1014,7 +1014,7 @@ mail.add_x_header = On ; The path to a log file that will log all mail() calls. Log entries include ; the full path of the script, line number, To address and headers. ;mail.log = -; Log mail to syslog (Event Log on NT, not valid in Windows 95). +; Log mail to syslog (Event Log on Windows). ;mail.log = syslog [SQL] diff --git a/php/embed-php5.5/php.ini b/php/embed-php5.5/php.ini index f631c71..717f4f9 100644 --- a/php/embed-php5.5/php.ini +++ b/php/embed-php5.5/php.ini @@ -573,7 +573,7 @@ html_errors = On ; http://php.net/error-log ; Example: ;error_log = php_errors.log -; Log errors to syslog (Event Log on NT, not valid in Windows 95). +; Log errors to syslog (Event Log on Windows). ;error_log = syslog ;windows.show_crt_warning @@ -1014,7 +1014,7 @@ mail.add_x_header = On ; The path to a log file that will log all mail() calls. Log entries include ; the full path of the script, line number, To address and headers. ;mail.log = -; Log mail to syslog (Event Log on NT, not valid in Windows 95). +; Log mail to syslog (Event Log on Windows). ;mail.log = syslog [SQL] diff --git a/php/fpm-php5.5/php.ini b/php/fpm-php5.5/php.ini index f631c71..717f4f9 100644 --- a/php/fpm-php5.5/php.ini +++ b/php/fpm-php5.5/php.ini @@ -573,7 +573,7 @@ html_errors = On ; http://php.net/error-log ; Example: ;error_log = php_errors.log -; Log errors to syslog (Event Log on NT, not valid in Windows 95). +; Log errors to syslog (Event Log on Windows). ;error_log = syslog ;windows.show_crt_warning @@ -1014,7 +1014,7 @@ mail.add_x_header = On ; The path to a log file that will log all mail() calls. Log entries include ; the full path of the script, line number, To address and headers. ;mail.log = -; Log mail to syslog (Event Log on NT, not valid in Windows 95). +; Log mail to syslog (Event Log on Windows). ;mail.log = syslog [SQL] diff --git a/portage/package.keywords b/portage/package.keywords index cfab31d..2a9e99f 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -322,6 +322,7 @@ dev-python/fbrehm-libs ~dev-python/virtualenvwrapper-4.1.1 ~dev-ruby/facter-1.7.4 +~dev-ruby/facter-2.0.2 ~media-libs/freetype-2.4.11 diff --git a/portage/package.use b/portage/package.use index a39b196..60001f4 100644 --- a/portage/package.use +++ b/portage/package.use @@ -14,7 +14,7 @@ app-crypt/gnupg idea app-doc/doxygen dot -app-editors/vim cscope vim-with-x +app-editors/vim cscope racket vim-with-x app-misc/mc 7zip chdir mclib sftp -slang app-misc/screen multiuser @@ -123,7 +123,7 @@ media-libs/opencv cuda ffmpeg v4l media-libs/x264 interlaced # media-video/ffmpeg aac amr dirac frei0r gsm hardcoded-tables -pic schroedinger speex v4l2 vhook -media-video/ffmpeg aac aacplus amr ass dirac gsm hardcoded-tables openssl -pic schroedinger speex v4l2 vhook +media-video/ffmpeg aac aacplus amr ass dirac gsm hardcoded-tables libsoxr openssl -pic schroedinger speex v4l2 vhook # move net-analyzer/nagios-nrpe net-analyzer/nrpe net-analyzer/nrpe command-args diff --git a/revdep-rebuild/61-icedtea-bin-6 b/revdep-rebuild/61-icedtea-bin-6 index 309815c..59221b2 100644 --- a/revdep-rebuild/61-icedtea-bin-6 +++ b/revdep-rebuild/61-icedtea-bin-6 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.12.7" +SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.13.3" diff --git a/sandbox.d/20icedtea-bin-6 b/sandbox.d/20icedtea-bin-6 new file mode 100644 index 0000000..3001f3c --- /dev/null +++ b/sandbox.d/20icedtea-bin-6 @@ -0,0 +1 @@ +SANDBOX_PREDICT="/proc/self/coredump_filter" diff --git a/stunnel/stunnel.conf b/stunnel/stunnel.conf index 20709b7..9108adf 100644 --- a/stunnel/stunnel.conf +++ b/stunnel/stunnel.conf @@ -11,7 +11,7 @@ key = /etc/stunnel/stunnel.pem setuid = stunnel setgid = stunnel # PID is created inside chroot jail -pid = /var/run/stunnel/stunnel.pid +pid = /run/stunnel/stunnel.pid # Some performance tunings socket = l:TCP_NODELAY=1 @@ -43,10 +43,6 @@ socket = r:TCP_NODELAY=1 # Service-level configuration -[postgres] -accept = 5442 -connect = 5432 - #[pop3s] #accept = 995 #connect = 110 diff --git a/sysstat b/sysstat index 348add6..8694e31 100644 --- a/sysstat +++ b/sysstat @@ -1,4 +1,4 @@ -# sysstat-10.2.0 configuration file. +# sysstat-10.2.1 configuration file. # How long to keep log files (in days). # If value is greater than 28, then log files are kept in