summaryrefslogtreecommitdiff
path: root/net-proxy
diff options
context:
space:
mode:
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/Manifest.gzbin5543 -> 5547 bytes
-rw-r--r--net-proxy/dante/Manifest3
-rw-r--r--net-proxy/dante/dante-1.4.3.ebuild5
-rw-r--r--net-proxy/dante/files/dante-1.4.3-upnp-2.2.8.patch247
4 files changed, 252 insertions, 3 deletions
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 6385446290f2..7a0e69fa811e 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
Binary files differ
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 0570a0fce008..cce21c775d6c 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -8,6 +8,7 @@ AUX dante-1.4.1-sigpwr-siginfo.patch 554 BLAKE2B 893a5504843f2a3a7606e5ed7a85624
AUX dante-1.4.2-cflags.patch 1186 BLAKE2B 480a3f66a1b476efe78cbb8112436cd2362683b3d029ca3267e34ff93be54bc0c2647c5c0856c0cf0cebb9e39995956e043dc64195a940cc38e03a5df0fbfb28 SHA512 af83b08f929e6400ecca49ec161a0f361bbbecdca7221b837d0dd6d6762c8fe4abc71d0fbe46451cd5bc8d06cdf0a0d9c750d584563721ecbb7dc8f5a77138c8
AUX dante-1.4.3-gai-symbol.patch 989 BLAKE2B bd78bc8c96030a1fabd4202097b2bfca803da804a3e52fbb93a6f2f002347a5d8acd6eea0d236cad2019c372df78835f08b141650096b388fb86d0734adc5b22 SHA512 7732edf00dfe687827d71377975197c393695675d65680cb729eeedf292e03f12df66ee1e4538a5ed50970d1402ff263e88e06f69f2adee54ed8902f9a1a13e3
AUX dante-1.4.3-osdep-debug.patch 828 BLAKE2B 04b285f902adb6958c9c1fde3e42d5141322732ae7819541bcdec224b736bc895aad31dbb87082108b583f04f6bfb9e2f44a2b239a4aafb92ee9743481ee710c SHA512 c5b8d8617f50d13d3a7058f8fcc470e49e6994a7f2994a5f32fbc6470f624069357e56b590e2e6c54fcfa5f5b8ab9463bece47db2e1196c2711481c5e3767575
+AUX dante-1.4.3-upnp-2.2.8.patch 8191 BLAKE2B 00bab0ffc1129efb87da28e3fd6a06311670bb40c8724db68d84efe15fe5f9553d2904d94321cfa8d55f3e67fb0181411b6485a0dd0743f2a55c024108d738d7 SHA512 de40dabafc4bf299ee5b76c4fcb2c0e1493bdfea40cf3094a73e4730fadb7d29f1398b3b39211d28d722230afc7a8639dbc0d8d6bde32759985327f44133b1e7
AUX dante-sockd-conf 350 BLAKE2B 3293e1b92e48f805c40a996b9e3a264197b55d4628d153755287b795ea4ab19b43dd4781e9fe1fa5a34a26ca5799b0fb4e9b2db79b4ccbb4f82a13de1f9677f7 SHA512 c9dd0982dc6893fdb6160279531d431255bd97011b6351a09d28db6c0db15886ebb323f62afc960b621455a24940c8f4baed409b4bc3c791bd3f3fe6104b30bc
AUX dante-sockd.service 167 BLAKE2B 924bc8feeb62b1e8f1271bccacd12e5624db0f326a8e71f470a8f0f487c11514deca0426f08194b3579f1a4a816aafe28072fa213dcb34dd82b3cccf9ac75149 SHA512 0acc71e1ab429d38c61db45dc5eb3c9ea58d822eefc83912ae9d569486eb281184f07183a40754eaf6e4f6f67c46a3683629734d6333767623d702f98bc720de
AUX sockd.conf 7031 BLAKE2B 9ccc208a027538e5fdbfacb352c6072dd19e1106954d608cd17e661be256356ecf36b3170d48018ee6b2162694426434c17bf582b03413a7530c2f58646f0bc5 SHA512 a443ea203aefd3ed51b10c7140dde2fc64dfa31c2fb08539a45353ab77daea42c63b160c276f0ef9e4c683032260f93228af64db83ade7476ff6d353b63dec19
@@ -18,5 +19,5 @@ DIST dante-1.4.1.tar.gz 1284288 BLAKE2B 34c78007245339088d79e0b969b8f55d20b0ee59
DIST dante-1.4.3.tar.gz 1343935 BLAKE2B dc069fd99a0d4a606b1eb7ce5dabbb20be63a4b4b3b02ee5e7c6d9b5614ae89226559df9c0bdaa3bee803b04e452311ab016c9116d57f3f8f48205ec797c5475 SHA512 c19675b2dee931366caf4a0dd4f44045ae731cc2f986e5d2e4bf498925c7d93a92a32088234d4a9443424f6dfb0796a1fa3fdc7c47e5aa11612c29a101f47888
DIST dante_1.4.3+dfsg-2.debian.tar.xz 42736 BLAKE2B 3e385eb4dee0278edfe72720139b19d4900b828372e6dc5b8361dbcf2ba76f0a0a5b523680068aa0c61fcbabac25ce413f23c96ab56c368ddda1ef8dd1fee528 SHA512 0acbb82eba1e37af0b485ac5b43cb06f5d699e5cac427a8c678fe8633a08ce5697ff936d3f1dd747cb2cc3c7ac7c713193ae07c1913e794f35fd55278c8fec16
EBUILD dante-1.4.1-r6.ebuild 2780 BLAKE2B f0b1d5d30fd514fb996317a0ccfc36c31c2db2d78fe08a882ecd2331a8aa27ecbfed36db790d3f9f3f208eb33c0a899acb52c9a411c53d69f7abb8d262cd5901 SHA512 506a193e250f6c3331b626d3d79a700d113497aa511383521c2bfe1ede96d33c04f32e1081f667579c9d757450c070bd83cb9bbc9dc7db43db93862d3d11b214
-EBUILD dante-1.4.3.ebuild 3220 BLAKE2B 423abc93fdfade0ddbcc652c37f181793ace57c102bfb8396ea27475110cd738bceb3385b00ab65e8686360935e2a540b8cf2299ff3593958b3049e3c1e22dee SHA512 7ebd8c1d9c552bbb2f892ef10f0297fa12034f0b5d12796185c47950242482c6b6122d6769f12697f8305b48c46fe8a2ff06fa1d8d91798f09e09fadfaebf307
+EBUILD dante-1.4.3.ebuild 3258 BLAKE2B 56e25bee5968dfd07442e06acdda8981c94e9440c83c4c572a52ad8f6d6d10e5b18e75d387ec74cfd35f9863850793cad0262f57492ab241eaa33e75b59b414a SHA512 249ebc29cc49bf28ecb99b987f6901110e54e95e9a81b808b0b1baf1b2e4d63695c971f4f26e532f7c9c4bb08880a0d904e557ce533518175758765845efa156
MISC metadata.xml 213 BLAKE2B 8999188a1062bf7ec3ba841f532113bb39808fbdbfd3cba1107aec6c8796e897b1ade98d0ea8e92eb504f132a51aa46fb49b6ad1a04c5b389d333f054c2589b8 SHA512 7d3e51679dce13a213e18c54e9072c88a121abad190a83dd7d1ce224b075ac639e4a0d0d8a2b98ca8a59da3a1576629b021afb9fe48c180345e609605c6aef0e
diff --git a/net-proxy/dante/dante-1.4.3.ebuild b/net-proxy/dante/dante-1.4.3.ebuild
index 10bfc9b77559..8a481dc9de9e 100644
--- a/net-proxy/dante/dante-1.4.3.ebuild
+++ b/net-proxy/dante/dante-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ PATCH_LEVEL="dfsg-2"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="debug kerberos pam selinux static-libs tcpd upnp"
CDEPEND="
@@ -46,6 +46,7 @@ PATCHES=(
#"${FILESDIR}"/${PN}-1.4.1-miniupnp14.patch #564680 # upstreamed
"${FILESDIR}"/${PN}-1.4.3-osdep-debug.patch
"${FILESDIR}"/${PN}-1.4.3-gai-symbol.patch
+ "${FILESDIR}"/${PN}-1.4.3-upnp-2.2.8.patch
)
src_prepare() {
diff --git a/net-proxy/dante/files/dante-1.4.3-upnp-2.2.8.patch b/net-proxy/dante/files/dante-1.4.3-upnp-2.2.8.patch
new file mode 100644
index 000000000000..271d3094f80a
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.4.3-upnp-2.2.8.patch
@@ -0,0 +1,247 @@
+--- a/configure
++++ b/configure
+@@ -32805,6 +32805,49 @@
+ LIBS=$oLIBS
+ fi
+ if test x"${have_libminiupnp}" = xt; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for miniupnpc version >= 2.2.8" >&5
++$as_echo_n "checking for miniupnpc version >= 2.2.8... " >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++ #include <stdio.h>
++ #include <miniupnpc/miniupnpc.h>
++ #include <miniupnpc/upnpcommands.h>
++ #include <miniupnpc/upnperrors.h>
++int
++main ()
++{
++
++
++ #ifndef MINIUPNPC_API_VERSION
++ #error "no api version define"
++ #else
++ # if MINIUPNPC_API_VERSION < 18
++ #error "api version too low"
++ # endif
++ #endif
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define HAVE_LIBMINIUPNP 1" >>confdefs.h
++
++
++$as_echo "#define HAVE_LIBMINIUPNP228 1" >>confdefs.h
++
++ unset no_upnp
++ SOCKDDEPS="${SOCKDDEPS}${SOCKDDEPS:+ }$UPNPLIB"
++ DLIBDEPS="${DLIBDEPS}${DLIBDEPS:+ }$UPNPLIB"
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for miniupnpc version >= 1.7" >&5
+ $as_echo_n "checking for miniupnpc version >= 1.7... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -32822,8 +32865,8 @@
+ #ifndef MINIUPNPC_API_VERSION
+ #error "no api version define"
+ #else
+- # if MINIUPNPC_API_VERSION < 8
+- #error "api version too low"
++ # if MINIUPNPC_API_VERSION < 8 || MINIUPNPC_API_VERSION > 17
++ #error "api version too low or high"
+ # endif
+ #endif
+ ;
+--- ./include/autoconf.h.in.orig 2021-04-30 21:29:27.000000000 +0200
++++ ./include/autoconf.h.in 2025-01-13 13:18:20.846544677 +0100
+@@ -797,6 +797,9 @@
+ /* UPNP support library 1.7 */
+ #undef HAVE_LIBMINIUPNP17
+
++/* UPNP support library 2.2.8 */
++#undef HAVE_LIBMINIUPNP228
++
+ /* Define to 1 if you have the `prldap60' library (-lprldap60). */
+ #undef HAVE_LIBPRLDAP60
+
+--- ./include/common.h.orig 2021-02-02 20:34:15.000000000 +0100
++++ ./include/common.h 2025-01-13 13:16:32.969992076 +0100
+@@ -1404,9 +1404,20 @@
+ /* return codes from UPNP_GetValidIGD(). */
+ #define UPNP_NO_IGD (0)
+ #define UPNP_CONNECTED_IGD (1)
++
++#if HAVE_LIBMINIUPNP228
++
++#define UPNP_RESERVED_IGD (2)
++#define UPNP_DISCONNECTED_IGD (3)
++#define UPNP_UNKNOWN_DEVICE (4)
++
++#else /* !HAVE_LIBMINIUPNP_228 */
++
+ #define UPNP_DISCONNECTED_IGD (2)
+ #define UPNP_UNKNOWN_DEVICE (3)
+
++#endif /* !HAVE_LIBMINIUPNP_228 */
++
+ #define UPNP_SUCCESS (1)
+ #define UPNP_FAILURE (2)
+
+--- ./include/redefac.h.orig 2021-04-30 21:48:32.000000000 +0200
++++ ./include/redefac.h 2025-01-13 13:13:43.206075810 +0100
+@@ -1004,6 +1004,10 @@
+ #define HAVE_LIBMINIUPNP17 0
+ #endif
+
++#ifndef HAVE_LIBMINIUPNP228
++#define HAVE_LIBMINIUPNP228 0
++#endif
++
+ #ifndef HAVE_LIBPRLDAP60
+ #define HAVE_LIBPRLDAP60 0
+ #endif
+--- ./lib/upnp.c.orig 2020-11-11 17:11:55.000000000 +0100
++++ ./lib/upnp.c 2024-11-21 17:02:49.000000000 +0100
+@@ -42,7 +42,7 @@
+ */
+
+ static const char rcsid[] =
+-"$Id: upnp.c,v 1.153.4.4.2.2.4.2 2020/11/11 16:11:55 karls Exp $";
++"$Id: upnp.c,v 1.153.4.4.2.2.4.2.4.1 2024/11/21 16:02:49 karls Exp $";
+
+ #include "common.h"
+
+@@ -154,7 +154,7 @@
+ addrstring,
+ NULL,
+ 0
+-#if HAVE_LIBMINIUPNP17
++#if HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228
+ ,0,
+
+ #if MINIUPNPC_API_VERSION >= 14
+@@ -162,7 +162,7 @@
+ #endif /* MINIUPNPC_API_VERSION >= 14 */
+
+ &rc
+-#endif /* HAVE_LIBMINIUPNP17 */
++#endif /* HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228 */
+ );
+
+ #if SOCKS_CLIENT && SOCKSLIBRARY_DYNAMIC
+@@ -208,7 +208,12 @@
+ socks_autoadd_directroute(&commands, &protocols, &saddr, &smask);
+ }
+
++#if HAVE_LIBMINIUPNP228
++ devtype = UPNP_GetValidIGD(dev, &url, &data, myaddr, sizeof(myaddr),
++ NULL, 0);
++#else /* !HAVE_LIBMINIUPNP228 */
+ devtype = UPNP_GetValidIGD(dev, &url, &data, myaddr, sizeof(myaddr));
++#endif /* !HAVE_LIBMINIUPNP228 */
+ switch (devtype) {
+ case UPNP_NO_IGD:
+ snprintf(emsg, emsglen, "no UPNP IGD discovered on local network");
+@@ -226,6 +231,20 @@
+ rc = 0;
+ break;
+
++#if HAVE_LIBMINIUPNP228
++ case UPNP_RESERVED_IGD:
++ snprintf(emsg, emsglen,
++ "UPNP IGD discovered at url %s, but its IP is reserved",
++ str2vis(url.controlURL,
++ strlen(url.controlURL),
++ vbuf,
++ sizeof(vbuf)));
++
++ swarnx("%s: %s", function, emsg);
++ rc = -1;
++ break;
++#endif /* HAVE_LIBMINIUPNP228 */
++
+ case UPNP_DISCONNECTED_IGD:
+ snprintf(emsg, emsglen,
+ "UPNP IGD discovered at url %s, but it is not connected",
+@@ -273,12 +292,12 @@
+ #if HAVE_LIBMINIUPNP13
+ STRCPY_ASSERTLEN(gw->state.data.upnp.servicetype, data.servicetype);
+
+-#elif HAVE_LIBMINIUPNP14 || HAVE_LIBMINIUPNP17
++#elif HAVE_LIBMINIUPNP14 || HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228
+ STRCPY_ASSERTLEN(gw->state.data.upnp.servicetype, data.CIF.servicetype);
+
+ #else
+ # error "unexpected miniupnp version"
+-#endif /* HAVE_LIBMINIUPNP17 */
++#endif /* HAVE_LIBMINIUPNP14 || HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228 */
+
+ slog(LOG_NEGOTIATE, "%s: inited ok. controlurl: %s, servicetype: %s",
+ function,
+@@ -756,9 +775,9 @@
+ buf,
+ protocol,
+ NULL
+-#if HAVE_LIBMINIUPNP17
++#if HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228
+ ,0
+-#endif /* HAVE_LIBMINIUPNP17 */
++#endif /* HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228 */
+ )) != UPNPCOMMAND_SUCCESS) {
+ snprintf(emsg, emsglen,
+ "UPNP_AddPortMapping() failed: %s", strupnperror(rc));
+--- ./miniupnpc.m4.orig 2012-11-02 13:08:14.000000000 +0100
++++ ./miniupnpc.m4 2024-11-21 17:02:49.000000000 +0100
+@@ -20,7 +20,7 @@
+ LIBS=$oLIBS
+ fi
+ if test x"${have_libminiupnp}" = xt; then
+- AC_MSG_CHECKING([for miniupnpc version >= 1.7])
++ AC_MSG_CHECKING([for miniupnpc version >= 2.2.8])
+ AC_TRY_COMPILE([
+ #include <stdio.h>
+ #include <miniupnpc/miniupnpc.h>
+@@ -30,11 +30,33 @@
+ #ifndef MINIUPNPC_API_VERSION
+ #error "no api version define"
+ #else
+- # if MINIUPNPC_API_VERSION < 8
++ # if MINIUPNPC_API_VERSION < 18
+ #error "api version too low"
+ # endif
+ #endif],
+ [AC_MSG_RESULT(yes)
++ AC_DEFINE(HAVE_LIBMINIUPNP, 1, [UPNP support library])
++ AC_DEFINE(HAVE_LIBMINIUPNP228, 1, [UPNP support library 2.2.8])
++ unset no_upnp
++ SOCKDDEPS="${SOCKDDEPS}${SOCKDDEPS:+ }$UPNPLIB"
++ DLIBDEPS="${DLIBDEPS}${DLIBDEPS:+ }$UPNPLIB"],
++ [AC_MSG_RESULT(no)])
++
++ AC_MSG_CHECKING([for miniupnpc version >= 1.7])
++ AC_TRY_COMPILE([
++ #include <stdio.h>
++ #include <miniupnpc/miniupnpc.h>
++ #include <miniupnpc/upnpcommands.h>
++ #include <miniupnpc/upnperrors.h>], [
++
++ #ifndef MINIUPNPC_API_VERSION
++ #error "no api version define"
++ #else
++ # if MINIUPNPC_API_VERSION < 8 || MINIUPNPC_API_VERSION > 17
++ #error "api version too low or high"
++ # endif
++ #endif],
++ [AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_LIBMINIUPNP, 1, [UPNP support library])
+ AC_DEFINE(HAVE_LIBMINIUPNP17, 1, [UPNP support library 1.7])
+ unset no_upnp
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-13 07:26:29 +0000