added --pidfile for baselayout2 start script part, bug 255423; thanks to D. Pillmeier

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.21-xen-main-r1 i686

4 files changed, 18 insertions, 11 deletions

diff --git a/net-www/vdradmin-am/ChangeLog b/net-www/vdradmin-am/ChangeLog
index 47c4234fb6ad..1ff401998488 100644
--- a/net-www/vdradmin-am/ChangeLog
+++ b/net-www/vdradmin-am/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/vdradmin-am
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.30 2009/01/13 18:00:02 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.31 2009/02/15 19:01:13 hd_brummy Exp $
+
+  15 Feb 2009; Joerg Bornkessel <hd_brummy@gentoo.org> files/vdradmin-rc-3,
+  files/vdradmin-4:
+  added --pidfile for baselayout2 start script part, bug 255423; thanks to
+  D. Pillmeier
 
   13 Jan 2009; Joerg Bornkessel <hd_brummy@gentoo.org> files/vdradmin-4,
   metadata.xml, +vdradmin-am-3.6.4-r1.ebuild:
diff --git a/net-www/vdradmin-am/Manifest b/net-www/vdradmin-am/Manifest
index f485ba6716e3..30e8c0420c3c 100644
--- a/net-www/vdradmin-am/Manifest
+++ b/net-www/vdradmin-am/Manifest
@@ -2,21 +2,21 @@
 Hash: SHA1
 
 AUX confd-2 295 RMD160 292ac9960158dc09b5c31adf85b49c29a5f2ca1b SHA1 07f5964bb3eaa0962d37ae7af0d049246cdb4ac5 SHA256 87d9c7449946c2724e0ddeb4de7c2eeee492b99f813131e47dafd9e860f8649f
-AUX vdradmin-4 1186 RMD160 b6a3ecc51318d99a26d3db51866d14874e8c9067 SHA1 e2c86a19151277cbaa51ba53052e8dc6c62a52ac SHA256 f355436c216214e7c86fed2273182eb6393669ab2830cf58876dca2b7bee3bdc
+AUX vdradmin-4 1232 RMD160 21d2fbc78916d69418f8a85ddab4a6b9f32ae540 SHA1 4d84f2cecd2ad8e6cee33dcbecd7058f3356f485 SHA256 2acda64b027b4076c6fe7c70e256ecbd3469caa5b735f26c664a628ce20cf08f
 AUX vdradmin-am-config-autoflush.diff 654 RMD160 f6d0a31c424c6a45d8786d2b98e9872e5e3ded5f SHA1 1a4b61fa0c218cecffb6530cabe5c59577b1df67 SHA256 1687001c6114cb373643982fb73a78e7656c70d253e9ff0d89b7ed466133f950
-AUX vdradmin-rc-3 1191 RMD160 a0aa7bd29679c9f17ba49b113f9d5f632aa343b9 SHA1 a92d0ee7c2122e3002b64e5eff3e1a1c68056445 SHA256 f83fa6f94307c6cfd450a35110df309112953006c7c486107846c2f6d8447ed3
+AUX vdradmin-rc-3 1242 RMD160 c81b58494025e5f012a0915e384d2e6c490a52c6 SHA1 c463014fdeb5433e5cb835af4030aeac84639aec SHA256 dd300479eadfa58df9a446b08d73e5574c36518d9d84ebdef7c58deef3b49e33
 DIST vdradmin-am-3.6.2.tar.bz2 685651 RMD160 5b01d0da1305093e6da35728f13af5671db02bcd SHA1 3b71d1a87639995a1b716986c9f8fa9a2a7c9410 SHA256 53821d339b3e17f42948a68baa289134d6f79f41cef96db13bb14b4cbf69f188
 DIST vdradmin-am-3.6.4.tar.bz2 718142 RMD160 e8e4f6da9b20e5696598ac1493549a154ebb9f7b SHA1 c65ca82df04891ac3b71d3e46e0d2b6d4355bd4f SHA256 aa956001b47feaaf7297d89fb15bfc17eeeb2c6125123abe7ce134e7d0ceb6b0
 EBUILD vdradmin-am-3.6.2.ebuild 4624 RMD160 77a3a76ba3ea12ff51fbbbc1b373a04b8a4d7acf SHA1 1fa1260cb7e4423ac61d18a11ee5404c416aa588 SHA256 511e4b5d3100371b9e50837bad5afc1fdd1a93424ff3e6bc37e06e703ac0495b
 EBUILD vdradmin-am-3.6.4-r1.ebuild 4864 RMD160 bad8f46300e7de91174403f744e60319df59c558 SHA1 640d955e25ac56d27c481527718e59efb8ed2af3 SHA256 e6968ff16151ab48d34a5f70c19c4a43f21acfa4af488303116f3044621488ce
 EBUILD vdradmin-am-3.6.4.ebuild 4653 RMD160 41ea18c105e13eb9d9efbb24131cab938bce364c SHA1 00ed69c052920750847fbd6eb79160da96c70c25 SHA256 24e5b8876961e69d0bf278c181cf0fe77f5ecad2b900e1ca4fcd19720c745c57
-MISC ChangeLog 6414 RMD160 e0b06521b4efccb6382b7cae94494903bab3ea3e SHA1 0be9932518ef0fdc47b4802337761389340fc228 SHA256 d548b5e99be4b59f9f9fd8cd7df2ecd2125e68a15260ce853a79949cce9d22cb
+MISC ChangeLog 6601 RMD160 0f931e23b9dfb7d0573cd76c410bf45ab00f081e SHA1 ddf47bf773abfdf1be1a3259c225a338aa4716bd SHA256 5964e2ee43c2793a68610452a30ed86fd8f9ca57941b4fbe388d638d47fbe3a0
 MISC metadata.xml 652 RMD160 c1c8a6d8b9632d603faace3e12b8d8f44afe8b5e SHA1 9eaeaf7403a8221c85d71615e2457be10796e98f SHA256 40a987f0caed004be4922c4d2a5f96472db5dc68aede439e3541a35c6ee8d412
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFJbNasdn07HTTCgIoRApYmAKCGalreLLy6Trh7tL1n830ncBWh/QCeJzg0
-v9yD1j0DpVwssXdcv290F2o=
-=C6Ih
+iD8DBQFJmGahdn07HTTCgIoRAuSLAJ0VOQ94ah6mWIW1d4IKyMGwFctEmACfT3Uz
+SDrQQg07+YGRlxD5Q1dmLNg=
+=7B0t
 -----END PGP SIGNATURE-----
diff --git a/net-www/vdradmin-am/files/vdradmin-4 b/net-www/vdradmin-am/files/vdradmin-4
index 442d8697f4c5..aeb8311eb92b 100644
--- a/net-www/vdradmin-am/files/vdradmin-4
+++ b/net-www/vdradmin-am/files/vdradmin-4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/files/vdradmin-4,v 1.2 2009/01/13 18:00:03 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/files/vdradmin-4,v 1.3 2009/02/15 19:01:12 hd_brummy Exp $
 
 depend() {
 	use vdr
@@ -30,7 +30,8 @@ start() {
 	set_charset
 	if [ -x /etc/init.d/root ]; then
 		# running on baselayout-2/openrc
-		start-stop-daemon --start --background --chuid "${VDRADMIN_USER}" --exec /usr/bin/perl /usr/bin/vdradmind
+		start-stop-daemon --start --background --chuid "${VDRADMIN_USER}" --pidfile /var/tmp/vdradmin/vdradmind.pid \
+		--exec /usr/bin/perl /usr/bin/vdradmind
 	else
 		start-stop-daemon --start --background --chuid "${VDRADMIN_USER}" --exec /usr/bin/vdradmind
 	fi
diff --git a/net-www/vdradmin-am/files/vdradmin-rc-3 b/net-www/vdradmin-am/files/vdradmin-rc-3
index d04725321532..e1c951295b52 100755
--- a/net-www/vdradmin-am/files/vdradmin-rc-3
+++ b/net-www/vdradmin-am/files/vdradmin-rc-3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/files/vdradmin-rc-3,v 1.1 2008/02/29 10:23:29 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/files/vdradmin-rc-3,v 1.2 2009/02/15 19:01:12 hd_brummy Exp $
 
 depend() {
 	need vdr
@@ -30,7 +30,8 @@ start() {
 	set_charset
 	if [ -x /etc/init.d/root ]; then
 		# running on baselayout-2/openrc
-		start-stop-daemon --start --background --chuid "${VDRADMIN_USER}" --exec /usr/bin/perl /usr/bin/vdradmind.pl
+		start-stop-daemon --start --background --chuid "${VDRADMIN_USER}" --pidfile /var/tmp/vdradmin/vdradmind.pid \
+		--exec /usr/bin/perl /usr/bin/vdradmind.pl
 	else
 		start-stop-daemon --start --background --chuid "${VDRADMIN_USER}" --exec /usr/bin/vdradmind.pl
 	fi