Revision bump. Use pid files in the init scripts. cf-execd needs cf-serverd.

(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)

5 files changed, 13 insertions, 6 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 944609e4ef41..172ac32f8692 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.111 2010/10/30 11:57:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.112 2010/11/03 18:40:42 idl0r Exp $
+
+*cfengine-3.0.5_p1-r3 (03 Nov 2010)
+
+  03 Nov 2010; Christian Ruppert <idl0r@gentoo.org>
+  -cfengine-3.0.5_p1-r2.ebuild, +cfengine-3.0.5_p1-r3.ebuild,
+  files/cf-execd.rc6, files/cf-monitord.rc6, files/cf-serverd.rc6:
+  Revision bump. Use pid files in the init scripts. cf-execd needs cf-serverd.
 
   30 Oct 2010; Markus Meier <maekke@gentoo.org> cfengine-3.0.5_p1-r2.ebuild:
   restore ~arm, bug #341163
diff --git a/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild b/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild
index 9b4c41ddb0cd..e992f324db54 100644
--- a/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild
+++ b/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild,v 1.3 2010/10/30 11:57:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild,v 1.1 2010/11/03 18:40:42 idl0r Exp $
 
 EAPI="3"
 
diff --git a/net-misc/cfengine/files/cf-execd.rc6 b/net-misc/cfengine/files/cf-execd.rc6
index 0dcbb7b45a0d..900ad4beefbe 100755
--- a/net-misc/cfengine/files/cf-execd.rc6
+++ b/net-misc/cfengine/files/cf-execd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 
 depend() {
-	need net
+	need net cf-serverd
 }
 
 start() {
@@ -12,6 +12,6 @@ start() {
 
 stop() {
 	ebegin "Stopping cf-execd"
-	start-stop-daemon --stop --exec /usr/sbin/cf-execd
+	start-stop-daemon --stop --pidfile /var/cfengine/cf-execd.pid --exec /usr/sbin/cf-execd
 	eend $?
 }
diff --git a/net-misc/cfengine/files/cf-monitord.rc6 b/net-misc/cfengine/files/cf-monitord.rc6
index bcd3092b042b..27ef2c26fc82 100755
--- a/net-misc/cfengine/files/cf-monitord.rc6
+++ b/net-misc/cfengine/files/cf-monitord.rc6
@@ -12,6 +12,6 @@ start() {
 
 stop() {
 	ebegin "Stopping cf-monitord"
-	start-stop-daemon --stop --exec /usr/sbin/cf-monitord
+	start-stop-daemon --stop --pidfile /var/cfengine/cf-monitord.pid --exec /usr/sbin/cf-monitord
 	eend $?
 }
diff --git a/net-misc/cfengine/files/cf-serverd.rc6 b/net-misc/cfengine/files/cf-serverd.rc6
index 802bc7c437f0..ca805d69716c 100755
--- a/net-misc/cfengine/files/cf-serverd.rc6
+++ b/net-misc/cfengine/files/cf-serverd.rc6
@@ -12,6 +12,6 @@ start() {
 
 stop() {
 	ebegin "Stopping cf-serverd"
-	start-stop-daemon --stop --exec /usr/sbin/cf-serverd
+	start-stop-daemon --stop --pidfile /var/cfengine/cf-serverd.pid --exec /usr/sbin/cf-serverd
 	eend $?
 }