Version bump, security bug 222805, CVE-2008-2420.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 i686

3 files changed, 93 insertions, 5 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index c6f7f6b7bb8d..49c0ca10549c 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.92 2008/04/17 19:23:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.93 2008/07/09 11:04:09 ulm Exp $
+
+*stunnel-4.25 (09 Jul 2008)
+
+  09 Jul 2008; Ulrich Mueller <ulm@gentoo.org> +stunnel-4.25.ebuild:
+  Version bump, security bug 222805, CVE-2008-2420.
 
 *stunnel-4.22 (17 Apr 2008)
 
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index a2e04dfce687..e7ba51533201 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -9,15 +9,17 @@ AUX stunnel.rc6 779 RMD160 3cb0ba8b6f90484a9cec951e3eb36eef45169f6d SHA1 7de8dc8
 DIST stunnel-3.26.tar.gz 228923 RMD160 63347b6bc6fca1496d74a8ef234eea98a45e0b04 SHA1 0d40d268a9e4b63630312cdee4efa5ecba53c9ec SHA256 d2a55b089d46d14bc4b456bb1927303492dab6649867c67a005d2c9d1ededfb3
 DIST stunnel-4.21.tar.gz 528196 RMD160 e0f599bb44bbdd5178af9972110f71ee64cbf724 SHA1 7785c45167d902aa728b839adee02a8cc056d86a SHA256 b1121c1157c48320491f1929eb1f1c64ba20f76c7352c0df01c77cf09be19add
 DIST stunnel-4.22.tar.gz 531252 RMD160 15cc7a426bdf3a24ae25cc30281d5ce5825d87ca SHA1 452d0068bcae39afe7401216153986f3af810e37 SHA256 3779efb7ff463ba2838f330decbc904ea65fa04eeaa1138505e3bab9ecef1d49
+DIST stunnel-4.25.tar.gz 532343 RMD160 dcb9962e5273e69f5aeaed6bf709495aa97baa52 SHA1 fc6d61fad996f750c76ea627c5dd9f789af0eaf6 SHA256 9c966a18124ad2c28773fe096b767071320bdb07db69f480df36cbca80069480
 EBUILD stunnel-3.26.ebuild 723 RMD160 0636c7eae1da61ec4af4771feae60d9a86f70322 SHA1 b71fe6b65de35833c2d35c620e38c231fe3a5d04 SHA256 adc4a2cb260ca77fd1881c960230486f4952b6946db94ec57a33f2131aeae986
 EBUILD stunnel-4.21-r1.ebuild 2409 RMD160 a458bec31394969c71a2b25e964969ba3c202031 SHA1 a011bf4cc15094b0cc9b43be26f36853563d2192 SHA256 21684cdeff9d9ca9466078cdd82932df2bd31a9226228a7f47630d0a8fe27192
 EBUILD stunnel-4.22.ebuild 2380 RMD160 7b840f884ff028379352e3cd03b52ceaa5da5bf3 SHA1 b667f590c71b873ba3cb671f1cc6a14d12c32419 SHA256 face85efc268c7862fff8429db3402c25c88644a6852305f6b14f0076f78f3b4
-MISC ChangeLog 13160 RMD160 a4a9fc723b4aab06daa85a77410d1410f79265c0 SHA1 81c15e02faa4b65f32fe10d76f6992c61cbf1379 SHA256 e3235e3491e564c12e56efecb1ebeef99056ac326918dc7f1db067c4c700fef5
+EBUILD stunnel-4.25.ebuild 2380 RMD160 8f9785da868151694117d1bf3ab9dfc7b2c834cf SHA1 119fd6ab028810392a8bdd2057373964fe74d097 SHA256 23d3215b73e350990f72797a332ba1461daa1b585ed631f4243c4e1e1c17c4fe
+MISC ChangeLog 13311 RMD160 f30bbb13bde1683982f7675e8fe8cb1453e4bacb SHA1 b8251ba5488cd305ca679b2ea9cac7c70d6c2768 SHA256 831d9359022af5b2b6ae00d9951b1e1e3169bfe3bf4e3dfd8c9123337b5ea196
 MISC metadata.xml 641 RMD160 7ad264c22b9e0705cf00b7985eee8d23c3383310 SHA1 c9314118d8fbc0644eb690f56f9d8859d3f7c578 SHA256 16e547775081b652662ac7156f0b6cfb7d1b8165865416cd154047c9ea6abebb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkgHo5YACgkQOeoy/oIi7uxdbQCaA0R+nckvveyzhboUuu7n/4tc
-sPUAn33sKxUUulJcLz7eToyL5bUQlgn3
-=z6J2
+iEYEARECAAYFAkh0my8ACgkQOeoy/oIi7uyXWgCfdkTKxzqkbowAB5dQ/AdpYoMD
+VO0AoIYizh2nCUT6sPrph13sVaPTUG6M
+=gyCy
 -----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/stunnel-4.25.ebuild b/net-misc/stunnel/stunnel-4.25.ebuild
new file mode 100644
index 000000000000..076fe1f3ca21
--- /dev/null
+++ b/net-misc/stunnel/stunnel-4.25.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.25.ebuild,v 1.1 2008/07/09 11:04:09 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}/${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.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
+}