Version bump (fixes #293548), stablize stunnel-4.27-r2

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 93 insertions, 12 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 5c9d742b4aaa..4eaa1a3c3906 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.106 2009/09/24 20:30:31 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.107 2009/12/09 01:01:58 ramereth Exp $
+
+*stunnel-4.29 (09 Dec 2009)
+
+  09 Dec 2009; Lance Albertson <ramereth@gentoo.org> stunnel-4.27-r2.ebuild,
+  +stunnel-4.29.ebuild:
+  Version bump (fixes #293548), stablize stunnel-4.27-r2
 
 *stunnel-4.27-r2 (24 Sep 2009)
 
@@ -45,7 +51,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:
@@ -74,7 +80,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:
@@ -95,7 +101,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:
@@ -104,7 +110,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)
@@ -144,7 +150,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:
@@ -156,7 +162,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,
@@ -178,7 +184,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:
@@ -306,7 +312,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,
@@ -331,7 +337,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/stunnel-4.27-r2.ebuild b/net-misc/stunnel/stunnel-4.27-r2.ebuild
index ba42e103b806..9097a23968f9 100644
--- a/net-misc/stunnel/stunnel-4.27-r2.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-r2.ebuild,v 1.1 2009/09/24 18:36:42 ramereth Exp $
+# $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
 
@@ -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.29.ebuild b/net-misc/stunnel/stunnel-4.29.ebuild
new file mode 100644
index 000000000000..b7689c75485e
--- /dev/null
+++ b/net-misc/stunnel/stunnel-4.29.ebuild
@@ -0,0 +1,75 @@
+# 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.29.ebuild,v 1.1 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
+	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."
+}