summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2004-03-26 08:45:49 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2004-03-26 08:45:49 +0000
commit485eb9c79d7cd829f034a65c2637a59b9d0a6318 (patch)
tree316d4d5f0b9a81828a10a37576f55b5ad491dbff /net-www
parentChangeLog claims GPL so set LICENSE to GPL-2 (Manifest recommit) (diff)
downloadgentoo-2-485eb9c79d7cd829f034a65c2637a59b9d0a6318.tar.gz
gentoo-2-485eb9c79d7cd829f034a65c2637a59b9d0a6318.tar.bz2
gentoo-2-485eb9c79d7cd829f034a65c2637a59b9d0a6318.zip
fix bug #45774.
Diffstat (limited to 'net-www')
-rw-r--r--net-www/apache/ChangeLog6
-rw-r--r--net-www/apache/files/2.0.49/apache2.initd4
2 files changed, 7 insertions, 3 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/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