Version bump, half closes 306127

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index c2260359c6e67242a6f88ab87477ef71178dc158..a836e8097a2223bfbdf0fa73209a4a87d9e04de4 100644 (file)
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,11 @@
 # 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.109 2010/01/15 20:19:33 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.110 2010/03/07 21:17:13 ramereth Exp $
+
+*stunnel-4.31 (07 Mar 2010)
+
+  07 Mar 2010; Lance Albertson <ramereth@gentoo.org> +stunnel-4.31.ebuild:
+  Version bump, half closes #306127
 
   15 Jan 2010; Lance Albertson <ramereth@gentoo.org> stunnel-4.29.ebuild:
   Stable on x86/amd64

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index b94b65dbb62bf4f07f152c6d5413dd1bf3d6853e..b35d71202ca10508987eaa3d776fcd8d7b3e6fd9 100644 (file)
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -10,17 +10,19 @@ DIST stunnel-3.26.tar.gz 228923 RMD160 63347b6bc6fca1496d74a8ef234eea98a45e0b04
 DIST stunnel-4.25.tar.gz 532343 RMD160 dcb9962e5273e69f5aeaed6bf709495aa97baa52 SHA1 fc6d61fad996f750c76ea627c5dd9f789af0eaf6 SHA256 9c966a18124ad2c28773fe096b767071320bdb07db69f480df36cbca80069480
 DIST stunnel-4.27.tar.gz 538604 RMD160 a0beb4dffbc40c5c4452af767840d6fa703868c9 SHA1 2daf52fb0906de9fc5bd6a270e620e9316034fd4 SHA256 c260a6544a39c3cff59626ca6bc7c14087dc4d4fab95c6cddd7dddd81df87cfb
 DIST stunnel-4.29.tar.gz 544292 RMD160 7861b38da0c9b1bf5c3aa8c1e9a654d7cedec5ba SHA1 f93ac9054c62b1db0dcf44f668d323d82cc0f413 SHA256 018064e852a2a125bcfb4b81baa77b5701ccf6aabe6a47564bfc046b18d11f9b
+DIST stunnel-4.31.tar.gz 548167 RMD160 813be2098bcd1fc0776d72d1ea6ee16b63c7f94d SHA1 f51fc544a0554f6eee2bfca1fcb8ddcb8386ce32 SHA256 187d0df2701d51c09b66f120cf6f1a62c4161e3e58dc84f893c1e5c7ccf30262
 EBUILD stunnel-3.26.ebuild 742 RMD160 828bcad3275266e52a5036f6670e0612c90e926a SHA1 84966259d3b71ddfce3ffec4b2ee14d43811fd81 SHA256 ab1b1e4697849381ed5acc09728dd07457674148a4864091eec747918b16b5ee
 EBUILD stunnel-4.25.ebuild 2377 RMD160 ba0d4c2d24962f5afe8df92c350560a8cc4a4487 SHA1 1e839c2596930e41930cfb977b72b2120e5fae2e SHA256 6f7f27d4cae7ed03b28be646d6b04fe1dc9524e0b016411712f691b44128da33
 EBUILD stunnel-4.27-r1.ebuild 2228 RMD160 01f222113b61221ed88f200a97b2039f57aabbc2 SHA1 c344d069208ec0f280b1dfa7732504508801108c SHA256 8cb4eaa091f088eac01a1c6dc8e29065cc69255d7f40c8bf647c98d7a70f529f
 EBUILD stunnel-4.27-r2.ebuild 2228 RMD160 b2924fabd71e24a11f7c469f2d962f4c9b6dedaa SHA1 fbe47ba5bc5f4f146138fc5d3efea0bf06a90c74 SHA256 182c42c2aec268cf73bcc3e25ac6a2ed5f53abd36f527f4f2160ca958dfa003f
 EBUILD stunnel-4.29.ebuild 2203 RMD160 e051ef3e8178fdde86fcba8259d3766556e12c28 SHA1 7413d0098fda030db976ee36031bd254689a66d2 SHA256 5d0548e27acec8d2a764a9b38671626957cc3c667a22aec203a1e79173e026fa
-MISC ChangeLog 15436 RMD160 565551d232deaaf2e7206662d8ce04e3aaa528bb SHA1 d6e6c0f1583a6270697681a77af8b603d873809d SHA256 853ec71c37ff22b3010bb5519af3f6d6b8f1bbada5556b51009be741848317e2
+EBUILD stunnel-4.31.ebuild 2167 RMD160 fcc8010a59f9ac001b2b1351a1e8dfd847ad1c90 SHA1 254f0cf5f790d34817d9227de24d1f627272be96 SHA256 3dd261a5a8dfd09b0db50f70f7127e29627bc18cdcc483e6e98b788cd0cac257
+MISC ChangeLog 15577 RMD160 6ee7bfb066b9bb15d71fe23c361c6e7ad98bf4dc SHA1 7ba0c650d48eb8bc4a818325f50d6c7df3b3b1c8 SHA256 c0fad104c587a5fddbd9388b046c444ad027cefc2e6ab0fa84b98a6fbf54f855
 MISC metadata.xml 641 RMD160 7ad264c22b9e0705cf00b7985eee8d23c3383310 SHA1 c9314118d8fbc0644eb690f56f9d8859d3f7c578 SHA256 16e547775081b652662ac7156f0b6cfb7d1b8165865416cd154047c9ea6abebb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFLUM3cQW+hXSf0t0IRAtS7AJ9VsMRK3Y0VWx9qxqlxkbwnE21PTQCgz6gP
-15b9sxMkjRZQKRM0hGg4D1s=
-=WkRR
+iD8DBQFLlBdeQW+hXSf0t0IRApkGAKDbc3HeYFsZmSOlherJPzIK86cSEgCeNuei
+aiqHRWcBr7TEz5Lj9/Q6hZM=
+=C6Nv
 -----END PGP SIGNATURE-----

diff --git a/net-misc/stunnel/stunnel-4.31.ebuild b/net-misc/stunnel/stunnel-4.31.ebuild
new file mode 100644 (file)
index 0000000..1543df2
--- /dev/null
+++ b/net-misc/stunnel/stunnel-4.31.ebuild
@@ -0,0 +1,74 @@
+# 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.ebuild,v 1.1 2010/03/07 21:17:13 ramereth Exp $
+
+EAPI="2"
+
+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_prepare() {
+       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_configure() {
+       econf $(use_enable ipv6) \
+               $(use_enable tcpd libwrap) || die "econf 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."
+}