Version bump, bug #197881.

(Portage version: 2.1.4_rc8)

9 files changed, 168 insertions, 114 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 51ba130dd2f6..248a84d0fb29 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.77 2007/11/10 05:26:34 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.78 2007/12/08 10:38:25 ulm Exp $
+
+*stunnel-4.21 (08 Dec 2007)
+
+  08 Dec 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/stunnel-4.21-libwrap.patch, files/stunnel.rc6,
+  +files/stunnel.rc6.4.20, -stunnel-4.16.ebuild, stunnel-4.20.ebuild,
+  +stunnel-4.21.ebuild:
+  Version bump; ebuild and patch by Santiago M. Mola <coldwind@gentoo.org> in
+  bug #197881. Replace call to docert by install_cert, bug #174759. The binary
+  is now installed in /usr/bin; provide a symlink for backwards compatibility
+  and update the rc file accordingly. Remove old version.
 
   10 Nov 2007; Samuli Suominen <drac@gentoo.org> stunnel-3.26.ebuild:
   Keyword ~amd64 wrt #193770.
diff --git a/net-misc/stunnel/files/digest-stunnel-4.16 b/net-misc/stunnel/files/digest-stunnel-4.16
deleted file mode 100644
index ae4e19986bb4..000000000000
--- a/net-misc/stunnel/files/digest-stunnel-4.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8ea5cae3eeaacc0271b766506b4b9d4a stunnel-4.16.tar.gz 507204
-RMD160 cbf8136049bcd8e306ee80bd66e4dd7666272b46 stunnel-4.16.tar.gz 507204
-SHA256 8ccf6d8e9960ec6cb64aa27c3e61cb1ee32f5ae12f208aebb923de9c9f200a6e stunnel-4.16.tar.gz 507204
diff --git a/net-misc/stunnel/files/digest-stunnel-4.21 b/net-misc/stunnel/files/digest-stunnel-4.21
new file mode 100644
index 000000000000..8b87ff9ad1c5
--- /dev/null
+++ b/net-misc/stunnel/files/digest-stunnel-4.21
@@ -0,0 +1,3 @@
+MD5 1eaec5228979beca4d548f453304e311 stunnel-4.21.tar.gz 528196
+RMD160 e0f599bb44bbdd5178af9972110f71ee64cbf724 stunnel-4.21.tar.gz 528196
+SHA256 b1121c1157c48320491f1929eb1f1c64ba20f76c7352c0df01c77cf09be19add stunnel-4.21.tar.gz 528196
diff --git a/net-misc/stunnel/files/stunnel-4.21-libwrap.patch b/net-misc/stunnel/files/stunnel-4.21-libwrap.patch
new file mode 100644
index 000000000000..c64f8e6cf698
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-4.21-libwrap.patch
@@ -0,0 +1,10 @@
+--- stunnel-4.21/configure.ac	2007-08-09 00:43:10.000000000 +0200
++++ stunnel-4.21.new/configure.ac	2007-11-02 16:16:11.000000000 +0100
+@@ -343,6 +343,7 @@
+         case "$enableval" in
+             yes) AC_MSG_RESULT([no])
+                 AC_DEFINE(HAVE_LIBWRAP)
++                LIBS="$LIBS -lwrap"
+                 ;;
+             no) AC_MSG_RESULT([yes])
+                 ;;
diff --git a/net-misc/stunnel/files/stunnel.rc6 b/net-misc/stunnel/files/stunnel.rc6
index 10d10b946506..3708a1c0dbca 100644
--- a/net-misc/stunnel/files/stunnel.rc6
+++ b/net-misc/stunnel/files/stunnel.rc6
@@ -1,34 +1,34 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6,v 1.7 2005/06/22 04:28:25 ramereth Exp $
 
 # Default pidfile location
 PIDFILE="/var/run/stunnel/stunnel.pid"
 
 checkconfig() {
-    # To ensure backwards compatibility
-    if [ ! -z "$(egrep '/etc/stunnel/stunnel.pid' /etc/stunnel/stunnel.conf)" ] ; then
-	ewarn "Please update your stunnel.conf!"
-	ewarn "pid should point to /var/run/stunnel/stunnel.pid"
-	PIDFILE="/etc/stunnel/stunnel.pid"
-    fi
+	# To ensure backwards compatibility
+	if grep -q /etc/stunnel/stunnel.pid /etc/stunnel/stunnel.conf; then
+		ewarn "Please update your stunnel.conf!"
+		ewarn "pid should point to /var/run/stunnel/stunnel.pid"
+		PIDFILE="/etc/stunnel/stunnel.pid"
+	fi
 }
 
 depend() {
-    need net
+	need net
 }
 
 start() {
-    checkconfig
-    ebegin "Starting stunnel"
-    start-stop-daemon --start --pidfile ${PIDFILE} --quiet --exec /usr/sbin/stunnel -- /etc/stunnel/stunnel.conf  
-    eend $?
+	checkconfig
+	ebegin "Starting stunnel"
+	start-stop-daemon --start --quiet --pidfile "${PIDFILE}" \
+		--exec /usr/bin/stunnel -- /etc/stunnel/stunnel.conf
+	eend $?
 }
 
 stop() {
-    checkconfig
-    ebegin "Stopping stunnel"
-    start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-    eend $?
+	checkconfig
+	ebegin "Stopping stunnel"
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
+	eend $?
 }
diff --git a/net-misc/stunnel/files/stunnel.rc6.4.20 b/net-misc/stunnel/files/stunnel.rc6.4.20
new file mode 100644
index 000000000000..b8bdfe5e29cd
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel.rc6.4.20
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6.4.20,v 1.1 2007/12/08 10:38:26 ulm Exp $
+
+# Default pidfile location
+PIDFILE="/var/run/stunnel/stunnel.pid"
+
+checkconfig() {
+    # To ensure backwards compatibility
+    if [ ! -z "$(egrep '/etc/stunnel/stunnel.pid' /etc/stunnel/stunnel.conf)" ] ; then
+	ewarn "Please update your stunnel.conf!"
+	ewarn "pid should point to /var/run/stunnel/stunnel.pid"
+	PIDFILE="/etc/stunnel/stunnel.pid"
+    fi
+}
+
+depend() {
+    need net
+}
+
+start() {
+    checkconfig
+    ebegin "Starting stunnel"
+    start-stop-daemon --start --pidfile ${PIDFILE} --quiet --exec /usr/sbin/stunnel -- /etc/stunnel/stunnel.conf  
+    eend $?
+}
+
+stop() {
+    checkconfig
+    ebegin "Stopping stunnel"
+    start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+    eend $?
+}
diff --git a/net-misc/stunnel/stunnel-4.16.ebuild b/net-misc/stunnel/stunnel-4.16.ebuild
deleted file mode 100644
index 7689392f5a36..000000000000
--- a/net-misc/stunnel/stunnel-4.16.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.16.ebuild,v 1.4 2007/03/09 17:38:51 vapier 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 ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="ipv6 selinux tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/openssl-0.9.6j"
-RDEPEND="${DEPEND}
-	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
-	newins ${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
-}
diff --git a/net-misc/stunnel/stunnel-4.20.ebuild b/net-misc/stunnel/stunnel-4.20.ebuild
index 75f231b7e377..3b7f40680eac 100644
--- a/net-misc/stunnel/stunnel-4.20.ebuild
+++ b/net-misc/stunnel/stunnel-4.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.20.ebuild,v 1.12 2007/11/03 16:00:15 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.20.ebuild,v 1.13 2007/12/08 10:38:25 ulm Exp $
 
 inherit ssl-cert eutils flag-o-matic
 
@@ -39,10 +39,10 @@ src_compile() {
 }
 
 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}
+	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
@@ -50,8 +50,8 @@ src_install() {
 		tools/importCA.html
 
 	insinto /etc/stunnel
-	newins ${FILESDIR}/stunnel.conf stunnel.conf
-	newinitd ${FILESDIR}/stunnel.rc6 stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel.rc6.${PV} stunnel
 	# Check if there's currently an cert already there
 	if [ ! -f /etc/stunnel/stunnel.key ]; then
 		docert stunnel
@@ -64,12 +64,12 @@ 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}
+	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
+		"${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"
diff --git a/net-misc/stunnel/stunnel-4.21.ebuild b/net-misc/stunnel/stunnel-4.21.ebuild
new file mode 100644
index 000000000000..fb6891db2d21
--- /dev/null
+++ b/net-misc/stunnel/stunnel-4.21.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.21.ebuild,v 1.1 2007/12/08 10:38:25 ulm 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 ~sparc ~x86"
+IUSE="ipv6 selinux tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	>=dev-libs/openssl-0.9.6j"
+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}"/${P}-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.rc6 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
+
+	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
+}