saving uncommitted changes in /etc prior to emerge run

diff --git a/apache2/magic b/apache2/magic
index 0de73361fb1f4970ac06393b361786333ad88a56..7c56119e9a59290f97eee23bbf483ee8a348639e 100644 (file)
--- a/apache2/magic
+++ b/apache2/magic
@@ -262,6 +262,9 @@
 #0     string          CP              color pointer
 #0     string          BA              bitmap array
 
+0      string          \x89PNG         image/png
+0      string          FWS             application/x-shockwave-flash
+0      string          CWS             application/x-shockwave-flash
 
 #------------------------------------------------------------------------------
 # lisp:  file(1) magic for lisp programs

diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf
index f4ff1004fdf63f20dd9d5a173cc21d6b94148cf2..569915157456b6b4b28e5fe49836bc7b7eee1b35 100644 (file)
--- a/apache2/modules.d/00_apache_manual.conf
+++ b/apache2/modules.d/00_apache_manual.conf
@@ -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/apache2/modules.d/00_mod_userdir.conf b/apache2/modules.d/00_mod_userdir.conf
index da7d0fb3f740c5b04a9bf0f7b9f4835344e9e42b..0087126c4008d3144ef9f5f24411607786e87284 100644 (file)
--- a/apache2/modules.d/00_mod_userdir.conf
+++ b/apache2/modules.d/00_mod_userdir.conf
@@ -11,12 +11,10 @@ UserDir public_html
        AllowOverride FileInfo AuthConfig Limit Indexes
        Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
        <Limit GET POST OPTIONS>
-               Order allow,deny
-               Allow from all
+               Require all granted
        </Limit>
        <LimitExcept GET POST OPTIONS>
-               Order deny,allow
-               Deny from all
+               Require all denied
        </LimitExcept>
 </Directory>
 

diff --git a/apache2/modules.d/40_mod_ssl.conf b/apache2/modules.d/40_mod_ssl.conf
index 82df7606c313608e2540402c5dc10e65dfd35db7..f51de4641782284191d9105de61b8446459e887f 100644 (file)
--- a/apache2/modules.d/40_mod_ssl.conf
+++ b/apache2/modules.d/40_mod_ssl.conf
@@ -10,7 +10,7 @@ SSLRandomSeed connect builtin
 # This is the Apache server configuration file providing SSL support.
 # It contains the configuration directives to instruct the server how to
 # serve pages over an https connection. For detailing information about these 
-# directives see <URL:http://httpd.apache.org/docs/2.2/mod/mod_ssl.html>
+# directives see <URL:http://httpd.apache.org/docs/2.4/mod/mod_ssl.html>
 
 # Do NOT simply read the instructions in here without understanding
 # what they do.  They're here only as hints or reminders. If you are unsure
@@ -50,14 +50,14 @@ SSLPassPhraseDialog  builtin
 ## Inter-Process Session Cache:
 # Configure the SSL Session Cache: First the mechanism  to use and second the
 # expiring timeout (in seconds).
-#SSLSessionCache               dbm:/var/run/ssl_scache
-SSLSessionCache                        shmcb:/var/run/ssl_scache(512000)
+#SSLSessionCache               dbm:/run/ssl_scache
+SSLSessionCache                        shmcb:/run/ssl_scache(512000)
 SSLSessionCacheTimeout  300
 
 ## Semaphore:
 # Configure the path to the mutual exclusion semaphore the SSL engine uses
 # internally for inter-process synchronization.
-SSLMutex  file:/var/run/ssl_mutex
+Mutex file:/run/apache_ssl_mutex ssl-cache
 
 ## SSL Compression:
 # Known to be vulnerable thus disabled by default (bug #507324).

diff --git a/apache2/modules.d/46_mod_ldap.conf b/apache2/modules.d/46_mod_ldap.conf
index c2893f824a04573bd682f2743c494ea8789db80f..883061fee969dbde06d3ec73998d7fde2d39efa6 100644 (file)
--- a/apache2/modules.d/46_mod_ldap.conf
+++ b/apache2/modules.d/46_mod_ldap.conf
@@ -11,9 +11,7 @@ LDAPOpCacheTTL                600
 
 <Location /ldap-status>
        SetHandler ldap-status
-       Order deny,allow
-       Deny from all
-       Allow from 127.0.0.1
+       Require local
 </Location>
 </IfDefine>
 

diff --git a/init.d/apache2 b/init.d/apache2
index 155747f15fede5f15bd36e2d2e193b354520f8ec..eebc130c343f8f137b60528e4f147a56d74247f5 100755 (executable)
--- a/init.d/apache2
+++ b/init.d/apache2
@@ -58,6 +58,7 @@ checkconfd() {
 }
 
 checkconfig() {
+       checkpath --directory /run/apache_ssl_mutex
        checkconfd || return 1
 
        ${APACHE2} ${APACHE2_OPTS} -t 1>/dev/null 2>&1