Fix for bug #44559

3 files changed, 23 insertions, 20 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 46150de11b9d..88d3b369e858 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.118 2004/04/06 01:02:27 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.119 2004/04/08 19:50:04 stuart Exp $
+
+  08 Apr 2004; Stuart Herbert <stuart@gentoo.org> files/2.0.49/apache2.initd:
+  Fix for bug #44559 - problems with apache2 init script
 
   05 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.48-r1.ebuild,
   apache-2.0.48-r2.ebuild, apache-2.0.48-r3.ebuild, apache-2.0.48-r4.ebuild,
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 541c725aea4f..145c85cc7691 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -6,16 +6,15 @@ MD5 19e2b87577db3ad3bfa74c554f3a27a9 apache-2.0.47.ebuild 11473
 MD5 c9b77db193d034968ab8287d4b625a80 apache-1.3.29.ebuild 7382
 MD5 bab1a33028c74eb9d3f71294e8816126 apache-1.3.29-r1.ebuild 7413
 MD5 483eea3ec70ffb7c4a68c3e26ba4314e apache-2.0.48-r1.ebuild 11783
-MD5 316637e1a71f080e0f027db9ddf1683f apache-2.0.49.ebuild 12677
 MD5 3c4fe9c2702e37b9397769d6b7d4fb56 apache-2.0.48-r3.ebuild 12181
-MD5 c7c96e73b07a891af20c11373fd61385 ChangeLog 22442
+MD5 b2f4b597ace10f7b4a63dfa6508f0846 ChangeLog 22581
 MD5 ec841d27e5613d0aae57ddf2083a7597 apache-1.3.28-r1.ebuild 7671
 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
 MD5 b4580094775cde0d53605e4c036ec191 apache-2.0.47-r1.ebuild 10759
 MD5 fcc5fef301f573c52854462740975b0b apache-1.3.27-r4.ebuild 8679
 MD5 f73405c24e4fe9e86c870dca88cc7284 apache-2.0.46.ebuild 11060
 MD5 52063286236598300600f9324e40fb56 apache-1.3.28.ebuild 8904
-MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729
+MD5 316637e1a71f080e0f027db9ddf1683f apache-2.0.49.ebuild 12677
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
 MD5 399e3c15e2afa45a732faed0df6b1a30 files/apache-1.3.28-zombie-cgi.patch 940
 MD5 86dc760b13645d25565a874a6d3b890e files/apache-2.0.47-gentoo.diff 3609
@@ -39,20 +38,21 @@ MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
 MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
 MD5 02db12f0d91e1f89e0b173fea6c5151d files/apacheaddmod 5977
-MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
 MD5 bae4b9d941cd38a32943533e958aa1b3 files/apachedelmod 3185
 MD5 9dc40e1918a2d30a578ebf1653f7182c files/apache-2.0.45-gentoo.diff 5448
-MD5 53491bef84e66a2ae0afb6634da07229 files/apache2 312
 MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28 211
 MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29 211
 MD5 a90bef6fb0fb6d05f74c36eaf26285d6 files/apachesplitlogfile 4959
 MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
 MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47 65
 MD5 4cc91d25cf4117b8db0fec344bebec4d files/digest-apache-2.0.48 65
-MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49 65
 MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
-MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
 MD5 17aee0f7a9de0f390fa046bc82436309 files/apache.confd 998
+MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
+MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49 65
+MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729
+MD5 53491bef84e66a2ae0afb6634da07229 files/apache2 312
+MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
 MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
 MD5 75e88ab5a3193fe8ff31c09f5bae2c09 files/conf/commonapache.conf 22175
 MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
@@ -80,18 +80,18 @@ MD5 66bf65c4f0a2072d612b781599515807 files/2.0.40/apache2.conf 7649
 MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.40/vhosts.conf 1695
 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.40/virtual-homepages.conf 780
 MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.40/dynamic-vhosts.conf 840
+MD5 77785d5ff6e5a7a21425dc69a6162779 files/2.0.49/apache2.conf 7652
+MD5 bf4f5fef094c57eeef892940ea689da9 files/2.0.49/apache2.confd 1951
+MD5 1f7353fc77165ffd4dacc32e0b0ce7c2 files/2.0.49/apache2.initd 2417
+MD5 dc5c8ebe712dc08bdb83fa8563924c96 files/2.0.49/commonapache2.conf 31775
+MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
+MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.49/dynamic-vhosts.conf 840
+MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.49/vhosts.conf 1695
+MD5 b69bf7c3126e471a2abff013e716367f files/2.0.49/virtual-homepages.conf 780
+MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
+MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.49/apache2splitlogfile 4844
 MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.49/40_mod_ssl.conf 3185
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
-MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
-MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.49/apache2splitlogfile 4844
 MD5 0fac1724d97d449d1cfb746275f7b32b files/2.0.49/apache2-builtin-mods 2211
 MD5 0e8867687279c44ddbf51375c537cd02 files/2.0.49/gentestcrt.sh 8800
-MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
-MD5 dc5c8ebe712dc08bdb83fa8563924c96 files/2.0.49/commonapache2.conf 31775
-MD5 bf4f5fef094c57eeef892940ea689da9 files/2.0.49/apache2.confd 1951
-MD5 7f5a7cefa6f0a27dba75dc7f2d51666f files/2.0.49/apache2.initd 2428
-MD5 77785d5ff6e5a7a21425dc69a6162779 files/2.0.49/apache2.conf 7652
-MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.49/vhosts.conf 1695
-MD5 b69bf7c3126e471a2abff013e716367f files/2.0.49/virtual-homepages.conf 780
-MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.49/dynamic-vhosts.conf 840
diff --git a/net-www/apache/files/2.0.49/apache2.initd b/net-www/apache/files/2.0.49/apache2.initd
index 987bb6ae1ed3..bd030ee33523 100644
--- a/net-www/apache/files/2.0.49/apache2.initd
+++ b/net-www/apache/files/2.0.49/apache2.initd
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/2.0.49/apache2.initd,v 1.3 2004/03/29 20:03:55 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/2.0.49/apache2.initd,v 1.4 2004/04/08 19:50:05 stuart Exp $
 
 opts="${opts} reload"
 
-[ "x${STARTUPERRORLOG}" != "x" ] && APACHE2_OPTS="${APACHE2_OPTS} -d ${STARTUPERRORLOG}"
+[ "x${SERVERROOT}" != "x" ] && APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT}"
 [ "x${CONFIGFILE}" != "x" ] && APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}"
 [ "x${STARTUPERRORLOG}" != "x" ] && APACHE2_OPTS="${APACHE2_OPTS} -E ${STARTUPERRORLOG}"
 # set a default for PIDFILE/RESTARTSTYLE for those that FAILED to follow