gentoo resync : 02.02.2022

2 files changed, 100 insertions, 0 deletions

diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 977a9ca9a7ff..dd3813911b9f 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -5,6 +5,9 @@ DIST miniupnpd-2.2.2.tar.gz 250649 BLAKE2B d561916ced9b5c58371382fe0bec68cd0771d
 DIST miniupnpd-2.2.2.tar.gz.sig 543 BLAKE2B 461a9149c66b0e314a767405024fc7bfb641a20ae36b908dc467c9211660d5cb0753fb3c99fa9d6df35d693a2f6790efb6a325f0005804572eaa78a02b23a482 SHA512 8ffc9901cd992cbd9d0fa4c5e510fe43f748ab4a7c4732cc8f2f685f19b71a3f087a63a39e1dbf081175ac65de34b5c05dc3ef636a805e550a0406119a5904ef
 DIST miniupnpd-2.2.3.tar.gz 254752 BLAKE2B ebdb8d4ce7dc649ef0243d2d698b9f51cb2006055eb3abb70d9ccc839cb57c7113595ef1b9b5886f55bc458d8260edf95ae6e1964a5d5423f9b0b46e07e02775 SHA512 56b1e93e9576fa412202e1940fcd8b7af57584714c15017bbcec1aa4fa7bba7a6fa5d1136048100d7cce3222f31b38837de1eae344b533164314c858cdf08ef9
 DIST miniupnpd-2.2.3.tar.gz.sig 543 BLAKE2B 3ba2e69cfd7e0a27a746f45e5eb10e573e00c4fc20a7d62b94a2e0b7e4e9ad8779d53df72e31547b78dc6e34676204a4848652e81d1e479a68973e150f51f468 SHA512 9f766f3e94de1fbd458c7bda30cc87892198af7544aa9dc0fa4c6b6a1c9434e4bab6f8583eeccf3ae613da240ad599d750425c507e8138d483710459f31a0b21
+DIST miniupnpd-2.3.0.tar.gz 256069 BLAKE2B dd21b4ee692cf9958bd996c6fe70e7e1f6cdfe467506676d2335ccf37cd0ed7e55ff435983747cad5d2342019b36597e538fcb9b511872889305330212e88cb0 SHA512 437a4b101bcadd9feb3845d37402c253a0a2114463fd8c5930859c7eae0ffaf7714ef7c9d387be2339c584e2f106fafa008a4364ff347b6640153c9a09919b0a
+DIST miniupnpd-2.3.0.tar.gz.sig 543 BLAKE2B 312d46521d37c1a2fda146f2c7c964af45ffa4a75bc327dc743b40f96586e0916a674db4a0bb847b5e386f0b781319868d1d6cc74fbffaf3a8e989db18f4f6e6 SHA512 87be539c27d0147fcc62b69a82858518e862f2b593a0e03a9986e3641a0d61f4fa831d79a7ce645b33569234463a9517b9dbbc79ee988c9f561474a4757c4c04
 EBUILD miniupnpd-2.2.2.ebuild 2138 BLAKE2B 44b683c5351bcadb577444cfdc527406840ba7d88e051cbf4f3bdbaafa830fe94982939eb92503c8e5917d7859314c8ec35451b963ba9840fee1c4a897052146 SHA512 1ff9bfd42924d4303cd9d658bfad50e106cd89d0ef7fb4e117bd3bf18434308153b7290c6a237675f4036d3f13f681cd929cfa92c42a71d2ebe37c746cd5b043
 EBUILD miniupnpd-2.2.3.ebuild 2365 BLAKE2B e9330f2e1fe1997f1727a9ec5b7621abbdcad02892973dd8ae5737b91b152a29250b6b5d83c1d0aeb2e379d9480bddd927f5c9a93c4aa786f453cabe2a0ed477 SHA512 194ba80f9f4d1e8f666b0f2bd2e07bc09677939c8fb1f5e2362b67d2a8f50244b8b7c5d9079e53bbd69a4670b6bd6da55f16681b83e61108d583e3f76dc3ad00
+EBUILD miniupnpd-2.3.0.ebuild 2303 BLAKE2B 63acd9ba73444181cf175d0fbbe813a0ef2cab95d2510102b195e8ee3e122bb172a42e90eb676181abdb1d93047b688f4d259ed57442a105530717d839896c88 SHA512 3e0ced2044ffadcd019e3922bd703f29192c40abb2b04c3e135ac931c0e61b6c90917681d84674d93ecd7137f417ee31cdbcdefc089143e974d630c1b85ffe13
 MISC metadata.xml 903 BLAKE2B 08e36f0ed04a8314bcd5edab87303883dc2dfe454b4ab427bf8f1716922f20465c61971dae2eb95381783589b202b4480f98c0d1f01fb2e7cc8e2a72ee9a294c SHA512 3b253a010b5f5e683c6cd4b60d9e8ef3a1bf6c85856ea18bbb2d97a610af7ca1bfbf0d62096044d3c851067b5203359d1768a58eafe6d06ad48a36013839d811
diff --git a/net-misc/miniupnpd/miniupnpd-2.3.0.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.0.ebuild
new file mode 100644
index 000000000000..328c65b49bbc
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.3.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs verify-sig
+
+MY_P=${P/_rc/-RC}
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0=
+	!nftables? (
+		>=net-firewall/iptables-1.4.6:0=[ipv6?]
+		net-libs/libnfnetlink:=
+		net-libs/libmnl:=
+	)
+	nftables? (
+		net-firewall/nftables
+		net-libs/libnftnl:=
+		net-libs/libmnl:=
+	)"
+DEPEND="${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )"
+BDEPEND="
+	sys-apps/lsb-release
+	verify-sig? ( sec-keys/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_prepare() {
+	default
+
+	# fails without a default route
+	sed -i -e 's:EXTIF=.*:EXTIF=lo:' testgetifaddr.sh || die
+}
+
+src_configure() {
+	local opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+		--firewall=$(usex nftables nftables iptables)
+	)
+
+	# custom script
+	./configure "${opts[@]}" || die
+	# prevent gzipping manpage
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_test() {
+	emake CC="$(tc-getCC)" check
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	local confd_seds=()
+	if use nftables; then
+		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+	else
+		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+	fi
+	if ! use ipv6 || use nftables; then
+		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+		"${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}