saving uncommitted changes in /etc prior to emerge run

diff --git a/apache2/httpd.conf b/apache2/httpd.conf
index 7e8d723001f131cd71047fb64314c42c32b176e4..a51a2ddc1a39b05b075bcd3631e67cec4f1e642b 100644 (file)
--- a/apache2/httpd.conf
+++ b/apache2/httpd.conf
@@ -127,6 +127,9 @@ LoadModule log_config_module modules/mod_log_config.so
 LoadModule log_forensic_module modules/mod_log_forensic.so
 LoadModule logio_module modules/mod_logio.so
 LoadModule macro_module modules/mod_macro.so
+<IfDefine SSL>
+LoadModule md_module modules/mod_md.so
+</IfDefine>
 LoadModule mime_module modules/mod_mime.so
 LoadModule mime_magic_module modules/mod_mime_magic.so
 LoadModule negotiation_module modules/mod_negotiation.so
@@ -188,6 +191,7 @@ LoadModule userdir_module modules/mod_userdir.so
 LoadModule usertrack_module modules/mod_usertrack.so
 LoadModule version_module modules/mod_version.so
 LoadModule vhost_alias_module modules/mod_vhost_alias.so
+LoadModule watchdog_module modules/mod_watchdog.so
 LoadModule xml2enc_module modules/mod_xml2enc.so
 
 # If you wish httpd to run as a different user or group, you must run

diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf
index 208d1c26d95498257210600145309688baa0274f..b5c118aa0d2ac2e13ad1eae59e42dc71d28fd6e4 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.29-r1/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.33-r1/manual$1"
 
-<Directory "/usr/share/doc/apache-2.4.29-r1/manual">
+<Directory "/usr/share/doc/apache-2.4.33-r1/manual">
        Options Indexes
        AllowOverride None
        Require all granted

diff --git a/init.d/apache2 b/init.d/apache2
index 74ba82723566b3ba794bb0cd42015391ae4f739a..3c7e538914439b845439fc1e9f2f8460778c15b3 100755 (executable)
--- a/init.d/apache2
+++ b/init.d/apache2
@@ -34,7 +34,7 @@ APACHE2="/usr/sbin/apache2"
 
 depend() {
        need net
-       use mysql dns logger netmount postgresql
+       use dns entropy logger mysql netmount postgresql
        after sshd
 }
 
@@ -151,7 +151,7 @@ modules() {
 }
 
 fullstatus() {
-       if ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
+       if ! command -v $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
                eerror "lynx not found! you need to emerge www-client/lynx"
        else
                ${LYNX} ${STATUSURL}
@@ -168,7 +168,7 @@ configdump() {
 
        checkconfd || return 1
 
-       if ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
+       if ! command -v $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
                eerror "lynx not found! you need to emerge www-client/lynx"
        else
                echo "${APACHE2} started with '${APACHE2_OPTS}'"