Fix init script, stablize x86/amd64, fix header

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 27 insertions, 27 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/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."
 }