Version bump

Package-Manager: portage-2.2.8-r2/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 a1bdd14cb24f..14070fd5f326 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.185 2014/09/25 22:16:03 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.186 2014/10/11 12:07:21 blueness Exp $
+
+*stunnel-5.05 (11 Oct 2014)
+
+  11 Oct 2014; Anthony G. Basile <blueness@gentoo.org> +stunnel-5.05.ebuild:
+  Version bump
 
   25 Sep 2014; Anthony G. Basile <blueness@gentoo.org> stunnel-5.02.ebuild,
   stunnel-5.03.ebuild:
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index b8b89143fcee..9fa6be731913 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -8,25 +8,27 @@ AUX stunnel.tmpfiles.conf 38 SHA256 68c9c963673a3bf0f3ce3f32751c9e36a3299251da12
 DIST stunnel-5.02.tar.gz 590655 SHA256 c258b71d7f82bba5b0a4ccc69fbda632f1fefe9108589a92aa1016f33985973e SHA512 2f1c44b06188e3bd347b97544122eb9bc0c2a4227e6c4bab184ddef8a35300c09451d836dbd97de3d9656c69ff4ad8f0573e54cdb738bdd751388bd93d0417a6 WHIRLPOOL 9d974639157a1970fcd60abc9b05f3e0ebbdcf45f229736cbbdf7e72d0bdef405e65cf654c4a7820202258dc0a1d3eb23c46f1a67c9cc0f567f4cbede0d04d33
 DIST stunnel-5.03.tar.gz 590778 SHA256 9a1e369466fa756e6f48b11480a3338c1fa4717e6472871bf4a3a96c483edd03 SHA512 db46df32e51064c2f2c148d6222088a5c9cc9a8b5ad746b1a2d848fef5cb69d7580f52d7357aec872c67c452ff585f60f455360ff0f6748449ce676292bfb4b5 WHIRLPOOL 00a9b4649c2c06ff4b2b5b3cb022fc08d91dd9cd167786acaff8ce0a7e632e6a8d4ef1d82f2f694b241f4e30f9e2fa2e28eac5be2224a48d3667242f23347864
 DIST stunnel-5.04.tar.gz 592939 SHA256 ee9702e073cb8d5940a1310ae171a38d3264f1ce3b087160728bbbcf5710cec1 SHA512 035f220106a1b9ff9c7b97c8dcd16397fd23e18213607d2a3b8502696402862dc2144fa388efbcc036db7c5235f6a89a3444e73efb9f16a793ad6bde175abc3d WHIRLPOOL 2cf9a25fa1cab01f00c43d3aa3a5a7af2bc1ab01aa9d8cd09fe07edcc635b8a2bad6098f9ea8feb43376290194bda7a5410e9f514f1185835f8cd214ec63b884
+DIST stunnel-5.05.tar.gz 596760 SHA256 c7e1653345150db7e48d00e1129cf571c7c85de8e7e1aa70b21cf1d76b1e31ef SHA512 2998c8780624686ac886ea5c19e52d969c7e2036dbef1e97ee00b8fd0fa6d117f22980652209dd798d5c2195d56a07e5b9191cfeccfc83476e207525231a3f4e WHIRLPOOL 0f80348d4bbae7b9065cab9613bb72473a35a531249b6c71331f4b069d196bc4d6a2d26586b4470cf02619f4a6e6912c88e888cf685d843a137bafba0f4ac0f8
 EBUILD stunnel-5.02.ebuild 2629 SHA256 2124faedd8ee0a64197ee8cb465bf968703104c5a7eb5489990f062e534c68ad SHA512 40cf14b4800615f5c13fa73852332600a5b16611db0a04902a7f3f2f59f1e52ead18a1678f30addb7de90f5b2f86e4c85e2cb6d9badcef23aa3ed56cffe40fda WHIRLPOOL d7746320594165be7ab5dd7e1b14d15e66aa654f244bd5b90921d880dfe21fd9c77856b381c9188af7d8bceab4c9fc39ad3a296361eea81e7aaa5bb26161da6c
 EBUILD stunnel-5.03.ebuild 2631 SHA256 6f6b67ae41eb6fdb4b186d4ebd052d2e0e27061407f1386e21b6da632a8c6736 SHA512 3f3a5ac4580b2e5ad2b376870034fabb0300349ee4a1bb150d8131e9faa53ccb01495e971e9c2650829801bb131bc8e7f7b481242f51d3ce74500713bb927ab2 WHIRLPOOL de83a97809dbfd49834357c92fdebe44e642afb2b5501492bdec2b8061cc86515543665c1d1a5705476cb0800bab0652afa64691cac79c36b66d2bd81a5acbb1
 EBUILD stunnel-5.04.ebuild 2637 SHA256 ea03e0b21e7b006f51571109368635bad31bd745ad79a23afc664d7107e7005d SHA512 c2749269a21eb7b3cd6fe5f241412f57deef204786fc15ba689b6e9ef3e0ca091650995af2756081307ef78377e9cd96b6db3866d3331270affb8dfcad44df50 WHIRLPOOL 28c746d7450c7c0181e2cd9c56cd75ce16e5f396e5c0361f1d4360813cd45c43c079ea07e46d299812719f696d855c5516e50206f22be443570dd7a6c75a3afc
-MISC ChangeLog 27141 SHA256 68b2979bea554c591710bbbb985575d52a784a71aa9ae14735143aa1ce0da100 SHA512 2383e9754c813989a7977a7baf4b8d1a458923f5acb9f7e15b1c6537d15e94fb954a19a53cca2fff6ae6faae739a9625185ce8a9135f86dff7f7467c75f105f1 WHIRLPOOL b6c5711d537bcf9361aeff2f16850c79296a928b76155c298a095145868b0bbbdd0f287fbe21c27742e31a9e301f2499dd40edbe356c262b0a5d38a003cfc14a
+EBUILD stunnel-5.05.ebuild 2637 SHA256 9ac11498792deb97b2f5c4322b0d822177441b0fd7b2068297f4cbbc225141d9 SHA512 21a0c6ce4344e85f9985dbe9b4863a3e825439c64c4a741a007292ec7f75fc3206077d3bdc5df3ecd8332022f6fedbf0543ce23ed5d65ee019086cc6e0e17623 WHIRLPOOL a3644255861ead8b2900f1305549ae48f8f6de4d7957ef10d508a2ea32720bce84077f619132ac051b92663944478dbab135fc345394cb74058df154bc6e1a4a
+MISC ChangeLog 27263 SHA256 315794e9fe7721fbef299d5173854c58ea43af712849d59867ca75a6906de0bf SHA512 289b400541a6c2567d57614d7728ed27a20a45f77bcb0cb0347d965429cdee2a112380f10a76c0d9a53e8d2f1cd6e514857817b15e798a86ca13d706bec62fea WHIRLPOOL e4e583ec5de37efcc9741accf326b5ef9161a641906aa6becc5b4625b7a621569b03216114d0c6ff76d546b1aa5afaa7b3ac7fcaa1186868a29242cf04a582af
 MISC metadata.xml 622 SHA256 42b6c75bd95fd3f6322e6a6f726a9e07d74f0b46376a6f17718f9043cf6cc225 SHA512 930faf03b0f8e73c0ddb1a9821c04d8e0b0eb49fbf1e70ba439cd810e7aac827490b2036fb9a4bf4d8f2d96b3a2e0c0b2923ed21ae17b08ca09464c7cee54997 WHIRLPOOL a604c6422e399f97c5d701d756eee871438b9bb7fb7195c5b4a35357be9e11b7709d7e77172d85f1e5f1d31987de958e8f0f29f13bd1106afab1bb32b75564e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUJJQ2AAoJEJOE+m71LUu69VkP/0u/pLWapMCymmKETK4DbKRY
-boaYpaih2+FBKSel9cFWERPehWwwNgcS9CRGp88owv6NJ3C/6teZgf3g+raVBd+h
-xKuVhwg7+riqhXSZGnCgTIHh9xiY9MFIM3yZLLqb4xM8csHEMP7PbXKrTgZVo2ZP
-45zZTvwyhXKqq1tuIoXyzrgQBaWULtqQkfQYn1owCi1AwxJDIj+rAep05dcE5MuH
-JxeY9GKb6k0eQLmcccxcLtqPkZk2ZD660tq61c4p2CLk+OFE8hHJsZPrBfdnKAN4
-N8rGfuOLM+UkUd8a4YC8AqajDLf5G51u2jRIWoQCg9OnxVOLNyPzAvylJTaO4tPF
-jFBIwqgW6UBDppB7X6LNBJy+yfkxcWoHipq6BXlxBnHpe1subKKEvG6ld9/vUd73
-KnWZ/XA9WlM56xwu4MGYf39LDteUXxgMpGXxJJ514CsvHe8fXjdVv33BtxVoNd6I
-Hng3n4a0TIiSd6HXXYvADFH3Vec3a1wiBB2LDG1BZTIkQygEslk7vW+8Ye1Iy/P5
-z4Tg6BpP8iwphsSIdOpGvOTFkBSm7FMeWamhcNjG47N96DJyyQm4t2j1RJhrk5/k
-FlZSfVE0ikjkt977MVNhBEIuO16xQ7Cuq69oxcvSsvLJEHBAQZzBrjU5STtfTaZb
-9e5pc/5DSLHYUHtBuIJq
-=7+bQ
+iQIcBAEBCAAGBQJUOR24AAoJEJOE+m71LUu6P5sQAJvDuEipKv4QrIUWX8cWB/0d
+HEHJkh9eHaG4rZ7ogYtpNck4ACyv70u10g+Bl6PgqcA4TKxrS1hPV4QBoxWrw7aW
+Myj7CnlFglg0tv3jqvTGpJv0We/IoiJV9q3yAddZ/82cT2BFcKGgACk8nY8PzA1E
+0oWFIK6O+MjcCAqyLxECVth+HmkX+XyBo/5jbVA4//WUvAFuySgwZyvbCbiRVK1x
+2c/MZa3gd0q8VLr5yCVS9ZDaadIhzCTPe2dtkkG5EtUaGGnOvoz+LpgVH9yLQ4ME
+Ihb/g6RTszxsfUp8OcZGL1yf6VYpTU1evJO/PTB+6hK36XSwz0EJOVfwZJdj1XSE
+uGOqr+PADCn5CpsGL0QGu+vF87brrO1WFkKIhAXl51J/e0FQFoQYQmZU8OCJui5k
+fqvqRfFNyaklAuXxTX8kqNhqvsFa/G6Ss6U8IzCbSNq5zivTu6/35ERv0ouuBMfy
+qw2p5uC8hfNtfGvKdDqldFDeTvLIC3YnE5/byyv6gBNpB9X56ZmbFHr80syv0JXV
+lm/MlCtSl6GcopRpBiJY4hJhY4ueNQ+sXxYjuCt/Aa2e78tVjiIZjdelYv9tl+Av
+yZjrJZKqlS6mqAGKM7JDzcKy6SAXVja+gGxxYz0jhYY3S+FCX3ElgFo5lS3yrd9p
+3ZyBUyHZUoj7F6TfddcY
+=LBRO
 -----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/stunnel-5.05.ebuild b/net-misc/stunnel/stunnel-5.05.ebuild
new file mode 100644
index 000000000000..54e411b22261
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.05.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.05.ebuild,v 1.1 2014/10/11 12:07:21 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."
+}