gentoo auto-resync : 20:03:2024 - 13:00:14

3 files changed, 3 insertions, 114 deletions

diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 7f253d7a48e3..556517d2091e 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,12 +1,9 @@
 AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
-DIST miniupnpd-2.3.3.tar.gz 260079 BLAKE2B 4b32e05bc7002bc7edc946f01b1984f3d184e0e9949a9685ffa5351ece9dacc09dc48567cc6f68972343a1921f4ceb5c541d4b557c4991f311289a511c492efa SHA512 98915e3c1410d6753a58133596bad012fea205f36ae4991c2cf4b358d1e905e029287cfcf1aa97283c2e3c1cb8c20655bff35d49a37ae8756739e33c4ae3e7ef
-DIST miniupnpd-2.3.3.tar.gz.sig 543 BLAKE2B 33b6166ba64a7a7c1b019c84d8a623d2905f32b41ea6b7cfd96c180e3d8738af264b5f073a9503c037f4609f15cb73f039701368eba63764de9edc79159961f6 SHA512 f2b167fec659e2f366ac180e8245c35e2907f5fb6be31fb62aad072e8a67868b995dd9400b4f41ebdfe2dcb46df583e5a1d6260f93c9b3eb25ba46bc7f6106dd
-DIST miniupnpd-2.3.4.tar.gz 260810 BLAKE2B 7ce722aabcb0142740ffd4669c4326a99ed2903c1a0da984c5c3eb2ce523c4f6919d73b84708857ca51711fb4fdb0f8f00547ba81f3ea0e7bc700d166c07bb69 SHA512 7e84fcc7fbbdcb8e40d8ef35c48b331e0189427ca61d67b33c856c0598496cecade2bc7880590581c5eaf77c686496bb3228ed93d3d8edc073e8f5781a03ae9e
-DIST miniupnpd-2.3.4.tar.gz.sig 543 BLAKE2B 5940c26bc6717e2b6f636dded1a5d7e4625d69e763191fe97fc7c2459ad9957a80d809c5795511ef35ef005817abb01a78e1c0f0af0c2508fea671a1fba17212 SHA512 abcea4fa53b31582e2bd8db1a1df53b25142757e760e62c4200c3067d3f8c2f9b6d11211d6d1232cc44565ded8503279e05ed42c3915a16ed432063f555c00e3
 DIST miniupnpd-2.3.5.tar.gz 261952 BLAKE2B 022ddbc495a2dbb500ab54a3c0569a16acf3726927eac42dc316b7251dd21e705be62e3d0bb2e159ff7a5a72078bae2c04bd279d0a97fe2bf378dc8c039089d8 SHA512 bbb82f1b94a68c1bbf65a2e188b39305ec265cb89d9c0f3ab2d3c72eee43ee33c7d6280161344a8d51828cba2e62e2e5f9a54b0c0089503dbed5cd3a154ff0ff
 DIST miniupnpd-2.3.5.tar.gz.sig 543 BLAKE2B 17394e1da7d95c89771dd7578e4f1e2ce407c04b142f44fe4f110beff908797991553a7275c3ba28df03b09877963d16092cb718d4c75d96211db07226bcb176 SHA512 ef21f493da56b9f3fe99003ee299c08b13ddcf433d7136222817ff2e1c775bf7c28cbb47ef3ab60c662380e585c2be0ca4c38e261697de410f5a751c1f4fe2da
-EBUILD miniupnpd-2.3.3.ebuild 2361 BLAKE2B e3de6c666d983fe708bfe822d6bb5d1c40b1d499862f2e6b9e2fe426a0624e79ae59247a9349af2ccb03f7bb77ef862a069684fe007ae7d957190100e90dcb65 SHA512 04ddf52d97dba78ef993116ea6d44fc564f111392b7ea49b524a8acab9d054ac294a862817668520dfe3bb166aefeabf2e91a7cfcdd632481d1be8e3b36ba9d3
-EBUILD miniupnpd-2.3.4.ebuild 2361 BLAKE2B 72e1f38f9c24ce443aa6a4320c287b9f9f64a088d4e481de936aa0cd3062a3723b38bce50aecdb43c362ae81ba780c9ac31ec01b3c03527b2ac9b9861ef5e634 SHA512 9ad0036463ef1a7dba8d45cf197db26f50251bfa082a49447e6e581ac8d54363f288a6f4e339b29f02794afde249b8361ff1ea51f8d6a79b6e5b0381b371d4bc
+DIST miniupnpd-2.3.6.tar.gz 263018 BLAKE2B 9e3d6bfdbe71a09a15bf11c1a718b1388db991de52a2ec742aaec70128e4ac5147f441ccfa50e7077f09682ac724040343c4e351b4cc8c3d9e8efe04773651ec SHA512 41ed8d0afcfdba70ab5ec44a33ad4643b226bea2da972fc432035fd3ff3a790227a71c32ca47574558e36eb491b0f6ab7710d3ef0af5ac6a359d899dcb36893c
+DIST miniupnpd-2.3.6.tar.gz.sig 543 BLAKE2B 5c5c3566a9dfd16d95ca70fa006f7ce7097aebfe76940c03c22047064d5dae92aed73062f2455f08b61a99a747f9615e72c06e178628d948532b987b40fb262f SHA512 312a9db9cbd74912294a7cc2d4ccc69634806fc58702083fda56e11ad1fd978e92ad71f217cadf5f4482e8e655df07e6d7cc52ae494b8167140ae4db74cd352d
 EBUILD miniupnpd-2.3.5.ebuild 2361 BLAKE2B 72e1f38f9c24ce443aa6a4320c287b9f9f64a088d4e481de936aa0cd3062a3723b38bce50aecdb43c362ae81ba780c9ac31ec01b3c03527b2ac9b9861ef5e634 SHA512 9ad0036463ef1a7dba8d45cf197db26f50251bfa082a49447e6e581ac8d54363f288a6f4e339b29f02794afde249b8361ff1ea51f8d6a79b6e5b0381b371d4bc
+EBUILD miniupnpd-2.3.6.ebuild 2361 BLAKE2B 72e1f38f9c24ce443aa6a4320c287b9f9f64a088d4e481de936aa0cd3062a3723b38bce50aecdb43c362ae81ba780c9ac31ec01b3c03527b2ac9b9861ef5e634 SHA512 9ad0036463ef1a7dba8d45cf197db26f50251bfa082a49447e6e581ac8d54363f288a6f4e339b29f02794afde249b8361ff1ea51f8d6a79b6e5b0381b371d4bc
 MISC metadata.xml 985 BLAKE2B 4df9a4cf573d7aa45b80bc5062682325c3e063fd4b6147164dcc2a4e1b859def25df4541e1859c8843153c9de3a74557a3b66c94b69a65a94162752e177a907e SHA512 2068b103e2804c899ab17f63ae0aaf46442252067d6a8c12e7cc94c0b8760f5d764cf4124be78079236611cd05d7c5016b1b08499d1c265c561193344dfdeba6
diff --git a/net-misc/miniupnpd/miniupnpd-2.3.3.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.3.ebuild
deleted file mode 100644
index b28bd1d20603..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.3.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="
-	http://miniupnp.free.fr/
-	https://miniupnp.tuxfamily.org/
-	https://github.com/miniupnp/miniupnp/
-"
-SRC_URI="
-	https://miniupnp.tuxfamily.org/files/${P}.tar.gz
-	verify-sig? (
-		https://miniupnp.tuxfamily.org/files/${P}.tar.gz.sig
-	)
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~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=/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"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.3.4.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.6.ebuild
index ef90208e7b6d..ef90208e7b6d 100644
--- a/net-misc/miniupnpd/miniupnpd-2.3.4.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.3.6.ebuild