[patch] support only one mpm (dist)

apache-onempm-dist.patch (text/plain), 2.43 KB, created by Benedikt Böhm (RETIRED) on 2005-04-22 02:06:35 UTC

Index: init/apache2.confd
===================================================================
RCS file: /var/cvsroot/gentoo-src/apache/dist/2.0/init/apache2.confd,v
retrieving revision 1.1
diff -u -b -B -r1.1 apache2.confd
--- init/apache2.confd	8 Jan 2005 03:58:40 -0000	1.1
+++ init/apache2.confd	22 Apr 2005 08:31:32 -0000
@@ -28,11 +28,6 @@
 # ServerRoot setting
 #SERVERROOT=/usr/lib/apache2
 
-# MPM to use
-# to get available MPMs:
-#  for i in `ls /usr/sbin/apache2.*`; do echo `basename ${i/apache2./}`;done
-#MPM=prefork
-
 # Configuration file location
 # - If this does NOT start with a '/', then it is treated relative to
 # $SERVERROOT by Apache
Index: init/apache2.initd
===================================================================
RCS file: /var/cvsroot/gentoo-src/apache/dist/2.0/init/apache2.initd,v
retrieving revision 1.5
diff -u -b -B -r1.5 apache2.initd
--- init/apache2.initd	13 Feb 2005 02:09:59 -0000	1.5
+++ init/apache2.initd	22 Apr 2005 08:31:32 -0000
@@ -46,19 +46,11 @@
 		return 1
 	fi
 	
-	if [ "x${MPM}" != "x" ]; then
-		if [ ! -x /usr/sbin/apache2.${MPM} ]; then
-			eerror "Unable to find specified MPM: ${MPM}"
-			return 1
-		fi
-		MY_MPM=".${MPM}"
-	fi
-	
 	[ -n "${SERVERROOT}" ] && APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT}"
 	[ -n "${CONFIGFILE}" ] && APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}"
 	[ -n "${STARTUPERRORLOG}" ] && APACHE2_OPTS="${APACHE2_OPTS} -E ${STARTUPERRORLOG}"
 	
-	APACHE2="env -i PATH=${PATH} /usr/sbin/apache2${MY_MPM}"
+	APACHE2="env -i PATH=${PATH} /usr/sbin/apache2"
 	
 	$APACHE2 ${APACHE2_OPTS} -t 1>/dev/null 2>&1
 	ret=$?
Index: patches/00_all_gentoo_base.patch
===================================================================
RCS file: /var/cvsroot/gentoo-src/apache/dist/2.0/patches/00_all_gentoo_base.patch,v
retrieving revision 1.3
diff -u -b -B -r1.3 00_all_gentoo_base.patch
--- patches/00_all_gentoo_base.patch	21 Apr 2005 10:53:03 -0000	1.3
+++ patches/00_all_gentoo_base.patch	22 Apr 2005 08:31:32 -0000
@@ -56,11 +56,7 @@
  # the path to your httpd binary, including options if necessary
 -HTTPD='@exp_sbindir@/@progname@'
 +. /etc/conf.d/apache2
-+if [ -n ${MPM} ] && [ -x @exp_sbindir@/@progname@.${MPM} ]; then
-+    HTTPD="@exp_sbindir@/@progname@.${MPM} ${APACHE2_OPTS}"
-+else
-+    HTTPD="@exp_sbindir@/@progname@ ${APACHE2_OPTS}"
-+fi
++HTTPD="@exp_sbindir@/@progname@ ${APACHE2_OPTS}"
  #
  # pick up any necessary environment variables
 -if test -f @exp_sbindir@/envvars; then