Version bump, stablize 4.29-r1 & 4.31-r1, ebuild clean up, add 0.5s delay in init script to resolve bug #308931

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

8 files changed, 36 insertions, 174 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 384974c6dc2e..20ba3bf8e933 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.112 2010/03/25 21:46:20 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.113 2010/06/21 00:46:41 ramereth Exp $
+
+*stunnel-4.33 (21 Jun 2010)
+
+  21 Jun 2010; Lance Albertson <ramereth@gentoo.org>
+  -stunnel-4.27-r1.ebuild, -stunnel-4.27-r2.ebuild, -stunnel-4.29.ebuild,
+  stunnel-4.29-r1.ebuild, stunnel-4.31-r1.ebuild, +stunnel-4.33.ebuild,
+  files/stunnel.initd:
+  Version bump, stablize 4.29-r1 & 4.31-r1, ebuild clean up, add 0.5s delay
+  in init script to resolve bug #308931
 
 *stunnel-4.31-r1 (25 Mar 2010)
 
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index d116f17b6df5..7e5331c4c471 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -6,26 +6,24 @@ AUX stunnel-4.21-libwrap.patch 380 RMD160 c5ed7c06c3612bc5930ca8c77cac8bf58ec403
 AUX stunnel-4.29-x-forwarded-for.patch 10800 RMD160 2760938f49a6fb8c032b8647dba2a431dfd79bc9 SHA1 aef4eec3cf321ea2fa1959502f29973bcfc429ec SHA256 227c1f7071b5930dd0d04be05b2a6f8d97227f6ac78e3513e1f813fef29f98ea
 AUX stunnel-4.31-x-forwarded-for.patch 10786 RMD160 a27d72b2025d7825915d9d65f8c652baabd5ecd8 SHA1 f15856dd0497789da8f88a448e9d76e0a10a7ccc SHA256 d2b2b03043e5692af07925d80d4775b92dba0179b85ebb64de9ab678761c560c
 AUX stunnel.conf 1423 RMD160 606c53b0e241e44c8aabe423ca6772dc76aa69a9 SHA1 0b18a6dea836abc3c224c367f9ebd6fa30b931f2 SHA256 be8deb0e051f594e14c898c2ec8a4a6879adcd48a56286093653346d12c3f105
-AUX stunnel.initd 1758 RMD160 96506108f0d7cbd4337aec6fb62e026abdadddd4 SHA1 2ed4a796c155cd57e5d9ebcdcabccdbceab68c35 SHA256 b79ca05f3aae99394242bd086626bc6b84d3b9803ed6ddac4131739e927f46aa
+AUX stunnel.initd 1986 RMD160 66b0631d02a665a0fadca460502c7c09fa5c7b9c SHA1 5330e325d2f82896e0d7dc374a7b3c1f840fb2ef SHA256 4f97093f81b854099851ba32552b36036906933933f7a794c7b1e6aa1c006e3b
 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
 DIST stunnel-4.29.tar.gz 544292 RMD160 7861b38da0c9b1bf5c3aa8c1e9a654d7cedec5ba SHA1 f93ac9054c62b1db0dcf44f668d323d82cc0f413 SHA256 018064e852a2a125bcfb4b81baa77b5701ccf6aabe6a47564bfc046b18d11f9b
 DIST stunnel-4.31.tar.gz 548167 RMD160 813be2098bcd1fc0776d72d1ea6ee16b63c7f94d SHA1 f51fc544a0554f6eee2bfca1fcb8ddcb8386ce32 SHA256 187d0df2701d51c09b66f120cf6f1a62c4161e3e58dc84f893c1e5c7ccf30262
+DIST stunnel-4.33.tar.gz 560103 RMD160 b9d32b4c17cf250d3284e020bb9c6b3fc4463cc5 SHA1 695c7ef834952cb8ddbc790e10b6e32798fc2767 SHA256 240763140000dea6ab76b30f5f5571a8ef4d22ba0712176a9c31c221bb9a48fc
 EBUILD stunnel-3.26.ebuild 742 RMD160 828bcad3275266e52a5036f6670e0612c90e926a SHA1 84966259d3b71ddfce3ffec4b2ee14d43811fd81 SHA256 ab1b1e4697849381ed5acc09728dd07457674148a4864091eec747918b16b5ee
 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 2228 RMD160 b2924fabd71e24a11f7c469f2d962f4c9b6dedaa SHA1 fbe47ba5bc5f4f146138fc5d3efea0bf06a90c74 SHA256 182c42c2aec268cf73bcc3e25ac6a2ed5f53abd36f527f4f2160ca958dfa003f
-EBUILD stunnel-4.29-r1.ebuild 2244 RMD160 17267d07cd531fadc1afdcb045b5821409a44279 SHA1 638c82bc077c7015dfb26c8b20444c9437a5b49c SHA256 e89d5d74115d52ed5b3cf734c5818ace3f096ec72595a5ff7e2d7123c321a229
-EBUILD stunnel-4.29.ebuild 2203 RMD160 e051ef3e8178fdde86fcba8259d3766556e12c28 SHA1 7413d0098fda030db976ee36031bd254689a66d2 SHA256 5d0548e27acec8d2a764a9b38671626957cc3c667a22aec203a1e79173e026fa
-EBUILD stunnel-4.31-r1.ebuild 2244 RMD160 c4b385be0ce7a34c5b3bfad1994e8163e70403e7 SHA1 c32775b3fcb05c869bc1250afe77c8c0a732c58d SHA256 4d56e242f6d6f68620b2fba0b6bb6df5b1ade002f063b2e0cbed596b2e647e8a
-MISC ChangeLog 16057 RMD160 4af7803ca33d438e613c0012cc5a979b44a96e83 SHA1 3a05ba4e7fe795e5fcd25eb67255e638c37cc23b SHA256 f336484241fb5fd521b3f9ce5ed27016480f2d91d74946fdfc0cc323e049a84e
+EBUILD stunnel-4.29-r1.ebuild 2242 RMD160 264645bc34707174e6c6b27556059844b6064118 SHA1 7b004e161fb0e924aba981538304caab2ed2817c SHA256 2ee64c194016480b992a3af6e60e172180e1f8820da107440ddbe6626a85c450
+EBUILD stunnel-4.31-r1.ebuild 2242 RMD160 c9f2ac8a27a3b27c216dcedffdc4faf09d9c7863 SHA1 819a1c1df6dc3d0b9a9d61583d9edec3d5a7963a SHA256 5731a98fa0cacf8d6315e8e0fac9c06aa3f21eeafc8a4d3074f7b6067c3446ed
+EBUILD stunnel-4.33.ebuild 2241 RMD160 39020acb50554b28df1c1b3b404795a784489fa3 SHA1 e124b54839dbc4a4072780eee0ddf8881f94a134 SHA256 c4a35e5c2a4352129183375030367288aba1a94d4da5a6b1cdfbe0a21331fe05
+MISC ChangeLog 16425 RMD160 c2dbbb06c07452556de4d14beaadf55107a1022f SHA1 000bffd260096cae35e0b9eb2346931316ca6940 SHA256 15eaa12a7d3bfd144ab9501dd25bb15d3f5d3809ca65b503a578dffefb2c7784
 MISC metadata.xml 730 RMD160 bbd4ce0b27247c5969c171573a18d785b4893132 SHA1 eb5a0705fbb23a0c6cbbe61d2e03e0a14b601572 SHA256 e628cf7d971c59907c106bfc88a7e0fa1d313412cc306e160af7154aa804d64f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFLq9kEQW+hXSf0t0IRAoXfAJsG1ckmKt/wQQVx9kRHTTa1M0p/YgCeIB9j
-bPx4om7tHjZpuG/F0iqhB2M=
-=3WsR
+iD8DBQFMHrZYQW+hXSf0t0IRAgrzAJ4hrZqSaddyCl36x9Bgbu2fw3ecsACgiA/+
+hH107f07Ly8mmogDV/t4REg=
+=1jAg
 -----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/files/stunnel.initd b/net-misc/stunnel/files/stunnel.initd
index e5bb3f0ca767..cf33c04f085c 100644
--- a/net-misc/stunnel/files/stunnel.initd
+++ b/net-misc/stunnel/files/stunnel.initd
@@ -38,6 +38,11 @@ start() {
             if [ "${PROCLIST}" ] && kill -0 ${PROCLIST} 2> /dev/null ; then
                 ewarn "  already running: ${file} "
             elif ${DAEMON} ${ARGS} ; then
+                if ! test -f ${CHROOT}/${PIDFILE} ; then
+                    # give the daemon time to create the pid file
+                    # See bug #308931 for more details
+                    sleep 0.5s
+                fi
                 if test -f ${CHROOT}/${PIDFILE} ; then
                     einfo "   ${file}"
                 else
diff --git a/net-misc/stunnel/stunnel-4.27-r1.ebuild b/net-misc/stunnel/stunnel-4.27-r1.ebuild
deleted file mode 100644
index ed5494699bf9..000000000000
--- a/net-misc/stunnel/stunnel-4.27-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.2 2009/09/24 18:36:42 ramereth Exp $
-
-inherit autotools ssl-cert eutils
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://stunnel.mirt.net/"
-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"
-IUSE="ipv6 selinux tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/openssl-0.9.8k"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-4.21-libwrap.patch"
-	eautoreconf
-
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-}
-
-src_compile() {
-	econf $(use_enable ipv6) \
-		$(use_enable tcpd libwrap) || die "econf died"
-	emake || die "emake died"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -rf "${D}"/usr/share/doc/${PN}
-	rm -f "${D}"/etc/stunnel/stunnel.conf-sample "${D}"/usr/bin/stunnel3 \
-		"${D}"/usr/share/man/man8/stunnel.{fr,pl}.8
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog doc/en/transproxy.txt
-	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel.initd stunnel
-
-	keepdir /var/run/stunnel
-	fowners stunnel:stunnel /var/run/stunnel
-}
-
-pkg_postinst() {
-	if [ ! -f "${ROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${ROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${ROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	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."
-}
diff --git a/net-misc/stunnel/stunnel-4.27-r2.ebuild b/net-misc/stunnel/stunnel-4.27-r2.ebuild
deleted file mode 100644
index 9097a23968f9..000000000000
--- a/net-misc/stunnel/stunnel-4.27-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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-r2.ebuild,v 1.2 2009/12/09 01:01:58 ramereth Exp $
-
-inherit autotools ssl-cert eutils
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://stunnel.mirt.net/"
-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"
-IUSE="ipv6 selinux tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/openssl-0.9.8k"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-4.21-libwrap.patch"
-	eautoreconf
-
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-}
-
-src_compile() {
-	econf $(use_enable ipv6) \
-		$(use_enable tcpd libwrap) || die "econf died"
-	emake || die "emake died"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -rf "${D}"/usr/share/doc/${PN}
-	rm -f "${D}"/etc/stunnel/stunnel.conf-sample "${D}"/usr/bin/stunnel3 \
-		"${D}"/usr/share/man/man8/stunnel.{fr,pl}.8
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog doc/en/transproxy.txt
-	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel.initd stunnel
-
-	keepdir /var/run/stunnel
-	fowners stunnel:stunnel /var/run/stunnel
-}
-
-pkg_postinst() {
-	if [ ! -f "${ROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${ROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${ROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	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."
-}
diff --git a/net-misc/stunnel/stunnel-4.29-r1.ebuild b/net-misc/stunnel/stunnel-4.29-r1.ebuild
index 843a72cbe0c1..a7b302e59119 100644
--- a/net-misc/stunnel/stunnel-4.29-r1.ebuild
+++ b/net-misc/stunnel/stunnel-4.29-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.29-r1.ebuild,v 1.1 2010/03/07 21:36:28 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.29-r1.ebuild,v 1.2 2010/06/21 00:46:41 ramereth Exp $
 
 EAPI="2"
 
@@ -12,7 +12,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 xforward"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-4.31-r1.ebuild b/net-misc/stunnel/stunnel-4.31-r1.ebuild
index 3a906fd655ed..2951f893b572 100644
--- a/net-misc/stunnel/stunnel-4.31-r1.ebuild
+++ b/net-misc/stunnel/stunnel-4.31-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.31-r1.ebuild,v 1.1 2010/03/25 21:46:20 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.31-r1.ebuild,v 1.2 2010/06/21 00:46:41 ramereth Exp $
 
 EAPI="2"
 
@@ -12,7 +12,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 xforward"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-4.29.ebuild b/net-misc/stunnel/stunnel-4.33.ebuild
index f07bfd9c7f25..95f7ba8b4d4f 100644
--- a/net-misc/stunnel/stunnel-4.29.ebuild
+++ b/net-misc/stunnel/stunnel-4.33.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.29.ebuild,v 1.2 2010/01/15 20:19:33 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.33.ebuild,v 1.1 2010/06/21 00:46:41 ramereth Exp $
+
+EAPI="2"
 
 inherit autotools ssl-cert eutils
 
@@ -10,8 +12,8 @@ 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"
-IUSE="ipv6 selinux tcpd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ipv6 selinux tcpd xforward"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
 	>=dev-libs/openssl-0.9.8k"
@@ -23,10 +25,9 @@ pkg_setup() {
 	enewuser stunnel -1 -1 -1 stunnel
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${PN}-4.21-libwrap.patch"
+	use xforward && epatch "${FILESDIR}/${P}-x-forwarded-for.patch"
 	eautoreconf
 
 	# Hack away generation of certificate
@@ -34,10 +35,9 @@ src_unpack() {
 		tools/Makefile.in || die "sed failed"
 }
 
-src_compile() {
+src_configure() {
 	econf $(use_enable ipv6) \
 		$(use_enable tcpd libwrap) || die "econf died"
-	emake || die "emake died"
 }
 
 src_install() {