Current state

diff --git a/.etckeeper b/.etckeeper
index 700d927f0a49924c428ffc9f722769af84c1908b..06ac25323c985fa4c99d27fbc38bfc94824409d1 100755 (executable)
--- 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 (file)
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 (file)
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 dde5ef6badacfc9ba8ae681cc69651d888966582..66d46b8bb13cd8aa995b0d50827444a91f84f99b 100644 (file)
--- a/dbus-1/session.conf
+++ b/dbus-1/session.conf
@@ -49,7 +49,7 @@
   <limit name="max_outgoing_bytes">1000000000</limit>
   <limit name="max_outgoing_unix_fds">250000000</limit>
   <limit name="max_message_size">1000000000</limit>
-  <limit name="max_message_unix_fds">4096</limit>
+  <limit name="max_message_unix_fds">1024</limit>
   <limit name="service_start_timeout">120000</limit>  
   <limit name="auth_timeout">240000</limit>
   <limit name="max_completed_connections">100000</limit>  

diff --git a/init.d/stunnel b/init.d/stunnel
index 4d3202b17f28af3ede7a01c90aa7a69b5d00392b..531f244a6f6e66c9b1a0940b0576545425aa8a32 100755 (executable)
--- 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 f631c7157191c1140c168002190cbb4cfb30f8a3..717f4f95817b0a6a16498b679ae5ba39de4fff40 100644 (file)
--- 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 f631c7157191c1140c168002190cbb4cfb30f8a3..717f4f95817b0a6a16498b679ae5ba39de4fff40 100644 (file)
--- 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 f631c7157191c1140c168002190cbb4cfb30f8a3..717f4f95817b0a6a16498b679ae5ba39de4fff40 100644 (file)
--- 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 f631c7157191c1140c168002190cbb4cfb30f8a3..717f4f95817b0a6a16498b679ae5ba39de4fff40 100644 (file)
--- 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 f631c7157191c1140c168002190cbb4cfb30f8a3..717f4f95817b0a6a16498b679ae5ba39de4fff40 100644 (file)
--- 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 cfab31d53433c08fc4e9157a950cf9302cdb4c04..2a9e99f5dd1cb6fadb38059217a0906951178a72 100644 (file)
--- 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 a39b196ada0c3d8ee143fbc26114d28937a8ca86..60001f41523480976838814becd523543914770e 100644 (file)
--- 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 309815c63ca620c6edb1a2bdca290992f887efc1..59221b2b1cbb77aff37192c765f70f2600eb0b65 100644 (file)
--- 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 (file)
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 20709b75cca1bbc29e114a1b108e60754c7ddd2b..9108adf16ef3a478a9f0a5ae8f56bc9aed0f6024 100644 (file)
--- 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 348add68a433b4313978e2bdb5eada9efcece4a8..8694e31debcd142f775f2c7900ccf2be615def45 100644 (file)
--- 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