Fix init script, stablize x86/amd64, fix header

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 42 insertions, 32 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 8d7b4305e308..e99cfd7cd19c 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.104 2009/08/23 01:34:35 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.105 2009/09/24 18:36:42 ramereth Exp $
+
+*stunnel-4.27-r2 (24 Sep 2009)
+
+  24 Sep 2009; Lance Albertson <ramereth@gentoo.org> -stunnel-4.27.ebuild,
+  stunnel-4.27-r1.ebuild, +stunnel-4.27-r2.ebuild, files/stunnel.initd:
+  Fix init script, stablize x86/amd64, fix header
 
 *stunnel-4.27-r1 (22 Aug 2009)
 
@@ -39,7 +45,7 @@
   11 Jul 2008; Jeroen Roovers <jer@gentoo.org> stunnel-4.25.ebuild:
   Stable for HPPA (bug #222805).
 
-  10 Jul 2008; Raúl Porcel <armin76@gentoo.org> stunnel-4.25.ebuild:
+  10 Jul 2008; Raúl Porcel <armin76@gentoo.org> stunnel-4.25.ebuild:
   alpha/sparc stable wrt #222805
 
   10 Jul 2008; Christian Faulhammer <opfer@gentoo.org> stunnel-4.25.ebuild:
@@ -68,7 +74,7 @@
   24 Dec 2007; Brent Baude <ranger@gentoo.org> stunnel-4.21-r1.ebuild:
   Marking stunnel-4.21-r1 ppc64 stable for bug 201896
 
-  24 Dec 2007; Raúl Porcel <armin76@gentoo.org> stunnel-4.21-r1.ebuild:
+  24 Dec 2007; Raúl Porcel <armin76@gentoo.org> stunnel-4.21-r1.ebuild:
   alpha stable wrt #201896
 
   21 Dec 2007; nixnut <nixnut@gentoo.org> stunnel-4.21-r1.ebuild:
@@ -89,7 +95,7 @@
   +files/stunnel-4.21-setuid.patch, +stunnel-4.21-r1.ebuild:
   Apply patch from upstream wrt bug #202709.
 
-  14 Dec 2007; Raúl Porcel <armin76@gentoo.org> stunnel-4.21.ebuild:
+  14 Dec 2007; Raúl Porcel <armin76@gentoo.org> stunnel-4.21.ebuild:
   alpha/sparc stable wrt #201896
 
   12 Dec 2007; Markus Rothe <corsair@gentoo.org> stunnel-4.21.ebuild:
@@ -98,7 +104,7 @@
   12 Dec 2007; Jeroen Roovers <jer@gentoo.org> stunnel-4.21.ebuild:
   Stable for HPPA (bug #201896).
 
-  10 Dec 2007; Dawid Węgliński <cla@gentoo.org> stunnel-4.21.ebuild:
+  10 Dec 2007; Dawid Węgliński <cla@gentoo.org> stunnel-4.21.ebuild:
   Stable on x86 (bug #201896)
 
 *stunnel-4.21 (08 Dec 2007)
@@ -138,7 +144,7 @@
   20 Sep 2007; Robert Buchholz <rbu@gentoo.org> stunnel-3.26.ebuild:
   amd64 stable (bug #113778)
 
-  05 Sep 2007; Raúl Porcel <armin76@gentoo.org> stunnel-4.20.ebuild:
+  05 Sep 2007; Raúl Porcel <armin76@gentoo.org> stunnel-4.20.ebuild:
   alpha stable wrt #113778, thanks to Tobias Klausmann for testing
 
   05 Sep 2007; Christian Faulhammer <opfer@gentoo.org> stunnel-4.20.ebuild:
@@ -150,7 +156,7 @@
   01 Sep 2007; Joseph Jezak <josejx@gentoo.org> stunnel-4.20.ebuild:
   Marked ppc stable and re-added ~ppc64 for bug #113778.
 
-  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
 
   02 Feb 2007; Aron Griffis <agriffis@gentoo.org> stunnel-3.26.ebuild,
@@ -172,7 +178,7 @@
   31 Oct 2006; Aron Griffis <agriffis@gentoo.org> +stunnel-4.16.ebuild:
   Bump to 4.16 (from 4.15)
 
-  15 Jul 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  15 Jul 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove aliz from metadata.xml as he's retired.
 
   13 Jul 2006; Aron Griffis <agriffis@gentoo.org> stunnel-4.15.ebuild:
@@ -300,7 +306,7 @@
   22 Aug 2004; Jason Wever <weeve@gentoo.org> stunnel-4.05.ebuild:
   Stable on sparc.
 
-  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> stunnel-4.05.ebuild:
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> stunnel-4.05.ebuild:
   Stable on alpha.
 
   18 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> files/stunnel.conf.4.05,
@@ -325,7 +331,7 @@
   Version bump found by Daniel Webert <daniel_webert@web.de> in #53519. Added
   metadata.xml.
 
-  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> stunnel-4.04-r3.ebuild:
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> stunnel-4.04-r3.ebuild:
   Stable on alpha.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> stunnel-4.04-r3.ebuild:
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 3115f749b8fa..0e18e2e4cce2 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,14 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX stunnel-3.26-gentoo.diff 941 RMD160 4ca4f85a8888c7c9dbeed9d1303bae182d19195d SHA1 5517c6e3395664d76c84548ea67ffd8fddddbdcd SHA256 e2a9fab361699b01ccd004ef598bb868d5f6f37bd40d05b7a16a97cd9ecee2f2
 AUX stunnel-4.21-libwrap.patch 380 RMD160 c5ed7c06c3612bc5930ca8c77cac8bf58ec403f3 SHA1 fa1bf6674f775fa1b5934f4707c9e7eafed0d8a9 SHA256 b22f56707b96df785ebc20b48faf9761fb52cf4a362be875c60071b0d4572be1
 AUX stunnel.conf 1423 RMD160 606c53b0e241e44c8aabe423ca6772dc76aa69a9 SHA1 0b18a6dea836abc3c224c367f9ebd6fa30b931f2 SHA256 be8deb0e051f594e14c898c2ec8a4a6879adcd48a56286093653346d12c3f105
-AUX stunnel.initd 1750 RMD160 c60143c7977b5b0dcd26da436a9200c2c78fe2fa SHA1 02d23737a8552b561acb8aae56354bd4d7b317e8 SHA256 dcc512265c1ce497bdf0e64ba582fe8affe1612ea9935bb3cbd4606942b20475
+AUX stunnel.initd 1758 RMD160 96506108f0d7cbd4337aec6fb62e026abdadddd4 SHA1 2ed4a796c155cd57e5d9ebcdcabccdbceab68c35 SHA256 b79ca05f3aae99394242bd086626bc6b84d3b9803ed6ddac4131739e927f46aa
 AUX stunnel.rc6 779 RMD160 3cb0ba8b6f90484a9cec951e3eb36eef45169f6d SHA1 7de8dc829e271b3ed248e3b44afb9b537621cc02 SHA256 b2128e3bfe38485ef4afad35b57d8711666281087f3fcf920d5d313642e06dea
 DIST stunnel-3.26.tar.gz 228923 RMD160 63347b6bc6fca1496d74a8ef234eea98a45e0b04 SHA1 0d40d268a9e4b63630312cdee4efa5ecba53c9ec SHA256 d2a55b089d46d14bc4b456bb1927303492dab6649867c67a005d2c9d1ededfb3
 DIST stunnel-4.25.tar.gz 532343 RMD160 dcb9962e5273e69f5aeaed6bf709495aa97baa52 SHA1 fc6d61fad996f750c76ea627c5dd9f789af0eaf6 SHA256 9c966a18124ad2c28773fe096b767071320bdb07db69f480df36cbca80069480
 DIST stunnel-4.27.tar.gz 538604 RMD160 a0beb4dffbc40c5c4452af767840d6fa703868c9 SHA1 2daf52fb0906de9fc5bd6a270e620e9316034fd4 SHA256 c260a6544a39c3cff59626ca6bc7c14087dc4d4fab95c6cddd7dddd81df87cfb
 EBUILD stunnel-3.26.ebuild 742 RMD160 828bcad3275266e52a5036f6670e0612c90e926a SHA1 84966259d3b71ddfce3ffec4b2ee14d43811fd81 SHA256 ab1b1e4697849381ed5acc09728dd07457674148a4864091eec747918b16b5ee
-EBUILD stunnel-4.25.ebuild 2375 RMD160 d8e2adf5aa30389a5c6f1ea3b59cccb3e88e2581 SHA1 cab4724bd91dc869cc4df296165804f6d9b57398 SHA256 98457e8a9921a07480aad95e2cd921e96cef87ef60c0e7a4b97f57bf641c63bf
-EBUILD stunnel-4.27-r1.ebuild 2230 RMD160 c655398eb8a9198fedf5359c48c14259d8eaf66f SHA1 4fda271342889c711092d480e85820cd0519aecd SHA256 b5351205411db9cc3e7e61180a641da5c3dd2da7e0050b1009796793fc14fa1c
-EBUILD stunnel-4.27.ebuild 2390 RMD160 319d6b740f7e086a5d4fcb4181dc2d6c6b86031c SHA1 abc19ccd0e243f36483f2612f6669e456a32f54d SHA256 51f64f5a5c7bc44a19e62fae2bb54aaa575d80a1dced42a7a2b1bf6003629d90
-MISC ChangeLog 14921 RMD160 e9b60add4a954561690c405581f81cb21460a5cb SHA1 62334460f8a57b52d69359cfddb4b6849ac3a8ee SHA256 712be9b1a24bbfb997fff10fcfc6a9f3bda18d4031186ab3fee427ef60ee2aa8
+EBUILD stunnel-4.25.ebuild 2377 RMD160 ba0d4c2d24962f5afe8df92c350560a8cc4a4487 SHA1 1e839c2596930e41930cfb977b72b2120e5fae2e SHA256 6f7f27d4cae7ed03b28be646d6b04fe1dc9524e0b016411712f691b44128da33
+EBUILD stunnel-4.27-r1.ebuild 2228 RMD160 01f222113b61221ed88f200a97b2039f57aabbc2 SHA1 c344d069208ec0f280b1dfa7732504508801108c SHA256 8cb4eaa091f088eac01a1c6dc8e29065cc69255d7f40c8bf647c98d7a70f529f
+EBUILD stunnel-4.27-r2.ebuild 2230 RMD160 1c1de82644495eef2708e7ce2513864c1da6e654 SHA1 006c1a553415105121dff24c09b95e293efdfd99 SHA256 07c22552748a967dc8934fc1183edd4785cc6efc59d4c3a9976305255b710b2c
+MISC ChangeLog 15171 RMD160 576930d03535a152e39d6ece3b5c5fb6417e3700 SHA1 e4a998d2919ae0e215c08088741a9e409ff3d1c4 SHA256 ab30d5ecddd57087e7d36165398e2a76ddd849fa9d5b35acb323bc7cab3ef23b
 MISC metadata.xml 641 RMD160 7ad264c22b9e0705cf00b7985eee8d23c3383310 SHA1 c9314118d8fbc0644eb690f56f9d8859d3f7c578 SHA256 16e547775081b652662ac7156f0b6cfb7d1b8165865416cd154047c9ea6abebb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iD8DBQFKu7xbQW+hXSf0t0IRArguAJ4qvT42FKVxF8igdfUSM2/FDw9/awCg2Jwv
+OJ9K98S2C7yiBZda5Q05Y1Q=
+=Zq7c
+-----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/files/stunnel.initd b/net-misc/stunnel/files/stunnel.initd
index 8a31e3db858a..e5bb3f0ca767 100644
--- a/net-misc/stunnel/files/stunnel.initd
+++ b/net-misc/stunnel/files/stunnel.initd
@@ -62,7 +62,7 @@ stop() {
 }
 
 restart() {
-    stop
+    svc_stop
     sleep 1
-    start
+    svc_start
 }
diff --git a/net-misc/stunnel/stunnel-4.25.ebuild b/net-misc/stunnel/stunnel-4.25.ebuild
index fb5bc0b0fe03..6b9349fa72f2 100644
--- a/net-misc/stunnel/stunnel-4.25.ebuild
+++ b/net-misc/stunnel/stunnel-4.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.25.ebuild,v 1.8 2008/11/06 02:52:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.25.ebuild,v 1.9 2009/09/24 18:36:42 ramereth Exp $
 
 inherit autotools ssl-cert eutils
 
diff --git a/net-misc/stunnel/stunnel-4.27-r1.ebuild b/net-misc/stunnel/stunnel-4.27-r1.ebuild
index f44809269e42..ed5494699bf9 100644
--- a/net-misc/stunnel/stunnel-4.27-r1.ebuild
+++ b/net-misc/stunnel/stunnel-4.27-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.27-r1.ebuild,v 1.1 2009/08/23 01:34:35 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.27-r1.ebuild,v 1.2 2009/09/24 18:36:42 ramereth Exp $
 
 inherit autotools ssl-cert eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="ipv6 selinux tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-4.27.ebuild b/net-misc/stunnel/stunnel-4.27-r2.ebuild
index 161752df91ad..ba42e103b806 100644
--- a/net-misc/stunnel/stunnel-4.27.ebuild
+++ b/net-misc/stunnel/stunnel-4.27-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.27.ebuild,v 1.1 2009/04/30 21:45:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.27-r2.ebuild,v 1.1 2009/09/24 18:36:42 ramereth Exp $
 
 inherit autotools ssl-cert eutils
 
@@ -56,7 +56,7 @@ src_install() {
 
 	insinto /etc/stunnel
 	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel.rc6 stunnel
+	newinitd "${FILESDIR}"/stunnel.initd stunnel
 
 	keepdir /var/run/stunnel
 	fowners stunnel:stunnel /var/run/stunnel
@@ -69,13 +69,7 @@ pkg_postinst() {
 		chmod 0640 "${ROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
 	fi
 
-	if [ ! -z "$(grep /etc/stunnel/stunnel.pid \
-		"${ROOT}"/etc/stunnel/stunnel.conf )" ] ; then
-
-		ewarn "As of stunnel-4.09, the pid file will be located in /var/run/stunnel."
-		ewarn "Please stop stunnel, etc-update, and start stunnel back up to ensure"
-		ewarn "the update takes place"
-		ewarn
-		ewarn "The new location will be /var/run/stunnel/stunnel.pid"
-	fi
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename."
 }