Version bump.

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

3 files changed, 102 insertions, 15 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 667e4a7d9e94..cf2b1306d7f7 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.213 2015/03/26 12:31:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.214 2015/04/17 11:59:05 blueness Exp $
+
+*stunnel-5.15 (17 Apr 2015)
+
+  17 Apr 2015; Anthony G. Basile <blueness@gentoo.org> +stunnel-5.15.ebuild:
+  Version bump.
 
 *stunnel-5.14 (26 Mar 2015)
 
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index ff9c3c58fb04..c1b82add8458 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -11,28 +11,30 @@ DIST stunnel-5.09.tar.gz 588436 SHA256 87b34a74061861d1edd2ab238c73eb989b3d0a17e
 DIST stunnel-5.10.tar.gz 603179 SHA256 032bfc1854f8a0b9e452343c36ec6b52c7e0daef0863423c6b13a61a7c92eb23 SHA512 02b2985010991590de32ece5bfb11eb2437e07e1906342aac4336cd406f2d66920c7fda02375e5def02d4f898544b035d3e0d5b4d039bed4b561fc5a31d62904 WHIRLPOOL 982668302cb477f113a55747f36ede1632e8cbe55a18d536e83a357d12a1ddff8320f9096bdc2093dd19e06cd7f12a268bed3e828107f56b5929bee07de3d1e5
 DIST stunnel-5.11.tar.gz 603842 SHA256 71a8bc37e58e34509b0267ade02292994c7a127f14d6e5ba03081db695edff8c SHA512 4a663bb6c6e167fc325f4e5658679ea09afdfa6c9851023c56d30f846416f5abffb7120c404a77ebc7b1483029088726a59f478c4ca4fcb4393440ce497a2e90 WHIRLPOOL a08e91fe39b453575f5c3678f47313be21c150878f771ee9cb433da9d098176451de77b59e2fecd112634161748f386805b1c85ca21b56490973454c185bca50
 DIST stunnel-5.14.tar.gz 608366 SHA256 2197b4fc1db82eba69c8baf1fac30f0767af26e9f8c7e9e1d5a4a8fbb264695a SHA512 f0d074f5c525036d98565c9c315f1761920c2e7cd7687a9a0f0441e7caf5cf3930b14c078f4f158806c557ba8ea0698aa3b23d5e7e03c076ee3b6667140148c8 WHIRLPOOL af8d018ffb74aafafef7bc90c63c2a5c1e4dbe164f71eb7aea7cf5388f60c9f49c19ce4dcbf2e55c2c166ee1be98ff5ef72171d750949e668391a7afeca78224
+DIST stunnel-5.15.tar.gz 613768 SHA256 58ff4645eb5d6bd64e6ddedaa683534302f75625c531e8a6364badcac0541cba SHA512 317d9d970b15024bd28d5db1014592d1f7cf342f617618c301e3810c98a595d80c888136aa0050ca750fd75084966f653dbcc725c4721d15eaeb4b280a1267e0 WHIRLPOOL ad015f3063b6c6bf16f4d5db6479e87a216cb1a87c53c7e2f14f71ef7255984551c39b486d9378122bd2c916e3351aaf07a4ee2023ee6cbd8e4e989cddd039f3
 EBUILD stunnel-5.07.ebuild 2623 SHA256 d9f5a33ed46cdae69481bbf177449b09d158349cd4b6136aaa035fb5572fe8e5 SHA512 c0f3b5b952f4e90213ba86482b467a1b475457cfa35dfd01136f2b5e457a8b77f2880c917754e68bb1545d1a6ceb2104d8dcfc22fbd144ab6e614e05940e1551 WHIRLPOOL fe9518ac28369b348014c54d07e47d58876864b2a154880b7efc79df88f9c62ac6139523532a8c31114f8d4a2d2d0b8f9c9f70de7e1e24cf11c824c0bd3e667d
 EBUILD stunnel-5.08.ebuild 2624 SHA256 c9d2a47b72acb1d84c332009edd9a574d1e6250ce6ebd98f01de013951e68114 SHA512 5b900c0b491e58f2d4bbaa80b1efcb4767898c1d865b371d2bf4c9b4284e1e6846fa03a1519d9f8fdbe4db129a5c5e463d5ff02dc27fdda3e096311ea6388dbd WHIRLPOOL a32e999d3f5140e992da90b20e680cdc9045f3aff9a696affa578316486eca42da149e77d136b61f65a3eb5a46435b2d49e09e89ab32d97ce7f2381dcb888721
 EBUILD stunnel-5.09.ebuild 2637 SHA256 27d9a58a7cbf169d455fc01e04fa75c30981e4edcb2a82ae08ff5660db45c456 SHA512 fdd23babcb2d5abbbb693c22a1a0501864c122036965c6684153b1d51dfe3979698a30953a2fd932077f73a349d908ec17dee02635d28583896038f4aa002988 WHIRLPOOL 2e4ffede8832dfcc460094c5826b66d428db5e575cb5133d605d22dd40c121a9f73802f80dfce6457867b515e6e6b195fdf7ad1ef8efa7b34ff1953738dd2411
 EBUILD stunnel-5.10.ebuild 2637 SHA256 d7766156a67aefd54f0f0a89e1ca5b587fd466abfba0a8e8a059a4c5bc14068c SHA512 128eb2e51bdb8e5e0a6cbc63a515073443a6fe57b5804949b9593406ebcd16c3a45284d14c4a2c663a5d255841b96e3b49af687433d757ab7e14c1626e455882 WHIRLPOOL 74be531bdd37cb2f7db8a56133d72a7e0eaf1eb82455578d1762a1b1089778319c808a88a7540ae8126ed8cbe68dc7e55c1c617e92427c18fe981b8747d1be8e
 EBUILD stunnel-5.11.ebuild 2637 SHA256 df52141059bb371a1863daffb26d941af1913e27b48b20dc5d3d4b199cd3aa48 SHA512 088a67c05673f49fb23c60f442ca3b05df93c5408ed1e0913f838fad7c50bc635f350c970f031d5d666c70ca1deb5ded03c02038ff8f1f4d3711702c2109ac52 WHIRLPOOL 7f0512e33c545bacd7d1f87bd56bc316d5164c7a43d7eeef2c7ad3a02f5c24b1c13cc96c6130df35e6bcc2dc074139f6a1afa5d609de59add7156124435d9829
 EBUILD stunnel-5.14.ebuild 2637 SHA256 f450cc3c77112575910cf58dbb77c51d27525949f64a2b52ea60d8cd52d15d2e SHA512 542831eb69e6de4ed883e848d95b2ac103d8e6a1d454de852d61ee438f5e14c48a44f96d219c10673de5618fdb98030dbd49cc25cf75512407558e75e1174077 WHIRLPOOL ba9eabacefc16a62479409966e60b9635687af2f3bacc981a85a9510a316f01d998c36f66befff4adbde4b51276e751599288502ef54c4ef1b155e30fc9b1a2b
-MISC ChangeLog 30407 SHA256 d267734b9c71b2645e4403fd94e31476c03bdd3adda991f6fa917470a22b689c SHA512 7f916b19f49c8af3827c0bbcf9f6fc1cc2ce35868aaf24e9980b76bd492e31a7003801dc11a255d6f074f54ed2b097874b59062994bfe3fe901f6cab055d18fd WHIRLPOOL 837ad2867c149e88c22edddcc52883d776b96c62a72f24af6529ae756e6231ca6968528db78f43358e15cf1900b3b7b7fae13b169334fe1a6cab65280ae99bb4
+EBUILD stunnel-5.15.ebuild 2637 SHA256 6bf7a9ca2ffefc1a08975db3cb652a18c9e83cb725f6b6b854128ee917baabbf SHA512 2f263958e248930b8611696726dfe736f2d97245351e960ff4c416e988879b703a4961ca6ba75b7c4f0d8066a2766daa6b67b5aee5f83f2be43f8571a9ae6514 WHIRLPOOL 6cc8b7846fb83db0af3565b94da836d4aef9d5a59716805ba7914123040a8ca74bdc6c35ac5805a99367907899ec35a39b5763ec7b24272b638c734f42b75325
+MISC ChangeLog 30530 SHA256 fddd68c44d1325d4ad44e1e2788e57dd3e147ca55252ed6ae1ec5d9e5017c84d SHA512 9168105ba88371d7b577ba97c243653c306cb91caf22e6223c65158126527f4336bafcd83418b7f155ffc5d7aa015f58d29ed9929c8ca2917953f0547826f1a5 WHIRLPOOL 27d0e6f3860f79bfc3e7717683dd55c25bd1aa32d845855c64991870f5029f9214475fd958baa0b19877c74b4851cd2f5471d490ffbb67c8bed4f66f850b7b6b
 MISC metadata.xml 622 SHA256 42b6c75bd95fd3f6322e6a6f726a9e07d74f0b46376a6f17718f9043cf6cc225 SHA512 930faf03b0f8e73c0ddb1a9821c04d8e0b0eb49fbf1e70ba439cd810e7aac827490b2036fb9a4bf4d8f2d96b3a2e0c0b2923ed21ae17b08ca09464c7cee54997 WHIRLPOOL a604c6422e399f97c5d701d756eee871438b9bb7fb7195c5b4a35357be9e11b7709d7e77172d85f1e5f1d31987de958e8f0f29f13bd1106afab1bb32b75564e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVE/xgAAoJEJOE+m71LUu6kwoQAIiKmqaqclAiuXd8r2EINoWF
-JEsPqQWQQk8Cv8aT62N9YAPJTalK8VRNp/LWEl1b/EAaO0ukwSjpMrGqUU3Cmzvh
-ta7v1VuswDGmC98okQKSpveTmV/L9YlExCX/MwzAHBM392MxXp1WJ9elvjpOpkgT
-3vDG+kuFU5HMEDcUzDWUAf/3Vy1yV8dNc0t/EB2ZhsvBeRXYc9FfTeoQ/LQ/J4yh
-V49PGgc4EtE4Dn/gF+RfsM43DbZCRBZzFooBWHsECFQruhPGpZoGstT7iYdVmxvx
-x5gDQKLDq+d6yfIkAZdvB4y0Gxpjy1TCOWD2OEv7j3boeyv1wti++J6kGT+L+uB+
-JVwCEmJoQUhg7iISsToFNCwCmD63HF5/PZ6gHffbQwwLI8EX772jpB4bktM5zBYK
-+GpadYtkDhVPNOZ7Hwa19Y9oBuov+XTseLa43DvNIPW1jUCH1gfY8POONml1fJLK
-UEsqGJjcCEeKZRLEOIFFz70v0IAowJr8yrdOxcIrgsErwiQY8sLUeLPPZwR7P5Ra
-A6LRnc3Kf8a/LGi4Xu7MYhfgO+r444mkLzPM1eX4pK8FvELHgsbZjDW9+ELjjSbu
-vYnPOUmApAlBorAtkl2z2A/EtnOEuqd+Xa5kA1VAUf9wOjpfnvJ0/4NjSes60066
-AhNxr87BzZzYaTril0z5
-=gT56
+iQIcBAEBCAAGBQJVMPYfAAoJEJOE+m71LUu6OQEP/1QbShvqD+us/5/DXfClPodZ
+k5mH47IbB/3BBU+PWI1tFdoWu102iXb4ljOyOqJ2NOAaEx/PyHC4fIi8tTxpceoG
+bdaenJFkptsJIEgggNgtaxgWbgLsAdVtcmgqIWvL21aL5y0M57JClJfEwsCgu/1X
+vtRbnWPz0rq6ImSijr8h4trBo0wpid/+BDh7HMtdRlvit/9+GJpR0IF21FKs8cYr
+OLAY5Hj68LZx/NDi72aglLSL5Dl+8jpfa0W8qS3jtA7IWznGWzcHmICkT1tKaxP6
+3Vl8UVOsSR4jTo5S5Oz8NIlzr6XHPgtb6rE7Yzk/B86r8ayQduDoJuzjEr63CM7Z
+EVFz+88ItKeDzUPoaRrYdtlHcQIU43QjIRsTpGEhjvsNMdAHXF2Hn6Kq3hrKS14/
++je/zTzJNM+do+/5jH8LSJT92/r7YoqfaC6/AnG4T8pf+n1rmssXGArlFgg8LI9B
+kzKX5R1SN566rAZl1t5rRsEqCztu08If6fLibkMUXVxNGn6SMXWgR880BJa5W16k
+5Z+hvNjnEOmAxyeo2Ao5waMzKo6C7lL1uh19rWxlbuXIRJLtxVn6VGQyXFa5JRfS
+/YE0ZBrgvUHOwQFhq7d9bREidmb5Xl5wDk9EN3EM6V1Sr7BmTCrNLijydSo3GAeL
+3c37Ez3sbh1kJR76sTv8
+=k6Y0
 -----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/stunnel-5.15.ebuild b/net-misc/stunnel/stunnel-5.15.ebuild
new file mode 100644
index 000000000000..ac81538f0f37
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.15.ebuild
@@ -0,0 +1,80 @@
+# 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.15.ebuild,v 1.1 2015/04/17 11:59:05 blueness Exp $
+
+EAPI="5"
+
+inherit ssl-cert eutils 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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 selinux tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	dev-libs/openssl"
+RDEPEND="${DEPEND}
+	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"
+}
+
+src_configure() {
+	econf \
+		$(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/bin/stunnel3 \
+		"${ED}"/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
+	doinitd "${FILESDIR}"/stunnel
+
+	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."
+}