commit eb6df4eaed8aff16888f028f7b63166f91cb3702 · pyrox.dev/nixpkgs

+6 -13

pkgs/by-name/da/dante/clang-osint-m4.patch

··· 1 diff -ur a/osdep.m4 b/osdep.m4 2 - --- a/osdep.m4 2017-01-18 09:11:20.000000000 -0500 3 - +++ b/osdep.m4 2023-10-21 12:43:59.464797030 -0400 4 @@ -381,6 +381,7 @@ 5 unset have_sa_len 6 AC_MSG_CHECKING([for sa_len in sockaddr]) ··· 9 #include <sys/types.h> 10 #include <sys/socket.h> 11 ], [struct sockaddr sa; 12 - @@ -397,12 +398,13 @@ 13 unset sa_len_type_found 14 for type in uint8_t "unsigned char"; do 15 AC_TRY_COMPILE([ 16 +#include <stdint.h> 17 #include <sys/types.h> 18 - #include <sys/socket.h>], [ 19 - struct sockaddr sa; 20 - $type *sa_len_ptr; 21 - sa_len_ptr = &sa.sa_len; 22 - -sa_len_ptr++; /* use to avoid warning/error */], 23 - +(*sa_len_ptr)++; /* use to avoid warning/error */], 24 - [AC_DEFINE_UNQUOTED(sa_len_type, [$type], [sa_len type]) 25 - sa_len_type_found=t 26 - break]) 27 - @@ -636,6 +638,7 @@ 28 in_port_t, in_addr_t], 29 , , 30 [

··· 1 diff -ur a/osdep.m4 b/osdep.m4 2 + --- a/osdep.m4 2024-11-20 08:07:22.000000000 +1100 3 + +++ b/osdep.m4 2024-12-16 20:39:15.424935602 +1100 4 @@ -381,6 +381,7 @@ 5 unset have_sa_len 6 AC_MSG_CHECKING([for sa_len in sockaddr]) ··· 9 #include <sys/types.h> 10 #include <sys/socket.h> 11 ], [struct sockaddr sa; 12 + @@ -397,6 +398,7 @@ 13 unset sa_len_type_found 14 for type in uint8_t "unsigned char"; do 15 AC_TRY_COMPILE([ 16 +#include <stdint.h> 17 #include <sys/types.h> 18 + #include <sys/socket.h> 19 + #include <stdio.h>], [ 20 + @@ -640,6 +642,7 @@ 21 in_port_t, in_addr_t], 22 , , 23 [

-176

pkgs/by-name/da/dante/dante-1.4.3-miniupnpc-2.2.8.patch

··· 1 - diff --git a/include/autoconf.h.in b/include/autoconf.h.in 2 - index bab2fcfa6c...22bc9202ca 100644 3 - --- a/include/autoconf.h.in 4 - +++ b/include/autoconf.h.in 5 - @@ -797,6 +797,9 @@ 6 - /* UPNP support library 1.7 */ 7 - #undef HAVE_LIBMINIUPNP17 8 - 9 - +/* UPNP support library 2.2.8 */ 10 - +#undef HAVE_LIBMINIUPNP228 11 - + 12 - /* Define to 1 if you have the `prldap60' library (-lprldap60). */ 13 - #undef HAVE_LIBPRLDAP60 14 - 15 - diff --git a/include/common.h b/include/common.h 16 - index 137f5ec51f...2c24759b52 100755 17 - --- a/include/common.h 18 - +++ b/include/common.h 19 - @@ -1404,8 +1404,14 @@ 20 - /* return codes from UPNP_GetValidIGD(). */ 21 - #define UPNP_NO_IGD (0) 22 - #define UPNP_CONNECTED_IGD (1) 23 - +#if HAVE_LIBMINIUPNP228 24 - +#define UPNP_RESERVED_IGD (2) 25 - +#define UPNP_DISCONNECTED_IGD (3) 26 - +#define UPNP_UNKNOWN_DEVICE (4) 27 - +#else /* !HAVE_LIBMINIUPNP_228 */ 28 - #define UPNP_DISCONNECTED_IGD (2) 29 - #define UPNP_UNKNOWN_DEVICE (3) 30 - +#endif /* !HAVE_LIBMINIUPNP_228 */ 31 - 32 - #define UPNP_SUCCESS (1) 33 - #define UPNP_FAILURE (2) 34 - diff --git a/lib/upnp.c b/lib/upnp.c 35 - index d9535ca03c...dc99d53c06 100644 36 - --- a/lib/upnp.c 37 - +++ b/lib/upnp.c 38 - @@ -154,7 +154,7 @@ 39 - addrstring, 40 - NULL, 41 - 0 42 - -#if HAVE_LIBMINIUPNP17 43 - +#if HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228 44 - ,0, 45 - 46 - #if MINIUPNPC_API_VERSION >= 14 47 - @@ -162,7 +162,7 @@ 48 - #endif /* MINIUPNPC_API_VERSION >= 14 */ 49 - 50 - &rc 51 - -#endif /* HAVE_LIBMINIUPNP17 */ 52 - +#endif /* HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228 */ 53 - ); 54 - 55 - #if SOCKS_CLIENT && SOCKSLIBRARY_DYNAMIC 56 - @@ -208,7 +208,12 @@ 57 - socks_autoadd_directroute(&commands, &protocols, &saddr, &smask); 58 - } 59 - 60 - +#if HAVE_LIBMINIUPNP228 61 - + devtype = UPNP_GetValidIGD(dev, &url, &data, myaddr, sizeof(myaddr), 62 - + NULL, 0); 63 - +#else /* !HAVE_LIBMINIUPNP228 */ 64 - devtype = UPNP_GetValidIGD(dev, &url, &data, myaddr, sizeof(myaddr)); 65 - +#endif /* !HAVE_LIBMINIUPNP228 */ 66 - switch (devtype) { 67 - case UPNP_NO_IGD: 68 - snprintf(emsg, emsglen, "no UPNP IGD discovered on local network"); 69 - @@ -226,9 +231,10 @@ 70 - rc = 0; 71 - break; 72 - 73 - - case UPNP_DISCONNECTED_IGD: 74 - +#if HAVE_LIBMINIUPNP228 75 - + case UPNP_RESERVED_IGD: 76 - snprintf(emsg, emsglen, 77 - - "UPNP IGD discovered at url %s, but it is not connected", 78 - + "UPNP IGD discovered at url %s, but its IP is reserved", 79 - str2vis(url.controlURL, 80 - strlen(url.controlURL), 81 - vbuf, 82 - @@ -236,6 +242,18 @@ 83 - 84 - swarnx("%s: %s", function, emsg); 85 - rc = -1; 86 - +#endif /* HAVE_LIBMINIUPNP228 */ 87 - + 88 - + case UPNP_DISCONNECTED_IGD: 89 - + snprintf(emsg, emsglen, 90 - + "UPNP IGD discovered at url %s, but it is not connected", 91 - + str2vis(url.controlURL, 92 - + strlen(url.controlURL), 93 - + vbuf, 94 - + sizeof(vbuf))); 95 - + 96 - + swarnx("%s: %s", function, emsg); 97 - + rc = -1; 98 - break; 99 - 100 - case UPNP_UNKNOWN_DEVICE: 101 - @@ -273,12 +291,12 @@ 102 - #if HAVE_LIBMINIUPNP13 103 - STRCPY_ASSERTLEN(gw->state.data.upnp.servicetype, data.servicetype); 104 - 105 - -#elif HAVE_LIBMINIUPNP14 || HAVE_LIBMINIUPNP17 106 - +#elif HAVE_LIBMINIUPNP14 || HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228 107 - STRCPY_ASSERTLEN(gw->state.data.upnp.servicetype, data.CIF.servicetype); 108 - 109 - #else 110 - # error "unexpected miniupnp version" 111 - -#endif /* HAVE_LIBMINIUPNP17 */ 112 - +#endif /* HAVE_LIBMINIUPNP14 || HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228 */ 113 - 114 - slog(LOG_NEGOTIATE, "%s: inited ok. controlurl: %s, servicetype: %s", 115 - function, 116 - @@ -756,9 +774,9 @@ 117 - buf, 118 - protocol, 119 - NULL 120 - -#if HAVE_LIBMINIUPNP17 121 - +#if HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228 122 - ,0 123 - -#endif /* HAVE_LIBMINIUPNP17 */ 124 - +#endif /* HAVE_LIBMINIUPNP17 || HAVE_LIBMINIUPNP228 */ 125 - )) != UPNPCOMMAND_SUCCESS) { 126 - snprintf(emsg, emsglen, 127 - "UPNP_AddPortMapping() failed: %s", strupnperror(rc)); 128 - diff --git a/miniupnpc.m4 b/miniupnpc.m4 129 - index 85086d4917...ebb8875763 100644 130 - --- a/miniupnpc.m4 131 - +++ b/miniupnpc.m4 132 - @@ -20,7 +20,7 @@ 133 - LIBS=$oLIBS 134 - fi 135 - if test x"${have_libminiupnp}" = xt; then 136 - - AC_MSG_CHECKING([for miniupnpc version >= 1.7]) 137 - + AC_MSG_CHECKING([for miniupnpc version >= 2.2.8]) 138 - AC_TRY_COMPILE([ 139 - #include <stdio.h> 140 - #include <miniupnpc/miniupnpc.h> 141 - @@ -30,12 +30,34 @@ 142 - #ifndef MINIUPNPC_API_VERSION 143 - #error "no api version define" 144 - #else 145 - - # if MINIUPNPC_API_VERSION < 8 146 - + # if MINIUPNPC_API_VERSION < 18 147 - #error "api version too low" 148 - # endif 149 - #endif], 150 - [AC_MSG_RESULT(yes) 151 - AC_DEFINE(HAVE_LIBMINIUPNP, 1, [UPNP support library]) 152 - + AC_DEFINE(HAVE_LIBMINIUPNP228, 1, [UPNP support library 2.2.8]) 153 - + unset no_upnp 154 - + SOCKDDEPS="${SOCKDDEPS}${SOCKDDEPS:+ }$UPNPLIB" 155 - + DLIBDEPS="${DLIBDEPS}${DLIBDEPS:+ }$UPNPLIB"], 156 - + [AC_MSG_RESULT(no)]) 157 - + 158 - + AC_MSG_CHECKING([for miniupnpc version >= 1.7]) 159 - + AC_TRY_COMPILE([ 160 - + #include <stdio.h> 161 - + #include <miniupnpc/miniupnpc.h> 162 - + #include <miniupnpc/upnpcommands.h> 163 - + #include <miniupnpc/upnperrors.h>], [ 164 - + 165 - + #ifndef MINIUPNPC_API_VERSION 166 - + #error "no api version define" 167 - + #else 168 - + # if MINIUPNPC_API_VERSION < 8 || MINIUPNPC_API_VERSION > 17 169 - + #error "api version too low or high" 170 - + # endif 171 - + #endif], 172 - + [AC_MSG_RESULT(yes) 173 - + AC_DEFINE(HAVE_LIBMINIUPNP, 1, [UPNP support library]) 174 - AC_DEFINE(HAVE_LIBMINIUPNP17, 1, [UPNP support library 1.7]) 175 - unset no_upnp 176 - SOCKDDEPS="${SOCKDDEPS}${SOCKDDEPS:+ }$UPNPLIB"

···

+2 -4

pkgs/by-name/da/dante/package.nix

··· 17 in 18 stdenv.mkDerivation rec { 19 pname = "dante"; 20 - version = "1.4.3"; 21 22 src = fetchurl { 23 url = "https://www.inet.no/dante/files/${pname}-${version}.tar.gz"; 24 - sha256 = "0pbahkj43rx7rmv2x40mf5p3g3x9d6i2sz7pzglarf54w5ghd2j1"; 25 }; 26 27 nativeBuildInputs = [ autoreconfHook ]; ··· 46 # Fixes several issues with `osint.m4` that causes incorrect check failures when using newer 47 # versions of clang: missing `stdint.h` for `uint8_t` and unused `sa_len_ptr`. 48 ./clang-osint-m4.patch 49 - # Fixes build with miniupnpc 2.2.8. 50 - ./dante-1.4.3-miniupnpc-2.2.8.patch 51 ] 52 ++ lib.optionals remove_getaddrinfo_checks [ 53 (fetchpatch {

··· 17 in 18 stdenv.mkDerivation rec { 19 pname = "dante"; 20 + version = "1.4.4"; 21 22 src = fetchurl { 23 url = "https://www.inet.no/dante/files/${pname}-${version}.tar.gz"; 24 + sha256 = "sha256-GXPHcy8fnwpMDM8sHORix8JQYLJWQ+qQ+bmPU6gT+uw="; 25 }; 26 27 nativeBuildInputs = [ autoreconfHook ]; ··· 46 # Fixes several issues with `osint.m4` that causes incorrect check failures when using newer 47 # versions of clang: missing `stdint.h` for `uint8_t` and unused `sa_len_ptr`. 48 ./clang-osint-m4.patch 49 ] 50 ++ lib.optionals remove_getaddrinfo_checks [ 51 (fetchpatch {