Change "exit" to "return" in init script and use doinitd. Thanks to Tomasz Orzechowski for reporting and Sérgio Luís for init script. Closes Bug 99138

Package-Manager: portage-2.1.2_rc2

4 files changed, 21 insertions, 17 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index bbee0a078cac..0572982004c3 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openswan
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.30 2006/10/16 02:46:58 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.31 2006/11/22 19:09:55 masterdriverz Exp $
+
+  22 Nov 2006; Charlie Shepherd <masterdriverz@gentoo.org> ChangeLog:
+  Change "exit" to "return" in init script and use doinitd. Thanks to Tomasz
+  Orzechowski for reporting and Sérgio Luís for init script. Closes Bug
+  99138
 
   16 Oct 2006; Daniel Drake <dsd@gentoo.org> openswan-2.4.4.ebuild:
   Use linux-mod, to fix bug #149197 reported by DominikBuerkle
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index 1abd4ed5c6af..8cd3e29f40d3 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -1,20 +1,20 @@
-AUX ipsec 1549 RMD160 ee263f8bd96e45ce2f14df2f8c7155f93e3c5c44 SHA1 a096150c16afbdaa8fa23e3164ed5cc221267e42 SHA256 2a8eb7ce1bc96f23bf04813398e8669c5c31ac0d96a60a649d7a7ad13e3641c2
-MD5 98be49e476925c27652e5b6016639bad files/ipsec 1549
-RMD160 ee263f8bd96e45ce2f14df2f8c7155f93e3c5c44 files/ipsec 1549
-SHA256 2a8eb7ce1bc96f23bf04813398e8669c5c31ac0d96a60a649d7a7ad13e3641c2 files/ipsec 1549
+AUX ipsec 1551 RMD160 9f2480ebfb7549df1cbe3cf5c62575acd78a986a SHA1 53c1826bea6a613a025d34ea3b68e95c2b13e62c SHA256 926aedf5585626202b9817e0d37ef40c4a07ef1f75b77de228eb7f5f8b8e6f21
+MD5 ec906a9d1fd912d2e294a5f6d00f1dc3 files/ipsec 1551
+RMD160 9f2480ebfb7549df1cbe3cf5c62575acd78a986a files/ipsec 1551
+SHA256 926aedf5585626202b9817e0d37ef40c4a07ef1f75b77de228eb7f5f8b8e6f21 files/ipsec 1551
 AUX openswan-2.4.4-gentoo.patch 17758 RMD160 9048fe80d6b4b7b187e4c82887afcf5a48128b0e SHA1 fe76c5c807ba0931c979c19480eb0fec24463558 SHA256 ed3681b1253e44e5178b67d21f66ce8eb4db03b02715e9ce636778850255543f
 MD5 50900bb43e8903e91321d0be7f7e672b files/openswan-2.4.4-gentoo.patch 17758
 RMD160 9048fe80d6b4b7b187e4c82887afcf5a48128b0e files/openswan-2.4.4-gentoo.patch 17758
 SHA256 ed3681b1253e44e5178b67d21f66ce8eb4db03b02715e9ce636778850255543f files/openswan-2.4.4-gentoo.patch 17758
 DIST openswan-2.4.4.tar.gz 3588694 RMD160 b2eeb9b5f5186d33b644aa0bb9c46fb2746850ae SHA1 0f706fedaaa4594d3e56592447f58a20c5c5f886 SHA256 b7d18cbaf30bbe66820dd13f170e3c9ae183307d5c5ee3cd4fa0e2711110ad79
-EBUILD openswan-2.4.4.ebuild 1985 RMD160 eca4e6441ea17fbd22a31f5ac3aa95326cac5a67 SHA1 c601c19f5c32d44845e4aaee33b01d3887a5deed SHA256 602b0c62fe298511a18d9cb51e52bf3c929055bcc10313e23773e748a71cc011
-MD5 0a6b8fb0b983a4a2e007cdf017e9fee3 openswan-2.4.4.ebuild 1985
-RMD160 eca4e6441ea17fbd22a31f5ac3aa95326cac5a67 openswan-2.4.4.ebuild 1985
-SHA256 602b0c62fe298511a18d9cb51e52bf3c929055bcc10313e23773e748a71cc011 openswan-2.4.4.ebuild 1985
-MISC ChangeLog 5314 RMD160 c57e865639a5de2dc820f024a176504f862acec8 SHA1 7556a16f03e6b5a55ac36bf24de813aaa7775e60 SHA256 7bc5f761fe8f1b1df40c94098ad3649f06083373efa10955acd7dcba4dc7e33a
-MD5 33e4fbdcb31398715546cdc480bc6466 ChangeLog 5314
-RMD160 c57e865639a5de2dc820f024a176504f862acec8 ChangeLog 5314
-SHA256 7bc5f761fe8f1b1df40c94098ad3649f06083373efa10955acd7dcba4dc7e33a ChangeLog 5314
+EBUILD openswan-2.4.4.ebuild 1975 RMD160 6a40f7f3cd0c95a41eac118474b8df2f6b7cd0a5 SHA1 66cf86bf1c5c0086727466d24512c0064935058b SHA256 1c7da4d3a4f9e4b6744c0d41563aa9c249cda3844fab9b74a5cd9378201e4750
+MD5 319f88807cc48255685ebb42f2e4938e openswan-2.4.4.ebuild 1975
+RMD160 6a40f7f3cd0c95a41eac118474b8df2f6b7cd0a5 openswan-2.4.4.ebuild 1975
+SHA256 1c7da4d3a4f9e4b6744c0d41563aa9c249cda3844fab9b74a5cd9378201e4750 openswan-2.4.4.ebuild 1975
+MISC ChangeLog 5554 RMD160 7d1adf2a71ea9087697a367c3202a4d11fbdbc36 SHA1 618ab24003cbe93b28e4743c0dd41962d4343966 SHA256 c571492e4fe0a38d00ab7501a41c362cc9b597f4b1f0a8910b777b33d9e529e5
+MD5 285e74485b4af68ce6a63d294e9f53b4 ChangeLog 5554
+RMD160 7d1adf2a71ea9087697a367c3202a4d11fbdbc36 ChangeLog 5554
+SHA256 c571492e4fe0a38d00ab7501a41c362cc9b597f4b1f0a8910b777b33d9e529e5 ChangeLog 5554
 MISC metadata.xml 568 RMD160 2e125013ab267b1363716992132776bc38594ae4 SHA1 9579a2650144de1ba2f4284722b9eba138a9687d SHA256 89e23bc79dada00ca870d71bf4bacefdae75a5f59c1e6b6cded682270b219f9f
 MD5 0f26f5619b06afba5889ea1982b99557 metadata.xml 568
 RMD160 2e125013ab267b1363716992132776bc38594ae4 metadata.xml 568
diff --git a/net-misc/openswan/files/ipsec b/net-misc/openswan/files/ipsec
index 2db1fa68f05c..2d4bf293e6e1 100644
--- a/net-misc/openswan/files/ipsec
+++ b/net-misc/openswan/files/ipsec
@@ -28,7 +28,7 @@ ipsecdoit() {
 	then
 		echo "$IPSEC_confreadstatus -- \`$1' aborted" |
 			logger -s -p daemon.error -t ipsec_setup
-		exit 1
+		return 1
 	fi
 	IPSECsyslog=${IPSECsyslog-daemon.error}
 	export IPSECsyslog
diff --git a/net-misc/openswan/openswan-2.4.4.ebuild b/net-misc/openswan/openswan-2.4.4.ebuild
index ff377505bedc..1a0a59d2a751 100644
--- a/net-misc/openswan/openswan-2.4.4.ebuild
+++ b/net-misc/openswan/openswan-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.4.ebuild,v 1.3 2006/10/16 02:46:58 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.4.ebuild,v 1.4 2006/11/22 19:09:55 masterdriverz Exp $
 
 inherit eutils linux-info
 
@@ -81,6 +81,5 @@ src_install() {
 
 	dosym /etc/ipsec/ipsec.d /etc/ipsec.d
 
-	exeinto /etc/init.d/
-	doexe ${FILESDIR}/ipsec
+	doinitd ${FILESDIR}/ipsec
 }