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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

7 files changed, 27 insertions, 163 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/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() {