rev bump to fix init scripts for stable OpenRC users.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux i686

5 files changed, 60 insertions, 13 deletions

diff --git a/net-misc/badvpn/ChangeLog b/net-misc/badvpn/ChangeLog
index 5a224c2516f3..46e69da5d93c 100644
--- a/net-misc/badvpn/ChangeLog
+++ b/net-misc/badvpn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/badvpn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/badvpn/ChangeLog,v 1.4 2012/08/19 18:09:49 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/badvpn/ChangeLog,v 1.5 2012/08/23 01:37:21 williamh Exp $
+
+*badvpn-1.999.123-r2 (23 Aug 2012)
+
+  23 Aug 2012; William Hubbs <williamh@gentoo.org> -badvpn-1.999.123-r1.ebuild,
+  +badvpn-1.999.123-r2.ebuild, files/badvpn-ncd.init, files/badvpn-server.init:
+  My initial rewrite of the init scripts broke them for stable OpenRc
+  users, so this fixes that issue.
 
   19 Aug 2012; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   add williamh as maintainer
diff --git a/net-misc/badvpn/Manifest b/net-misc/badvpn/Manifest
index cebded4a53aa..3fbd5635f928 100644
--- a/net-misc/badvpn/Manifest
+++ b/net-misc/badvpn/Manifest
@@ -2,21 +2,17 @@
 Hash: SHA256
 
 AUX badvpn-ncd.conf 182 SHA256 52e17827c5455c65fed6e1609a2feb35491393be389798760d518b2bf4b0eec3 SHA512 4b113e3630de4b679d3c74cd4154d0353c6ea8791a77b302c867f5007e889502cf4e6bd1c45d6151e1ea6843bc13ac3e6458790eb4e646daf17d0126b996492f WHIRLPOOL 15b3bbfa207870dd4eda28781e387bd4de8981984ebf400e6742ba652ede7edc25e94f256d1d4e5dec615d727dc763d9680374dcc934fc4dc4b0c167f23ca3af
-AUX badvpn-ncd.init 551 SHA256 9c1d4b2720efd3b7135c46e309ed9592b6e54571d77c8ab0feba0d0cb58fbc47 SHA512 c4ff3e7a02759d1a7035f8a005b2626455b86c6d2bb3c64849510efa966fcfca23e57ee5649ea89e6a5be748011026bf0755ef2ed00e52b96b4ccea962c5995d WHIRLPOOL 5c84ab1ac031da893df7a6229f8e174eb114259c710cc0ce985b044f68610f8a8193ae0c47f6cbaa280f15398a1fcd85ecba9cc8b847021bfcb4f22db6b4a968
+AUX badvpn-ncd.init 1092 SHA256 e8527851065bc1f0ae4c1ad975f9cf09cb3b8d677a3e7138dfd484365a4ede0b SHA512 df1a815b4b6da454aed13f5606dd9510050b80fcbddc95c6cd686f0a1e85116b879496bf8d961d1ff9f30b2d7cd60a1f62ff6585ffc4faf3d4dd574e043aa431 WHIRLPOOL 35c951c5d8b72195fe3417e55ef932094a3cee11b762023e104800310678b17f8e8799cd90afe4c63e7ab45c368b8ceb8bf69b97bcc6f280a6b8883170ea2ca7
 AUX badvpn-server.conf 227 SHA256 888f63e217739f1684574064d5c6f3e88cf562dab17885b15e14905a70cd86f3 SHA512 c5628f1380434884d297846a1c49a31f369a17f97ab9914a741cfde9a21df52926b247c0b9544605c2438f47110c9f548b9161c5975be91e70dacfdf993839c8 WHIRLPOOL adf1d5584e84d5027dd566ee01e0792b7e23ace5b51a808ad3762d3141852f2373bf67c300d78c6f4fcd75add36742b5d84ef03c7d92b6a9c2a76812e51c458d
-AUX badvpn-server.init 541 SHA256 6776be3cf8fbc75338c1ec61915e99c96d89ae950167273b731123d267234522 SHA512 54b2fb1d2e2c71bd8bbe953708cd8afe3f89d5ef4730fd5567b813142464409045766ceee3e473db6487897a0fbb38f57257947ad9decde09f26b0352148ff3a WHIRLPOOL d35baa6fcca7396caf262b044507f4e675411435b1e80950dbb1b9066291dcd9d4dc3765740018bff836c4f5bfc4c3c3e3347dc07fa64ce39ed45cb45ef3c0a0
+AUX badvpn-server.init 1082 SHA256 e4e7ec9e7257c42be010f526bd89cd8e153e9ff98f75dd26d7fcdbc378f0d696 SHA512 3f9f2c2325f58586ac836f5d676685aa54196f518702ef77767b1eaa6daf92e985b2b49865b76acb964f1fdb99f4902c66b2682708deec49d3c7415a718b70d8 WHIRLPOOL d3b69ff7ecb74b8e3891dc0be1cf431a0a378571e5a913724422e08c94a511f3e9180f0abe6e52ccd34ed5ece5a79fddad7f21ca387c0438776fa457d8ffdb22
 DIST badvpn-1.999.123.tar.bz2 905823 SHA256 e971ec1c093da2ada77d14592ceefcd263ae2831ff95a3da8ee55a13495abb40 SHA512 24e591aeb907f3e5249e1b01ce62fb18a7e60898952b874ada633fa4ac31c1b456184245a67563f6977f080f9ae93da5c39049948b2eecc1e526b0c0c366b6d1 WHIRLPOOL d2440a8c427cb7c25e493fba7e9320e2ac201e9b82b6cb5f08a752b77c2121efe70694e317eff1c1c90da50e398b341e1e6bf9469f57c19a5ab9861d5a2531c8
-EBUILD badvpn-1.999.123-r1.ebuild 1766 SHA256 7719f34f19a390d84bbc4c13599ece06728d5d88827a2994ef6afb087b2e5c5d SHA512 f299abdcd3915a73f32296d80a34363fd47c31e5a8949dd03fe7cb6c817c8c6364c94ce7fe70fb411a6cf5954e9de0511af43ae4be5287b144e7bd604b000a9d WHIRLPOOL 9fb989a605273e575658c1d888ae776b58a08e9a1bc49b3508e5e5c22ea00fe4060317b0f37316cba8d51b33c84f92857398d5862ebd98dd0727cc6dba86b825
-MISC ChangeLog 885 SHA256 688ed478020e2fe6de63cc4b0e58ebd96d97de73d21392b81c2b2a8bfd4cbad5 SHA512 a7154d4c5344b6e6fc5c435c45abf0a60cd53898f8041d954114aae67d31ecdca5e3c57d1a7c9421854a5cc53a75b169a51ca8a09b050244f104851588ac822c WHIRLPOOL 2c7f24c80f457389adee29bedaa6037643eaf0ccaf25f746157ee10b14b74d0a973f2584c05e9f3f10370c87cc844af9d1be6c3db45fa31f4bc8f148d2c44b2c
+EBUILD badvpn-1.999.123-r2.ebuild 1766 SHA256 c61785fe92a683e89fff14bc36dadf71ce3cf1524e3edd656a768a8a59cb5b26 SHA512 8ef5bb825c478f21eead53d7f09041b12c748222baaf1a8af593a4f68b35b6b02bebe88d81777ffca9d2f836412d1e053036127bc134ad585e31320f2674137a WHIRLPOOL 9721e4f33038055bdafc20f09a28907d1e7d6e4680d196aded1aac9b5859e4ae20c5d8263a6b3da7fa2872ca68c97c586bf9e6c8d9919ebe296be41dfe4121bd
+MISC ChangeLog 1187 SHA256 b6bf87dacfb8e4895c0d944f0a05933c8c80087e37c400fd3cd7deee2252644f SHA512 cef5727a597f7eb4bcc4ecb8e10b29ba4c29aac6a5bb84bbede7db44a929c84b0f67399fd0e8c27f5c77d88abc02142f0e3c58b683b566267ecc09215c812d72 WHIRLPOOL 39d6177f098792d7a3a7c41118290c2562a6b667f8136aafc997f9d7eba77a2fdfba4ed2ffe8a2ec673e1b3542705ca6fef3bdb72fb8b4c2d08461e2e1c70e68
 MISC metadata.xml 2050 SHA256 06522d51dae80aedc4d0f8f31f966527891990637e5411ee42035898e0e23856 SHA512 c79b5b4e464819195a9455f0fbc7781bc70532674a0b44a0660d027b0110135e9b8104504df40bba419cce558f7a670edd81feeb3129c271a2f8001582efdf40 WHIRLPOOL 53755e749220a668be70ef268fca53f6a6896938a06bec531fefbfac180225bbe4170c51116c1eeffd17a12b68b3c41e76c73ca9a4e9ef8c48efa49e90926347
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQMSrEAAoJEFpvPKfnPDWzSEkH/jQd9RAqkdQD/1u8v44w0Qlc
-0JRYhFT1VC4+n0MTvtyxKn5kHvaNNZBg7iLmLut+wYA7qtoRPZEjnYfNATc0oceQ
-1d3ZHyWWYHaCprIdVQXmur6+PNlWYbEpqP01M9QMQwvDuesWnIe5HakO79+bIpau
-lY8FbmZDKpjyZ51weRDRoYu57h+XBRBvPgomRRnHAwmEDdoVZy8G0GOoBoIPzhz5
-YgWxXfnasvOPr0YAlOKCe1GBBqANf7hstqrAYYobbB88d+wHTo6IDMl9yYDT/aMP
-Fu2JNRsqaLak19MgMwimyp0WPFJhwQfndd45wK6wG7T2+mp6FSiBxvrVSnB/KP0=
-=+zko
+iEYEAREIAAYFAlA1iXcACgkQblQW9DDEZTi7IACcCc0iIkNH/K9klHXQ0tHDLWVR
+flcAoKHaMn5hKZlhhSMCob3z/AdgNg8s
+=rGg4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/badvpn/badvpn-1.999.123-r1.ebuild b/net-misc/badvpn/badvpn-1.999.123-r2.ebuild
index 43fbc0bbea1b..ba62b8c090db 100644
--- a/net-misc/badvpn/badvpn-1.999.123-r1.ebuild
+++ b/net-misc/badvpn/badvpn-1.999.123-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/badvpn/badvpn-1.999.123-r1.ebuild,v 1.1 2012/08/19 13:23:21 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/badvpn/badvpn-1.999.123-r2.ebuild,v 1.1 2012/08/23 01:37:21 williamh Exp $
 
 EAPI=4
 inherit eutils cmake-utils user
diff --git a/net-misc/badvpn/files/badvpn-ncd.init b/net-misc/badvpn/files/badvpn-ncd.init
index dba4c9af56d8..ce35ba351716 100644
--- a/net-misc/badvpn/files/badvpn-ncd.init
+++ b/net-misc/badvpn/files/badvpn-ncd.init
@@ -21,3 +21,25 @@ start_pre() {
 		--syslog-ident \"${ncd_syslog_ident:-${RC_SVCNAME}}\""
 	fi
 }
+
+start()
+{
+	[ -n "$command" ] || return 0
+	local _background=
+	ebegin "Starting ${name:-$RC_SVCNAME}"
+	if yesno "${command_background}"; then
+		if [ -z "${pidfile}" ]; then
+			eend 1 "command_background option used but no pidfile specified"
+			return 1
+		fi
+		_background="--background --make-pidfile"
+	fi
+	eval start-stop-daemon --start \
+		--exec $command \
+		${procname:+--name} $procname \
+		${pidfile:+--pidfile} $pidfile \
+		$_background $start_stop_daemon_args \
+		-- $command_args
+	eend $? "Failed to start $RC_SVCNAME"
+	return $?
+}
diff --git a/net-misc/badvpn/files/badvpn-server.init b/net-misc/badvpn/files/badvpn-server.init
index 2af1db36c5ce..b4200c3ad096 100644
--- a/net-misc/badvpn/files/badvpn-server.init
+++ b/net-misc/badvpn/files/badvpn-server.init
@@ -21,3 +21,25 @@ start_pre() {
 			--syslog-ident \"${vpn_syslog_ident:-${RC_SVCNAME}}\""
         fi
 }
+
+start()
+{
+	[ -n "$command" ] || return 0
+	local _background=
+	ebegin "Starting ${name:-$RC_SVCNAME}"
+	if yesno "${command_background}"; then
+		if [ -z "${pidfile}" ]; then
+			eend 1 "command_background option used but no pidfile specified"
+			return 1
+		fi
+		_background="--background --make-pidfile"
+	fi
+	eval start-stop-daemon --start \
+		--exec $command \
+		${procname:+--name} $procname \
+		${pidfile:+--pidfile} $pidfile \
+		$_background $start_stop_daemon_args \
+		-- $command_args
+	eend $? "Failed to start $RC_SVCNAME"
+	return $?
+}