diff options
Diffstat (limited to 'net')
34 files changed, 317 insertions, 149 deletions
diff --git a/net/amnezia-kmod/Makefile b/net/amnezia-kmod/Makefile index 8e6d734dd4ed..523c32e5834e 100644 --- a/net/amnezia-kmod/Makefile +++ b/net/amnezia-kmod/Makefile @@ -1,5 +1,5 @@ PORTNAME= amnezia -PORTVERSION= 1.0.8 +PORTVERSION= 2.0.8 DISTVERSIONPREFIX= v CATEGORIES= net net-vpn PKGNAMESUFFIX= -kmod diff --git a/net/amnezia-kmod/distinfo b/net/amnezia-kmod/distinfo index 1e206f9cefcc..318fbb887373 100644 --- a/net/amnezia-kmod/distinfo +++ b/net/amnezia-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1753648668 -SHA256 (vgrebenschikov-wireguard-amnezia-kmod-v1.0.8_GH0.tar.gz) = 5045cfe0f0f6d58c2c6f5103f2f5b4238b7f59f33ca6f0a8b516762ead7ba7eb -SIZE (vgrebenschikov-wireguard-amnezia-kmod-v1.0.8_GH0.tar.gz) = 57959 +TIMESTAMP = 1765569800 +SHA256 (vgrebenschikov-wireguard-amnezia-kmod-v2.0.8_GH0.tar.gz) = 3e8eef841d8249f9406c1d06c666aa2f902524c965c388fac489543043764a9b +SIZE (vgrebenschikov-wireguard-amnezia-kmod-v2.0.8_GH0.tar.gz) = 69102 diff --git a/net/amnezia-kmod/files/patch-if__wg.c b/net/amnezia-kmod/files/patch-if__wg.c index 9dd13ffb9054..c5fce996ad63 100644 --- a/net/amnezia-kmod/files/patch-if__wg.c +++ b/net/amnezia-kmod/files/patch-if__wg.c @@ -1,6 +1,6 @@ ---- if_wg.c.orig 2025-07-22 17:38:01 UTC +--- if_wg.c.orig 2025-12-10 17:55:03 UTC +++ if_wg.c -@@ -278,21 +278,21 @@ static volatile unsigned long peer_counter = 0; +@@ -305,21 +305,21 @@ static volatile unsigned long peer_counter = 0; static int clone_count; static uma_zone_t wg_packet_zone; static volatile unsigned long peer_counter = 0; @@ -27,7 +27,7 @@ #define WG_CAPS IFCAP_LINKSTATE struct wg_timespec64 { -@@ -386,10 +386,10 @@ static int wg_ioctl(if_t, u_long, caddr_t); +@@ -418,10 +418,10 @@ static int wg_ioctl(if_t, u_long, caddr_t); static void wg_reassign(if_t, struct vnet *, char *unused); static void wg_init(void *); static int wg_ioctl(if_t, u_long, caddr_t); @@ -42,7 +42,7 @@ /* TODO Peer */ static struct wg_peer * -@@ -408,7 +408,7 @@ wg_peer_alloc(struct wg_softc *sc, const uint8_t pub_k +@@ -448,7 +448,7 @@ wg_peer_create(struct wg_softc *sc, const uint8_t pub_ cookie_maker_init(&peer->p_cookie, pub_key); @@ -51,7 +51,7 @@ wg_queue_init(&peer->p_stage_queue, "stageq"); wg_queue_init(&peer->p_encrypt_serial, "txq"); -@@ -428,9 +428,9 @@ wg_peer_alloc(struct wg_softc *sc, const uint8_t pub_k +@@ -468,9 +468,9 @@ wg_peer_create(struct wg_softc *sc, const uint8_t pub_ peer->p_handshake_retries = 0; GROUPTASK_INIT(&peer->p_send, 0, (gtask_fn_t *)wg_deliver_out, peer); @@ -63,7 +63,7 @@ LIST_INIT(&peer->p_aips); peer->p_aips_num = 0; -@@ -3286,26 +3286,26 @@ static void +@@ -3720,26 +3720,26 @@ static void } static void @@ -79,9 +79,9 @@ + V_amn_cloner = ifc_attach_cloner(wgname, &req); } -VNET_SYSINIT(vnet_wg_init, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, -- vnet_wg_init, NULL); +- vnet_wg_init, NULL); +VNET_SYSINIT(vnet_amn_init, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, -+ vnet_amn_init, NULL); ++ vnet_amn_init, NULL); static void -vnet_wg_uninit(const void *unused __unused) @@ -93,13 +93,13 @@ + ifc_detach_cloner(V_amn_cloner); } -VNET_SYSUNINIT(vnet_wg_uninit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, -- vnet_wg_uninit, NULL); +- vnet_wg_uninit, NULL); +VNET_SYSUNINIT(vnet_amn_uninit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, -+ vnet_amn_uninit, NULL); ++ vnet_amn_uninit, NULL); static int wg_prison_remove(void *obj, void *data __unused) -@@ -3352,14 +3352,14 @@ static int +@@ -3786,14 +3786,14 @@ static int #endif static int @@ -113,10 +113,10 @@ - wg_packet_zone = uma_zcreate("wg packet", sizeof(struct wg_packet), + wg_packet_zone = uma_zcreate("amn packet", sizeof(struct wg_packet), - NULL, NULL, NULL, NULL, 0, 0); + NULL, NULL, NULL, NULL, 0, 0); ret = crypto_init(); -@@ -3378,15 +3378,15 @@ static void +@@ -3812,15 +3812,15 @@ static void } static void @@ -135,7 +135,7 @@ } } VNET_LIST_RUNLOCK(); -@@ -3401,13 +3401,13 @@ static int +@@ -3835,13 +3835,13 @@ static int } static int @@ -152,7 +152,7 @@ break; default: return (EOPNOTSUPP); -@@ -3415,12 +3415,12 @@ wg_module_event_handler(module_t mod, int what, void * +@@ -3849,12 +3849,12 @@ wg_module_event_handler(module_t mod, int what, void * return (0); } diff --git a/net/amnezia-kmod/pkg-descr b/net/amnezia-kmod/pkg-descr index 00d5e020f365..07b78e9e5464 100644 --- a/net/amnezia-kmod/pkg-descr +++ b/net/amnezia-kmod/pkg-descr @@ -13,3 +13,5 @@ regular internet traffic. This package provides the FreeBSD kernel module (if_amn.ko) implementation for Amnezia VPN, enabling kernel-level support for the protocol. + +Partial support of AWG2 protocol added - 2.0 S3/S4 parameters. diff --git a/net/amnezia-tools/Makefile b/net/amnezia-tools/Makefile index f48a8948fd1f..0167f3c2172f 100644 --- a/net/amnezia-tools/Makefile +++ b/net/amnezia-tools/Makefile @@ -1,7 +1,6 @@ PORTNAME= amnezia DISTVERSIONPREFIX= v -DISTVERSION= 1.0.20241018 -PORTREVISION= 4 +DISTVERSION= 1.0.20250903 CATEGORIES= net net-vpn PKGNAMESUFFIX= -tools @@ -21,7 +20,9 @@ USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= wg-quick/freebsd.bash -MAKE_ARGS+= DEBUG=no \ +DEBUG?= no + +MAKE_ARGS+= DEBUG=${DEBUG} \ WITH_BASHCOMPLETION=yes \ WITH_SYSTEMDUNITS=no MAKE_ENV+= MANDIR="${PREFIX}/share/man" \ diff --git a/net/amnezia-tools/distinfo b/net/amnezia-tools/distinfo index 4121ea84aa23..33f5d4d3fc37 100644 --- a/net/amnezia-tools/distinfo +++ b/net/amnezia-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754646104 -SHA256 (amnezia-vpn-amneziawg-tools-v1.0.20241018_GH0.tar.gz) = 60f1cec1774fb871a2d8dc24e4f731625516d90f663d6e0d2c77d9247222f2f9 -SIZE (amnezia-vpn-amneziawg-tools-v1.0.20241018_GH0.tar.gz) = 156259 +TIMESTAMP = 1761344729 +SHA256 (amnezia-vpn-amneziawg-tools-v1.0.20250903_GH0.tar.gz) = d729a6f54aafcd55b2cbb7324f09ca8f0d2536772970652bf822a271d0c907d7 +SIZE (amnezia-vpn-amneziawg-tools-v1.0.20250903_GH0.tar.gz) = 160214 diff --git a/net/amnezia-tools/files/patch-config.c b/net/amnezia-tools/files/patch-config.c index 68d939b8e675..0b87c28f2ac3 100644 --- a/net/amnezia-tools/files/patch-config.c +++ b/net/amnezia-tools/files/patch-config.c @@ -1,6 +1,6 @@ ---- config.c.orig 2024-10-01 13:02:42 UTC +--- config.c.orig 2025-09-03 14:11:13 UTC +++ config.c -@@ -252,7 +252,7 @@ static inline bool parse_endpoint(struct sockaddr *end +@@ -259,7 +259,7 @@ static inline bool parse_endpoint(struct sockaddr *end * * So this is what we do, except FreeBSD removed EAI_NODATA some time ago, so that's conditional. */ @@ -9,7 +9,7 @@ #ifdef EAI_NODATA ret == EAI_NODATA || #endif -@@ -337,6 +337,20 @@ static bool validate_netmask(struct wgallowedip *allow +@@ -344,6 +344,20 @@ static bool validate_netmask(struct wgallowedip *allow return true; } @@ -30,7 +30,7 @@ static inline bool parse_allowedips(struct wgpeer *peer, struct wgallowedip **last_allowedip, const char *value) { struct wgallowedip *allowedip = *last_allowedip, *new_allowedip; -@@ -353,10 +367,18 @@ static inline bool parse_allowedips(struct wgpeer *pee +@@ -360,10 +374,18 @@ static inline bool parse_allowedips(struct wgpeer *pee } sep = mutable; while ((mask = strsep(&sep, ","))) { @@ -49,7 +49,7 @@ ip = strsep(&mask, "/"); new_allowedip = calloc(1, sizeof(*new_allowedip)); -@@ -387,6 +409,7 @@ static inline bool parse_allowedips(struct wgpeer *pee +@@ -394,6 +416,7 @@ static inline bool parse_allowedips(struct wgpeer *pee else goto err; new_allowedip->cidr = cidr; diff --git a/net/amnezia-tools/files/patch-containers.h b/net/amnezia-tools/files/patch-containers.h index 88563f74058a..233c2465854b 100644 --- a/net/amnezia-tools/files/patch-containers.h +++ b/net/amnezia-tools/files/patch-containers.h @@ -1,6 +1,6 @@ ---- containers.h.orig 2024-10-01 13:02:42 UTC +--- containers.h.orig 2025-09-03 14:11:13 UTC +++ containers.h -@@ -29,6 +29,10 @@ struct timespec64 { +@@ -34,6 +34,10 @@ struct timespec64 { int64_t tv_nsec; }; @@ -11,7 +11,7 @@ struct wgallowedip { uint16_t family; union { -@@ -36,6 +40,7 @@ struct wgallowedip { +@@ -41,6 +45,7 @@ struct wgallowedip { struct in6_addr ip6; }; uint8_t cidr; diff --git a/net/amnezia-tools/files/patch-ipc-freebsd.h b/net/amnezia-tools/files/patch-ipc-freebsd.h index 22255c0bcca3..2737729233b5 100644 --- a/net/amnezia-tools/files/patch-ipc-freebsd.h +++ b/net/amnezia-tools/files/patch-ipc-freebsd.h @@ -1,4 +1,4 @@ ---- ipc-freebsd.h.orig 2024-10-01 13:02:42 UTC +--- ipc-freebsd.h.orig 2025-09-03 14:11:13 UTC +++ ipc-freebsd.h @@ -15,13 +15,13 @@ static int get_dgram_socket(void) { @@ -16,7 +16,28 @@ struct ifg_req *ifg; int s = get_dgram_socket(), ret = 0; -@@ -389,6 +389,8 @@ static int kernel_set_device(struct wgdevice *dev) +@@ -458,15 +458,15 @@ static int kernel_set_device(struct wgdevice *dev) + if (dev->flags & WGDEVICE_HAS_H4) + nvlist_add_binary(nvl_device, "h4", dev->transport_packet_magic_header, strlen(dev->transport_packet_magic_header) + 1); + if (dev->flags & WGDEVICE_HAS_I1) +- nvlist_add_binary(nvl_device, "i1", dev->i1, strlen(dev->i1) + 1); ++ nvlist_add_binary(nvl_device, "i1", dev->i1 ? dev->i1 : "", strlen(dev->i1 ? dev->i1 : "") + 1); + if (dev->flags & WGDEVICE_HAS_I2) +- nvlist_add_binary(nvl_device, "i2", dev->i2, strlen(dev->i2) + 1); ++ nvlist_add_binary(nvl_device, "i2", dev->i2 ? dev->i2 : "", strlen(dev->i2 ? dev->i2 : "") + 1); + if (dev->flags & WGDEVICE_HAS_I3) +- nvlist_add_binary(nvl_device, "i3", dev->i3, strlen(dev->i3) + 1); ++ nvlist_add_binary(nvl_device, "i3", dev->i3 ? dev->i3 : "", strlen(dev->i3 ? dev->i3 : "") + 1); + if (dev->flags & WGDEVICE_HAS_I4) +- nvlist_add_binary(nvl_device, "i4", dev->i4, strlen(dev->i4) + 1); ++ nvlist_add_binary(nvl_device, "i4", dev->i4 ? dev->i4 : "", strlen(dev->i4 ? dev->i4 : "") + 1); + if (dev->flags & WGDEVICE_HAS_I5) +- nvlist_add_binary(nvl_device, "i5", dev->i5, strlen(dev->i5) + 1); ++ nvlist_add_binary(nvl_device, "i5", dev->i5 ? dev->i5 : "", strlen(dev->i5 ? dev->i5 : "") + 1); + if (dev->flags & WGDEVICE_HAS_FWMARK) + nvlist_add_number(nvl_device, "user-cookie", dev->fwmark); + if (dev->flags & WGDEVICE_REPLACE_PEERS) +@@ -502,6 +502,8 @@ static int kernel_set_device(struct wgdevice *dev) nvl_aips[j] = nvlist_create(0); if (!nvl_aips[j]) goto err_peer; diff --git a/net/amnezia-tools/files/patch-ipc-uapi.h b/net/amnezia-tools/files/patch-ipc-uapi.h index 61df9f69e784..cbf4811ca8a7 100644 --- a/net/amnezia-tools/files/patch-ipc-uapi.h +++ b/net/amnezia-tools/files/patch-ipc-uapi.h @@ -1,6 +1,6 @@ ---- ipc-uapi.h.orig 2024-10-01 13:02:42 UTC +--- ipc-uapi.h.orig 2025-09-03 14:11:13 UTC +++ ipc-uapi.h -@@ -111,7 +111,7 @@ static int userspace_set_device(struct wgdevice *dev) +@@ -126,7 +126,7 @@ static int userspace_set_device(struct wgdevice *dev) continue; } else continue; diff --git a/net/amnezia-tools/files/patch-man_wg.8 b/net/amnezia-tools/files/patch-man_wg.8 index 87e018ff2856..5356f8d2069c 100644 --- a/net/amnezia-tools/files/patch-man_wg.8 +++ b/net/amnezia-tools/files/patch-man_wg.8 @@ -1,4 +1,4 @@ ---- man/wg.8.orig 2024-10-01 13:02:42 UTC +--- man/wg.8.orig 2025-09-03 14:11:13 UTC +++ man/wg.8 @@ -1,10 +1,10 @@ -.TH WG 8 "2015 August 13" ZX2C4 "WireGuard" @@ -67,7 +67,7 @@ is optional and is by default off; setting it to 0 or "off" disables it. Otherwise it represents, in seconds, between 1 and 65535 inclusive, how often to send an authenticated empty packet to the peer, for the purpose of keeping -@@ -119,11 +121,52 @@ A private key and a corresponding public key may be ge +@@ -119,11 +121,94 @@ A private key and a corresponding public key may be ge .br $ umask 077 .br @@ -103,25 +103,67 @@ +\fBs1\fP +Size of handshake initiation packet prepend junk. Should be the same on both ends. +.br -+0–1132 (recomended 15–150), s1 + 56 ≠ s2 ++0–1304 (recomended 15–150) + +.TP +\fBs2\fP +Size of handshake response packet prepend junk. Should be the same on both ends. +.br -+0–1188 (recomended 15–150), s1 + 56 ≠ s2 ++0–1360 (recomended 15–150) ++ ++.TP ++\fBs3\fP ++Size of handshake cookie packet prepend junk. Should be the same on both ends. ++.br ++0–1388 (recomended 15–150) ++ ++.TP ++\fBs4\fP ++Size of data transport packet prepend junk. Should be the same on both ends. ++Will effectively decrease maximum possible MTU of interface. ++.br ++0–160 (recomended 15-32) + +.TP +\fBh1-h4\fP +Custom identifiers for initiation/response/cookie/data packets. Should be the same on both ends. +.br -+The unique value in range of 5 - 4,294,967,295 (0x5 - 0xFFFFFFFF), h1 != h2 != h3 != h4 ++Should be either the unique value in range of 5 - 4294967295 (0x5 - 0xFFFFFFFF) ++.br ++Or should be either the range of two such values, via '-', like 2294967295-4294970000, when range is used a random number from the range selected for each packet. ++For range, first value should be less then second. ++.br ++Such ranges or values should not intersect/match each other. ++ ++.TP ++\fBi1-i5\fP ++Pre-crafted custom signature packets to be send before hadshake. May be configured on either side and may be different between sides. ++These packets are being send prior to every handshake, in the same way as Junk packets do. The sending order is i1, i2, i3, i4, i5. If there is no value specified, the packet is skipped. ++.br ++Value is a sequence of tags specified below: + ++.br ++\fB<b 0x[seq]>\fP - static bytes tag. Dumps [seq] as-is to the packet. [seq] is hex-encoded sequence which represents bytes sequence (2 hex numbers per byte) and is always even-sized ++ ++.br ++\fB<r [size]>\fP - random bytes tag. Dumps [size] amount of randomly-generated bytes to the packet ++ ++.br ++\fB<rd [size]>\fP - random digits tag. Dumps [size] amount of randomly-generated bytes from [0-9] set to the packet ++ ++.br ++\fB<rc [size]>\fP - random chars tag. Dumps [size] amount of randomly-generated bytes from [a-zA-Z] set to the packet ++ ++.br ++\fB<t>\fP - timestamp tag. Dumps 4-bytes long current system time in UNIX format ++ ++.br ++\fB<c>\fP - packet counter tag. Dumps 4-bytes long amount of packets sent by AWG + .SH CONFIGURATION FILE FORMAT The configuration file format is based on \fIINI\fP. There are two top level sections -- \fIInterface\fP and \fIPeer\fP. Multiple \fIPeer\fP sections may be specified, but -@@ -224,7 +267,7 @@ on a per-interface basis by using +@@ -224,7 +309,7 @@ on a per-interface basis by using on a per-interface basis by using .BR ifconfig (1): @@ -130,7 +172,7 @@ On userspace implementations, it is customary to set the \fILOG_LEVEL\fP environment variable to \fIverbose\fP. -@@ -240,19 +283,18 @@ If set to an integer or to \fIinfinity\fP, DNS resolut +@@ -240,19 +325,18 @@ If set to an integer or to \fIinfinity\fP, DNS resolut If set to an integer or to \fIinfinity\fP, DNS resolution for each peer's endpoint will be retried that many times for non-permanent errors, with an increasing delay between retries. If unset, the default is 15 retries. .SH SEE ALSO diff --git a/net/amnezia-tools/files/patch-set.c b/net/amnezia-tools/files/patch-set.c index 61e1ec5314d0..060312414f44 100644 --- a/net/amnezia-tools/files/patch-set.c +++ b/net/amnezia-tools/files/patch-set.c @@ -1,11 +1,11 @@ ---- set.c.orig 2024-10-01 13:02:42 UTC +--- set.c.orig 2025-09-03 14:11:13 UTC +++ set.c @@ -18,7 +18,7 @@ int set_main(int argc, const char *argv[]) int ret = 1; if (argc < 3) { -- fprintf(stderr, "Usage: %s %s <interface> [listen-port <port>] [fwmark <mark>] [private-key <file path>] [peer <base64 public key> [remove] [preshared-key <file path>] [endpoint <ip>:<port>] [persistent-keepalive <interval seconds>] [allowed-ips <ip1>/<cidr1>[,<ip2>/<cidr2>] [advanced-security <on|off>]...] ]...\n", PROG_NAME, argv[0]); -+ fprintf(stderr, "Usage: %s %s <interface> [listen-port <port>] [fwmark <mark>] [private-key <file path>] [peer <base64 public key> [remove] [preshared-key <file path>] [endpoint <ip>:<port>] [persistent-keepalive <interval seconds>] [allowed-ips [+|-]<ip1>/<cidr1>[,[+|-]<ip2>/<cidr2>] [advanced-security <on|off>]...] ]...\n", PROG_NAME, argv[0]); +- fprintf(stderr, "Usage: %s %s <interface> [listen-port <port>] [fwmark <mark>] [private-key <file path>] [jc <junk_count>] [jmin <min_value>] [jmax <max_value>] [s1 <init_junk>] [s2 <resp_junk>] [s3 <cookie_junk>] [s4 <trans_junk>] [h1 <init_header>] [h2 <resp_header>] [h3 <cookie_header>] [h4 <transp_header>] [i1 \"<taged_junk>\"] [i2 \"<taged_junk>\"] [i3 \"<taged_junk>\"] [i4 \"<taged_junk>\"] [i5 \"<taged_junk>\"] [peer <base64 public key> [remove] [preshared-key <file path>] [endpoint <ip>:<port>] [persistent-keepalive <interval seconds>] [allowed-ips <ip1>/<cidr1>[,<ip2>/<cidr2>] [advanced-security <on|off>]...] ]...\n", PROG_NAME, argv[0]); ++ fprintf(stderr, "Usage: %s %s <interface> [listen-port <port>] [fwmark <mark>] [private-key <file path>] [jc <junk_count>] [jmin <min_value>] [jmax <max_value>] [s1 <init_junk>] [s2 <resp_junk>] [s3 <cookie_junk>] [s4 <trans_junk>] [h1 <init_header>] [h2 <resp_header>] [h3 <cookie_header>] [h4 <transp_header>] [i1 \"<taged_junk>\"] [i2 \"<taged_junk>\"] [i3 \"<taged_junk>\"] [i4 \"<taged_junk>\"] [i5 \"<taged_junk>\"] [peer <base64 public key> [remove] [preshared-key <file path>] [endpoint <ip>:<port>] [persistent-keepalive <interval seconds>] [allowed-ips [+|-]<ip1>/<cidr1>[,[+|-]<ip2>/<cidr2>] [advanced-security <on|off>]...] ]...\n", PROG_NAME, argv[0]); return 1; } diff --git a/net/amnezia-tools/files/patch-show.c b/net/amnezia-tools/files/patch-show.c new file mode 100644 index 000000000000..fb6f765c71dc --- /dev/null +++ b/net/amnezia-tools/files/patch-show.c @@ -0,0 +1,51 @@ +--- show.c.orig 2025-09-03 14:11:13 UTC ++++ show.c +@@ -401,39 +401,39 @@ static bool ugly_print(struct wgdevice *device, const + } else if (!strcmp(param, "h1")) { + if (with_interface) + printf("%s\t", device->name); +- printf("%s\n", device->init_packet_magic_header); ++ printf("%s\n", device->init_packet_magic_header?:"0"); + } else if (!strcmp(param, "h2")) { + if (with_interface) + printf("%s\t", device->name); +- printf("%s\n", device->response_packet_magic_header); ++ printf("%s\n", device->response_packet_magic_header?:"0"); + } else if (!strcmp(param, "h3")) { + if (with_interface) + printf("%s\t", device->name); +- printf("%s\n", device->underload_packet_magic_header); ++ printf("%s\n", device->underload_packet_magic_header?:"0"); + } else if (!strcmp(param, "h4")) { + if (with_interface) + printf("%s\t", device->name); +- printf("%s\n", device->transport_packet_magic_header); ++ printf("%s\n", device->transport_packet_magic_header?:"0"); + } else if (!strcmp(param, "i1")) { + if (with_interface) + printf("%s\t", device->name); +- printf("%s\n", device->i1); ++ printf("%s\n", device->i1?:""); + } else if (!strcmp(param, "i2")) { + if (with_interface) + printf("%s\t", device->name); +- printf("%s\n", device->i2); ++ printf("%s\n", device->i2?:""); + } else if (!strcmp(param, "i3")) { + if (with_interface) + printf("%s\t", device->name); +- printf("%s\n", device->i3); ++ printf("%s\n", device->i3?:""); + } else if (!strcmp(param, "i4")) { + if (with_interface) + printf("%s\t", device->name); +- printf("%s\n", device->i4); ++ printf("%s\n", device->i4?:""); + } else if (!strcmp(param, "i5")) { + if (with_interface) + printf("%s\t", device->name); +- printf("%s\n", device->i5); ++ printf("%s\n", device->i5?:""); + } else if (!strcmp(param, "endpoints")) { + for_each_wgpeer(device, peer) { + if (with_interface) diff --git a/net/amnezia-tools/files/patch-wg-quick_freebsd.bash b/net/amnezia-tools/files/patch-wg-quick_freebsd.bash index e4f2cfe40c0a..cc582319c260 100644 --- a/net/amnezia-tools/files/patch-wg-quick_freebsd.bash +++ b/net/amnezia-tools/files/patch-wg-quick_freebsd.bash @@ -1,6 +1,6 @@ ---- wg-quick/freebsd.bash.orig 2025-12-03 19:32:16 UTC +--- wg-quick/freebsd.bash.orig 2025-12-12 22:28:42 UTC +++ wg-quick/freebsd.bash -@@ -25,11 +25,20 @@ CONFIG_FILE="" +@@ -25,11 +25,18 @@ CONFIG_FILE="" POST_DOWN=( ) SAVE_CONFIG=0 CONFIG_FILE="" @@ -11,17 +11,15 @@ PROGRAM="${0##*/}" ARGS=( "$@" ) - IS_ASESCURITY_ON=0 + IS_AWG_ON=0 -+ +declare -A ROUTES +declare -A ENDPOINTS_MAP + -+ cmd() { echo "[#] $*" >&3 "$@" -@@ -40,7 +49,7 @@ die() { +@@ -40,7 +47,7 @@ die() { exit 1 } @@ -30,7 +28,7 @@ unset ORIGINAL_TMPDIR make_temp() { -@@ -64,7 +73,7 @@ parse_options() { +@@ -64,7 +71,7 @@ parse_options() { } parse_options() { @@ -39,7 +37,7 @@ CONFIG_FILE="$1" if [[ $CONFIG_FILE =~ ^[a-zA-Z0-9_=+.-]{1,15}$ ]]; then for path in "${CONFIG_SEARCH_PATHS[@]}"; do -@@ -82,7 +91,7 @@ parse_options() { +@@ -82,7 +89,7 @@ parse_options() { stripped="${line%%\#*}" key="${stripped%%=*}"; key="${key##*([[:space:]])}"; key="${key%%*([[:space:]])}" value="${stripped#*=}"; value="${value##*([[:space:]])}"; value="${value%%*([[:space:]])}" @@ -48,7 +46,7 @@ [[ $key == "[Interface]" ]] && interface_section=1 if [[ $interface_section -eq 1 ]]; then case "$key" in -@@ -96,9 +105,14 @@ parse_options() { +@@ -96,9 +103,14 @@ parse_options() { PreDown) PRE_DOWN+=( "$value" ); continue ;; PostUp) POST_UP+=( "$value" ); continue ;; PostDown) POST_DOWN+=( "$value" ); continue ;; @@ -63,9 +61,9 @@ Jc);& Jmin);& Jmax);& -@@ -109,6 +123,17 @@ parse_options() { - H3);& - H4) IS_ASESCURITY_ON=1;; +@@ -116,6 +128,17 @@ parse_options() { + I4);& + I5) IS_AWG_ON=1;; esac + else + case "$key" in @@ -81,44 +79,105 @@ fi WG_CONFIG+="$line"$'\n' done < "$CONFIG_FILE" -@@ -129,19 +154,22 @@ add_if() { +@@ -136,20 +159,24 @@ add_if() { add_if() { local ret rc - local cmd="ifconfig wg create name "$INTERFACE"" -- if [[ $IS_ASESCURITY_ON == 1 ]]; then -+ local cmd="ifconfig amn create name "$INTERFACE"" -+ if [[ $USERLAND == 1 ]]; then - cmd="amneziawg-go "$INTERFACE""; - fi +- if [[ $IS_AWG_ON == 1 ]]; then +- cmd="amneziawg-go "$INTERFACE""; +- fi - if ret="$(cmd $cmd 2>&1 >/dev/null)"; then - return 0 -+ if [ -n "$DESCRIPTION" ]; then -+ ret="$(cmd $cmd description "$DESCRIPTION" 2>&1 >/dev/null)" && return 0 -+ else -+ -+ ret="$(cmd $cmd 2>&1 >/dev/null)" && return 0 - fi - rc=$? - if [[ $ret == *"ifconfig: ioctl SIOCSIFNAME (set name): File exists"* ]]; then - echo "$ret" >&3 - return $rc - fi +- fi +- rc=$? +- if [[ $ret == *"ifconfig: ioctl SIOCSIFNAME (set name): File exists"* ]]; then +- echo "$ret" >&3 +- return $rc +- fi - echo "[!] Missing WireGuard kernel support ($ret). Falling back to slow userspace implementation." >&3 ++ local cmd="ifconfig amn create name "$INTERFACE"" ++ if [[ $USERLAND == 0 ]]; then ++ if [ -n "$DESCRIPTION" ]; then ++ ret="$(cmd $cmd description "$DESCRIPTION" 2>&1 >/dev/null)" && return 0 ++ else ++ ret="$(cmd $cmd 2>&1 >/dev/null)" && return 0 ++ fi ++ rc=$? ++ if [[ $ret == *"ifconfig: ioctl SIOCSIFNAME (set name): File exists"* ]]; then ++ echo "$ret" >&3 ++ return $rc ++ fi ++ fi + echo "[!] Missing Amnezia kernel support ($ret). Falling back to slow userspace implementation." >&3 cmd "${WG_QUICK_USERSPACE_IMPLEMENTATION:-amneziawg-go}" "$INTERFACE" ++ if [ -n "$DESCRIPTION" ]; then ++ cmd ifconfig $INTERFACE description "$DESCRIPTION" ++ fi + } + + del_routes() { +@@ -181,9 +208,9 @@ del_if() { + if [[ -S /var/run/amneziawg/$INTERFACE.sock ]]; then + cmd rm -f "/var/run/amneziawg/$INTERFACE.sock" + else +- cmd ifconfig "$INTERFACE" destroy ++ cmd ifconfig -n "$INTERFACE" destroy + fi +- while ifconfig "$INTERFACE" >/dev/null 2>&1; do ++ while ifconfig -n "$INTERFACE" >/dev/null 2>&1; do + # HACK: it would be nice to `route monitor` here and wait for RTM_IFANNOUNCE + # but it turns out that the announcement is made before the interface + # disappears so we sometimes get a hang. So, we're instead left with polling +@@ -193,21 +220,21 @@ up_if() { } -@@ -209,7 +237,7 @@ set_mtu() { + up_if() { +- cmd ifconfig "$INTERFACE" up ++ cmd ifconfig -n "$INTERFACE" up + } + + add_addr() { + if [[ $1 == *:* ]]; then +- cmd ifconfig "$INTERFACE" inet6 "$1" alias ++ cmd ifconfig -n "$INTERFACE" inet6 "$1" alias + else +- cmd ifconfig "$INTERFACE" inet "$1" alias ++ cmd ifconfig -n "$INTERFACE" inet "$1" alias + fi + } + + set_mtu() { + local mtu=0 endpoint output family + if [[ -n $MTU ]]; then +- cmd ifconfig "$INTERFACE" mtu "$MTU" ++ cmd ifconfig -n "$INTERFACE" mtu "$MTU" + return + fi + while read -r _ endpoint; do +@@ -215,14 +242,16 @@ set_mtu() { + family=inet [[ ${BASH_REMATCH[1]} == *:* ]] && family=inet6 output="$(route -n get "-$family" "${BASH_REMATCH[1]}" || true)" - [[ $output =~ interface:\ ([^ ]+)$'\n' && $(ifconfig "${BASH_REMATCH[1]}") =~ mtu\ ([0-9]+) && ${BASH_REMATCH[1]} -gt $mtu ]] && mtu="${BASH_REMATCH[1]}" +- [[ $output =~ interface:\ ([^ ]+)$'\n' && $(ifconfig "${BASH_REMATCH[1]}") =~ mtu\ ([0-9]+) && ${BASH_REMATCH[1]} -gt $mtu ]] && mtu="${BASH_REMATCH[1]}" - done < <(wg show "$INTERFACE" endpoints) ++ [[ $output =~ interface:\ ([^ ]+)$'\n' && $(ifconfig -n "${BASH_REMATCH[1]}") =~ mtu\ ([0-9]+) && ${BASH_REMATCH[1]} -gt $mtu ]] && mtu="${BASH_REMATCH[1]}" + done < <(awg show "$INTERFACE" endpoints) if [[ $mtu -eq 0 ]]; then read -r output < <(route -n get default || true) || true - [[ $output =~ interface:\ ([^ ]+)$'\n' && $(ifconfig "${BASH_REMATCH[1]}") =~ mtu\ ([0-9]+) && ${BASH_REMATCH[1]} -gt $mtu ]] && mtu="${BASH_REMATCH[1]}" -@@ -242,7 +270,7 @@ collect_endpoints() { +- [[ $output =~ interface:\ ([^ ]+)$'\n' && $(ifconfig "${BASH_REMATCH[1]}") =~ mtu\ ([0-9]+) && ${BASH_REMATCH[1]} -gt $mtu ]] && mtu="${BASH_REMATCH[1]}" ++ [[ $output =~ interface:\ ([^ ]+)$'\n' && $(ifconfig -n "${BASH_REMATCH[1]}") =~ mtu\ ([0-9]+) && ${BASH_REMATCH[1]} -gt $mtu ]] && mtu="${BASH_REMATCH[1]}" + fi +- [[ $mtu -gt 0 ]] || mtu=1500 +- cmd ifconfig "$INTERFACE" mtu $(( mtu - 80 )) ++ if [[ $mtu -gt 0 && $mtu -lt 1420 ]]; then ++ # setup MTU only if discovered MTU is less then default ++ cmd ifconfig -n "$INTERFACE" mtu $(( mtu - 80 )) || true ++ fi + } + + +@@ -249,7 +278,7 @@ collect_endpoints() { while read -r _ endpoint; do [[ $endpoint =~ ^\[?([a-z0-9:.]+)\]?:[0-9]+$ ]] || continue ENDPOINTS+=( "${BASH_REMATCH[1]}" ) @@ -127,7 +186,7 @@ } set_endpoint_direct_route() { -@@ -297,18 +325,25 @@ monitor_daemon() { +@@ -304,25 +333,108 @@ monitor_daemon() { } monitor_daemon() { @@ -153,10 +212,11 @@ # endpoints change. while read -u 19 -r event; do - [[ $event == RTM_* ]] || continue - ifconfig "$INTERFACE" >/dev/null 2>&1 || break +- ifconfig "$INTERFACE" >/dev/null 2>&1 || break ++ ifconfig -n "$INTERFACE" >/dev/null 2>&1 || break [[ $AUTO_ROUTE4 -eq 1 || $AUTO_ROUTE6 -eq 1 ]] && set_endpoint_direct_route # TODO: set the mtu as well, but only if up -@@ -316,6 +351,82 @@ monitor_daemon() { + done kill $pid) & disown } @@ -239,7 +299,7 @@ HAVE_SET_DNS=0 set_dns() { [[ ${#DNS[@]} -gt 0 ]] || return 0 -@@ -354,7 +465,7 @@ set_config() { +@@ -361,7 +473,7 @@ set_config() { } set_config() { @@ -248,7 +308,7 @@ } save_config() { -@@ -386,7 +497,7 @@ save_config() { +@@ -393,7 +505,7 @@ save_config() { done old_umask="$(umask)" umask 077 @@ -257,7 +317,7 @@ trap 'rm -f "$CONFIG_FILE.tmp"; clean_temp; exit' INT TERM EXIT echo "${current_config/\[Interface\]$'\n'/$new_config}" > "$CONFIG_FILE.tmp" || die "Could not write configuration file" sync "$CONFIG_FILE.tmp" -@@ -412,7 +523,7 @@ cmd_usage() { +@@ -419,7 +531,7 @@ cmd_usage() { followed by \`.conf'. Otherwise, INTERFACE is an interface name, with configuration found at: ${CONFIG_SEARCH_PATHS[@]/%//INTERFACE.conf}. @@ -266,7 +326,7 @@ of the following additions to the [Interface] section, which are handled by $PROGRAM: -@@ -429,10 +540,24 @@ cmd_usage() { +@@ -436,13 +548,27 @@ cmd_usage() { - SaveConfig: if set to \`true', the configuration is saved from the current state of the interface upon shutdown. @@ -291,8 +351,12 @@ + cmd_up() { local i - [[ -z $(ifconfig "$INTERFACE" 2>/dev/null) ]] || die "\`$INTERFACE' already exists" -@@ -446,26 +571,31 @@ cmd_up() { +- [[ -z $(ifconfig "$INTERFACE" 2>/dev/null) ]] || die "\`$INTERFACE' already exists" ++ [[ -z $(ifconfig -n "$INTERFACE" 2>/dev/null) ]] || die "\`$INTERFACE' already exists" + trap 'del_if; del_routes; clean_temp; exit' INT TERM EXIT + add_if + execute_hooks "${PRE_UP[@]}" +@@ -453,26 +579,31 @@ cmd_up() { set_mtu up_if set_dns @@ -328,7 +392,7 @@ save_config } -@@ -473,6 +603,10 @@ cmd_strip() { +@@ -480,6 +611,10 @@ cmd_strip() { echo "$WG_CONFIG" } @@ -339,7 +403,7 @@ # ~~ function override insertion point ~~ make_temp -@@ -496,6 +630,18 @@ elif [[ $# -eq 2 && $1 == strip ]]; then +@@ -503,6 +638,18 @@ elif [[ $# -eq 2 && $1 == strip ]]; then auto_su parse_options "$2" cmd_strip diff --git a/net/dataplaneapi/Makefile b/net/dataplaneapi/Makefile index 85020c58295c..16225927e7da 100644 --- a/net/dataplaneapi/Makefile +++ b/net/dataplaneapi/Makefile @@ -1,12 +1,11 @@ PORTNAME= dataplaneapi DISTVERSIONPREFIX= v -DISTVERSION= 3.2.5 -PORTREVISION= 2 +DISTVERSION= 3.2.7 CATEGORIES= net MAINTAINER= dtxdf@FreeBSD.org COMMENT= HAProxy Data Plane API -WWW= https://github.com/haproxytech/${PORTNAME} +WWW= https://github.com/haproxytech/dataplaneapi LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE @@ -35,7 +34,7 @@ OPTIONS_DEFINE= DOCS # Run 'git checkout ${DISTVERSIONPREFIX}${DISTVERSION} && git rev-parse --short HEAD' # in the Data Plane API repository to get the value of GITID. -GITID= daff5f5e +GITID= 3f1e3ef3 BUILD_DATE= $$(date -u "+%Y-%m-%dT%H:%M:%SZ") diff --git a/net/dataplaneapi/distinfo b/net/dataplaneapi/distinfo index abb86f7f3105..2856221a8e21 100644 --- a/net/dataplaneapi/distinfo +++ b/net/dataplaneapi/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1760648211 -SHA256 (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.2.5_GH0/go.mod) = 0d14e043e370d3f9112165b3ba948d9cf857d3d8dbe1a569a744e28082b88284 -SIZE (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.2.5_GH0/go.mod) = 4957 -SHA256 (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.2.5_GH0/haproxytech-dataplaneapi-v3.2.5_GH0.tar.gz) = ea532a97355c81f9faa12b56fb07ff9caead520bfc6774cf82ab1c8c25c269c4 -SIZE (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.2.5_GH0/haproxytech-dataplaneapi-v3.2.5_GH0.tar.gz) = 1086637 +TIMESTAMP = 1766094257 +SHA256 (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.2.7_GH0/go.mod) = 2afb65bfd9de920e067ad61a7d567211d19aa98829a1b6d8553dab782d3be8f9 +SIZE (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.2.7_GH0/go.mod) = 4875 +SHA256 (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.2.7_GH0/haproxytech-dataplaneapi-v3.2.7_GH0.tar.gz) = cf66af10a46f47cdcf326da72932112afca96c0d7133b1a8060cfa591d595ea1 +SIZE (go/net_dataplaneapi/haproxytech-dataplaneapi-v3.2.7_GH0/haproxytech-dataplaneapi-v3.2.7_GH0.tar.gz) = 1086874 diff --git a/net/py-pystun3/Makefile b/net/py-pystun3/Makefile index 50db9a9151e1..0cb74f3c88b2 100644 --- a/net/py-pystun3/Makefile +++ b/net/py-pystun3/Makefile @@ -1,5 +1,5 @@ PORTNAME= pystun3 -PORTVERSION= 1.0.0 +PORTVERSION= 2.0.0 CATEGORIES= net python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-pystun3/distinfo b/net/py-pystun3/distinfo index df59a907c24f..5ccba7b82a35 100644 --- a/net/py-pystun3/distinfo +++ b/net/py-pystun3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1764264918 -SHA256 (pystun3-1.0.0.tar.gz) = abafa1d957741df4bcc4cd2298a423db5831fec2600a62719210ea115dddc8f9 -SIZE (pystun3-1.0.0.tar.gz) = 5966 +TIMESTAMP = 1766093775 +SHA256 (pystun3-2.0.0.tar.gz) = 99abfe83df69fd0f6278e9be1456827fafb9e4e25efed8074d15b754ac9b1fee +SIZE (pystun3-2.0.0.tar.gz) = 6717 diff --git a/net/py-qt6-networkauth/Makefile b/net/py-qt6-networkauth/Makefile index a12de94a4bde..7a486a550fce 100644 --- a/net/py-qt6-networkauth/Makefile +++ b/net/py-qt6-networkauth/Makefile @@ -1,6 +1,5 @@ PORTNAME= networkauth DISTVERSION= ${PYQTNETWORKAUTH_VERSION} -PORTREVISION= 1 CATEGORIES= net devel python MASTER_SITES= ${MASTER_SITES_PYQTNETWORKAUTH} PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- diff --git a/net/py-qt6-networkauth/distinfo b/net/py-qt6-networkauth/distinfo index 528e5d14955c..095986c5166d 100644 --- a/net/py-qt6-networkauth/distinfo +++ b/net/py-qt6-networkauth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743732662 -SHA256 (pyqt6_networkauth-6.9.0.tar.gz) = 9acb6e97bd54584bbaeac2aabc40ec17a79d868f7da37a163c7bd4b7a8f04b09 -SIZE (pyqt6_networkauth-6.9.0.tar.gz) = 21591 +TIMESTAMP = 1761269265 +SHA256 (pyqt6_networkauth-6.10.0.tar.gz) = 94c9504613c8ff68f08eb1ff6ba7804c277b56e335baa6e44c1eba5279961f7b +SIZE (pyqt6_networkauth-6.10.0.tar.gz) = 23658 diff --git a/net/py-qt6-networkauth/pkg-plist b/net/py-qt6-networkauth/pkg-plist index b7e7bd79b5f6..9ed021483d8f 100644 --- a/net/py-qt6-networkauth/pkg-plist +++ b/net/py-qt6-networkauth/pkg-plist @@ -15,3 +15,4 @@ %%PYTHON_SITELIBDIR%%/pyqt6_networkauth-%%PYQTNETWORKAUTH_VERSION%%.dist-info/INSTALLER %%PYTHON_SITELIBDIR%%/pyqt6_networkauth-%%PYQTNETWORKAUTH_VERSION%%.dist-info/METADATA %%PYTHON_SITELIBDIR%%/pyqt6_networkauth-%%PYQTNETWORKAUTH_VERSION%%.dist-info/RECORD +%%PYTHON_SITELIBDIR%%/pyqt6_networkauth-%%PYQTNETWORKAUTH_VERSION%%.dist-info/licenses/LICENSE diff --git a/net/qt6-coap/distinfo b/net/qt6-coap/distinfo index 501eb986e5c6..5945274a75f6 100644 --- a/net/qt6-coap/distinfo +++ b/net/qt6-coap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759303887 -SHA256 (KDE/Qt/6.9.3/qt-qtcoap-v6.9.3_GH0.tar.gz) = c795e55428ef4d45c50ecb1c9eaba994d258b213bd6405ae3c9903c0724cf07b -SIZE (KDE/Qt/6.9.3/qt-qtcoap-v6.9.3_GH0.tar.gz) = 186772 +TIMESTAMP = 1763965091 +SHA256 (KDE/Qt/6.10.1/qt-qtcoap-v6.10.1_GH0.tar.gz) = de077e00ef5a938ee3e86e093ca860e564dcdd00c13f62a8df98515a6a5cf782 +SIZE (KDE/Qt/6.10.1/qt-qtcoap-v6.10.1_GH0.tar.gz) = 186784 diff --git a/net/qt6-coap/pkg-plist b/net/qt6-coap/pkg-plist index 722e45171c48..c9c6228cf9d8 100644 --- a/net/qt6-coap/pkg-plist +++ b/net/qt6-coap/pkg-plist @@ -60,7 +60,7 @@ lib/cmake/Qt6CoapPrivate/Qt6CoapPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6Coap.so %%QT_LIBDIR%%/libQt6Coap.so.6 %%QT_LIBDIR%%/libQt6Coap.so.%%FULLVER%% -%%QT_LIBDIR%%/metatypes/qt6coap_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6coap_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_coap.pri %%QT_MKSPECDIR%%/modules/qt_lib_coap_private.pri %%QT_SBOMDIR%%/qtcoap-%%FULLVER%%.spdx diff --git a/net/qt6-mqtt/distinfo b/net/qt6-mqtt/distinfo index faa628afd19d..f3b08838aea3 100644 --- a/net/qt6-mqtt/distinfo +++ b/net/qt6-mqtt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759303895 -SHA256 (KDE/Qt/6.9.3/qt-qtmqtt-v6.9.3_GH0.tar.gz) = 4fc80a4a0cbe6c696eed7c5c0209819470a0bcc48a2ceaec71e5572ce7be4b8b -SIZE (KDE/Qt/6.9.3/qt-qtmqtt-v6.9.3_GH0.tar.gz) = 210408 +TIMESTAMP = 1763965205 +SHA256 (KDE/Qt/6.10.1/qt-qtmqtt-v6.10.1_GH0.tar.gz) = 4c0f246daa2009c8b3b9fb0172970fbb6452a0c2846ed5fe4de87ed4b884f9f9 +SIZE (KDE/Qt/6.10.1/qt-qtmqtt-v6.10.1_GH0.tar.gz) = 220879 diff --git a/net/qt6-mqtt/pkg-plist b/net/qt6-mqtt/pkg-plist index da87b95b6fd4..9e152209754b 100644 --- a/net/qt6-mqtt/pkg-plist +++ b/net/qt6-mqtt/pkg-plist @@ -59,7 +59,7 @@ lib/cmake/Qt6MqttPrivate/Qt6MqttPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6Mqtt.so %%QT_LIBDIR%%/libQt6Mqtt.so.6 %%QT_LIBDIR%%/libQt6Mqtt.so.%%FULLVER%% -%%QT_LIBDIR%%/metatypes/qt6mqtt_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6mqtt_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_mqtt.pri %%QT_MKSPECDIR%%/modules/qt_lib_mqtt_private.pri %%QT_SBOMDIR%%/qtmqtt-%%FULLVER%%.spdx diff --git a/net/qt6-networkauth/distinfo b/net/qt6-networkauth/distinfo index 58d68541f637..8d256baf243c 100644 --- a/net/qt6-networkauth/distinfo +++ b/net/qt6-networkauth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759303905 -SHA256 (KDE/Qt/6.9.3/qtnetworkauth-everywhere-src-6.9.3.tar.xz) = 67d9dc47ed133e22aa78bedef53963bee3761318e5e74dc98f82ad9814cc7ec7 -SIZE (KDE/Qt/6.9.3/qtnetworkauth-everywhere-src-6.9.3.tar.xz) = 432616 +TIMESTAMP = 1763964338 +SHA256 (KDE/Qt/6.10.1/qtnetworkauth-everywhere-src-6.10.1.tar.xz) = 1435eb598172d888d7d1795a297c7623f7d8f3afe010c8f40c5aa100abcf380d +SIZE (KDE/Qt/6.10.1/qtnetworkauth-everywhere-src-6.10.1.tar.xz) = 432496 diff --git a/net/qt6-networkauth/pkg-plist b/net/qt6-networkauth/pkg-plist index 73b440f7f18e..71a5152809f3 100644 --- a/net/qt6-networkauth/pkg-plist +++ b/net/qt6-networkauth/pkg-plist @@ -56,7 +56,7 @@ lib/cmake/Qt6NetworkAuthPrivate/Qt6NetworkAuthPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6NetworkAuth.so %%QT_LIBDIR%%/libQt6NetworkAuth.so.6 %%QT_LIBDIR%%/libQt6NetworkAuth.so.%%FULLVER%% -%%QT_LIBDIR%%/metatypes/qt6networkauth_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6networkauth_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_networkauth.pri %%QT_MKSPECDIR%%/modules/qt_lib_networkauth_private.pri %%QT_SBOMDIR%%/qtnetworkauth-%%FULLVER%%.spdx diff --git a/net/samba420/Makefile b/net/samba420/Makefile index 487e6fb0e241..36db6c71fe15 100644 --- a/net/samba420/Makefile +++ b/net/samba420/Makefile @@ -1,6 +1,5 @@ PORTNAME= ${SAMBA4_BASENAME}420 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 11 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -12,6 +11,8 @@ WWW= https://gitlab.com/samba-freebsd/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING +DEPRECATED= Discontinued upstream; transition to a supported versions of Samba (refer to https://wiki.samba.org/index.php/Samba_Release_Planning) + USES= cpe CONFLICTS_INSTALL?= samba4* @@ -52,7 +53,7 @@ EXTRA_PATCHES= \ SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.20.7 +SAMBA4_VERSION= 4.20.8 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} diff --git a/net/samba420/distinfo b/net/samba420/distinfo index e6dc8bc2d49f..9858f8d90d7f 100644 --- a/net/samba420/distinfo +++ b/net/samba420/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737565689 -SHA256 (samba-4.20.7.tar.gz) = 5afe8b66e612ab1c7e57c6146adfe98ec3ea9d40dee2962a2076a3d6d6973b78 -SIZE (samba-4.20.7.tar.gz) = 42523056 +TIMESTAMP = 1766066171 +SHA256 (samba-4.20.8.tar.gz) = 75be0e8d31f45013e9b260fe7cf304a36d2d8128391914772577215ec173a807 +SIZE (samba-4.20.8.tar.gz) = 42531989 diff --git a/net/samba420/files/patch-python_samba_tdb__util.py b/net/samba420/files/patch-python_samba_tdb__util.py deleted file mode 100644 index ffbe35f0016b..000000000000 --- a/net/samba420/files/patch-python_samba_tdb__util.py +++ /dev/null @@ -1,15 +0,0 @@ ---- python/samba/tdb_util.py.orig 2025-02-17 11:38:24.136379000 +0100 -+++ python/samba/tdb_util.py 2025-02-17 11:38:44.171612000 +0100 -@@ -37,9 +37,10 @@ - raise FileNotFoundError(2, "could not find tdbbackup tool: " - "is tdb-tools installed?") - -- tdbbackup_cmd = [toolpath, "-s", ".copy.tdb", file1] - if readonly: -- tdbbackup_cmd.append("-r") -+ tdbbackup_cmd = [toolpath, "-r", "-s", ".copy.tdb", file1] -+ else: -+ tdbbackup_cmd = [toolpath, "-s", ".copy.tdb", file1] - - status = subprocess.check_call(tdbbackup_cmd, close_fds=True, shell=False) - diff --git a/net/samba420/pkg-plist.python b/net/samba420/pkg-plist.python index 2ee4e7430379..4eba1ad08c42 100644 --- a/net/samba420/pkg-plist.python +++ b/net/samba420/pkg-plist.python @@ -432,6 +432,7 @@ lib/samba4/private/libsamba-python%%PYTHON_TAG%%-private-samba.so %%PYTHON_SITELIBDIR%%/samba/tests/messaging.py %%PYTHON_SITELIBDIR%%/samba/tests/ndr/gkdi.py %%PYTHON_SITELIBDIR%%/samba/tests/ndr/gmsa.py +%%PYTHON_SITELIBDIR%%/samba/tests/ndr/sd.py %%PYTHON_SITELIBDIR%%/samba/tests/ndr/wbint.py %%PYTHON_SITELIBDIR%%/samba/tests/net_join.py %%PYTHON_SITELIBDIR%%/samba/tests/net_join_no_spnego.py diff --git a/net/smb4k/Makefile b/net/smb4k/Makefile index 33479bf81657..40a9f2ee0b18 100644 --- a/net/smb4k/Makefile +++ b/net/smb4k/Makefile @@ -1,6 +1,5 @@ PORTNAME= smb4k -DISTVERSION= 4.0.4 -PORTREVISION= 1 +DISTVERSION= 4.0.5 CATEGORIES= net kde MASTER_SITES= SF/${PORTNAME}/${DISTVERSION} @@ -18,11 +17,11 @@ RUN_DEPENDS= rsync:net/rsync USES= cmake compiler:c++17-lang cpe gettext-tools gl kde:6 qt:6 \ samba tar:xz xorg -CPE_VENDOR= ${PORTNAME}_project +CPE_VENDOR= smb4k_project USE_GL= gl opengl # GLX -USE_KDE= auth colorscheme completion config configwidgets coreaddons \ - crash dbusaddons dnssd guiaddons i18n iconthemes jobwidgets kirigami2 \ - kio libplasma notifications service solid statusnotifieritem \ +USE_KDE= auth completion config configwidgets coreaddons crash \ + dbusaddons dnssd i18n iconthemes jobwidgets kio kirigami2 \ + libplasma notifications solid statusnotifieritem \ wallet widgetsaddons windowsystem xmlgui \ doctools:build ecm:build USE_QT= base declarative diff --git a/net/smb4k/distinfo b/net/smb4k/distinfo index 087f04c9d49d..5d67e3308a00 100644 --- a/net/smb4k/distinfo +++ b/net/smb4k/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756392828 -SHA256 (smb4k-4.0.4.tar.xz) = b7c3f69c80cea5dacaf667e96f68f4c4d99dd6f8eef2b90d7a9afea82fe2ca99 -SIZE (smb4k-4.0.4.tar.xz) = 4853384 +TIMESTAMP = 1766060947 +SHA256 (smb4k-4.0.5.tar.xz) = 7172cfb48b073ceac6c712066233be640938e935e27057e129882f935a81b9e9 +SIZE (smb4k-4.0.5.tar.xz) = 4880008 diff --git a/net/smb4k/pkg-plist b/net/smb4k/pkg-plist index fddf30b8aa60..40106c520a3d 100644 --- a/net/smb4k/pkg-plist +++ b/net/smb4k/pkg-plist @@ -69,6 +69,8 @@ share/doc/HTML/nl/smb4k/index.cache.bz2 share/doc/HTML/nl/smb4k/index.docbook share/doc/HTML/pt_BR/smb4k/index.cache.bz2 share/doc/HTML/pt_BR/smb4k/index.docbook +share/doc/HTML/ru/smb4k/index.cache.bz2 +share/doc/HTML/ru/smb4k/index.docbook share/doc/HTML/sv/smb4k/index.cache.bz2 share/doc/HTML/sv/smb4k/index.docbook share/doc/HTML/uk/smb4k/index.cache.bz2 |