gentoo resync : 02.02.2022

3 files changed, 210 insertions, 0 deletions

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 740bc37a0efa..b0f8e28221f5 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -4,7 +4,11 @@ AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc
 DIST stunnel-5.58.tar.gz 988551 BLAKE2B 45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d SHA512 6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece
 DIST stunnel-5.59.tar.gz 995508 BLAKE2B 12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ddddab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17 SHA512 c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
 DIST stunnel-5.60.tar.gz 984278 BLAKE2B b20bf85f49751b6ac7ddb56c53daa3bb45848eb5dfcb0fd139883abc8a0a81a80dac6a1b5fec4b7b0d3c1a347620a07ae34734565d212d4fc23c4c58feaf3228 SHA512 4ad0423a7e52c0db8746caf4b64ff69abe1f5c880417779d9933597d7ca86f240b64b578dc3e625fba04bbbddad7aa056dd62d2ecdf6d6a842ffa228bace705e
+DIST stunnel-5.61.tar.gz 873660 BLAKE2B 450c18af02710e39dbbd89a6fefe5c73977ca6e402196ffa71de2392f16f4e49282b76e77222053103d0123cac64b353fc2e7db391b1496262b05557ac2d78c3 SHA512 e228d21fb39bba0175684a70d7323ed839c689810fccb84e9140619b22a7ce91c0ac2a38107c3c52ac9652a02d10918d087459673382ea4d00df8b3ad3abe6cc
+DIST stunnel-5.62.tar.gz 862456 BLAKE2B ba551fa8455314bdf5088fccbbb4b7740f00be6d15362a0d219242c3b1a8197327549ccf85dddfa76b4a8f06f9ece6313f122e1c1be992797cda97381f5b40d1 SHA512 4ce03faa27e417b49fbdf0fbac91befb2c05ce64694b4b6fd2fc482031ee4a229299627133a47ff3efdfdffce751e1300d95d0a8ac1f1858c7c96f0b067170de
 EBUILD stunnel-5.58.ebuild 2951 BLAKE2B afa7a612d238ba4e1195da562a63d632472cac4c11affbace964201206e7dfe472fd757ab548c0a2834e0b8cbaf4a1f44bd34d888a37a8dcabe04f57ef76cd88 SHA512 947e8b54f6d21b980bcc4afcd43a644da26ff8565fa6ad312c8086d2c782cd345a20fda94781296df4e8c913b5e0b88ddf582588a430bce4b9d4bbde05c3c651
 EBUILD stunnel-5.59.ebuild 2998 BLAKE2B c3421d1466ef1c50be9a0080b0fcabc4a0dc1d898fd3b9981adc7a80d5d6fe74c8cd883447f6fe2c46d89cf8e4fe1cb3b9ee6c920da652f705a3d55f5f1567ff SHA512 34491f45e231755ca5fed2a84c08b3e74d67ec125b12ee3ef3d111fe7e4df9966812052f402502b23935b514296c168d6bd4966bcde32edc5d25f6a02c63328e
 EBUILD stunnel-5.60.ebuild 3004 BLAKE2B 18ae3e208e065f910159202d3ee2635d100deb1e9be0ef903f5cee3b44ab4f0c604aaaf0ae91d62f28bfbd57bb50caecc5f1e5c004122219cf3ff33aff80cd19 SHA512 380dd888e2c5e313796c091fc0b50da00da6f98227cffd4b5fd5f90663592a327f9cb175b2aaa997a76656066c3f080ecd993ae0dfd467cc8d1159cb4d8eda49
+EBUILD stunnel-5.61.ebuild 3004 BLAKE2B 4cc8c789a7f886531ef368e9f607b91b2d1761cccf267a8b2dd32385ff43097e8baea9971831593f67b656caa6393a1402e7108574c3f5c318067a003787ee61 SHA512 4455e2522b6335096ee82c331a35c92fea8fff86e1744677c91d85f141567dc60600c0b3fbe3b8f5631aa1754527d15028c9c7e79c71398c3acab0577d311c19
+EBUILD stunnel-5.62.ebuild 3004 BLAKE2B 4cc8c789a7f886531ef368e9f607b91b2d1761cccf267a8b2dd32385ff43097e8baea9971831593f67b656caa6393a1402e7108574c3f5c318067a003787ee61 SHA512 4455e2522b6335096ee82c331a35c92fea8fff86e1744677c91d85f141567dc60600c0b3fbe3b8f5631aa1754527d15028c9c7e79c71398c3acab0577d311c19
 MISC metadata.xml 797 BLAKE2B 223460276faf20ee415c5c0137aefe26cfd54df0049cdfce1c62bef53aeef6c9f35967d05995b8a3a2e8958e427ae34dc3acb26aa7939d7b52f8996d324480f3 SHA512 a391483377cbdf230f6d41f9dfd88b76a2fb3219b868b4c090e6ba977482378599f1d087d884f88b31f2a76e2fccd37f72ee6a7cb39aaea5f4b6179c64e75fd6
diff --git a/net-misc/stunnel/stunnel-5.61.ebuild b/net-misc/stunnel/stunnel-5.61.ebuild
new file mode 100644
index 000000000000..e95ddd9a93dd
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.61.ebuild
@@ -0,0 +1,103 @@
+# 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
+}
+
+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"
+}
diff --git a/net-misc/stunnel/stunnel-5.62.ebuild b/net-misc/stunnel/stunnel-5.62.ebuild
new file mode 100644
index 000000000000..e95ddd9a93dd
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.62.ebuild
@@ -0,0 +1,103 @@
+# 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
+}
+
+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"
+}