diff options
Diffstat (limited to 'net')
38 files changed, 440 insertions, 208 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/google-cloud-sdk/Makefile b/net/google-cloud-sdk/Makefile index 967ac4aa4c03..ffac8c1d3e97 100644 --- a/net/google-cloud-sdk/Makefile +++ b/net/google-cloud-sdk/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-cloud-sdk -DISTVERSION= 549.0.1 +DISTVERSION= 550.0.0 CATEGORIES= net MASTER_SITES= https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/ DISTNAME= google-cloud-sdk-${PORTVERSION}-linux-x86_64 diff --git a/net/google-cloud-sdk/distinfo b/net/google-cloud-sdk/distinfo index 49d2326c34d8..def75711e0c7 100644 --- a/net/google-cloud-sdk/distinfo +++ b/net/google-cloud-sdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1765638783 -SHA256 (google-cloud-sdk-549.0.1-linux-x86_64.tar.gz) = 0223233b3cfdf9065ad8e061e0fe9e0ac66e7a9871f7b5dfe23e789b1f6b22c5 -SIZE (google-cloud-sdk-549.0.1-linux-x86_64.tar.gz) = 202958423 +TIMESTAMP = 1765962094 +SHA256 (google-cloud-sdk-550.0.0-linux-x86_64.tar.gz) = a7bce5e6e156ffe4d8c2f4ad5136886f128138aa319dced812e91999699d459d +SIZE (google-cloud-sdk-550.0.0-linux-x86_64.tar.gz) = 203170056 diff --git a/net/mcast-bridge/Makefile b/net/mcast-bridge/Makefile index 24b2925a5bae..a81bf39c8e39 100644 --- a/net/mcast-bridge/Makefile +++ b/net/mcast-bridge/Makefile @@ -1,6 +1,6 @@ PORTNAME= mcast-bridge DISTVERSIONPREFIX= v -DISTVERSION= 1.2.0 +DISTVERSION= 1.3.0 CATEGORIES= net MAINTAINER= dennypage@me.com diff --git a/net/mcast-bridge/distinfo b/net/mcast-bridge/distinfo index 343b49a711d5..a8fe0835729b 100644 --- a/net/mcast-bridge/distinfo +++ b/net/mcast-bridge/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1764867726 -SHA256 (dennypage-mcast-bridge-v1.2.0_GH0.tar.gz) = 0575d7b20bf5e84b93ba0ad3985d4a699c4c660ddc047f3284518a54d996a290 -SIZE (dennypage-mcast-bridge-v1.2.0_GH0.tar.gz) = 45252 +TIMESTAMP = 1765913188 +SHA256 (dennypage-mcast-bridge-v1.3.0_GH0.tar.gz) = e113c9dea3c7c55777a7e39900192c0473a3b8d55dc412cdfb0d155c6beb3151 +SIZE (dennypage-mcast-bridge-v1.3.0_GH0.tar.gz) = 47663 diff --git a/net/mdns-bridge/Makefile b/net/mdns-bridge/Makefile index ce31b4dd60f2..a245ca9eace9 100644 --- a/net/mdns-bridge/Makefile +++ b/net/mdns-bridge/Makefile @@ -1,6 +1,6 @@ PORTNAME= mdns-bridge DISTVERSIONPREFIX= v -DISTVERSION= 2.3.0 +DISTVERSION= 2.4.0 CATEGORIES= net MAINTAINER= dennypage@me.com diff --git a/net/mdns-bridge/distinfo b/net/mdns-bridge/distinfo index bd2b97d9f465..d1c53d0d9053 100644 --- a/net/mdns-bridge/distinfo +++ b/net/mdns-bridge/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1764871970 -SHA256 (dennypage-mdns-bridge-v2.3.0_GH0.tar.gz) = 92f53b2d2020d4e8757adda2d0f234aa875416e085494c6724fc39e6a55e9b4f -SIZE (dennypage-mdns-bridge-v2.3.0_GH0.tar.gz) = 26855 +TIMESTAMP = 1765994950 +SHA256 (dennypage-mdns-bridge-v2.4.0_GH0.tar.gz) = e3276aa4689c6f342ff5bf190804be1a29804384302c88255a2e710197e76e20 +SIZE (dennypage-mdns-bridge-v2.4.0_GH0.tar.gz) = 27010 diff --git a/net/onedrivegui/Makefile b/net/onedrivegui/Makefile index a86ce56e977b..5facdb54ffb7 100644 --- a/net/onedrivegui/Makefile +++ b/net/onedrivegui/Makefile @@ -1,5 +1,5 @@ PORTNAME= onedrivegui -DISTVERSION= 1.2.2 +DISTVERSION= 1.3.0 DISTVERSIONPREFIX= v CATEGORIES= net python diff --git a/net/onedrivegui/distinfo b/net/onedrivegui/distinfo index 4c67e99ee9c8..2ccd5c80c2c9 100644 --- a/net/onedrivegui/distinfo +++ b/net/onedrivegui/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759115543 -SHA256 (bpozdena-OneDriveGUI-v1.2.2_GH0.tar.gz) = c98fe134fae3b58188b2408b4733520335d5a1682cd7d9709b7f34ad7cf05758 -SIZE (bpozdena-OneDriveGUI-v1.2.2_GH0.tar.gz) = 115872 +TIMESTAMP = 1765945283 +SHA256 (bpozdena-OneDriveGUI-v1.3.0_GH0.tar.gz) = be325a873055269fd31856b921b7326de0013486d5ea0e0b40e424f220bf35ee +SIZE (bpozdena-OneDriveGUI-v1.3.0_GH0.tar.gz) = 125114 diff --git a/net/onedrivegui/pkg-plist b/net/onedrivegui/pkg-plist index 0f2a60537438..13d9e90a188f 100644 --- a/net/onedrivegui/pkg-plist +++ b/net/onedrivegui/pkg-plist @@ -16,12 +16,12 @@ share/icons/hicolor/48x48/apps/onedrivegui.png %%DATADIR%%/resources/images/close-filled.png %%DATADIR%%/resources/images/folder.png %%DATADIR%%/resources/images/gear.png -%%DATADIR%%/resources/images/icons8-cloud-cross-40_2.png -%%DATADIR%%/resources/images/icons8-cloud-done-40_2.png -%%DATADIR%%/resources/images/icons8-cloud-sync-40_2.png +%%DATADIR%%/resources/images/icons8-cloud-80.png +%%DATADIR%%/resources/images/icons8-cloud-done-80.png +%%DATADIR%%/resources/images/icons8-cloud-error-80.png +%%DATADIR%%/resources/images/icons8-cloud-stop-80.png +%%DATADIR%%/resources/images/icons8-cloud-sync-80.png %%DATADIR%%/resources/images/icons8-clouds-48.ico -%%DATADIR%%/resources/images/icons8-clouds-48.png -%%DATADIR%%/resources/images/icons8-clouds-80-dark-edge.png %%DATADIR%%/resources/images/icons8-green-circle-48.png %%DATADIR%%/resources/images/icons8-red-circle-48.png %%DATADIR%%/resources/images/menu.png @@ -60,6 +60,7 @@ share/icons/hicolor/48x48/apps/onedrivegui.png %%DATADIR%%/ui/ui_profile_settings_page.py %%DATADIR%%/ui/ui_profile_settings_window.py %%DATADIR%%/utils/__init__.py +%%DATADIR%%/utils/autostart.py %%DATADIR%%/utils/utils.py %%DATADIR%%/wizard.py %%DATADIR%%/workers.py 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 diff --git a/net/spoofdpi/Makefile b/net/spoofdpi/Makefile index 2c9da0e06d27..e6b31c9949c8 100644 --- a/net/spoofdpi/Makefile +++ b/net/spoofdpi/Makefile @@ -1,7 +1,6 @@ PORTNAME= spoofdpi DISTVERSIONPREFIX= v -DISTVERSION= 1.1.3 -PORTREVISION= 1 +DISTVERSION= 1.2.0 CATEGORIES= net MAINTAINER= nxjoseph@protonmail.com @@ -18,25 +17,32 @@ GH_ACCOUNT= xvzc GH_PROJECT= SpoofDPI GH_TUPLE= BurntSushi:toml:v1.5.0:burntsushi_toml/vendor/github.com/BurntSushi/toml \ davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ + gabriel-vasile:mimetype:v1.4.10:gabriel_vasile_mimetype/vendor/github.com/gabriel-vasile/mimetype \ go-check:check:41f04d3bba15:go_check_check/vendor/gopkg.in/check.v1 \ + go-playground:locales:v0.14.1:go_playground_locales/vendor/github.com/go-playground/locales \ + go-playground:universal-translator:v0.18.1:go_playground_universal_translator/vendor/github.com/go-playground/universal-translator \ + go-playground:validator:v10.28.0:go_playground_validator_v10/vendor/github.com/go-playground/validator/v10 \ go-yaml:yaml:v3.0.1:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \ - golang:mod:v0.18.0:golang_mod/vendor/golang.org/x/mod \ - golang:net:v0.38.0:golang_net/vendor/golang.org/x/net \ - golang:sync:v0.12.0:golang_sync/vendor/golang.org/x/sync \ - golang:sys:v0.31.0:golang_sys/vendor/golang.org/x/sys \ - golang:tools:v0.22.0:golang_tools/vendor/golang.org/x/tools \ + golang:crypto:v0.42.0:golang_crypto/vendor/golang.org/x/crypto \ + golang:mod:v0.27.0:golang_mod/vendor/golang.org/x/mod \ + golang:net:v0.43.0:golang_net/vendor/golang.org/x/net \ + golang:sync:v0.17.0:golang_sync/vendor/golang.org/x/sync \ + golang:sys:v0.36.0:golang_sys/vendor/golang.org/x/sys \ + golang:text:v0.29.0:golang_text/vendor/golang.org/x/text \ + golang:tools:v0.36.0:golang_tools/vendor/golang.org/x/tools \ google:gopacket:v1.1.19:google_gopacket/vendor/github.com/google/gopacket \ jackpal:gateway:v1.1.1:jackpal_gateway/vendor/github.com/jackpal/gateway \ kr:pretty:v0.1.0:kr_pretty/vendor/github.com/kr/pretty \ + leodido:go-urn:v1.4.0:leodido_go_urn/vendor/github.com/leodido/go-urn \ mattn:go-colorable:v0.1.13:mattn_go_colorable/vendor/github.com/mattn/go-colorable \ mattn:go-isatty:v0.0.19:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ - mattn:go-runewidth:v0.0.15:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ miekg:dns:v1.1.61:miekg_dns/vendor/github.com/miekg/dns \ pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ rs:zerolog:v1.33.0:rs_zerolog/vendor/github.com/rs/zerolog \ + samber:lo:v1.52.0:samber_lo/vendor/github.com/samber/lo \ stretchr:objx:v0.5.2:stretchr_objx/vendor/github.com/stretchr/objx \ stretchr:testify:v1.11.1:stretchr_testify/vendor/github.com/stretchr/testify \ - urfave:cli:v3.5.0:urfave_cli_v3/vendor/github.com/urfave/cli/v3 + urfave:cli:v3.6.1:urfave_cli_v3/vendor/github.com/urfave/cli/v3 USE_RC_SUBR= ${PORTNAME} GO_TARGET= ./cmd/${PORTNAME} @@ -54,7 +60,7 @@ PLIST_FILES= "@dir(${USERS},${GROUPS},0770) ${ETCDIR}" \ post-patch: ${CP} ${FILESDIR}/modules.txt ${WRKSRC}/vendor - @${REINPLACE_CMD} -e '220s#"etc"#"${ETCDIR}"#g' \ + @${REINPLACE_CMD} -e '342s#"etc"#"${ETCDIR}"#g' \ ${WRKSRC}/internal/config/cli.go post-install: diff --git a/net/spoofdpi/distinfo b/net/spoofdpi/distinfo index f7ef56ede616..92bef04d1cfd 100644 --- a/net/spoofdpi/distinfo +++ b/net/spoofdpi/distinfo @@ -1,45 +1,59 @@ -TIMESTAMP = 1764165145 -SHA256 (xvzc-SpoofDPI-v1.1.3_GH0.tar.gz) = 638630f41313583381f58158197fca8bb5b70686298ce0e9539866bde5929a60 -SIZE (xvzc-SpoofDPI-v1.1.3_GH0.tar.gz) = 1495404 +TIMESTAMP = 1765917720 +SHA256 (xvzc-SpoofDPI-v1.2.0_GH0.tar.gz) = 30dbc1b69ac1cedb10703a4dc6923c761bf845b7450e4600dd4aab293480ff05 +SIZE (xvzc-SpoofDPI-v1.2.0_GH0.tar.gz) = 1525752 SHA256 (BurntSushi-toml-v1.5.0_GH0.tar.gz) = 723ede1a61ca8311046f840020e485dec3ceb2e614d1a539cd154375bdd7b8cb SIZE (BurntSushi-toml-v1.5.0_GH0.tar.gz) = 118644 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 +SHA256 (gabriel-vasile-mimetype-v1.4.10_GH0.tar.gz) = cabca04c944919cbf146fd8e0bd444795e5942aeacc7252f910df27fb196f97b +SIZE (gabriel-vasile-mimetype-v1.4.10_GH0.tar.gz) = 826818 SHA256 (go-check-check-41f04d3bba15_GH0.tar.gz) = 2d5b1036909b241e44f0d6a7cfa936cf9f875efb4f0af077cd61585c6d0c0432 SIZE (go-check-check-41f04d3bba15_GH0.tar.gz) = 31614 +SHA256 (go-playground-locales-v0.14.1_GH0.tar.gz) = 29b29f1ff125e04a4d81a1f584d929ac8444663255cfdfa076a78339e23b4624 +SIZE (go-playground-locales-v0.14.1_GH0.tar.gz) = 4364173 +SHA256 (go-playground-universal-translator-v0.18.1_GH0.tar.gz) = 5e30d5afbaebbac71e95a826920465fadd7e0ce0fdb00ee8ce29451a09aaa4f2 +SIZE (go-playground-universal-translator-v0.18.1_GH0.tar.gz) = 37149 +SHA256 (go-playground-validator-v10.28.0_GH0.tar.gz) = 60a91e1db10695c626d2c247571e5ff810f7c28eb0a5851704d610dd77e4f247 +SIZE (go-playground-validator-v10.28.0_GH0.tar.gz) = 308643 SHA256 (go-yaml-yaml-v3.0.1_GH0.tar.gz) = cf05411540d3e6ef8f1fd88434b34f94cedaceb540329031d80e23b74540c4e5 SIZE (go-yaml-yaml-v3.0.1_GH0.tar.gz) = 91173 -SHA256 (golang-mod-v0.18.0_GH0.tar.gz) = 247133e4ef1a5863af267a81c2d3f2b6e6b439f250db4e1d7e16df46d37e4d71 -SIZE (golang-mod-v0.18.0_GH0.tar.gz) = 123147 -SHA256 (golang-net-v0.38.0_GH0.tar.gz) = f5f44a7625a2cee3ab3b38f8b08a1e058395faf44c29ae5e9a29af9e5f13c822 -SIZE (golang-net-v0.38.0_GH0.tar.gz) = 1502112 -SHA256 (golang-sync-v0.12.0_GH0.tar.gz) = 1032c8a956571df44cfb3c22122a7a3a771af53b1af5698b15e0143a8aacfde7 -SIZE (golang-sync-v0.12.0_GH0.tar.gz) = 17923 -SHA256 (golang-sys-v0.31.0_GH0.tar.gz) = de9873501d7e57afe8964b48d17392f82b5f1fd611915e6084523f9eb7506972 -SIZE (golang-sys-v0.31.0_GH0.tar.gz) = 1523040 -SHA256 (golang-tools-v0.22.0_GH0.tar.gz) = ae80020fa6994e1e112478eb4fc3aefcf9b21500c6e2ef5c5b3bdbb3f8943f13 -SIZE (golang-tools-v0.22.0_GH0.tar.gz) = 3853706 +SHA256 (golang-crypto-v0.42.0_GH0.tar.gz) = 4f0c623e94394b192af9afb187954b84af65cf0cb6aab852b14323c60506aa63 +SIZE (golang-crypto-v0.42.0_GH0.tar.gz) = 2156903 +SHA256 (golang-mod-v0.27.0_GH0.tar.gz) = dcd1ba21c7695b209830ccc4881e41d591ae65e6f1938575bd095640444afa19 +SIZE (golang-mod-v0.27.0_GH0.tar.gz) = 126553 +SHA256 (golang-net-v0.43.0_GH0.tar.gz) = 82b2d04549216f36a8c538a756010a90222e3942ab815596b86a62dbf766f2d2 +SIZE (golang-net-v0.43.0_GH0.tar.gz) = 1504428 +SHA256 (golang-sync-v0.17.0_GH0.tar.gz) = 43bb928dbf895ec51797c1ec8899dd8cbb57af34e8e0c4960609cb957af1aad7 +SIZE (golang-sync-v0.17.0_GH0.tar.gz) = 18189 +SHA256 (golang-sys-v0.36.0_GH0.tar.gz) = 5a4963997b147e64a840afb93c662bf4e320a3089d4540b7c0cbc982ad09bc2a +SIZE (golang-sys-v0.36.0_GH0.tar.gz) = 1530636 +SHA256 (golang-text-v0.29.0_GH0.tar.gz) = 9fbdba333af6a936b6f54a3c9f730f3e29ecece3f1a98285ff8dfee79225d371 +SIZE (golang-text-v0.29.0_GH0.tar.gz) = 8973069 +SHA256 (golang-tools-v0.36.0_GH0.tar.gz) = 299d2320e8f6adb5b53fb1a32e613b00cd2263237c2c4f8f3a68885040b2cfb9 +SIZE (golang-tools-v0.36.0_GH0.tar.gz) = 9079404 SHA256 (google-gopacket-v1.1.19_GH0.tar.gz) = 31efa87cc9d2b41e5e66c7daa8839d841d2a43cc477bf595c9e8c24ef6903830 SIZE (google-gopacket-v1.1.19_GH0.tar.gz) = 950745 SHA256 (jackpal-gateway-v1.1.1_GH0.tar.gz) = 69842d3b542a8c436f23fabaf40ec8ff88272e0639d7905c3bab2d94ea13b52b SIZE (jackpal-gateway-v1.1.1_GH0.tar.gz) = 16671 SHA256 (kr-pretty-v0.1.0_GH0.tar.gz) = 3aeb5d90b719765781befb9f156d0d0b8e5a7aafbcf15321e9eabbd35df31358 SIZE (kr-pretty-v0.1.0_GH0.tar.gz) = 8550 +SHA256 (leodido-go-urn-v1.4.0_GH0.tar.gz) = 711dcaa61598e44f058be5884aca8ce6d9ba42ed0940fdd280fec36495ed90d3 +SIZE (leodido-go-urn-v1.4.0_GH0.tar.gz) = 1998692 SHA256 (mattn-go-colorable-v0.1.13_GH0.tar.gz) = c3b62c76d365906bba9aa9d9ec048fd33a2a5742299d6482a08e7466d4c52d77 SIZE (mattn-go-colorable-v0.1.13_GH0.tar.gz) = 9762 SHA256 (mattn-go-isatty-v0.0.19_GH0.tar.gz) = 67b1614d495030982d276b211f3ba2a155fad61919ba96e34db8e67ed28660e4 SIZE (mattn-go-isatty-v0.0.19_GH0.tar.gz) = 4679 -SHA256 (mattn-go-runewidth-v0.0.15_GH0.tar.gz) = 44a5d37bd7119a9d288d7ff61cf3b4d42c2902c66b0d94136d41d2eb3cf2ba85 -SIZE (mattn-go-runewidth-v0.0.15_GH0.tar.gz) = 18284 SHA256 (miekg-dns-v1.1.61_GH0.tar.gz) = 90333c02da30c7ec20688e854e34f71d450831e5c4eba007d828864bb4ff4d47 SIZE (miekg-dns-v1.1.61_GH0.tar.gz) = 217914 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 SHA256 (rs-zerolog-v1.33.0_GH0.tar.gz) = 7a32947b007164edb7a888048f8bec6d7de9cf503e79e099d6b6814fad0f6ac7 SIZE (rs-zerolog-v1.33.0_GH0.tar.gz) = 216046 +SHA256 (samber-lo-v1.52.0_GH0.tar.gz) = f2045b040f9afff60182f2c161e1c4aca6a49e656be1022d1eda497d240e8383 +SIZE (samber-lo-v1.52.0_GH0.tar.gz) = 93914 SHA256 (stretchr-objx-v0.5.2_GH0.tar.gz) = c21c81a2e619fe8194c9cfafd577a72fe163df5a384d68799fbc54eef4b0e33f SIZE (stretchr-objx-v0.5.2_GH0.tar.gz) = 33222 SHA256 (stretchr-testify-v1.11.1_GH0.tar.gz) = 4b51fbc0f19e42841013748e6d527314e1d0e7255122766b5fca1d35b4630c69 SIZE (stretchr-testify-v1.11.1_GH0.tar.gz) = 116832 -SHA256 (urfave-cli-v3.5.0_GH0.tar.gz) = bb5987d7ba2c59721496e01a246732955051140126df5f1e6da6d9c9c20ad5e2 -SIZE (urfave-cli-v3.5.0_GH0.tar.gz) = 6805679 +SHA256 (urfave-cli-v3.6.1_GH0.tar.gz) = cfddd39c0df7a7c1f7ec93b0c84fdb4c72ef46d2380a46d273a5cda585cb80cf +SIZE (urfave-cli-v3.6.1_GH0.tar.gz) = 6807151 diff --git a/net/spoofdpi/files/modules.txt b/net/spoofdpi/files/modules.txt index 48c505de7ef7..363d89b25ba8 100644 --- a/net/spoofdpi/files/modules.txt +++ b/net/spoofdpi/files/modules.txt @@ -5,6 +5,14 @@ github.com/BurntSushi/toml/internal # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew +# github.com/gabriel-vasile/mimetype v1.4.10 +## explicit; go 1.21 +# github.com/go-playground/locales v0.14.1 +## explicit; go 1.17 +# github.com/go-playground/universal-translator v0.18.1 +## explicit; go 1.18 +# github.com/go-playground/validator/v10 v10.28.0 +## explicit; go 1.24.0 # github.com/google/gopacket v1.1.19 ## explicit; go 1.12 github.com/google/gopacket @@ -15,6 +23,8 @@ github.com/google/gopacket/pcap github.com/jackpal/gateway # github.com/kr/pretty v0.1.0 ## explicit +# github.com/leodido/go-urn v1.4.0 +## explicit; go 1.18 # github.com/mattn/go-colorable v0.1.13 ## explicit; go 1.15 github.com/mattn/go-colorable @@ -33,6 +43,8 @@ github.com/rs/zerolog github.com/rs/zerolog/internal/cbor github.com/rs/zerolog/internal/json github.com/rs/zerolog/log +# github.com/samber/lo v1.52.0 +## explicit; go 1.18 # github.com/stretchr/objx v0.5.2 ## explicit; go 1.20 github.com/stretchr/objx @@ -41,13 +53,16 @@ github.com/stretchr/objx github.com/stretchr/testify/assert github.com/stretchr/testify/assert/yaml github.com/stretchr/testify/mock -# github.com/urfave/cli/v3 v3.5.0 +github.com/stretchr/testify/require +# github.com/urfave/cli/v3 v3.6.1 ## explicit; go 1.22 github.com/urfave/cli/v3 -# golang.org/x/mod v0.18.0 -## explicit; go 1.18 +# golang.org/x/crypto v0.42.0 +## explicit; go 1.24.0 +# golang.org/x/mod v0.27.0 +## explicit; go 1.23.0 golang.org/x/mod/semver -# golang.org/x/net v0.38.0 +# golang.org/x/net v0.43.0 ## explicit; go 1.23.0 golang.org/x/net/bpf golang.org/x/net/internal/iana @@ -55,19 +70,21 @@ golang.org/x/net/internal/socket golang.org/x/net/ipv4 golang.org/x/net/ipv6 golang.org/x/net/route -# golang.org/x/sync v0.12.0 -## explicit; go 1.23.0 +# golang.org/x/sync v0.17.0 +## explicit; go 1.24.0 golang.org/x/sync/errgroup -# golang.org/x/sys v0.31.0 -## explicit; go 1.23.0 +# golang.org/x/sys v0.36.0 +## explicit; go 1.24.0 golang.org/x/sys/unix golang.org/x/sys/windows -# golang.org/x/tools v0.22.0 -## explicit; go 1.19 +# golang.org/x/text v0.29.0 +## explicit; go 1.24.0 +# golang.org/x/tools v0.36.0 +## explicit; go 1.23.0 golang.org/x/tools/go/gcexportdata -golang.org/x/tools/go/internal/packagesdriver golang.org/x/tools/go/packages golang.org/x/tools/go/types/objectpath +golang.org/x/tools/go/types/typeutil golang.org/x/tools/internal/aliases golang.org/x/tools/internal/event golang.org/x/tools/internal/event/core @@ -78,7 +95,7 @@ golang.org/x/tools/internal/gocommand golang.org/x/tools/internal/packagesinternal golang.org/x/tools/internal/pkgbits golang.org/x/tools/internal/stdlib -golang.org/x/tools/internal/tokeninternal +golang.org/x/tools/internal/typeparams golang.org/x/tools/internal/typesinternal golang.org/x/tools/internal/versions # gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 diff --git a/net/spoofdpi/files/pkg-message.in b/net/spoofdpi/files/pkg-message.in index 2c70f131080e..a102654f3bf3 100644 --- a/net/spoofdpi/files/pkg-message.in +++ b/net/spoofdpi/files/pkg-message.in @@ -34,4 +34,10 @@ You can edit the config via being as root or adding your user to the ${PORTNAME} Config locations are: $SPOOFDPI_CONFIG environment variable, ${ETCDIR}/${PORTNAME}.toml, $XDG_CONFIG_HOME/${PORTNAME}/${PORTNAME}.toml and $HOME/.config/${PORTNAME}/${PORTNAME}.toml EOM } +{ type: upgrade + maximum_version: "1.2.0" + message: << EOM +The whole configuration file has changed, see the documentation for more details. I've updated the sample config in the port. +EOM +} ] diff --git a/net/spoofdpi/files/spoofdpi.in b/net/spoofdpi/files/spoofdpi.in index 7c2beb0fc533..9eeedd64b8b2 100644 --- a/net/spoofdpi/files/spoofdpi.in +++ b/net/spoofdpi/files/spoofdpi.in @@ -10,7 +10,7 @@ # spoofdpi (default empty). # spoofdpi_user (str): User to run spoofdpi as. Default # to "%%USER%%" created by the port. -# spoofdpi_log (path): Console log file (default /dev/null). +# spoofdpi_log (path): Console log file (default /var/log/spoofdpi.log or set to /dev/null to omit). . /etc/rc.subr @@ -33,7 +33,7 @@ load_rc_config "${name}" eval "${rcvar}=\${${rcvar}:-'NO'}" eval "_args=\${${name}_args:-''}" eval "_user=\${${name}_user:-'%%USER%%'}" -eval "_log=\${${name}_log:-/dev/null}" +eval "_log=\${${name}_log:-/var/log/${name}.log}" pidfile="/var/run/${name}.pid" diff --git a/net/spoofdpi/files/spoofdpi.toml.sample b/net/spoofdpi/files/spoofdpi.toml.sample index 3c1af2a7e542..36ce94dbded7 100644 --- a/net/spoofdpi/files/spoofdpi.toml.sample +++ b/net/spoofdpi/files/spoofdpi.toml.sample @@ -1,11 +1,37 @@ -dns-addr = "1.1.1.1" -dns-port = "53" +[general] + +# Available values are debug, trace, info, warn, error, and disabled. (default: "info") +log-level = "info" + +# Don't print banner +silent = true + +# This option is currently only supported on macOS. +system-proxy = false + +[server] # If you want to run SpoofDPI remotely (e.g., on a physically separated machine), then you should set this value # to 0.0.0.0. Otherwise, it is recommended to leave this option as default. -listen-addr = "127.0.0.1" +listen-addr = "127.0.0.1:8080" + +[dns] + +# available options: udp/https/system (default: "udp") +mode = "https" + +# DNS address and port number +# this is used when dns-mode is set to udp. +addr = "8.8.8.8:53" + +# This is used when dns-mode is set to https. +https-url = "https://dns.google/dns-query" + +# Filters DNS queries by record type (A for IPv4, AAAA for IPv6). +# Available values are "ipv4", "ipv6", and "all". +# If your Internet Service Provider (ISP) doesn't support IPv6, it is recommended to set this option to "ipv4" for stability. +qtype = "all" -# Port to listen on. -listen-port = "8080" +# If true, DNS records will be cached to improve performance and reduce latency. +cache = false -doh-endpoint = "https://dns.google/dns-query" diff --git a/net/uriparser/Makefile b/net/uriparser/Makefile index de5ca5bdf6e5..d5521497000e 100644 --- a/net/uriparser/Makefile +++ b/net/uriparser/Makefile @@ -1,9 +1,13 @@ PORTNAME= uriparser DISTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= net -MASTER_SITES= https://github.com/uriparser/uriparser/releases/download/uriparser-${DISTVERSION}/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + ${DISTNAME}-doc.zip \ + ${DISTNAME}-doc.qch +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ + ${DISTNAME}-doc.zip MAINTAINER= svysh.fbsd@gmail.com COMMENT= URI parsing library @@ -16,35 +20,24 @@ LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/COPYING.BSD-3-Clause LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LGPL-2.1 LICENSE_FILE= ${WRKSRC}/README.md -BUILD_DEPENDS= bash:shells/bash TEST_DEPENDS= googletest>=1.10.0:devel/googletest -USES= cmake:noninja,testing cpe pathfix tar:xz +USES= cmake:testing cpe pathfix tar:xz CPE_VENDOR= uriparser_project - USE_LDCONFIG= yes CMAKE_OFF= URIPARSER_BUILD_TESTS \ - URIPARSER_BUILD_DOCS # will fetch prebuilds from the upstream, if DOCS is selected + URIPARSER_BUILD_DOCS CMAKE_TESTING_ON= URIPARSER_BUILD_TESTS PLIST_SUB= DISTVERSION=${DISTVERSION} PORTDOCS= * -OPTIONS_DEFINE= DOCS -DOCS_DISTFILES= ${_DISTDOCSFILE} \ - ${_DISTDOCSNAME}.qch -DOCS_EXTRACT_ONLY= ${_DISTDOCSFILE} - -_DISTDOCSFILE= ${_DISTDOCSNAME}.zip -_DISTDOCSNAME= ${DISTNAME}-doc +OPTIONS_DEFINE= DOCS post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/qch - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/../${_DISTDOCSNAME} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${DISTDIR}/${_DISTDOCSNAME}.qch ${STAGEDIR}${DOCSDIR}/qch - ( ${ECHO} "QCH file is a QT Compressed Help file, generated by doxygen, cf:"; \ - ${ECHO} "https://doc.qt.io/qt-5/assistant-details.html"; ) > ${STAGEDIR}${DOCSDIR}/qch/readme-qch + (cd ${WRKDIR}/${DISTNAME}-doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + ${INSTALL_MAN} ${DISTDIR}/${DISTNAME}-doc.qch ${STAGEDIR}${DOCSDIR}/qch .include <bsd.port.mk> diff --git a/net/uriparser/distinfo b/net/uriparser/distinfo index 2689d362b06a..e12f068203ac 100644 --- a/net/uriparser/distinfo +++ b/net/uriparser/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1765827435 +TIMESTAMP = 1765831847 SHA256 (uriparser-1.0.0.tar.xz) = 154a3f649d80a78d5095fc461ec032ffb45f5ed3619edec923ac68cff29a088d SIZE (uriparser-1.0.0.tar.xz) = 200048 SHA256 (uriparser-1.0.0-doc.zip) = 089de452fe185cf79523c93f5692a88029fd19d1f6953557363f145a1fc6a711 |