Version bump.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 109 insertions, 15 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 0b655ee475d8..169a78e7b009 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.236 2015/07/09 14:38:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.237 2015/07/28 12:01:09 blueness Exp $
+
+*stunnel-5.21 (28 Jul 2015)
+
+  28 Jul 2015; Anthony G. Basile <blueness@gentoo.org> +stunnel-5.21.ebuild:
+  Version bump.
 
 *stunnel-5.20 (09 Jul 2015)
 
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 3aa8efe3e66b..20cb0a70ca27 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -9,27 +9,29 @@ DIST stunnel-5.17.tar.gz 613840 SHA256 c3e79e582621a0827125e35e1c00450190104fc02
 DIST stunnel-5.18.tar.gz 624660 SHA256 0532c0a2f8de3da1ab625e384146501ce5936fac63d01561c3a9bf652b692317 SHA512 292d5ef96c6d84c248b75f9e0e9b344c79177ec72f96097281bb37a12e52f4b5e44d363b1c164ee86536dbc492c8e9f899e17a1842c85453c2ef113a5d1862ec WHIRLPOOL 2cea6cc70350fa750e46d09ad28621fe4c0334442829e42d2157344424e6a2437b2642c5219bf4d5be1588f8c91671c805423c13c06b24b73d56686dabb4b412
 DIST stunnel-5.19.tar.gz 620810 SHA256 0b543242cf26649acfdd9f00de564c3e8de7ac2237d53935ffdc7eb24f4d556d SHA512 93b1b6f62873610dada98b7d555aafa8495f9d34fd2a9b92e2bc6420edbc087f428ca6d6d47560055b36809fad08ec7eb41e71bc0abe97c84277125484866574 WHIRLPOOL 5fbab7761a7284766b65bac177bd997ac506141627992bc7f8642250a99d6dd7dc09a2a609934aa66ad99ba7faa2cf886edb2d0b1b942d672671aff57cbf3d48
 DIST stunnel-5.20.tar.gz 625091 SHA256 4a36a3729a7287d9d82c4b38bf72c4d3496346cb969b86129c5deac22b20292b SHA512 59262aacf866cac25bac707b94c5a6185aa868b5fdfab38a9ef03a00b80f106d92e2872c0b0fecbc5d13adb7bdea7f922768fb78f38355dbf67eb34a148441e4 WHIRLPOOL fc890dff4ddeb00df9e8ea84fae8f0f23609d1356c91d4cdeade55f164bad322a8a2df72955b710e46e1f74a33bbc7f5c8d734efc190d0835056926d7c902b26
+DIST stunnel-5.21.tar.gz 626573 SHA256 2aef568b1955f5e233f6a8e17ebce3d30755f1be44c813f5a48e621f785596e3 SHA512 2b9991963f86df0525c37e7faa1e4fcba78fb37170dc1f03fafbe644840631d6075de65cd10aeaffae46fa26379ba1e8eaf51d2b44d44ae1e7a476c22532bdc3 WHIRLPOOL 4a051382492a0025ac34a264967df1aa4f1d448db672a95d0787ca9b8c1d8378b6d53d5ab3f870da1d748d8437c6f37b3c8445f1a57ef6c08d16f3e1b4fb8795
 EBUILD stunnel-5.14.ebuild 2629 SHA256 03d462745f44c9708f82cf3c49fe07824b7449f776a5e87138faf5249bb4b6d3 SHA512 c5feb173797c92184dfd0c10f2b4fd17d1079c64089cd78d1d55e640f941c1936a7536b31ab6c49e97aabceab4caea34b0f00a84935cd724c357361d5d7b10d7 WHIRLPOOL f0e196a3b60f6887fae74f2e9ee009ff5413e97d7e14b0cb377cf24170aab26a371865e81204baeb1ace7a3c9abbe52aeab1bbf91cf645b5e290711be1d1c286
 EBUILD stunnel-5.17.ebuild 2788 SHA256 efd975d3e44c2ca3de8735a79e28a08e8bdbefa74d40963a7195856754ccbcc8 SHA512 0817c9b2c35ba9d90b35e302011a8216e49bc84a23f6ae29339f5265295e7b7021d79b7342fe28f68e6351a1b8df6d24793d324213cfa234a8bad76cf8e39eef WHIRLPOOL 27e2aac6bd2302b45190b4ff1849198856c59c59f522f2628f0b4621d5cafd97c0fe67e26c78aaa506d7feefe03dae56d9a4c4f75828625b9d7f2f5b2fc454af
 EBUILD stunnel-5.18.ebuild 2855 SHA256 45e9c4be13db9f38b827ade28970720f3f1598017867086197ef9071fa35e45f SHA512 24d88a0a80eec749655ef962fb6c7ea9653c3071e69ab33813d7357be3be2dd3401d8c0ddb2758319cb6c999d10ecd442e70d379ae10cc5ca943156f01ae0e22 WHIRLPOOL 50cf1c35be6145a4dba6800dd28a5d325a9424889817ed354511aed8fd77501329ea48eabb8a23863e04f479b9e5b71e9d01f361f30b94c475fbf3353ff38e2e
 EBUILD stunnel-5.19.ebuild 2858 SHA256 f87c76c164d9ba40e4b86ac701d989f93f45e1fdc8b833e69f04cfe68a300d16 SHA512 540a46e8b5b650b031165d441bfae37c794ecd8c82b3028b233f2cc5ec991ad5642ed7cf89f8c53191ce7729d7a3b75e0a42f8a931e05f4289df2ab97eb30dbf WHIRLPOOL 376e014a7b0279baff61883a60fb5d032cac89ee683ee6bd8f5d151774437e9e7aa51980d2ba17f6c5cf6767f5546777c65e75538cc545789eb5ce5723ee569c
 EBUILD stunnel-5.20.ebuild 2858 SHA256 df436be033abe679871e878d33e4e27ddd042b50744d584dbb9d9afe8642d5e6 SHA512 98c36c65c1597251e5cd11008f190c46737c8e2a0fa32ed475cbe974bbab61a3d7c373ff666da0c886001aa2fba6e850abdc6f75259ce9b17e91836307581955 WHIRLPOOL 2647ac698295e6b5181146aef1681271571cf1472d8ef7e5eab53d8d1287f8bfdca7d68ad1f4f5292c801aae549a3ddfffcb2f99cb7338660e955055abea8223
-MISC ChangeLog 33288 SHA256 283fda7801c2e42a95db51e6e3be9d5ea67dd95de6897240f68580fe8e425b65 SHA512 b9dbb36d3cba41c24b3c1dcf09ab247808d327555859e07c583479c6232a2fc06037f9c2385455e2d17040cf99873b83c389077593273540d425211560406fed WHIRLPOOL f5d9ae57e8ef7f143e583b5dd714e0ee6155e2d245e0e526b654d24258501b3a7d02b62f3e14563d3bbfa7b095c82551f9d594a7aa8e23763061fee020da981f
+EBUILD stunnel-5.21.ebuild 2858 SHA256 47737f6fb7f0538c386839bc7adeef9221a2b888163f234f7d89b9b84e562c69 SHA512 9a0bce2bd1ad265a5ab49571a95ac308813f2f9f281d3d06c125b746422b0c04da2c25ce607a2b6b151c55a60ca71d073a29077f1d19745af6a8425892e74bf0 WHIRLPOOL 58a6d3bc3b04752e8b293dcdc269b86708a3176704655f90af6643d066c57134b1f2178960d74e98c79a6c3923701cfa4668e4e55286141a69d4fa18bc8079e1
+MISC ChangeLog 33411 SHA256 8f9e55814c255bdf80757523c39525dbdc702e0695cdfe7380784a6912a682d0 SHA512 fb7b0f9f4ea501912fb459b44f54dc1ec04604e4880704ac237795f2b08f8e734a3c2b8d88c8d19743cfc83eb457dfd3cc737f968f834915d804024a459e8610 WHIRLPOOL c9867cb6fef5594eefcc3c6bf61f67ca621130ede246f88f8f00ee8a1abf4e820db7d0af9d506265c4fec477acfee338256659d6c987051e2af2373d28373e52
 MISC metadata.xml 698 SHA256 43717a802d6671f3b535427a7bfaf85ec60fd060091f4e1ac9a92487a4d49235 SHA512 2b22c5097b287d9d079f98407413c5247faf00f7fcf1f57eca5dca4081c10fae9ff136ab092819ba1ac53f880d88e943ac2b79c571338dc9f79f0a8dab34e58f WHIRLPOOL 1935c5e5f093136cf076375d3f757ca25b982dafaf110988a06d5457e1189cd14cc067d9dd167aa0f09d185b608feac636cdc22bd99a7c9bd0896516370ac0e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVnogZAAoJEJOE+m71LUu6C+gP/i6n1s6huA2aqlms7A3zM3Zx
-WxWgvZohlCcjh7Xw4xbDTvaTCys5QwYk6Gw+v7X+m7FI2vMthzHwNRMxbi8SMnk3
-TAb9p5BbEHKQOOQox/w16b5TMHoFWSFygM2rRYF4qvf9JCgJm7mLEhzCorztCOjt
-yPOFENic+eBYFiZcmg3nR10fYIx9KY2WOB4i52NERI2t3YoEhrNewvo/AG9Ax0+Y
-kwQzxvbqUjFeV0xvhiH2ne6hzQMT9rK1tOrx5l9q7znhUfnTFWMtCrHZHRP0PZ4Q
-fDR59dHhSOdEuMhHhvAJjsEK4WI1IiI1RZ6C2FVCfksu590AQKMBJS5Vcwg3DS+6
-5DIhh0L2ZtNb1FpIkO1Zp/7AmduvVwORlzSSFkU8SUURuXk9soz0RSWHpqq1AsFp
-Rm5CdeCrW8eKWp8R+7ah7vEc3eGx2+7KrKnFhVzkx6JwPNDqrDoQJ5/cBWAIK3wC
-o4Wcb/t4NU5Uq9XzIGhXgouU+3BEcKYnO3eD7HJ6QdUhrgHZyoIDHBXbQSK+pii+
-yqNY7unWNLDOha3EQNYwM1MANhJFRtY0xSp6AB4rSjxJpkwpmcHQkMur25DCyKRz
-fCotEnusGMuP6U3T+DUEc/QerMJsWmKbsWPprk/jQLfV2w2kymyBF6qEhqrtPbHR
-aRYYmoz17NcV5VViSHqT
-=zXc5
+iQIcBAEBCAAGBQJVt2+0AAoJEJOE+m71LUu6BU0P/2DloxYpkQ63qbmyr7Qo9syu
+s8CBAhMhRTAGmekFdd29ZOLdj20JOcIXi7IOKk+qJ6l32f6FyrZ0BUi8vw18IKaO
+75b6cFTxQxpZPYTzbA4adq/Aadi5Ww+thhxqg6L/VlzeALfwIc1qieIksCmd4L/d
+BQ2is7odWcspGcdZ99lewdUFqpdpkuZ+xzbjZQJd84hSjlTuguPD5tKK2UKTdRcA
+10bkUMiLlnSrcimo6vDyqNDstS56u2Tvv+46riCgqIgQri3GBJUhYIvLRkZWVVhJ
+TsITbuYBxFT+SogLyk9sSxF4C8U4lwKWzMGcL/TBzyAMbn6hr3AsoEz6yyMhQj5Y
+aLDbaDpTWKKA6NJKod1ZmdMV5jA5mlnUK5j9d074zIz6h7tkx/InPpEXARO6x5C7
+t8xWGSfa5JaRd5OLYeN0g6HbhXPaBtfUn/NDP+Vpv3ObfQKiGYY1s+kQhjA2U4EY
+cX1TzmalQcJ75M/PvvDdufpzs92dIpo33hfXN8ju6pDqKkU2qv+ImGCBNLfTFOh8
+p5XEk+eAicNbTVMl10oZRh0+lSMhq+zvcaIil8fbHnctFFkTeRXm6sKJAPFXtrsv
+ePry57hmWFDPQ8vQCCa8G8GKWMz0c3NtMdT9fcAzzYowrvk+g0wLbaJd6khsrn3R
+HA04eNI9SXcXZMObrjcF
+=Dwo5
 -----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/stunnel-5.21.ebuild b/net-misc/stunnel/stunnel-5.21.ebuild
new file mode 100644
index 000000000000..1fdfec91fe9d
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.21.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.21.ebuild,v 1.1 2015/07/28 12:01:09 blueness Exp $
+
+EAPI="5"
+
+inherit ssl-cert eutils multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	dev-libs/openssl:="
+RDEPEND="${DEPEND}
+	stunnel3? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-stunnel )"
+
+pkg_setup() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable ipv6) \
+		$(use_enable tcpd libwrap) \
+		--with-ssl="${EPREFIX}"/usr \
+		--disable-fips
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# 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
+	doinitd "${FILESDIR}"/stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/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."
+}