gentoo resync 08.09.2018

9 files changed, 111 insertions, 14 deletions

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 18c9bee5661f..d2a669c7d633 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -13,11 +13,13 @@ DIST stunnel-5.44.tar.gz 699117 BLAKE2B 956c7ce8987f79efab3baaa5071263466ec01f04
 DIST stunnel-5.45.tar.gz 706423 BLAKE2B 81c5355419de3b0bc88d59ea8c98d1a4523d7a1ae6a3d12464f7ab6a1df1f5dd798d2f50ec7adce7515e68a650149321f13e34791781620ad071824246502dce SHA512 653fea6e5002983bb9231a542ab1bab078428821910b8e257adbeea88e583e84d080615f232d5d3086e8d6069c43ddbdfc7923c4b50071ab0c0be547e76d8983
 DIST stunnel-5.46.tar.gz 706499 BLAKE2B 6ece93015b2a59ec17fa60505bccb5e4444879d44fa0cea6e838aa56d178f61f26b8b9b469d8bf2991d4c094fd824eaed2b5214184f6a15e0c415c53b6f7d136 SHA512 2000e36d4d011a83e47afcaf19473e083da010d7b3909cb831c51975512257888615b5d64f4a4d78f48529d68c6740ea2be7f7935b0ab86de4535e290f78cc97
 DIST stunnel-5.48.tar.gz 708356 BLAKE2B 6f4538c5fe6bc00eb0f45edfbf83f1de6cfcd23257aa368dc0ba788dd17af7033ba20f1ab7c3f5bf48a5e2ff3d4048eb1a344d1ea4cebebe69e6e2277aaf19ba SHA512 5e6669ecd6e9b49aa6ef82b9a4dc6a2193c975eef85262aba70c7f264ef1b4d15dc287a2baa94b71be063deddcd07a20a5347ed5280f044fc6f68c61429a24fa
-EBUILD stunnel-5.36.ebuild 2899 BLAKE2B a4c62a1a79157b5b24a8904dacbe45a44b22b53710b44a5bb5c3823e29df666024e8300d82cc6fc5e52a9f8cedad0beaaadc5ee4bec4d366f2544587009c73db SHA512 ffeac1d20a4a83fcda56ae36b81e7a230ae18ad786fdbd51024b0f87b013c9988538cb92d8757869b3337fc78cf25e605fa31fe3d54b437df59c3f1d4a8ec595
-EBUILD stunnel-5.40.ebuild 2930 BLAKE2B b18d32b276cb28e83b8f99b5c495c929c3c6ddff54a7580be3387aa4d5e114feed917bdf4a7faa4136850cdea0ba019fdc3c86fb28268f23f23a125ceb7b896e SHA512 6034f34af01ed21b16474f1ec4a76249d9ee2f14e4312ecf8d7cb75f66f49e9e641328fa4904cc9adec6d9cb480e63187ed9bb9a6263846ef2eaf7a2d8f3eb20
-EBUILD stunnel-5.43.ebuild 2923 BLAKE2B b4438beb61d47b2b7ff23d9023edfcf28e998ca1355742957d8e9eb6634068e45aa38a5b749127b8f4c5e1e659d8e9ff3342ab1449545a9287d79478960dc82e SHA512 17cc6782cdb7362cc3464be3e3946119676d0d782a0646731d34d1ade7c8a20eb300901ccad83f50879ec2fe4571a5dfcb73f94a889efdfa12ff6a8f4df2f5d8
-EBUILD stunnel-5.44.ebuild 2930 BLAKE2B 2f027288047c1efa62cbcff7869b492422b925576e2f672a851f8c101de4c9a8dbe87d6746050eb5d6115ccaab81c5006b5ee046b3356cf161142c99c6ee6372 SHA512 af327981e004f8a56473fcfa88d8f5027991461a6ffc791db6a840919513dd0e0d3de47828e7a4d6425bef432b76d2d8a05b3a6ab742668e5da4051d44aead7d
-EBUILD stunnel-5.45.ebuild 2930 BLAKE2B 95ade179eb9d81e66ea6fe7523a299c8e6dd58d43867568b8e22d22125f6a6111d1f8b988df153cb438afba2736db811507d87acf0f2b5b00469904c12657f34 SHA512 c8fca15345e1a955af0824d847dc0e06a220da7dcdff9a5144e567f54ea7e6c36a14d74fb407b5981249c3076811e7da2fcb668855cdcbca019aa27e464c9229
-EBUILD stunnel-5.46.ebuild 2930 BLAKE2B 95ade179eb9d81e66ea6fe7523a299c8e6dd58d43867568b8e22d22125f6a6111d1f8b988df153cb438afba2736db811507d87acf0f2b5b00469904c12657f34 SHA512 c8fca15345e1a955af0824d847dc0e06a220da7dcdff9a5144e567f54ea7e6c36a14d74fb407b5981249c3076811e7da2fcb668855cdcbca019aa27e464c9229
-EBUILD stunnel-5.48.ebuild 2930 BLAKE2B 53abfb43b47f4eca2785109e8dcd38ba7d2e112401f49c4481bbc03e2678debd6eb660592f2cecd21f3931317189f5193144fa79eb3c5cb353d4fcee6c9bf525 SHA512 9ba4ca10038b20457a596a416b52a2249a206c78dee0273cde8d0f5dbd8063504119a637fd8845109321608f444906b67360101f09469047e1dc63eeb4eec5f4
+DIST stunnel-5.49.tar.gz 713560 BLAKE2B c93b6ea7f9e8da2668919101caf30850370f1c7e742863959d2c1350829e7f5a6d12ff8a8cf66dbac47db40c150cb23a6bce3bea6d79e3c906c4fedad8d410a2 SHA512 8bfd17684ea0d6eeec278f00618c6f96af113fbe14aaafd882d43f3d834ca1e5ed27f9908dffb04224ea4a1234063846f816e3528b95234ae156b61ade6aaa16
+EBUILD stunnel-5.36.ebuild 2888 BLAKE2B eeeb7cd12318516aabcfe224d531d6061e25d4e51ed0c607a4ff56a1d721eb09cf275759fb47ea3e787fc760155492d97c96f341c2a3e28f4f4ac546c10b4160 SHA512 1257f0dcc4e1bdfb32095577841b866535318aba496d662d34fec13d6acbb45f0f6ed46ef185549e317a8254782f4d73a6827622f62ab27e6b011b3bf306b5bd
+EBUILD stunnel-5.40.ebuild 2919 BLAKE2B de5cbf748e76f13d9b07591988ae868c0dbc6ac5d619564951c983bcfd71a195f306be41f86e602c2b87a709a8315ca65112082310458945ebb809a1b1925df7 SHA512 affc603a13a074d6b37dfe1c2cdf400814f13209b1d7ab11a48c4c99a3ff6b607b510d6719f47a4a51071422296ecb4c44455ab9792c594880f12b944c1476fa
+EBUILD stunnel-5.43.ebuild 2912 BLAKE2B 834bda9e67568a42e3e0c87621e37a31ffbfc098d90f17ca45edb5bb6c5eee4c54e5bd899a0717851af2b225d7fe8ec4153d2c7c1133a62f2ebfa1cfaa14b460 SHA512 49b8e6a4ae5b218655a76695adf3f3e9cff3cf03198e4692083548bd348b272c9ded224ccd13076d955d3c92fab3a5f9735a279cd72a608ed5b15efcfa5da26e
+EBUILD stunnel-5.44.ebuild 2919 BLAKE2B c0c06ad293fcd5f7ccc57040fab9ef8305107c5450535d0a6cb061f0cab39ea1bf5e55d06c6fc297b100c267d852e0926cbcc70b8519caf9cf8869cdb08afa97 SHA512 8545c5e5fd24fcd317c1eeecd1677c833830cb5be4c4df0ff403b995b1f5d06012155d1ade602a669f6f892c66ba195594452c41fe0b61280e50a2996560a064
+EBUILD stunnel-5.45.ebuild 2919 BLAKE2B 681bc10896db6846af224e3c96af98bad2889040594f02cee8ec80ebf92f77905c26c3412832abb465112fddf16a39c7e763eecf6054a99f3f83e18066ecdce8 SHA512 bebf0ff0498dc819dd95d603d514720b89ee757f9f0ca39b393862f0a3fbb91e6dde173e079178fa7e18bfd1a5bb6b33bce374dbe70fe49a0e1d07707123f497
+EBUILD stunnel-5.46.ebuild 2919 BLAKE2B 681bc10896db6846af224e3c96af98bad2889040594f02cee8ec80ebf92f77905c26c3412832abb465112fddf16a39c7e763eecf6054a99f3f83e18066ecdce8 SHA512 bebf0ff0498dc819dd95d603d514720b89ee757f9f0ca39b393862f0a3fbb91e6dde173e079178fa7e18bfd1a5bb6b33bce374dbe70fe49a0e1d07707123f497
+EBUILD stunnel-5.48.ebuild 2919 BLAKE2B 4196e977ad27c0c45ca0debcaba4f4bf375ed06a5e539b99521f147f63f6b2a2416bff031ece65101a1f05b9aa1f2e5b4e7381db7895806575ec9d32964b3047 SHA512 6757bea11de403ac525cf4d70f5746e5f20f1b1b04a537fb33f694d3cfc9a49ba4d92250dce0927424eb1edc0297ea27d72faae57a2f098c88a21d044a7524ca
+EBUILD stunnel-5.49.ebuild 2919 BLAKE2B 4196e977ad27c0c45ca0debcaba4f4bf375ed06a5e539b99521f147f63f6b2a2416bff031ece65101a1f05b9aa1f2e5b4e7381db7895806575ec9d32964b3047 SHA512 6757bea11de403ac525cf4d70f5746e5f20f1b1b04a537fb33f694d3cfc9a49ba4d92250dce0927424eb1edc0297ea27d72faae57a2f098c88a21d044a7524ca
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/stunnel-5.36.ebuild b/net-misc/stunnel/stunnel-5.36.ebuild
index d89336a81611..430a5ab301d0 100644
--- a/net-misc/stunnel/stunnel-5.36.ebuild
+++ b/net-misc/stunnel/stunnel-5.36.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/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"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.40.ebuild b/net-misc/stunnel/stunnel-5.40.ebuild
index 8f37b78d84f4..779c55aafc89 100644
--- a/net-misc/stunnel/stunnel-5.40.ebuild
+++ b/net-misc/stunnel/stunnel-5.40.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.43.ebuild b/net-misc/stunnel/stunnel-5.43.ebuild
index 514b475ba351..278bd5348267 100644
--- a/net-misc/stunnel/stunnel-5.43.ebuild
+++ b/net-misc/stunnel/stunnel-5.43.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/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"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.44.ebuild b/net-misc/stunnel/stunnel-5.44.ebuild
index cb4aa4447841..00f1d19b6a2b 100644
--- a/net-misc/stunnel/stunnel-5.44.ebuild
+++ b/net-misc/stunnel/stunnel-5.44.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.45.ebuild b/net-misc/stunnel/stunnel-5.45.ebuild
index d30f1845da1c..997849c87f0f 100644
--- a/net-misc/stunnel/stunnel-5.45.ebuild
+++ b/net-misc/stunnel/stunnel-5.45.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.46.ebuild b/net-misc/stunnel/stunnel-5.46.ebuild
index d30f1845da1c..997849c87f0f 100644
--- a/net-misc/stunnel/stunnel-5.46.ebuild
+++ b/net-misc/stunnel/stunnel-5.46.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.48.ebuild b/net-misc/stunnel/stunnel-5.48.ebuild
index d7898dbcca06..6e724f8d84f5 100644
--- a/net-misc/stunnel/stunnel-5.48.ebuild
+++ b/net-misc/stunnel/stunnel-5.48.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.49.ebuild b/net-misc/stunnel/stunnel-5.49.ebuild
new file mode 100644
index 000000000000..6e724f8d84f5
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.49.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert 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 ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	stunnel3? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+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"
+
+	# libressl compat
+	eapply "${FILESDIR}"/${PN}-5.48-compat-libressl.patch
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+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
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r1 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."
+}