summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonny Davies <woodchip@gentoo.org>2003-10-30 19:57:15 +0000
committerDonny Davies <woodchip@gentoo.org>2003-10-30 19:57:15 +0000
commit7870bac1d1a8db4e42688a0d1ad0af1e9ec6e421 (patch)
treec09032061c67e93dda822f4791e00192a452d2cf /net-www
parentFix repeated printing in help system, bug #30115, patch by bartron (diff)
downloadgentoo-2-7870bac1d1a8db4e42688a0d1ad0af1e9ec6e421.tar.gz
gentoo-2-7870bac1d1a8db4e42688a0d1ad0af1e9ec6e421.tar.bz2
gentoo-2-7870bac1d1a8db4e42688a0d1ad0af1e9ec6e421.zip
start-stop-daemon path fixo
Diffstat (limited to 'net-www')
-rw-r--r--net-www/apache/ChangeLog6
-rw-r--r--net-www/apache/Manifest6
-rw-r--r--net-www/apache/files/2.0.40/apache2.initd4
-rw-r--r--net-www/apache/files/apache.rc64
4 files changed, 12 insertions, 8 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 388f56e7c512..897ff3e8d2fd 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-www/apache
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.75 2003/10/30 17:51:18 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.76 2003/10/30 19:57:10 woodchip Exp $
+
+ 30 Oct 2003; Donny Davies <woodchip@gentoo.org> files/apache.rc6,
+ files/2.0.40/apache2.initd:
+ Fixo; Use full path to start-stop-daemon. Thanks klieber.
*apache-2.0.48 (30 Oct 2003)
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index d31894615161..eb0be4f8a17c 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,7 +1,7 @@
MD5 90b7174ec6fa48a662d48ae3c0a08844 apache-2.0.48.ebuild 10707
MD5 246f3d374581e892615e2e5c8cb59e2a apache-1.3.27-r3.ebuild 7884
MD5 03c997dee35fcd0c56d77294ef557ab0 apache-2.0.47.ebuild 11434
-MD5 c227444ed676efe718c6e78835bad590 ChangeLog 15342
+MD5 fee6fd5ad8b1ae64e6819e84729a6aad ChangeLog 15502
MD5 09fa626c00f029bdfb266b1e5d16193e apache-1.3.28-r1.ebuild 7905
MD5 bd80c41f0d8d92374c3712c4cac4d2ff metadata.xml 503
MD5 235d2261cabdf2fbf72bee4b0ddd519f apache-2.0.47-r1.ebuild 10711
@@ -20,7 +20,7 @@ MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47-r1 65
MD5 5dbbb01b1f4e39ff052a49389caa76ed files/apache-1.3.27_db4_gentoo.patch 956
MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
MD5 f2c60b199c12729b25716ed451a24e38 files/apache-2.0.44-gentoo.diff 4895
-MD5 bbbaadd120cba9ffe9ace07f4c8105aa files/apache.rc6 1039
+MD5 85ccffe9b261e49604d01cee3b57d6fd files/apache.rc6 1045
MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
@@ -52,7 +52,7 @@ MD5 0055923f696c9ba3be7eeb5518603d40 files/2.0.40/ssl.conf 11082
MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.40/41_mod_ssl.default-vhost.conf 8053
MD5 9a54f9faa53622b7db4b7e119016c549 files/2.0.40/commonapache2.conf 31777
MD5 7648aa0e65d9bfd6ee5dc7109bc94fbc files/2.0.40/apache2.confd 784
-MD5 96870fc583bbab847ef92d446902d4e5 files/2.0.40/apache2.initd 1140
+MD5 473bbc8726eb6e8a49e9dcf661ccd7d1 files/2.0.40/apache2.initd 1146
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
diff --git a/net-www/apache/files/2.0.40/apache2.initd b/net-www/apache/files/2.0.40/apache2.initd
index c0cb071d60ab..1da337229b2d 100644
--- a/net-www/apache/files/2.0.40/apache2.initd
+++ b/net-www/apache/files/2.0.40/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.40/apache2.initd,v 1.11 2003/10/30 17:51:18 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/2.0.40/apache2.initd,v 1.12 2003/10/30 19:57:10 woodchip Exp $
opts="${opts} reload"
@@ -14,7 +14,7 @@ depend() {
start() {
ebegin "Starting apache2"
[ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache
- env -i start-stop-daemon --quiet --start --startas /usr/sbin/apache2 \
+ env -i /sbin/start-stop-daemon --quiet --start --startas /usr/sbin/apache2 \
--pidfile /var/run/apache2.pid -- -k start ${APACHE2_OPTS}
eend $?
}
diff --git a/net-www/apache/files/apache.rc6 b/net-www/apache/files/apache.rc6
index a65c62e46656..00916b681609 100644
--- a/net-www/apache/files/apache.rc6
+++ b/net-www/apache/files/apache.rc6
@@ -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/apache.rc6,v 1.14 2003/10/30 17:51:18 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/apache.rc6,v 1.15 2003/10/30 19:57:10 woodchip Exp $
opts="${opts} reload"
@@ -13,7 +13,7 @@ depend() {
start() {
ebegin "Starting apache"
- env -i start-stop-daemon -o --quiet --start --startas /usr/sbin/apache \
+ env -i /sbin/start-stop-daemon -o --quiet --start --startas /usr/sbin/apache \
--pidfile /var/run/apache.pid -- ${APACHE_OPTS}
eend $?
}