version bump, fixed ipv6/tcpd use flags, clean out broken ebuild

(Portage version: 2.0.54)

6 files changed, 110 insertions, 9 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 5ba013597ce7..b15a4cd783aa 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.52 2006/03/29 18:44:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.53 2006/04/27 13:56:18 ramereth Exp $
+
+*stunnel-4.15 (27 Apr 2006)
+*stunnel-4.14-r1 (27 Apr 2006)
+
+  27 Apr 2006; Lance Albertson <ramereth@gentoo.org> -stunnel-4.14.ebuild,
+  +stunnel-4.14-r1.ebuild, +stunnel-4.15.ebuild:
+  * Version bump
+  * Fixed ipv6/tcpd use flags for 4.14 and beyond. Apparently the configure
+  script doesn't honor --disable-foo.
+  * Removed broken ebuild
 
   29 Mar 2006; Brent Baude <ranger@gentoo.org> stunnel-4.09-r1.ebuild:
   Marking stunnel-4.09 ~ppc64 per infra request
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index e4596c5baf89..fad66558ec20 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -2,7 +2,8 @@ MD5 cec2f639e22a1679e9c7b3e7ad01a0ff ChangeLog 7622
 MD5 ea2086dcf69dddf6d075a7040d209335 files/digest-stunnel-3.26 64
 MD5 b562ecc7a9dab7e2e2582a0601b42569 files/digest-stunnel-4.09 64
 MD5 b562ecc7a9dab7e2e2582a0601b42569 files/digest-stunnel-4.09-r1 64
-MD5 ae279447729ad0d6d59b870b4ed28683 files/digest-stunnel-4.14 64
+MD5 ae279447729ad0d6d59b870b4ed28683 files/digest-stunnel-4.14-r1 64
+MD5 b8c378c46e46f1a99d22f25d970d02a5 files/digest-stunnel-4.15 64
 MD5 b42ca1fbeb5d6454de36aac4cb893294 files/stunnel-3.26-gentoo.diff 941
 MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.05-gentoo.diff 321
 MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.09-gentoo.diff 321
@@ -17,4 +18,5 @@ MD5 3c7d56a1f6a95f21ceb95ddf5c76073c metadata.xml 703
 MD5 40938d8bb3bba86aea441e89ad04bdc9 stunnel-3.26.ebuild 1085
 MD5 d222e6b103e40e0828c151f2d0c6f70e stunnel-4.09-r1.ebuild 2225
 MD5 1217dcb1ea077fa30403aa71cdaf7480 stunnel-4.09.ebuild 2127
-MD5 2e5b35dd3147164d11d25c7dd45695dd stunnel-4.14.ebuild 2223
+MD5 10d27d5baa60dfce3a059fcb2d1c553b stunnel-4.14-r1.ebuild 2423
+MD5 64ee008ce2e7e2b54c5da68fe1414940 stunnel-4.15.ebuild 2424
diff --git a/net-misc/stunnel/files/digest-stunnel-4.14 b/net-misc/stunnel/files/digest-stunnel-4.14-r1
index 73a5b584bea9..73a5b584bea9 100644
--- a/net-misc/stunnel/files/digest-stunnel-4.14
+++ b/net-misc/stunnel/files/digest-stunnel-4.14-r1
diff --git a/net-misc/stunnel/files/digest-stunnel-4.15 b/net-misc/stunnel/files/digest-stunnel-4.15
new file mode 100644
index 000000000000..7e469983c1f6
--- /dev/null
+++ b/net-misc/stunnel/files/digest-stunnel-4.15
@@ -0,0 +1 @@
+MD5 2c00153ad099a5f9c5609e8d1dbbe470 stunnel-4.15.tar.gz 497103
diff --git a/net-misc/stunnel/stunnel-4.14.ebuild b/net-misc/stunnel/stunnel-4.14-r1.ebuild
index b944f8e36f51..8c3a0861bea3 100644
--- a/net-misc/stunnel/stunnel-4.14.ebuild
+++ b/net-misc/stunnel/stunnel-4.14-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.14.ebuild,v 1.1 2005/11/20 03:16:42 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.14-r1.ebuild,v 1.1 2006/04/27 13:56:18 ramereth Exp $
 
 inherit ssl-cert eutils flag-o-matic
 
@@ -25,10 +25,16 @@ src_unpack() {
 }
 
 src_compile() {
-	econf \
-		`use_enable ipv6`\
-		`use_with tcpd tcp-wrappers` \
-		|| die "econf died"
+	local myconf=""
+	# Don't shoot me for doing this! The stunnel configure script is broke and
+	# doesn't honor --disable-foo
+	if use ipv6 ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+	if ! use tcpd ; then
+		myconf="${myconf} --disable-libwrap"
+	fi
+	econf ${myconf} || die "econf died"
 	emake || die "emake died"
 }
 
diff --git a/net-misc/stunnel/stunnel-4.15.ebuild b/net-misc/stunnel/stunnel-4.15.ebuild
new file mode 100644
index 000000000000..742a1f2c6961
--- /dev/null
+++ b/net-misc/stunnel/stunnel-4.15.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.15.ebuild,v 1.1 2006/04/27 13:56:18 ramereth Exp $
+
+inherit ssl-cert eutils flag-o-matic
+
+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 ~ppc ~sparc ~x86"
+IUSE="ipv6 selinux tcpd"
+
+DEPEND="virtual/libc
+	>=dev-libs/openssl-0.9.6j"
+RDEPEND=">=dev-libs/openssl-0.9.6j
+	selinux? ( sec-policy/selinux-stunnel )"
+
+src_unpack() {
+	unpack ${A}
+	# Hack away generation of certificate
+	sed -i s/^install-data-local:/do-not-run-this:/ "${S}"/tools/Makefile.in
+}
+
+src_compile() {
+	local myconf=""
+	# Don't shoot me for doing this! The stunnel configure script is broke and
+	# doesn't honor --disable-foo
+	if use ipv6 ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+	if ! use tcpd ; then
+		myconf="${myconf} --disable-libwrap"
+	fi
+	econf ${myconf} || die "econf died"
+	emake || die "emake died"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	rm -rf ${D}/usr/share/doc/${PN}
+	rm -f ${D}/{etc/stunnel/stunnel.conf-sample,usr/sbin/stunnel3}
+	rm -f ${D}/usr/share/man/man8/{stunnel.fr.8,stunnel.pl.8}
+
+	dodoc AUTHORS BUGS CREDITS INSTALL NEWS 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
+	donewins ${FILESDIR}/stunnel.conf stunnel.conf
+	newinitd ${FILESDIR}/stunnel.rc6 stunnel
+	# Check if there's currently an cert already there
+	if [ ! -f /etc/stunnel/stunnel.key ]; then
+		docert stunnel
+	fi
+
+	keepdir /var/run/stunnel
+}
+
+pkg_postinst() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+
+	chown stunnel:stunnel ${ROOT}/var/run/stunnel
+	chown stunnel:stunnel ${ROOT}/etc/stunnel/stunnel.{conf,crt,csr,key,pem}
+	chmod 0640 ${ROOT}/etc/stunnel/stunnel.{conf,crt,csr,key,pem}
+
+	if [ ! -z "$(egrep '/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"
+		ebeep 3
+		epause 3
+	fi
+}