diff options
author | Charlie Shepherd <masterdriverz@gentoo.org> | 2006-11-22 19:09:55 +0000 |
---|---|---|
committer | Charlie Shepherd <masterdriverz@gentoo.org> | 2006-11-22 19:09:55 +0000 |
commit | db416843b12486ed851a53f5811f82ea47742f22 (patch) | |
tree | 88ac23dbbf5cc8163332c8b28fd11928f8d4c515 /net-misc/openswan | |
parent | Add metadata.xml (diff) | |
download | gentoo-2-db416843b12486ed851a53f5811f82ea47742f22.tar.gz gentoo-2-db416843b12486ed851a53f5811f82ea47742f22.tar.bz2 gentoo-2-db416843b12486ed851a53f5811f82ea47742f22.zip |
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
(Portage version: 2.1.2_rc2)
Diffstat (limited to 'net-misc/openswan')
-rw-r--r-- | net-misc/openswan/ChangeLog | 7 | ||||
-rw-r--r-- | net-misc/openswan/files/ipsec | 2 | ||||
-rw-r--r-- | net-misc/openswan/openswan-2.4.4.ebuild | 5 |
3 files changed, 9 insertions, 5 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/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 } |