diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2004-03-26 08:45:49 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2004-03-26 08:45:49 +0000 |
| commit | 50ab38caeb4786ce135c0254c996f57545b50ee2 (patch) | |
| tree | 2ef8df79c58e655b3245fa46dbc70c18525826dc /net-www/apache | |
| parent | ChangeLog claims GPL so set LICENSE to GPL-2 (diff) | |
| download | historical-50ab38caeb4786ce135c0254c996f57545b50ee2.tar.gz historical-50ab38caeb4786ce135c0254c996f57545b50ee2.tar.bz2 historical-50ab38caeb4786ce135c0254c996f57545b50ee2.zip | |
fix bug #45774.
Diffstat (limited to 'net-www/apache')
| -rw-r--r-- | net-www/apache/ChangeLog | 6 | ||||
| -rw-r--r-- | net-www/apache/Manifest | 4 | ||||
| -rw-r--r-- | net-www/apache/files/2.0.49/apache2.initd | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog index f6c8b0ee89b3..59a3af7547e1 100644 --- a/net-www/apache/ChangeLog +++ b/net-www/apache/ChangeLog @@ -1,6 +1,10 @@ # 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.105 2004/03/24 16:20:20 zx Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.106 2004/03/26 08:45:48 robbat2 Exp $ + + 26 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> + files/2.0.49/apache2.initd: + fix bug #45774. 24 Mar 2004; Chris Aniszczyk <zx@gentoo.org> apache-2.0.49.ebuild: Marking stable on hppa. diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest index afa47ba54e0d..a26435200254 100644 --- a/net-www/apache/Manifest +++ b/net-www/apache/Manifest @@ -8,7 +8,7 @@ MD5 8b0802da8985bebebe0839a0424a1aeb apache-1.3.29-r1.ebuild 7314 MD5 b7737e1559b3508b5ba3dc679ae33537 apache-2.0.48-r1.ebuild 11662 MD5 7310b6787d782d8b03439d2f5e52b444 apache-2.0.49.ebuild 12447 MD5 450d24552a1de4f3c3cafe8f990585a3 apache-2.0.48-r3.ebuild 12060 -MD5 ef714f052fe86bc5690f27801936e39f ChangeLog 20544 +MD5 2f88fe2b3c11a9cf3adf6bee88c5aee1 ChangeLog 20651 MD5 28e0f7ec35e9ffd32ca9b85eba551071 apache-1.3.28-r1.ebuild 7670 MD5 bd80c41f0d8d92374c3712c4cac4d2ff metadata.xml 503 MD5 3604262d4ff6e52fbbb35796df8cd865 apache-2.0.47-r1.ebuild 10758 @@ -86,7 +86,7 @@ MD5 b3a6d1c01772a3623f7d467e9d8ad51c files/2.0.49/apache2-builtin-mods 2210 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053 MD5 dc5c8ebe712dc08bdb83fa8563924c96 files/2.0.49/commonapache2.conf 31775 MD5 4a7d5e937948ff12e82e520baa675745 files/2.0.49/apache2.confd 1950 -MD5 46cefc7dcd7c82cd18c382981bbbc531 files/2.0.49/apache2.initd 2413 +MD5 732dc50b2afa76c98ca0223188643195 files/2.0.49/apache2.initd 2427 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 diff --git a/net-www/apache/files/2.0.49/apache2.initd b/net-www/apache/files/2.0.49/apache2.initd index 9d5a6701825d..005b8b187f23 100644 --- a/net-www/apache/files/2.0.49/apache2.initd +++ b/net-www/apache/files/2.0.49/apache2.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 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.1 2004/03/22 21:17:57 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/2.0.49/apache2.initd,v 1.2 2004/03/26 08:45:49 robbat2 Exp $ opts="${opts} reload" @@ -20,7 +20,7 @@ checkconfig() { if [ ${CONFIGFILE:0:1} = "/" ]; then myconf="${CONFIGFILE}" else - myconf="${STARTUPERRORLOG}/${CONFIGFILE}" + myconf="${SERVERROOT:-/usr/lib/apache2}/${CONFIGFILE}" fi fi if [ ! -r "${myconf}" ]; then |