saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 6922749f5500ba0460e70aafb2658ad463448b00..a9d001cebbaa315f6ae7fc9626f43a49aeb74670 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -81,6 +81,7 @@ 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/.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'
@@ -98,6 +99,7 @@ maybe chmod 0644 'apache2/modules.d/10_mod_mem_cache.conf'
 maybe chmod 0644 'apache2/modules.d/11_mod_auth_kerb.conf'
 maybe chmod 0644 'apache2/modules.d/20_mod_fastcgi.conf'
 maybe chmod 0644 'apache2/modules.d/40_mod_ssl.conf'
+maybe chmod 0644 'apache2/modules.d/41_mod_http2.conf'
 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'

diff --git a/apache2/modules.d/._cfg0000_00_apache_manual.conf b/apache2/modules.d/._cfg0000_00_apache_manual.conf
new file mode 100644 (file)
index 0000000..7b89f91
--- /dev/null
+++ b/apache2/modules.d/._cfg0000_00_apache_manual.conf
@@ -0,0 +1,29 @@
+# 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.20/manual$1"
+
+<Directory "/usr/share/doc/apache-2.4.20/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/41_mod_http2.conf b/apache2/modules.d/41_mod_http2.conf
new file mode 100644 (file)
index 0000000..68b4838
--- /dev/null
+++ b/apache2/modules.d/41_mod_http2.conf
@@ -0,0 +1,9 @@
+<IfDefine SSL>
+  <IfModule http2_module>
+    # enable debugging for this module
+    #LogLevel http2:info
+
+    #Enable HTTP/2 support
+    Protocols h2 http/1.1
+  </IfModule>
+</IfDefine>

diff --git a/init.d/apache2 b/init.d/apache2
index eebc130c343f8f137b60528e4f147a56d74247f5..74ba82723566b3ba794bb0cd42015391ae4f739a 100755 (executable)
--- a/init.d/apache2
+++ b/init.d/apache2
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="configtest modules virtualhosts"
@@ -15,6 +15,23 @@ description_reload="Kills all children and reloads the configuration."
 description_virtualhosts="Show the settings as parsed from the config file (currently only shows the virtualhost settings)."
 description_stop="Kills all children and stops the server."
 
+# Apply default values for some conf.d variables.
+PIDFILE="${PIDFILE:-/var/run/apache2.pid}"
+TIMEOUT=${TIMEOUT:-15}
+SERVERROOT="${SERVERROOT:-/usr/lib64/apache2}"
+CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}"
+LYNX="${LYNX:-lynx -dump}"
+STATUSURL="${STATUSURL:-http://localhost/server-status}"
+RELOAD_TYPE="${RELOAD_TYPE:-graceful}"
+
+# Append the server root and configuration file parameters to the
+# user's APACHE2_OPTS.
+APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT}"
+APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}"
+
+# The path to the apache2 binary.
+APACHE2="/usr/sbin/apache2"
+
 depend() {
        need net
        use mysql dns logger netmount postgresql
@@ -28,44 +45,21 @@ configtest() {
 }
 
 checkconfd() {
-       if [ ! -f /etc/init.d/sysfs ]; then
-               eerror "This init script works only with openrc (baselayout-2)."
-               eerror "If you still need baselayout-1.x, please, use"
-               eerror "apache2.initd-baselayout-1 from /usr/share/doc/apache2-*/"
-       fi
-
-       PIDFILE="${PIDFILE:-/var/run/apache2.pid}"
-       TIMEOUT=${TIMEOUT:-15}
-
-       SERVERROOT="${SERVERROOT:-/usr/lib64/apache2}"
        if [ ! -d ${SERVERROOT} ]; then
                eerror "SERVERROOT does not exist: ${SERVERROOT}"
                return 1
        fi
-
-       CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}"
-       [ "${CONFIGFILE#/}" = "${CONFIGFILE}" ] && CONFIGFILE="${SERVERROOT}/${CONFIGFILE}"
-       if [ ! -r "${CONFIGFILE}" ]; then
-               eerror "Unable to read configuration file: ${CONFIGFILE}"
-               return 1
-       fi
-
-       APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT}"
-       APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}"
-       [ -n "${STARTUPERRORLOG}" ] && APACHE2_OPTS="${APACHE2_OPTS} -E ${STARTUPERRORLOG}"
-
-       APACHE2="/usr/sbin/apache2"
 }
 
 checkconfig() {
        checkpath --directory /run/apache_ssl_mutex
        checkconfd || return 1
 
-       ${APACHE2} ${APACHE2_OPTS} -t 1>/dev/null 2>&1
+       OUTPUT=$( ${APACHE2} ${APACHE2_OPTS} -t 2>&1 )
        ret=$?
        if [ $ret -ne 0 ]; then
                eerror "${SVCNAME} has detected an error in your setup:"
-               ${APACHE2} ${APACHE2_OPTS} -t
+               printf "%s\n" "${OUTPUT}"
        fi
 
        return $ret
@@ -74,6 +68,13 @@ checkconfig() {
 start() {
        checkconfig || return 1
 
+       if [ -n "${STARTUPERRORLOG}" ] ; then
+               # We must make sure that we only append to APACHE2_OPTS
+               # in start() and not in stop() or anywhere else that may
+               # be executed along with start(), see bug #566726.
+               APACHE2_OPTS="${APACHE2_OPTS} -E ${STARTUPERRORLOG}"
+       fi
+
        ebegin "Starting ${SVCNAME}"
        # Use start stop daemon to apply system limits #347301 
        start-stop-daemon --start -- ${APACHE2} ${APACHE2_OPTS} -k start
@@ -93,8 +94,6 @@ start() {
 stop() {
        if [ "${RC_CMD}" = "restart" ]; then
                checkconfig || return 1
-       else
-               checkconfd || return 1
        fi
 
        PID=$(cat "${PIDFILE}" 2>/dev/null)
@@ -117,8 +116,6 @@ stop() {
 }
 
 reload() {
-       RELOAD_TYPE="${RELOAD_TYPE:-graceful}"
-
        checkconfig || return 1
 
        if [ "${RELOAD_TYPE}" = "restart" ]; then
@@ -154,9 +151,6 @@ modules() {
 }
 
 fullstatus() {
-       LYNX="${LYNX:-lynx -dump}"
-       STATUSURL="${STATUSURL:-http://localhost/server-status}"
-
        if ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
                eerror "lynx not found! you need to emerge www-client/lynx"
        else
@@ -170,7 +164,6 @@ virtualhosts() {
 }
 
 configdump() {
-       LYNX="${LYNX:-lynx -dump}"
        INFOURL="${INFOURL:-http://localhost/server-info}"
 
        checkconfd || return 1