From 511aaa916dbb821f6d773d886c359954014efd1c Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 16 Jun 2016 00:02:15 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 apache2/modules.d/00_apache_manual.conf |  4 +-
 apache2/modules.d/41_mod_http2.conf     |  9 ++++
 init.d/apache2                          | 63 +++++++++++--------------
 3 files changed, 39 insertions(+), 37 deletions(-)
 create mode 100644 apache2/modules.d/41_mod_http2.conf

diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf
index 56991515..7b89f919 100644
--- 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.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/apache2/modules.d/41_mod_http2.conf b/apache2/modules.d/41_mod_http2.conf
new file mode 100644
index 00000000..68b4838c
--- /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 eebc130c..74ba8272 100755
--- 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
-- 
2.39.5