gentoo auto-resync : 25:06:2024 - 00:12:20

3 files changed, 41 insertions, 1 deletions

diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index ffecf9850541..e4e9554c488c 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -2,6 +2,7 @@ AUX 99i2pd 44 BLAKE2B d7a2d45f79ecb34f50eaddc09f318339eedfb2444d0a96d97691c6f395
 AUX i2pd-2.38.0-r1.logrotate 294 BLAKE2B 183e9d0a88a3ff4b1116d4f8475862ed110cf2bad43a1858b55fb6b502bf0c7fc975958e7a88fe9cf2bb331330e7aa70f13a3d9ce64fb525060bd84e965af5f2 SHA512 d2460d1d1b65222a0e3b89e464e75b2fd94fc65a49afe78a26c19e7a3c097b2334c02d58faad5f4ff06e3e4847425ed383f1963be2dbb9282a77c5b287a30fe2
 AUX i2pd-2.38.0.service 906 BLAKE2B 583c1856ceada5e60b7f595452afbe3e254616185d641e63f7931ccc972a52123745f72f1fffaf122be6fd3d4dadb311d58f4d639e0d2ba2187bde21f5340d2d SHA512 233722990f5e9934558b05a0aee5e0ef6af9bcd0b5f9c38cb9d1e61ffa37a4d80f403047dc15ec706bc03185d2e1ca27015210b6757a71786ad0bb4b75662981
 AUX i2pd-2.39.0.initd 1437 BLAKE2B 6f4e7b585e2acbabdb58999387954cac0ac5edd8bc7c3cec686f3ecb6e3b7b04a13c1de57ba081da7dee4c35b72bc65f2a1ac3c4dccf3a57c22b24eba248664f SHA512 58f28b38a39e3e7a1bf378e17dad1c0879c641d6c479db887f33e2689dde29f4f2fa1b9d3dc9a6ab03eb35d2e834b5691de2bc7d9c97c9a8523ebea1e9cd637e
+AUX i2pd-2.52.0-miniupnp.patch 1198 BLAKE2B 3448fb24ca2c41cf37b15a4c45e8245d0c5dbf535e3945b9f7093585f438b48319dbfd810268690aa4a49a5946a50681842baff63afebdda4dcd2d1f85959130 SHA512 c215df5e32142732f405534ad0fa874e8fa15f18513423f833c60f3d2bc4d143e5cf3065a0602b43636988331175062304996aa47ec0e0aead36a897b7383baa
 AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d21ef4d83620c064838d0e27f89f287a97404276490b848bd1372a40b915d4830b7755d801c4bda551099 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9
 DIST i2pd-2.49.0.tar.gz 654406 BLAKE2B 93b1bba73d308a7a6163b0b51ea59a3e11ea2d635d7275d71338ecd06d8d1dfb430e3e177aad0b3ae35f7e0e0bd95acb4e7750cbba70a4ded97fcc7596a1912b SHA512 f2461bf6e1ec2f1b581c8528de57c92350133642cd34ed9a6b2f4c8e8199aa9e5b9ff76d967c60350606f1ab5359f8a7dbbcaa58284e8769cdfa7e0a29a384af
 DIST i2pd-2.50.2.tar.gz 663010 BLAKE2B 671a294f1b4de3a71031c071330adad378e8fa418c95dbaeaba824071d38bc579d12113e899f00873e3a9a0a365f7ddc52ec9b728ffb19f254ffd8cacd9c945b SHA512 7df7a578711a959feee4326060829cf87c0d1669e473934549cb59d868a7aef7300ecd2d7a6b92a2295aa7e97964cc16d0e44a334db917e22b0b59573a9052de
@@ -10,5 +11,5 @@ DIST i2pd-2.52.0.tar.gz 677023 BLAKE2B 785eeb074df3e8a046ae3c6aa1204b52275ced565
 EBUILD i2pd-2.49.0.ebuild 1951 BLAKE2B 1cc165406b9fc798fb0954971781e242d8aa05bd20543f35316a996acbdaaad95ff5d5d3a0185004d765b4d6abfdfe1e23eb0a32d4d47aeef0cf5c429f73c988 SHA512 7c0c8e4933d9a005eb4bf4ac5b17aa82ccf49a898100165464f4e347759f69d5fabd4fad216ae6a5d623312ef1806995a50e11380756e698c01973f046651c83
 EBUILD i2pd-2.50.2.ebuild 1950 BLAKE2B e157516f805383504a9f5ef62da27a5fa0e05e5c887e8e3d8425b040236e3636aa6ece75ee33a04f2580a66df4ceb3266c3e0fb1749e48c97f2541f873c511db SHA512 f168aeb061b1a8401e3511b0f530934b2205f01b98ed217743f5e88790decdcae3c0dbc4c83cc6d6044f3092a6a4e25c47cb49371ab3a474116833e0234b13cf
 EBUILD i2pd-2.51.0.ebuild 1951 BLAKE2B b1e91ce459c30546a424386278ede00e1a6375fb75b69d4223c65896f574f9634e544301b0b7538170f3ada2f2f016c6025dad222968f10d100e3ae7cfb5cff0 SHA512 6011682fdf5ec09d8537a3c6f20cb9951655ae293bb476b0e1f30a14f923627d69def4c86f8a96bceb3156ffa296773fafff01f1308f34029c3c3054aa7636c7
-EBUILD i2pd-2.52.0.ebuild 1951 BLAKE2B b1e91ce459c30546a424386278ede00e1a6375fb75b69d4223c65896f574f9634e544301b0b7538170f3ada2f2f016c6025dad222968f10d100e3ae7cfb5cff0 SHA512 6011682fdf5ec09d8537a3c6f20cb9951655ae293bb476b0e1f30a14f923627d69def4c86f8a96bceb3156ffa296773fafff01f1308f34029c3c3054aa7636c7
+EBUILD i2pd-2.52.0.ebuild 1998 BLAKE2B bde3e799385fd58405fbe8a018675d37f97195287cc0a3ff5755109843a0e838e7de1d43e9715b555fc644c8c29fa0b535fd31408d78919361612834d8134aba SHA512 18869ec2a49814e905df5262cce17764befc14fa6d14db801778cd2bda9121b79c0e2d4c5c1b0f29340a28092d4f30fc37162df8be945c523bf5eaa69053bf29
 MISC metadata.xml 588 BLAKE2B a7a342599b07b88c0fc192386a7722eeb864b8f1debc4f30d6825e829b9c684d085edc6ef0b4e7d8e5bf3e04e93629df2925341784b2221d591084098a8a2d3e SHA512 86ca6c50c7eb8f06269a3e0b84f1189f4be57f40ea92b9cae3b9299b02c63d5a89fbb9ca6f16588a682ea1bb193c6395b55f67799c07e4bbf60f046185fb5d0e
diff --git a/net-vpn/i2pd/files/i2pd-2.52.0-miniupnp.patch b/net-vpn/i2pd/files/i2pd-2.52.0-miniupnp.patch
new file mode 100644
index 000000000000..5c9ef9231351
--- /dev/null
+++ b/net-vpn/i2pd/files/i2pd-2.52.0-miniupnp.patch
@@ -0,0 +1,37 @@
+commit 192e9ad7f6a6995ecb843fbbefe5425d0b37f6ee
+Author: Stefan Strogin <stefan@steils.org>
+Date:   Mon Jun 17 17:10:23 2024 +0000
+
+    Support miniupnp-2.2.8 (fixes #2071)
+    
+    Use UPNP_GetValidIGD for getting external IP.
+
+diff --git a/daemon/UPnP.cpp b/daemon/UPnP.cpp
+index 043d935e..7885578e 100644
+--- a/daemon/UPnP.cpp
++++ b/daemon/UPnP.cpp
+@@ -115,10 +115,16 @@ namespace transport
+ 			return;
+ 		}
+ 
++#if (MINIUPNPC_API_VERSION >= 18)
++		err = UPNP_GetValidIGD (m_Devlist, &m_upnpUrls, &m_upnpData, m_NetworkAddr, sizeof (m_NetworkAddr),
++					m_externalIPAddress, sizeof (m_externalIPAddress));
++#else
+ 		err = UPNP_GetValidIGD (m_Devlist, &m_upnpUrls, &m_upnpData, m_NetworkAddr, sizeof (m_NetworkAddr));
++#endif
+ 		m_upnpUrlsInitialized=err!=0;
+ 		if (err == UPNP_IGD_VALID_CONNECTED)
+ 		{
++#if (MINIUPNPC_API_VERSION < 18)
+ 			err = UPNP_GetExternalIPAddress (m_upnpUrls.controlURL, m_upnpData.first.servicetype, m_externalIPAddress);
+ 			if(err != UPNPCOMMAND_SUCCESS)
+ 			{
+@@ -126,6 +132,7 @@ namespace transport
+ 				return;
+ 			}
+ 			else
++#endif
+ 			{
+ 				LogPrint (eLogError, "UPnP: Found Internet Gateway Device ", m_upnpUrls.controlURL);
+ 				if (!m_externalIPAddress[0])
diff --git a/net-vpn/i2pd/i2pd-2.52.0.ebuild b/net-vpn/i2pd/i2pd-2.52.0.ebuild
index 0346c80cb527..504fce8a853d 100644
--- a/net-vpn/i2pd/i2pd-2.52.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.52.0.ebuild
@@ -27,6 +27,8 @@ CMAKE_USE_DIR="${WORKDIR}/${P}/build"
 
 DOCS=( ../README.md ../contrib/i2pd.conf ../contrib/tunnels.conf )
 
+PATCHES=( "${FILESDIR}/${P}-miniupnp.patch" )
+
 pkg_pretend() {
 	if use i2p-hardening && ! tc-is-gcc; then
 		die "i2p-hardening requires gcc"