saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 183f35a286db3028897ff1d687eba5d6566a0a13..4f9f181cb04b4ddb6c7bb9e1e3bfccff997e18a6 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -66,8 +66,6 @@ maybe chmod 0644 'apache2/httpd.conf'
 maybe chmod 0644 'apache2/info_users_passwd'
 maybe chmod 0644 'apache2/magic'
 maybe chmod 0755 'apache2/modules.d'
-maybe chmod 0644 'apache2/modules.d/._cfg0000_00_apache_manual.conf'
-maybe chmod 0644 'apache2/modules.d/._cfg0000_70_mod_php5.conf'
 maybe chmod 0644 'apache2/modules.d/.keep_dev-vcs_subversion-0'
 maybe chmod 0644 'apache2/modules.d/.keep_www-servers_apache-2'
 maybe chmod 0644 'apache2/modules.d/00_apache_manual.conf'
@@ -89,6 +87,7 @@ maybe chmod 0644 'apache2/modules.d/45_mod_dav.conf'
 maybe chmod 0644 'apache2/modules.d/46_mod_ldap.conf'
 maybe chmod 0644 'apache2/modules.d/47_mod_dav_svn.conf'
 maybe chmod 0644 'apache2/modules.d/70_mod_php.conf'
+maybe chmod 0644 'apache2/modules.d/70_mod_php5.conf'
 maybe chmod 0644 'apache2/modules.d/99_nagios4.conf'
 maybe chmod 0755 'apache2/ssl'
 maybe chmod 0600 'apache2/ssl/egroupware-cert.pem'
@@ -281,6 +280,7 @@ maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_mod_status.conf'
 maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_mod_status.conf.dist'
 maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_mpm.conf'
 maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_mpm.conf.dist'
+maybe chmod 0644 'config-archive/etc/apache2/modules.d/70_mod_php5.conf.dist'
 maybe chmod 0755 'config-archive/etc/apache2/vhosts.d'
 maybe chmod 0644 'config-archive/etc/apache2/vhosts.d/00_default_ssl_vhost.conf'
 maybe chmod 0644 'config-archive/etc/apache2/vhosts.d/00_default_ssl_vhost.conf.dist'
@@ -687,6 +687,7 @@ maybe chmod 0600 'config-archive/etc/ssh/sshd_config.4'
 maybe chmod 0600 'config-archive/etc/ssh/sshd_config.5'
 maybe chmod 0600 'config-archive/etc/ssh/sshd_config.6'
 maybe chmod 0600 'config-archive/etc/ssh/sshd_config.7'
+maybe chmod 0600 'config-archive/etc/ssh/sshd_config.8'
 maybe chmod 0600 'config-archive/etc/ssh/sshd_config.dist'
 maybe chmod 0755 'config-archive/etc/ssl'
 maybe chmod 0644 'config-archive/etc/ssl/openssl.cnf'
@@ -805,7 +806,6 @@ maybe chmod 0755 'cron.d'
 maybe chmod 0644 'cron.d/.keep_sys-process_cronie-0'
 maybe chmod 0644 'cron.d/sysstat'
 maybe chmod 0750 'cron.daily'
-maybe chmod 0755 'cron.daily/._cfg0000_logrotate'
 maybe chmod 0644 'cron.daily/.keep_sys-process_cronbase-0'
 maybe chmod 0755 'cron.daily/00-logwatch'
 maybe chmod 0755 'cron.daily/etckeeper'
@@ -1860,7 +1860,6 @@ maybe chmod 0644 'slsh.rc'
 maybe chmod 0755 'snmp'
 maybe chmod 0644 'snmp/snmpd.conf.example'
 maybe chmod 0755 'ssh'
-maybe chmod 0600 'ssh/._cfg0000_sshd_config'
 maybe chmod 0644 'ssh/moduli'
 maybe chmod 0644 'ssh/ssh_config'
 maybe chmod 0600 'ssh/ssh_host_dsa_key'

diff --git a/apache2/modules.d/._cfg0000_00_apache_manual.conf b/apache2/modules.d/._cfg0000_00_apache_manual.conf
deleted file mode 100644 (file)
index 4323a3c..0000000
--- a/apache2/modules.d/._cfg0000_00_apache_manual.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# Provide access to the documentation on your server as
-#  http://yourserver.example.com/manual/
-# The documentation is always available at
-#  http://httpd.apache.org/docs/2.4/
-<IfModule negotiation_module>
-<IfModule setenvif_module>
-<IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.23-r2/manual$1"
-
-<Directory "/usr/share/doc/apache-2.4.23-r2/manual">
-       Options Indexes
-       AllowOverride None
-       Require all granted
-
-       <Files *.html>
-               SetHandler type-map
-       </Files>
-
-       SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br)/ prefer-language=$1
-       RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br)){2,}(/.*)?$ /manual/$1$2
-
-       LanguagePriority en de es fr ja ko pt-br
-       ForceLanguagePriority Prefer Fallback
-</Directory>
-</IfDefine>
-</IfModule>
-</IfModule>
-
-# vim: ts=4 filetype=apache

diff --git a/apache2/modules.d/._cfg0000_70_mod_php5.conf b/apache2/modules.d/._cfg0000_70_mod_php5.conf
deleted file mode 100644 (file)
index bd79f78..0000000
--- a/apache2/modules.d/._cfg0000_70_mod_php5.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-###########
-# WARNING #
-###########
-#
-# This file is provided for backwards compatibility only. The Apache
-# PHP configuration is now located in 70_mod_php.conf and requires you
-# to set -DPHP in your Apache conf.d file. Please examine
-# 70_mod_php.conf and update your Apache configuration to use -DPHP
-# instead of -DPHP5. Afterwards you may delete this file.
-#
-<IfDefine PHP5>
-       # Load the module first
-       <IfModule !mod_php5.c>
-               LoadModule php5_module    modules/libphp5.so
-       </IfModule>
-
-       # Set it to handle the files
-       # NOTE: Avoiding AddHandler/AddType for security (bug #538822)
-       # NOTE: Please read the related news item!
-       <FilesMatch "\.(php|php5|phtml)$">
-               SetHandler application/x-httpd-php
-       </FilesMatch>
-       <FilesMatch "\.phps$">
-               SetHandler application/x-httpd-php-source
-       </FilesMatch>
-
-       DirectoryIndex index.php index.phtml
-</IfDefine>

diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf
index ec3abddad46ccb1e2a82188cb054e097abbbca9e..9cf4a12f9781d20c46c8635ac1fd003deba36a8c 100644 (file)
--- a/apache2/modules.d/00_apache_manual.conf
+++ b/apache2/modules.d/00_apache_manual.conf
@@ -5,9 +5,9 @@
 <IfModule negotiation_module>
 <IfModule setenvif_module>
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.23/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.23-r2/manual$1"
 
-<Directory "/usr/share/doc/apache-2.4.23/manual">
+<Directory "/usr/share/doc/apache-2.4.23-r2/manual">
        Options Indexes
        AllowOverride None
        Require all granted

diff --git a/apache2/modules.d/70_mod_php5.conf b/apache2/modules.d/70_mod_php5.conf
new file mode 100644 (file)
index 0000000..bd79f78
--- /dev/null
+++ b/apache2/modules.d/70_mod_php5.conf
@@ -0,0 +1,28 @@
+###########
+# WARNING #
+###########
+#
+# This file is provided for backwards compatibility only. The Apache
+# PHP configuration is now located in 70_mod_php.conf and requires you
+# to set -DPHP in your Apache conf.d file. Please examine
+# 70_mod_php.conf and update your Apache configuration to use -DPHP
+# instead of -DPHP5. Afterwards you may delete this file.
+#
+<IfDefine PHP5>
+       # Load the module first
+       <IfModule !mod_php5.c>
+               LoadModule php5_module    modules/libphp5.so
+       </IfModule>
+
+       # Set it to handle the files
+       # NOTE: Avoiding AddHandler/AddType for security (bug #538822)
+       # NOTE: Please read the related news item!
+       <FilesMatch "\.(php|php5|phtml)$">
+               SetHandler application/x-httpd-php
+       </FilesMatch>
+       <FilesMatch "\.phps$">
+               SetHandler application/x-httpd-php-source
+       </FilesMatch>
+
+       DirectoryIndex index.php index.phtml
+</IfDefine>

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 3faa571546aae2a1bf5d6cc3173ed6f6a8b88baf..ec3abddad46ccb1e2a82188cb054e097abbbca9e 100644 (file)
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf
@@ -5,9 +5,9 @@
 <IfModule negotiation_module>
 <IfModule setenvif_module>
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.20/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.23/manual$1"
 
-<Directory "/usr/share/doc/apache-2.4.20/manual">
+<Directory "/usr/share/doc/apache-2.4.23/manual">
        Options Indexes
        AllowOverride None
        Require all granted

diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1
index 7e7fa4a2a5e70df0c7918918f15910db985846a6..3faa571546aae2a1bf5d6cc3173ed6f6a8b88baf 100644 (file)
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1
@@ -5,9 +5,9 @@
 <IfModule negotiation_module>
 <IfModule setenvif_module>
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.18/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.20/manual$1"
 
-<Directory "/usr/share/doc/apache-2.4.18/manual">
+<Directory "/usr/share/doc/apache-2.4.20/manual">
        Options Indexes
        AllowOverride None
        Require all granted

diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.2 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.2
index e2c1b36516b7950062255a4b9e863240ed5fdca0..7e7fa4a2a5e70df0c7918918f15910db985846a6 100644 (file)
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.2
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.2
@@ -1,17 +1,16 @@
 # Provide access to the documentation on your server as
 #  http://yourserver.example.com/manual/
 # The documentation is always available at
-#  http://httpd.apache.org/docs/2.2/
+#  http://httpd.apache.org/docs/2.4/
 <IfModule negotiation_module>
 <IfModule setenvif_module>
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.31/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.18/manual$1"
 
-<Directory "/usr/share/doc/apache-2.2.31/manual">
+<Directory "/usr/share/doc/apache-2.4.18/manual">
        Options Indexes
        AllowOverride None
-       Order allow,deny
-       Allow from all
+       Require all granted
 
        <Files *.html>
                SetHandler type-map

diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.3 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.3
index f3526381a764a0ff3abf08e4bf788d4c45324f37..e2c1b36516b7950062255a4b9e863240ed5fdca0 100644 (file)
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.3
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.3
@@ -5,9 +5,9 @@
 <IfModule negotiation_module>
 <IfModule setenvif_module>
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.29/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.31/manual$1"
 
-<Directory "/usr/share/doc/apache-2.2.29/manual">
+<Directory "/usr/share/doc/apache-2.2.31/manual">
        Options Indexes
        AllowOverride None
        Order allow,deny

diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.4 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.4
index 5d8ffc1b08155eba4141ed88df9fd0c229ddd01e..f3526381a764a0ff3abf08e4bf788d4c45324f37 100644 (file)
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.4
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.4
@@ -5,9 +5,9 @@
 <IfModule negotiation_module>
 <IfModule setenvif_module>
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.27-r4/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.29/manual$1"
 
-<Directory "/usr/share/doc/apache-2.2.27-r4/manual">
+<Directory "/usr/share/doc/apache-2.2.29/manual">
        Options Indexes
        AllowOverride None
        Order allow,deny

diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.5 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.5
index 391c2e681567824e0b2f4df3eb6162bf68c8e52a..5d8ffc1b08155eba4141ed88df9fd0c229ddd01e 100644 (file)
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.5
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.5
@@ -2,10 +2,12 @@
 #  http://yourserver.example.com/manual/
 # The documentation is always available at
 #  http://httpd.apache.org/docs/2.2/
+<IfModule negotiation_module>
+<IfModule setenvif_module>
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.27/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.27-r4/manual$1"
 
-<Directory "/usr/share/doc/apache-2.2.27/manual">
+<Directory "/usr/share/doc/apache-2.2.27-r4/manual">
        Options Indexes
        AllowOverride None
        Order allow,deny
@@ -22,5 +24,7 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apac
        ForceLanguagePriority Prefer Fallback
 </Directory>
 </IfDefine>
+</IfModule>
+</IfModule>
 
 # vim: ts=4 filetype=apache

diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.6 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.6
index 33ae915d2e348fdda5f4124c48ee9f885a3629d0..391c2e681567824e0b2f4df3eb6162bf68c8e52a 100644 (file)
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.6
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.6
@@ -3,9 +3,9 @@
 # The documentation is always available at
 #  http://httpd.apache.org/docs/2.2/
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.25/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.27/manual$1"
 
-<Directory "/usr/share/doc/apache-2.2.25/manual">
+<Directory "/usr/share/doc/apache-2.2.27/manual">
        Options Indexes
        AllowOverride None
        Order allow,deny

diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.7 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.7
index f43bf59ca9ae67ee6707bc1add99418fb4a49ee2..33ae915d2e348fdda5f4124c48ee9f885a3629d0 100644 (file)
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.7
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.7
@@ -3,9 +3,9 @@
 # The documentation is always available at
 #  http://httpd.apache.org/docs/2.2/
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.24/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.25/manual$1"
 
-<Directory "/usr/share/doc/apache-2.2.24/manual">
+<Directory "/usr/share/doc/apache-2.2.25/manual">
        Options Indexes
        AllowOverride None
        Order allow,deny

diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.8 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.8
index 240d6b42dd705916ad5260d6ebfad876a0776a27..f43bf59ca9ae67ee6707bc1add99418fb4a49ee2 100644 (file)
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.8
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.8
@@ -3,9 +3,9 @@
 # The documentation is always available at
 #  http://httpd.apache.org/docs/2.2/
 <IfDefine MANUAL>
-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"
 
-<Directory "/usr/share/doc/apache-2.2.23/manual">
+<Directory "/usr/share/doc/apache-2.2.24/manual">
        Options Indexes
        AllowOverride None
        Order allow,deny

diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.9 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.9
index 25de5d121d068eb42d643275572cc7319bf9c896..240d6b42dd705916ad5260d6ebfad876a0776a27 100644 (file)
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.9
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.9
@@ -3,9 +3,9 @@
 # The documentation is always available at
 #  http://httpd.apache.org/docs/2.2/
 <IfDefine MANUAL>
-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.23/manual$1"
 
-<Directory "/usr/share/doc/apache-2.2.22/manual">
+<Directory "/usr/share/doc/apache-2.2.23/manual">
        Options Indexes
        AllowOverride None
        Order allow,deny
@@ -18,7 +18,7 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apac
        SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br)/ prefer-language=$1
        RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br)){2,}(/.*)?$ /manual/$1$2
 
-       LanguagePriority en de es fr ja ko pt-br
+       LanguagePriority de en es fr ja ko pt-br
        ForceLanguagePriority Prefer Fallback
 </Directory>
 </IfDefine>

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 c1ddd150644c8d8d316314a19d88711948659254..4323a3c30bbdcfd2de09b748d2749c75c9044c6d 100644 (file)
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist
@@ -5,9 +5,9 @@
 <IfModule negotiation_module>
 <IfModule setenvif_module>
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.23/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.23-r2/manual$1"
 
-<Directory "/usr/share/doc/apache-2.4.23/manual">
+<Directory "/usr/share/doc/apache-2.4.23-r2/manual">
        Options Indexes
        AllowOverride None
        Require all granted

diff --git a/config-archive/etc/apache2/modules.d/70_mod_php5.conf.dist b/config-archive/etc/apache2/modules.d/70_mod_php5.conf.dist
new file mode 100644 (file)
index 0000000..bd79f78
--- /dev/null
+++ b/config-archive/etc/apache2/modules.d/70_mod_php5.conf.dist
@@ -0,0 +1,28 @@
+###########
+# WARNING #
+###########
+#
+# This file is provided for backwards compatibility only. The Apache
+# PHP configuration is now located in 70_mod_php.conf and requires you
+# to set -DPHP in your Apache conf.d file. Please examine
+# 70_mod_php.conf and update your Apache configuration to use -DPHP
+# instead of -DPHP5. Afterwards you may delete this file.
+#
+<IfDefine PHP5>
+       # Load the module first
+       <IfModule !mod_php5.c>
+               LoadModule php5_module    modules/libphp5.so
+       </IfModule>
+
+       # Set it to handle the files
+       # NOTE: Avoiding AddHandler/AddType for security (bug #538822)
+       # NOTE: Please read the related news item!
+       <FilesMatch "\.(php|php5|phtml)$">
+               SetHandler application/x-httpd-php
+       </FilesMatch>
+       <FilesMatch "\.phps$">
+               SetHandler application/x-httpd-php-source
+       </FilesMatch>
+
+       DirectoryIndex index.php index.phtml
+</IfDefine>

diff --git a/config-archive/etc/cron.daily/logrotate.dist.new b/config-archive/etc/cron.daily/logrotate.dist.new
index c6d50d4a7e87dc2744440bd9b7a07199a0a6224b..67ff6265a937ab09c15d0729def31083e691afb5 100755 (executable)
--- a/config-archive/etc/cron.daily/logrotate.dist.new
+++ b/config-archive/etc/cron.daily/logrotate.dist.new
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-/usr/sbin/logrotate /etc/logrotate.conf
+/usr/bin/logrotate /etc/logrotate.conf
 EXITVALUE=$?
 if [ $EXITVALUE != 0 ]; then
     /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"

diff --git a/config-archive/etc/ssh/sshd_config b/config-archive/etc/ssh/sshd_config
index e5c3e3f951ac174109eaceb62bfa3a83ef605526..ebb232a058c001e133e35f07502150db2e9df0d8 100644 (file)
--- a/config-archive/etc/ssh/sshd_config
+++ b/config-archive/etc/ssh/sshd_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.97 2015/08/06 14:53:21 deraadt Exp $
+#      $OpenBSD: sshd_config,v 1.98 2016/02/17 05:29:04 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -108,7 +108,7 @@ PrintMotd no
 PrintLastLog no
 #TCPKeepAlive yes
 #UseLogin no
-UsePrivilegeSeparation sandbox         # Default for new installations.
+#UsePrivilegeSeparation sandbox
 #PermitUserEnvironment no
 #Compression delayed
 #ClientAliveInterval 0
@@ -145,20 +145,6 @@ AcceptEnv LANG LC_*
 # override default of no subsystems
 Subsystem      sftp    /usr/lib64/misc/sftp-server
 
-# the following are HPN related configuration options
-# tcp receive buffer polling. disable in non autotuning kernels
-#TcpRcvBufPoll yes
-
-# disable hpn performance boosts
-#HPNDisabled no
-
-# buffer size for hpn to non-hpn connections
-#HPNBufferSize 2048
-
-
-# allow the use of the none cipher
-#NoneEnabled no
-
 # Example of overriding settings on a per-user basis
 #Match User anoncvs
 #      X11Forwarding no

diff --git a/config-archive/etc/ssh/sshd_config.1 b/config-archive/etc/ssh/sshd_config.1
index 8fe554b130cd3258be306a0dcdadff4f04f88cb5..e5c3e3f951ac174109eaceb62bfa3a83ef605526 100644 (file)
--- a/config-archive/etc/ssh/sshd_config.1
+++ b/config-archive/etc/ssh/sshd_config.1
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.95 2015/04/27 21:42:48 djm Exp $
+#      $OpenBSD: sshd_config,v 1.97 2015/08/06 14:53:21 deraadt Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -70,7 +70,6 @@ PermitRootLogin yes
 #IgnoreRhosts yes
 
 # To disable tunneled clear text passwords, change to no here!
-#PasswordAuthentication no
 PasswordAuthentication no
 #PermitEmptyPasswords no
 

diff --git a/config-archive/etc/ssh/sshd_config.2 b/config-archive/etc/ssh/sshd_config.2
index 5eb8312b2bd8688cc5e231d066b5efd7e88929e5..8fe554b130cd3258be306a0dcdadff4f04f88cb5 100644 (file)
--- a/config-archive/etc/ssh/sshd_config.2
+++ b/config-archive/etc/ssh/sshd_config.2
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.93 2014/01/10 05:59:19 djm Exp $
+#      $OpenBSD: sshd_config,v 1.95 2015/04/27 21:42:48 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -26,72 +26,6 @@
 #HostKey /etc/ssh/ssh_host_ecdsa_key
 #HostKey /etc/ssh/ssh_host_ed25519_key
 
-# "key type names" for X.509 certificates with RSA key
-# Note first defined is used in signature operations!
-#X509KeyAlgorithm x509v3-sign-rsa,rsa-sha1
-#X509KeyAlgorithm x509v3-sign-rsa,rsa-md5
-
-# "key type names" for X.509 certificates with DSA key
-# Note first defined is used in signature operations!
-#X509KeyAlgorithm x509v3-sign-dss,dss-asn1
-#X509KeyAlgorithm x509v3-sign-dss,dss-raw
-
-# The intended use for the X509 client certificate. Without this option
-# no chain verification will be done. Currently accepted uses are case
-# insensitive:
-#  - "sslclient", "SSL client", "SSL_client" or "client"
-#  - "any", "Any Purpose", "Any_Purpose" or "AnyPurpose"
-#  - "skip" or ""(empty): don`t check purpose.
-#AllowedCertPurpose sslclient
-
-# Specifies whether self-issued(self-signed) X.509 certificate can be
-# allowed only by entry in AutorizedKeysFile that contain matching
-# public key or certificate blob.
-#KeyAllowSelfIssued no
-
-# Specifies whether CRL must present in store for all certificates in
-# certificate chain with atribute "cRLDistributionPoints"
-#MandatoryCRL no
-
-# A file with multiple certificates of certificate signers
-# in PEM format concatenated together.
-#CACertificateFile /etc/ssh/ca/ca-bundle.crt
-
-# A directory with certificates of certificate signers.
-# The certificates should have name of the form: [HASH].[NUMBER]
-# or have symbolic links to them of this form.
-#CACertificatePath /etc/ssh/ca/crt
-
-# A file with multiple CRL of certificate signers
-# in PEM format concatenated together.
-#CARevocationFile /etc/ssh/ca/ca-bundle.crl
-
-# A directory with CRL of certificate signers. 
-# The CRL should have name of the form: [HASH].r[NUMBER]
-# or have symbolic links to them of this form.
-#CARevocationPath /etc/ssh/ca/crl
-
-# LDAP protocol version.
-# Example:
-# CAldapVersion 2
-
-# Note because of OpenSSH options parser limitation
-# use %3D instead of = !
-# LDAP initialization may require URL to be escaped, i.e.
-# use %2C instead of ,(comma). Escaped URL don't depend from
-# LDAP initialization method.
-# Example:
-# CAldapURL ldap://localhost:389/dc%3Dexample%2Cdc%3Dcom
-
-# SSH can use "Online Certificate Status Protocol"(OCSP)
-# to validate certificate. Set VAType to
-#  - none    : do not use OCSP to validate certificates;
-#  - ocspcert: validate only certificates that specify `OCSP
-#      Service Locator' URL;
-#  - ocspspec: use specified in the configuration 'OCSP Responder'
-#      to validate all certificates.
-#VAType none
-
 # Lifetime and size of ephemeral version 1 server key
 #KeyRegenerationInterval 1h
 #ServerKeyBits 1024
@@ -152,7 +86,6 @@ PasswordAuthentication no
 # GSSAPI options
 #GSSAPIAuthentication no
 #GSSAPICleanupCredentials yes
-#GSSAPIStrictAcceptorCheck yes
 
 # Set this to 'yes' to enable PAM authentication, account processing,
 # and session processing. If this is enabled, PAM authentication will
@@ -181,8 +114,8 @@ UsePrivilegeSeparation sandbox              # Default for new installations.
 #Compression delayed
 #ClientAliveInterval 0
 #ClientAliveCountMax 3
-#UseDNS yes
-#PidFile /var/run/sshd.pid
+#UseDNS no
+#PidFile /run/sshd.pid
 #MaxStartups 10:30:100
 #PermitTunnel no
 #ChrootDirectory none

diff --git a/config-archive/etc/ssh/sshd_config.3 b/config-archive/etc/ssh/sshd_config.3
index c7c3f62a74ac9eaf92588253fb8283a35cf99ea7..5eb8312b2bd8688cc5e231d066b5efd7e88929e5 100644 (file)
--- a/config-archive/etc/ssh/sshd_config.3
+++ b/config-archive/etc/ssh/sshd_config.3
@@ -1,4 +1,4 @@
-#      $OpenBSD$
+#      $OpenBSD: sshd_config,v 1.93 2014/01/10 05:59:19 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -194,13 +194,29 @@ UsePrivilegeSeparation sandbox            # Default for new installations.
 # Allow client to pass locale environment variables
 AcceptEnv LANG LC_*
 
+# here are the new patched ldap related tokens
+# entries in your LDAP must have posixAccount & ldapPublicKey objectclass
+#UseLPK yes
+#LpkLdapConf /etc/ldap.conf
+#LpkServers  ldap://10.1.7.1/ ldap://10.1.7.2/
+#LpkUserDN   ou=users,dc=phear,dc=org
+#LpkGroupDN  ou=groups,dc=phear,dc=org
+#LpkBindDN cn=Manager,dc=phear,dc=org
+#LpkBindPw secret
+#LpkServerGroup mail
+#LpkFilter (hostAccess=master.phear.org)
+#LpkForceTLS no
+#LpkSearchTimelimit 3
+#LpkBindTimelimit 3
+#LpkPubKeyAttr sshPublicKey
+
 # override default of no subsystems
 Subsystem      sftp    /usr/lib64/misc/sftp-server
 
 # the following are HPN related configuration options
 # tcp receive buffer polling. disable in non autotuning kernels
 #TcpRcvBufPoll yes
- 
+
 # disable hpn performance boosts
 #HPNDisabled no
 

diff --git a/config-archive/etc/ssh/sshd_config.4 b/config-archive/etc/ssh/sshd_config.4
index 6401926782cd0817fc7940776c0cf1826fbceec9..c7c3f62a74ac9eaf92588253fb8283a35cf99ea7 100644 (file)
--- a/config-archive/etc/ssh/sshd_config.4
+++ b/config-archive/etc/ssh/sshd_config.4
@@ -24,6 +24,7 @@
 #HostKey /etc/ssh/ssh_host_rsa_key
 #HostKey /etc/ssh/ssh_host_dsa_key
 #HostKey /etc/ssh/ssh_host_ecdsa_key
+#HostKey /etc/ssh/ssh_host_ed25519_key
 
 # "key type names" for X.509 certificates with RSA key
 # Note first defined is used in signature operations!
@@ -153,8 +154,8 @@ PasswordAuthentication no
 #GSSAPICleanupCredentials yes
 #GSSAPIStrictAcceptorCheck yes
 
-# Set this to 'yes' to enable PAM authentication, account processing, 
-# and session processing. If this is enabled, PAM authentication will 
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
 # be allowed through the ChallengeResponseAuthentication and
 # PasswordAuthentication.  Depending on your PAM configuration,
 # PAM authentication via ChallengeResponseAuthentication may bypass
@@ -170,6 +171,7 @@ UsePAM yes
 #X11Forwarding no
 #X11DisplayOffset 10
 #X11UseLocalhost yes
+#PermitTTY yes
 PrintMotd no
 PrintLastLog no
 #TCPKeepAlive yes
@@ -213,6 +215,7 @@ Subsystem   sftp    /usr/lib64/misc/sftp-server
 #Match User anoncvs
 #      X11Forwarding no
 #      AllowTcpForwarding no
+#      PermitTTY no
 #      ForceCommand cvs server
 
 # Allow client to pass locale environment variables #367017

diff --git a/config-archive/etc/ssh/sshd_config.5 b/config-archive/etc/ssh/sshd_config.5
index e8168d6cc6ceeefdf3a430dc0f35632c5bc56b35..6401926782cd0817fc7940776c0cf1826fbceec9 100644 (file)
--- a/config-archive/etc/ssh/sshd_config.5
+++ b/config-archive/etc/ssh/sshd_config.5
@@ -27,8 +27,8 @@
 
 # "key type names" for X.509 certificates with RSA key
 # Note first defined is used in signature operations!
-#X509KeyAlgorithm x509v3-sign-rsa,rsa-md5
 #X509KeyAlgorithm x509v3-sign-rsa,rsa-sha1
+#X509KeyAlgorithm x509v3-sign-rsa,rsa-md5
 
 # "key type names" for X.509 certificates with DSA key
 # Note first defined is used in signature operations!
@@ -95,6 +95,9 @@
 #KeyRegenerationInterval 1h
 #ServerKeyBits 1024
 
+# Ciphers and keying
+#RekeyLimit default none
+
 # Logging
 # obsoletes QuietMode and FascistLogging
 #SyslogFacility AUTH
@@ -116,6 +119,11 @@ PermitRootLogin yes
 # but this is overridden so installations will only check .ssh/authorized_keys
 #AuthorizedKeysFile    .ssh/authorized_keys
 
+#AuthorizedPrincipalsFile none
+
+#AuthorizedKeysCommand none
+#AuthorizedKeysCommandUser nobody
+
 # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
 #RhostsRSAAuthentication no
 # similar for protocol version 2
@@ -166,16 +174,17 @@ PrintMotd no
 PrintLastLog no
 #TCPKeepAlive yes
 #UseLogin no
-#UsePrivilegeSeparation yes
+UsePrivilegeSeparation sandbox         # Default for new installations.
 #PermitUserEnvironment no
 #Compression delayed
 #ClientAliveInterval 0
 #ClientAliveCountMax 3
 #UseDNS yes
 #PidFile /var/run/sshd.pid
-#MaxStartups 10
+#MaxStartups 10:30:100
 #PermitTunnel no
 #ChrootDirectory none
+#VersionAddendum none
 
 # no default banner path
 #Banner none
@@ -190,18 +199,21 @@ Subsystem sftp    /usr/lib64/misc/sftp-server
 # tcp receive buffer polling. disable in non autotuning kernels
 #TcpRcvBufPoll yes
  
-# allow the use of the none cipher
-#NoneEnabled no
-
-# disable hpn performance boosts. 
+# disable hpn performance boosts
 #HPNDisabled no
 
 # buffer size for hpn to non-hpn connections
 #HPNBufferSize 2048
 
 
+# allow the use of the none cipher
+#NoneEnabled no
+
 # Example of overriding settings on a per-user basis
 #Match User anoncvs
 #      X11Forwarding no
 #      AllowTcpForwarding no
 #      ForceCommand cvs server
+
+# Allow client to pass locale environment variables #367017
+AcceptEnv LANG LC_*

diff --git a/config-archive/etc/ssh/sshd_config.6 b/config-archive/etc/ssh/sshd_config.6
index e686e9febdb47e014e1638e2232687b62a8db9d9..e8168d6cc6ceeefdf3a430dc0f35632c5bc56b35 100644 (file)
--- a/config-archive/etc/ssh/sshd_config.6
+++ b/config-archive/etc/ssh/sshd_config.6
@@ -7,7 +7,7 @@
 
 # The strategy used for options in the default sshd_config shipped with
 # OpenSSH is to specify options with their default value where
-# possible, but leave them commented.  Uncommented options change a
+# possible, but leave them commented.  Uncommented options override the
 # default value.
 
 #Port 22
@@ -103,14 +103,17 @@
 # Authentication:
 
 #LoginGraceTime 2m
-#PermitRootLogin yes
-PermitRootLogin no
+PermitRootLogin yes
+#PermitRootLogin no
 #StrictModes yes
 #MaxAuthTries 6
 #MaxSessions 10
 
 #RSAAuthentication yes
 #PubkeyAuthentication yes
+
+# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+# but this is overridden so installations will only check .ssh/authorized_keys
 #AuthorizedKeysFile    .ssh/authorized_keys
 
 # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
@@ -140,6 +143,7 @@ PasswordAuthentication no
 # GSSAPI options
 #GSSAPIAuthentication no
 #GSSAPICleanupCredentials yes
+#GSSAPIStrictAcceptorCheck yes
 
 # Set this to 'yes' to enable PAM authentication, account processing, 
 # and session processing. If this is enabled, PAM authentication will 
@@ -176,6 +180,9 @@ PrintLastLog no
 # no default banner path
 #Banner none
 
+# Allow client to pass locale environment variables
+AcceptEnv LANG LC_*
+
 # override default of no subsystems
 Subsystem      sftp    /usr/lib64/misc/sftp-server
 

diff --git a/config-archive/etc/ssh/sshd_config.7 b/config-archive/etc/ssh/sshd_config.7
index ca729797f0c4f211f74551bd277a81c081dfe6ac..e686e9febdb47e014e1638e2232687b62a8db9d9 100644 (file)
--- a/config-archive/etc/ssh/sshd_config.7
+++ b/config-archive/etc/ssh/sshd_config.7
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.82 2010/09/06 17:10:19 naddy Exp $
+#      $OpenBSD$
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -25,6 +25,72 @@
 #HostKey /etc/ssh/ssh_host_dsa_key
 #HostKey /etc/ssh/ssh_host_ecdsa_key
 
+# "key type names" for X.509 certificates with RSA key
+# Note first defined is used in signature operations!
+#X509KeyAlgorithm x509v3-sign-rsa,rsa-md5
+#X509KeyAlgorithm x509v3-sign-rsa,rsa-sha1
+
+# "key type names" for X.509 certificates with DSA key
+# Note first defined is used in signature operations!
+#X509KeyAlgorithm x509v3-sign-dss,dss-asn1
+#X509KeyAlgorithm x509v3-sign-dss,dss-raw
+
+# The intended use for the X509 client certificate. Without this option
+# no chain verification will be done. Currently accepted uses are case
+# insensitive:
+#  - "sslclient", "SSL client", "SSL_client" or "client"
+#  - "any", "Any Purpose", "Any_Purpose" or "AnyPurpose"
+#  - "skip" or ""(empty): don`t check purpose.
+#AllowedCertPurpose sslclient
+
+# Specifies whether self-issued(self-signed) X.509 certificate can be
+# allowed only by entry in AutorizedKeysFile that contain matching
+# public key or certificate blob.
+#KeyAllowSelfIssued no
+
+# Specifies whether CRL must present in store for all certificates in
+# certificate chain with atribute "cRLDistributionPoints"
+#MandatoryCRL no
+
+# A file with multiple certificates of certificate signers
+# in PEM format concatenated together.
+#CACertificateFile /etc/ssh/ca/ca-bundle.crt
+
+# A directory with certificates of certificate signers.
+# The certificates should have name of the form: [HASH].[NUMBER]
+# or have symbolic links to them of this form.
+#CACertificatePath /etc/ssh/ca/crt
+
+# A file with multiple CRL of certificate signers
+# in PEM format concatenated together.
+#CARevocationFile /etc/ssh/ca/ca-bundle.crl
+
+# A directory with CRL of certificate signers. 
+# The CRL should have name of the form: [HASH].r[NUMBER]
+# or have symbolic links to them of this form.
+#CARevocationPath /etc/ssh/ca/crl
+
+# LDAP protocol version.
+# Example:
+# CAldapVersion 2
+
+# Note because of OpenSSH options parser limitation
+# use %3D instead of = !
+# LDAP initialization may require URL to be escaped, i.e.
+# use %2C instead of ,(comma). Escaped URL don't depend from
+# LDAP initialization method.
+# Example:
+# CAldapURL ldap://localhost:389/dc%3Dexample%2Cdc%3Dcom
+
+# SSH can use "Online Certificate Status Protocol"(OCSP)
+# to validate certificate. Set VAType to
+#  - none    : do not use OCSP to validate certificates;
+#  - ocspcert: validate only certificates that specify `OCSP
+#      Service Locator' URL;
+#  - ocspspec: use specified in the configuration 'OCSP Responder'
+#      to validate all certificates.
+#VAType none
+
 # Lifetime and size of ephemeral version 1 server key
 #KeyRegenerationInterval 1h
 #ServerKeyBits 1024

diff --git a/config-archive/etc/ssh/sshd_config.8 b/config-archive/etc/ssh/sshd_config.8
new file mode 100644 (file)
index 0000000..ca72979
--- /dev/null
+++ b/config-archive/etc/ssh/sshd_config.8
@@ -0,0 +1,134 @@
+#      $OpenBSD: sshd_config,v 1.82 2010/09/06 17:10:19 naddy Exp $
+
+# This is the sshd server system-wide configuration file.  See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented.  Uncommented options change a
+# default value.
+
+#Port 22
+#AddressFamily any
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+# The default requires explicit activation of protocol 1
+#Protocol 2
+
+# HostKey for protocol version 1
+#HostKey /etc/ssh/ssh_host_key
+# HostKeys for protocol version 2
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_dsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
+
+# Lifetime and size of ephemeral version 1 server key
+#KeyRegenerationInterval 1h
+#ServerKeyBits 1024
+
+# Logging
+# obsoletes QuietMode and FascistLogging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 2m
+#PermitRootLogin yes
+PermitRootLogin no
+#StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10
+
+#RSAAuthentication yes
+#PubkeyAuthentication yes
+#AuthorizedKeysFile    .ssh/authorized_keys
+
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#RhostsRSAAuthentication no
+# similar for protocol version 2
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# RhostsRSAAuthentication and HostbasedAuthentication
+#IgnoreUserKnownHosts no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+
+# To disable tunneled clear text passwords, change to no here!
+#PasswordAuthentication no
+PasswordAuthentication no
+#PermitEmptyPasswords no
+
+# Change to no to disable s/key passwords
+#ChallengeResponseAuthentication yes
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+#KerberosGetAFSToken no
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+# Set this to 'yes' to enable PAM authentication, account processing, 
+# and session processing. If this is enabled, PAM authentication will 
+# be allowed through the ChallengeResponseAuthentication and
+# PasswordAuthentication.  Depending on your PAM configuration,
+# PAM authentication via ChallengeResponseAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and ChallengeResponseAuthentication to 'no'.
+UsePAM yes
+
+#AllowAgentForwarding yes
+#AllowTcpForwarding yes
+#GatewayPorts no
+#X11Forwarding no
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+PrintMotd no
+PrintLastLog no
+#TCPKeepAlive yes
+#UseLogin no
+#UsePrivilegeSeparation yes
+#PermitUserEnvironment no
+#Compression delayed
+#ClientAliveInterval 0
+#ClientAliveCountMax 3
+#UseDNS yes
+#PidFile /var/run/sshd.pid
+#MaxStartups 10
+#PermitTunnel no
+#ChrootDirectory none
+
+# no default banner path
+#Banner none
+
+# override default of no subsystems
+Subsystem      sftp    /usr/lib64/misc/sftp-server
+
+# the following are HPN related configuration options
+# tcp receive buffer polling. disable in non autotuning kernels
+#TcpRcvBufPoll yes
+ 
+# allow the use of the none cipher
+#NoneEnabled no
+
+# disable hpn performance boosts. 
+#HPNDisabled no
+
+# buffer size for hpn to non-hpn connections
+#HPNBufferSize 2048
+
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+#      X11Forwarding no
+#      AllowTcpForwarding no
+#      ForceCommand cvs server

diff --git a/config-archive/etc/ssh/sshd_config.dist b/config-archive/etc/ssh/sshd_config.dist
index 20d455d10688710b71b4ba8c6de6db49cd1c4912..4251be27e9f7a65dab7c38ccf9b00bf65443abfa 100644 (file)
--- a/config-archive/etc/ssh/sshd_config.dist
+++ b/config-archive/etc/ssh/sshd_config.dist
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.98 2016/02/17 05:29:04 djm Exp $
+#      $OpenBSD: sshd_config,v 1.99 2016/07/11 03:19:44 tedu Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -34,7 +34,6 @@
 #RekeyLimit default none
 
 # Logging
-# obsoletes QuietMode and FascistLogging
 #SyslogFacility AUTH
 #LogLevel INFO
 
@@ -141,6 +140,20 @@ PrintLastLog no
 # override default of no subsystems
 Subsystem      sftp    /usr/lib64/misc/sftp-server
 
+# the following are HPN related configuration options
+# tcp receive buffer polling. disable in non autotuning kernels
+#TcpRcvBufPoll yes
+
+# disable hpn performance boosts
+#HPNDisabled no
+
+# buffer size for hpn to non-hpn connections
+#HPNBufferSize 2048
+
+
+# allow the use of the none cipher
+#NoneEnabled no
+
 # Example of overriding settings on a per-user basis
 #Match User anoncvs
 #      X11Forwarding no

diff --git a/cron.daily/._cfg0000_logrotate b/cron.daily/._cfg0000_logrotate
deleted file mode 100755 (executable)
index 67ff626..0000000
--- a/cron.daily/._cfg0000_logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-/usr/bin/logrotate /etc/logrotate.conf
-EXITVALUE=$?
-if [ $EXITVALUE != 0 ]; then
-    /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"
-fi
-exit 0

diff --git a/portage/package.use b/portage/package.use
index c78e04995c591b0d7365cdd6aad44ef0d3ca9664..7efcea68db6e6852e60c9ddb369aeacadbd4c8d9 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -82,6 +82,7 @@ dev-python/ipython                    -doc smp
 dev-python/jinja                       -doc
 dev-python/numpy                       lapack
 dev-python/pandas                      -doc
+dev-python/paramiko                    -doc -examples
 dev-python/pb-base                     -doc
 dev-python/pb-logging                  -doc
 dev-python/pycairo                     -doc

diff --git a/ssh/._cfg0000_sshd_config b/ssh/._cfg0000_sshd_config
deleted file mode 100644 (file)
index 4251be2..0000000
--- a/ssh/._cfg0000_sshd_config
+++ /dev/null
@@ -1,165 +0,0 @@
-#      $OpenBSD: sshd_config,v 1.99 2016/07/11 03:19:44 tedu Exp $
-
-# This is the sshd server system-wide configuration file.  See
-# sshd_config(5) for more information.
-
-# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
-
-# The strategy used for options in the default sshd_config shipped with
-# OpenSSH is to specify options with their default value where
-# possible, but leave them commented.  Uncommented options override the
-# default value.
-
-#Port 22
-#AddressFamily any
-#ListenAddress 0.0.0.0
-#ListenAddress ::
-
-# The default requires explicit activation of protocol 1
-#Protocol 2
-
-# HostKey for protocol version 1
-#HostKey /etc/ssh/ssh_host_key
-# HostKeys for protocol version 2
-#HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_dsa_key
-#HostKey /etc/ssh/ssh_host_ecdsa_key
-#HostKey /etc/ssh/ssh_host_ed25519_key
-
-# Lifetime and size of ephemeral version 1 server key
-#KeyRegenerationInterval 1h
-#ServerKeyBits 1024
-
-# Ciphers and keying
-#RekeyLimit default none
-
-# Logging
-#SyslogFacility AUTH
-#LogLevel INFO
-
-# Authentication:
-
-#LoginGraceTime 2m
-#PermitRootLogin prohibit-password
-#StrictModes yes
-#MaxAuthTries 6
-#MaxSessions 10
-
-#RSAAuthentication yes
-#PubkeyAuthentication yes
-
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-#AuthorizedKeysFile    .ssh/authorized_keys
-
-#AuthorizedPrincipalsFile none
-
-#AuthorizedKeysCommand none
-#AuthorizedKeysCommandUser nobody
-
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#RhostsRSAAuthentication no
-# similar for protocol version 2
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# RhostsRSAAuthentication and HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
-
-# To disable tunneled clear text passwords, change to no here!
-PasswordAuthentication no
-#PermitEmptyPasswords no
-
-# Change to no to disable s/key passwords
-#ChallengeResponseAuthentication yes
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-
-# Set this to 'yes' to enable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the ChallengeResponseAuthentication and
-# PasswordAuthentication.  Depending on your PAM configuration,
-# PAM authentication via ChallengeResponseAuthentication may bypass
-# the setting of "PermitRootLogin without-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and ChallengeResponseAuthentication to 'no'.
-UsePAM yes
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-#X11Forwarding no
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PermitTTY yes
-PrintMotd no
-PrintLastLog no
-#TCPKeepAlive yes
-#UseLogin no
-#UsePrivilegeSeparation sandbox
-#PermitUserEnvironment no
-#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-#UseDNS no
-#PidFile /run/sshd.pid
-#MaxStartups 10:30:100
-#PermitTunnel no
-#ChrootDirectory none
-#VersionAddendum none
-
-# no default banner path
-#Banner none
-
-# here are the new patched ldap related tokens
-# entries in your LDAP must have posixAccount & ldapPublicKey objectclass
-#UseLPK yes
-#LpkLdapConf /etc/ldap.conf
-#LpkServers  ldap://10.1.7.1/ ldap://10.1.7.2/
-#LpkUserDN   ou=users,dc=phear,dc=org
-#LpkGroupDN  ou=groups,dc=phear,dc=org
-#LpkBindDN cn=Manager,dc=phear,dc=org
-#LpkBindPw secret
-#LpkServerGroup mail
-#LpkFilter (hostAccess=master.phear.org)
-#LpkForceTLS no
-#LpkSearchTimelimit 3
-#LpkBindTimelimit 3
-#LpkPubKeyAttr sshPublicKey
-
-# override default of no subsystems
-Subsystem      sftp    /usr/lib64/misc/sftp-server
-
-# the following are HPN related configuration options
-# tcp receive buffer polling. disable in non autotuning kernels
-#TcpRcvBufPoll yes
-
-# disable hpn performance boosts
-#HPNDisabled no
-
-# buffer size for hpn to non-hpn connections
-#HPNBufferSize 2048
-
-
-# allow the use of the none cipher
-#NoneEnabled no
-
-# Example of overriding settings on a per-user basis
-#Match User anoncvs
-#      X11Forwarding no
-#      AllowTcpForwarding no
-#      PermitTTY no
-#      ForceCommand cvs server
-
-# Allow client to pass locale environment variables #367017
-AcceptEnv LANG LC_*

diff --git a/ssh/sshd_config b/ssh/sshd_config
index ebb232a058c001e133e35f07502150db2e9df0d8..616440ed1b640fdf019152c8bebcca7eca2a2652 100644 (file)
--- a/ssh/sshd_config
+++ b/ssh/sshd_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.98 2016/02/17 05:29:04 djm Exp $
+#      $OpenBSD: sshd_config,v 1.99 2016/07/11 03:19:44 tedu Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -34,7 +34,6 @@
 #RekeyLimit default none
 
 # Logging
-# obsoletes QuietMode and FascistLogging
 #SyslogFacility AUTH
 #LogLevel INFO
 
@@ -145,6 +144,20 @@ AcceptEnv LANG LC_*
 # override default of no subsystems
 Subsystem      sftp    /usr/lib64/misc/sftp-server
 
+# the following are HPN related configuration options
+# tcp receive buffer polling. disable in non autotuning kernels
+#TcpRcvBufPoll yes
+
+# disable hpn performance boosts
+#HPNDisabled no
+
+# buffer size for hpn to non-hpn connections
+#HPNBufferSize 2048
+
+
+# allow the use of the none cipher
+#NoneEnabled no
+
 # Example of overriding settings on a per-user basis
 #Match User anoncvs
 #      X11Forwarding no