Version bump, solves bug #525234

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 14070fd5f326..1f5f053ec68e 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.186 2014/10/11 12:07:21 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.187 2014/11/02 12:06:14 blueness Exp $
+
+*stunnel-5.07 (02 Nov 2014)
+
+  02 Nov 2014; Anthony G. Basile <blueness@gentoo.org> +stunnel-5.07.ebuild:
+  Version bump, solves bug #525234
 
 *stunnel-5.05 (11 Oct 2014)
 
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 9fa6be731913..a6dab33c2245 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -9,26 +9,28 @@ DIST stunnel-5.02.tar.gz 590655 SHA256 c258b71d7f82bba5b0a4ccc69fbda632f1fefe910
 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
+DIST stunnel-5.07.tar.gz 599111 SHA256 505c6c63c4a20fc0cce8c35ef1ab7626c7b01071e3fca4ac6ea417afe8065309 SHA512 267addfc0ebc10509076a92a1614f70a94b0557735616aa8bacc82768132d65d35046df040bf310a3d1146cffc93a84c22d01985ada6b88a2064765687d7a5af WHIRLPOOL d2ec56c3a500e6189beed58663b4d97e6d718a7513133670eaacc001ce6b8ba60e142053f49190caa01bfea28fc8ebc515cec251f2378a5aea4155e41b7e4161
 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
 EBUILD stunnel-5.05.ebuild 2637 SHA256 9ac11498792deb97b2f5c4322b0d822177441b0fd7b2068297f4cbbc225141d9 SHA512 21a0c6ce4344e85f9985dbe9b4863a3e825439c64c4a741a007292ec7f75fc3206077d3bdc5df3ecd8332022f6fedbf0543ce23ed5d65ee019086cc6e0e17623 WHIRLPOOL a3644255861ead8b2900f1305549ae48f8f6de4d7957ef10d508a2ea32720bce84077f619132ac051b92663944478dbab135fc345394cb74058df154bc6e1a4a
-MISC ChangeLog 27263 SHA256 315794e9fe7721fbef299d5173854c58ea43af712849d59867ca75a6906de0bf SHA512 289b400541a6c2567d57614d7728ed27a20a45f77bcb0cb0347d965429cdee2a112380f10a76c0d9a53e8d2f1cd6e514857817b15e798a86ca13d706bec62fea WHIRLPOOL e4e583ec5de37efcc9741accf326b5ef9161a641906aa6becc5b4625b7a621569b03216114d0c6ff76d546b1aa5afaa7b3ac7fcaa1186868a29242cf04a582af
+EBUILD stunnel-5.07.ebuild 2637 SHA256 a9395e6cfac2a06cd51941b0541774780c3d6fc7f156c0c80dfe80c2847a6f59 SHA512 e8e4b2ed8151860697286b486dccd3fc93aa80d52b72fd9aa9091b2b1428480d198a629f50c817e2b90b3ea34d01326d065c1cb64f81fb0b04380bc3b089f3bf WHIRLPOOL 288ee50b125e2a151cea17de56c884639b73bc0a50a9c31b4586b484fb879d7720822a2debe121e5f872f6c17f0d2791ee5f0e721dcd2cd6082d8178273f93d0
+MISC ChangeLog 27405 SHA256 b878315464fa0d70ed0cb98ff9f1d60dbfa3aef1be409e464ca51a965170e9f0 SHA512 cfd34acc1c7fe3bd749ed9eedb05148ba5f38dffc0ba3a5e9206e51d81b4a89993cdb9d4e5e788a6a08943f4224bb84fb74948d984010425250efc067dbecc9f WHIRLPOOL caadd602956230a417bb2acc6b1a99ad541429340360ca90e887037243f580c07f0cf1607c22bc49eca37bd98257b297bbf5317ef70b73e000f3003130487d92
 MISC metadata.xml 622 SHA256 42b6c75bd95fd3f6322e6a6f726a9e07d74f0b46376a6f17718f9043cf6cc225 SHA512 930faf03b0f8e73c0ddb1a9821c04d8e0b0eb49fbf1e70ba439cd810e7aac827490b2036fb9a4bf4d8f2d96b3a2e0c0b2923ed21ae17b08ca09464c7cee54997 WHIRLPOOL a604c6422e399f97c5d701d756eee871438b9bb7fb7195c5b4a35357be9e11b7709d7e77172d85f1e5f1d31987de958e8f0f29f13bd1106afab1bb32b75564e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJUVh6pAAoJEJOE+m71LUu6ZfcQAJ6TX10/m1fvP/yvumQPXbXs
+YrvOkAbSDkHaUfTRBrxB6JvUetlxgmEzD6DMgjdF01MbPOvGqveT32HTp/z2CbGD
+zbyEMWOhKqpN61M3tZ25PyfUcGghb+0hQb77bOhwc3QV5JFOmQaqsVgDp6L/Vspo
+CS+KdGh/xydq2B8P6P7fNj3QIbeLyGOVG4KwVe5Q1BQ9k7hH2Qd/4zOiKkux+WsT
+vVprup16AhB2YtewjR2UvxzpUpQVbFOpmHtkHGLkrOVZ1N++tDd4qOnzL/eXAlGS
+gBDZijPYhAqKxfA2bALHcxy6EgCkYhQkWcQz/KdNFHeTo+2rcLosNaBYaZLX29CL
+ODbFN+rClOhrNYde9Objociw96rIadp/RMDBA065lGnpJbvKO1oDC6MONaTd/XwJ
+xJFONRduktOzdVpYXiG6UPTptydz2xrz2SWDX0Dogb0m6fS8yvU8ki86X9L/gUkO
+z+YnCrJ2Hy7DGen3mD7xptaVweisLE/Nr+D1dvj1a2d5z/Lbt9BHgIjZLcVbGL7X
+oW90MNz1LAPu7xCInOpBNnyf5nk4ZT3Zahc28FUZp2jrw7oH5wG5GP5FE5B8+DCg
+P4b0s7ZaIhZ0IWFrimdvPBvJ7gDyXRlCETSLy17uj9myCLP95LBCg6qawTI8qo0y
+qd0qOqzFu7ELq0PXQt//
+=NprK
 -----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/stunnel-5.07.ebuild b/net-misc/stunnel/stunnel-5.07.ebuild
new file mode 100644
index 000000000000..b118ff1da0a2
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.07.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.07.ebuild,v 1.1 2014/11/02 12:06:14 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."
+}