gentoo auto-resync : 21:07:2022 - 20:44:55

3 files changed, 110 insertions, 1 deletions

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 849226d31ad3..e121c61f149f 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -3,6 +3,8 @@ AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc55
 AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc576480adf193192a2218972d07961a3ab4d30f095c308844f25fe71cdf285bde201050be24d4ce0ca80d3 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb
 DIST stunnel-5.59.tar.gz 995508 BLAKE2B 12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ddddab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17 SHA512 c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
 DIST stunnel-5.64.tar.gz 869088 BLAKE2B c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23 SHA512 85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa
+DIST stunnel-5.65.tar.gz 872293 BLAKE2B 45cc4dd0ec91cb9a99c10d26910b05325af29ec2609c0b86d5aceb07fbd495ff6fe39b0fe2c5895358596ee34ed822870c6eb1a538e30557f4485d042f5ae781 SHA512 96ca0535a07d5ea050a5d985c0ab6299bb92e551715120f536869a7b408b795fdc251782aaa7a4a282749d3146726d71c8b3c25430969aa55745a863abe5728a
 EBUILD stunnel-5.59.ebuild 2998 BLAKE2B c3421d1466ef1c50be9a0080b0fcabc4a0dc1d898fd3b9981adc7a80d5d6fe74c8cd883447f6fe2c46d89cf8e4fe1cb3b9ee6c920da652f705a3d55f5f1567ff SHA512 34491f45e231755ca5fed2a84c08b3e74d67ec125b12ee3ef3d111fe7e4df9966812052f402502b23935b514296c168d6bd4966bcde32edc5d25f6a02c63328e
-EBUILD stunnel-5.64.ebuild 3004 BLAKE2B 4cc8c789a7f886531ef368e9f607b91b2d1761cccf267a8b2dd32385ff43097e8baea9971831593f67b656caa6393a1402e7108574c3f5c318067a003787ee61 SHA512 4455e2522b6335096ee82c331a35c92fea8fff86e1744677c91d85f141567dc60600c0b3fbe3b8f5631aa1754527d15028c9c7e79c71398c3acab0577d311c19
+EBUILD stunnel-5.64-r1.ebuild 3047 BLAKE2B 1d216f06ad662679882cdc40e2de036a657440e01cf99fbedf02bb5d38eacb35b10f6da563ea5b3a4da70c94fd6f06c4d89dca9b066dd72bdde59cd4e607bf78 SHA512 7e761c919921363ff9be7d13bacdde95c2428f050a482d3bda0a3828058a355358cad7786694088f3e454566da3160d732766dc6c665c485719e18eae66d18af
+EBUILD stunnel-5.65-r1.ebuild 3047 BLAKE2B 1d216f06ad662679882cdc40e2de036a657440e01cf99fbedf02bb5d38eacb35b10f6da563ea5b3a4da70c94fd6f06c4d89dca9b066dd72bdde59cd4e607bf78 SHA512 7e761c919921363ff9be7d13bacdde95c2428f050a482d3bda0a3828058a355358cad7786694088f3e454566da3160d732766dc6c665c485719e18eae66d18af
 MISC metadata.xml 797 BLAKE2B 223460276faf20ee415c5c0137aefe26cfd54df0049cdfce1c62bef53aeef6c9f35967d05995b8a3a2e8958e427ae34dc3acb26aa7939d7b52f8996d324480f3 SHA512 a391483377cbdf230f6d41f9dfd88b76a2fb3219b868b4c090e6ba977482378599f1d087d884f88b31f2a76e2fccd37f72ee6a7cb39aaea5f4b6179c64e75fd6
diff --git a/net-misc/stunnel/stunnel-5.64.ebuild b/net-misc/stunnel/stunnel-5.64-r1.ebuild
index e95ddd9a93dd..f58e4922369d 100644
--- a/net-misc/stunnel/stunnel-5.64.ebuild
+++ b/net-misc/stunnel/stunnel-5.64-r1.ebuild
@@ -84,6 +84,8 @@ src_install() {
 
 	systemd_dounit "${S}/tools/stunnel.service"
 	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/net-misc/stunnel/stunnel-5.65-r1.ebuild b/net-misc/stunnel/stunnel-5.65-r1.ebuild
new file mode 100644
index 000000000000..f58e4922369d
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.65-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html"
+SRC_URI="
+	https://www.stunnel.org/downloads/${P}.tar.gz
+	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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="
+	dev-libs/openssl:0=
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+	acct-user/stunnel
+	acct-group/stunnel
+	${DEPEND}
+	selinux? ( sec-policy/selinux-stunnel )
+	stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+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
+
+	eapply_user
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_enable ipv6)
+		$(use_enable tcpd libwrap)
+		--with-ssl="${EPREFIX}"/usr
+		--disable-fips
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+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.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+	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-r2 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+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
+
+	tmpfiles_process stunnel.conf
+
+	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.  For openrc make a symlink from the"
+	einfo "stunnel init script to \'stunnel.name\' and use that to start|stop"
+	einfo "your custom instance"
+}