diff options
Diffstat (limited to '')
58 files changed, 133 insertions, 1236 deletions
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index 5aebf555281d..9d61e301c1c0 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -191,7 +191,6 @@ SUBDIR += netbox SUBDIR += netbox-agent SUBDIR += netdata - SUBDIR += netdata-go SUBDIR += netdisco-mibs SUBDIR += netleak SUBDIR += netmagis-common diff --git a/net-mgmt/check_ssl_cert/Makefile b/net-mgmt/check_ssl_cert/Makefile index 2aabb219e671..8df15ec48850 100644 --- a/net-mgmt/check_ssl_cert/Makefile +++ b/net-mgmt/check_ssl_cert/Makefile @@ -5,7 +5,7 @@ MASTER_SITES= https://github.com/matteocorti/${PORTNAME}/releases/download/v${DI MAINTAINER= cmt@FreeBSD.org COMMENT= Nagios/Icinga plugin for checking SSL/TLS certificates -WWW= https://matteocorti.github.io/check_ssl_cert/ +WWW= https://github.com/matteocorti/check_ssl_cert/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING.md diff --git a/net-mgmt/check_wg/Makefile b/net-mgmt/check_wg/Makefile index bc2dba509654..3262eae34091 100644 --- a/net-mgmt/check_wg/Makefile +++ b/net-mgmt/check_wg/Makefile @@ -1,7 +1,6 @@ PORTNAME= check_wg DISTVERSIONPREFIX= v -DISTVERSION= 0.0.7 -PORTREVISION= 3 +DISTVERSION= 0.0.8 CATEGORIES= net-mgmt MAINTAINER= dsh@bamus.cz @@ -11,10 +10,15 @@ WWW= https://github.com/dsh2dsh/${PORTNAME} LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go:1.22,modules +USES= go:1.25,modules -GO_MODULE= github.com/dsh2dsh/${PORTNAME} -GO_BUILDFLAGS= -ldflags="${STRIP} -w -X ${GO_MODULE}/main.version=${DISTVERSIONFULL}" +USE_GITHUB= yes +GH_ACCOUNT= dsh2dsh + +GO_MOD_DIST= github +GO_MODULE= github.com/${GH_ACCOUNT}/${PORTNAME} +_BUILD_XFLAGS= main.version=${DISTVERSIONFULL} +GO_BUILDFLAGS= -ldflags "${STRIP} ${_BUILD_XFLAGS:S!^!-X ${GO_MODULE}/!}" PLIST_FILES= libexec/nagios/${PORTNAME} diff --git a/net-mgmt/check_wg/distinfo b/net-mgmt/check_wg/distinfo index ad28467f8c81..bb5096e8efee 100644 --- a/net-mgmt/check_wg/distinfo +++ b/net-mgmt/check_wg/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1716219169 -SHA256 (go/net-mgmt_check_wg/check_wg-v0.0.7/v0.0.7.mod) = 70bf440bb65daba36df9cf87cb3314523bb0435053cd72ff796b932cd3790809 -SIZE (go/net-mgmt_check_wg/check_wg-v0.0.7/v0.0.7.mod) = 423 -SHA256 (go/net-mgmt_check_wg/check_wg-v0.0.7/v0.0.7.zip) = f4f19a8cc0090d92323a4ebeb6ded085f7d1614e18f6ab1f7d67db0b41a0d2ee -SIZE (go/net-mgmt_check_wg/check_wg-v0.0.7/v0.0.7.zip) = 18637 +TIMESTAMP = 1757950900 +SHA256 (go/net-mgmt_check_wg/dsh2dsh-check_wg-v0.0.8_GH0/go.mod) = 30f089264b5856c3c455619f2324027ce33d9b2a1fd511ad5541a1ef8a63083e +SIZE (go/net-mgmt_check_wg/dsh2dsh-check_wg-v0.0.8_GH0/go.mod) = 424 +SHA256 (go/net-mgmt_check_wg/dsh2dsh-check_wg-v0.0.8_GH0/dsh2dsh-check_wg-v0.0.8_GH0.tar.gz) = 573329e204297d56c6f31019ba1a3520d21cbae44dc35fadb86398e2f36f4f65 +SIZE (go/net-mgmt_check_wg/dsh2dsh-check_wg-v0.0.8_GH0/dsh2dsh-check_wg-v0.0.8_GH0.tar.gz) = 12746 diff --git a/net-mgmt/crmsh/Makefile b/net-mgmt/crmsh/Makefile index 4926cb5b0457..d15e52c70637 100644 --- a/net-mgmt/crmsh/Makefile +++ b/net-mgmt/crmsh/Makefile @@ -1,6 +1,6 @@ PORTNAME= crmsh DISTVERSION= 4.6.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt python MAINTAINER= ports@FreeBSD.org @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PY_SETUPTOOLS} RUN_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}parallax>0:devel/py-parallax@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} diff --git a/net-mgmt/icingadb/files/icingadb.in b/net-mgmt/icingadb/files/icingadb.in index ab55bbfa3f37..c9855574faa3 100644 --- a/net-mgmt/icingadb/files/icingadb.in +++ b/net-mgmt/icingadb/files/icingadb.in @@ -50,6 +50,6 @@ icingadb_precmd() } -command_args="$icingadb_daemonflags -P $pidfile -t ${name} -T ${name} %%PREFIX%%/bin/$name -c %%PREFIX%%/etc/icingadb/config.yml" +command_args="$icingadb_daemonflags -H -P $pidfile -t ${name} -T ${name} %%PREFIX%%/bin/$name -c %%PREFIX%%/etc/icingadb/config.yml" run_rc_command "$1" diff --git a/net-mgmt/ipv6calc/Makefile b/net-mgmt/ipv6calc/Makefile index 670fcecbd8a6..f93b449aac1e 100644 --- a/net-mgmt/ipv6calc/Makefile +++ b/net-mgmt/ipv6calc/Makefile @@ -1,5 +1,5 @@ PORTNAME= ipv6calc -PORTVERSION= 4.3.2 +PORTVERSION= 4.3.3 CATEGORIES= net-mgmt MAINTAINER= sunpoet@FreeBSD.org diff --git a/net-mgmt/ipv6calc/distinfo b/net-mgmt/ipv6calc/distinfo index 37d0325035ea..fc7107216e1d 100644 --- a/net-mgmt/ipv6calc/distinfo +++ b/net-mgmt/ipv6calc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750188010 -SHA256 (pbiering-ipv6calc-4.3.2_GH0.tar.gz) = 4335c4edf7d51dbd0cafdd42ecda5598101f7a8ab257a74be2d9ec81f5bf895b -SIZE (pbiering-ipv6calc-4.3.2_GH0.tar.gz) = 1971792 +TIMESTAMP = 1757120528 +SHA256 (pbiering-ipv6calc-4.3.3_GH0.tar.gz) = 9e2a9aa3d7cd86f74793d5ebf383f2fa933cbc8f26c3917394f6b995ae92612d +SIZE (pbiering-ipv6calc-4.3.3_GH0.tar.gz) = 1985400 diff --git a/net-mgmt/kf6-networkmanager-qt/distinfo b/net-mgmt/kf6-networkmanager-qt/distinfo index 013c9fb8e5f9..c3d9d3aafb2b 100644 --- a/net-mgmt/kf6-networkmanager-qt/distinfo +++ b/net-mgmt/kf6-networkmanager-qt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754127975 -SHA256 (KDE/frameworks/6.17/networkmanager-qt-6.17.0.tar.xz) = d83beae867fb7d669886f513893f8eec58b5d7a24b429d89dc5c6c08b7a3f4e0 -SIZE (KDE/frameworks/6.17/networkmanager-qt-6.17.0.tar.xz) = 183968 +TIMESTAMP = 1757408198 +SHA256 (KDE/frameworks/6.18/networkmanager-qt-6.18.0.tar.xz) = 492836a74a03ba43facf52e827428f888f13d6e2bb8374819869707280a0310c +SIZE (KDE/frameworks/6.18/networkmanager-qt-6.18.0.tar.xz) = 184052 diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index a4b7eaa84e22..5f88bf9e07ab 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -1,5 +1,5 @@ PORTNAME= librenms -PORTVERSION= 25.8.0 +PORTVERSION= 25.9.1 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -133,7 +133,7 @@ _SCRIPT_FILES= daily.sh lnms # _RELEASE_TIMESTAMP is used for a patch inside the vendor code # it represents the release date via: git show --pretty='%H|%ct' -s 1.42.01 # It sits here so you remember to update it with each release -_RELEASE_TIMESTAMP= 1755492731 +_RELEASE_TIMESTAMP= 1758126180 _ROOT_DIRS= LibreNMS app bootstrap config database doc html \ includes lang licenses mibs misc resources routes \ scripts tests diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo index 87c2b96b6a51..981c11c49276 100644 --- a/net-mgmt/librenms/distinfo +++ b/net-mgmt/librenms/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1755522747 -SHA256 (librenms-vendor-25.8.0.tar.gz) = 9986dad74d2ebeee2ce2eeefd3ef1916e3ba058e004f034b137102f59ab79c11 -SIZE (librenms-vendor-25.8.0.tar.gz) = 27512017 -SHA256 (librenms-librenms-25.8.0_GH0.tar.gz) = 6022b7a9a12198fd49f358e281d400a1b704f4066612e07bc7d20223cce98c92 -SIZE (librenms-librenms-25.8.0_GH0.tar.gz) = 71480466 +TIMESTAMP = 1758226502 +SHA256 (librenms-vendor-25.9.1.tar.gz) = a5c447f5f3f60056516f39915b8efc95624c4646585cb600d8da582ff7d9deea +SIZE (librenms-vendor-25.9.1.tar.gz) = 27546661 +SHA256 (librenms-librenms-25.9.1_GH0.tar.gz) = c685b9d30ece1f5adc7d743e2ecea402562a35f081291363d3faca285049bd3a +SIZE (librenms-librenms-25.9.1_GH0.tar.gz) = 71669135 diff --git a/net-mgmt/mac-telnet/Makefile b/net-mgmt/mac-telnet/Makefile index bf0caf9f88dc..4e9834e47d62 100644 --- a/net-mgmt/mac-telnet/Makefile +++ b/net-mgmt/mac-telnet/Makefile @@ -1,6 +1,5 @@ PORTNAME= mac-telnet -PORTVERSION= 0.6.1 -PORTREVISION= 2 +PORTVERSION= 0.6.3 PORTEPOCH= 1 CATEGORIES= net-mgmt net diff --git a/net-mgmt/mac-telnet/distinfo b/net-mgmt/mac-telnet/distinfo index 00d0a1dd992b..f945a51e9e0f 100644 --- a/net-mgmt/mac-telnet/distinfo +++ b/net-mgmt/mac-telnet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723560182 -SHA256 (haakonnessjoen-MAC-Telnet-0.6.1-v0.6.1_GH0.tar.gz) = c6e2760d62bba643e9ac93b6e5664d109e42666cf8a1de7a9518eec191cfbb34 -SIZE (haakonnessjoen-MAC-Telnet-0.6.1-v0.6.1_GH0.tar.gz) = 80328 +TIMESTAMP = 1758544583 +SHA256 (haakonnessjoen-MAC-Telnet-0.6.3-v0.6.3_GH0.tar.gz) = 1b685568bddfe8d41cf70242a8db98968154334647b2c98c389596604e3fc38a +SIZE (haakonnessjoen-MAC-Telnet-0.6.3-v0.6.3_GH0.tar.gz) = 81507 diff --git a/net-mgmt/mac-telnet/files/patch-src_interfaces.c b/net-mgmt/mac-telnet/files/patch-src_interfaces.c deleted file mode 100644 index e3857f1ce4be..000000000000 --- a/net-mgmt/mac-telnet/files/patch-src_interfaces.c +++ /dev/null @@ -1,40 +0,0 @@ ---- src/interfaces.c.orig 2024-08-15 15:58:48 UTC -+++ src/interfaces.c -@@ -150,6 +150,9 @@ int net_get_interfaces(struct net_interface **interfac - static const struct ifaddrs *ifaddrsp; - const struct sockaddr_in *dl_addr; - int found = 0; -+#if !defined(__FreeBSD__) -+ long allones_bcast = htonl(INADDR_BROADCAST); -+#endif - - if (getifaddrs(&int_addrs) < 0) { - perror("getifaddrs"); -@@ -173,8 +176,14 @@ int net_get_interfaces(struct net_interface **interfac - - if (ifaddrsp->ifa_addr->sa_family == AF_INET) { - memcpy(interface->ipv4_addr, &dl_addr->sin_addr, IPV4_ALEN); -+#if defined(__FreeBSD__) -+ memcpy(interface->bcast_addr, &((const struct sockaddr_in *)ifaddrsp->ifa_broadaddr)->sin_addr, IPV4_ALEN); -+#else -+ memcpy(interface->bcast_addr, &allones_bcast, IPV4_ALEN); -+#endif - } else { - memset(interface->ipv4_addr, 0, IPV4_ALEN); -+ memset(interface->bcast_addr, 0, IPV4_ALEN); - } - } - #ifdef __linux__ -@@ -208,9 +217,12 @@ int net_get_interfaces(struct net_interface **interfac - DL_FOREACH(*interfaces, interface) { - struct in_addr *addr = - (struct in_addr *)interface->ipv4_addr; -+ struct in_addr *bcast = -+ (struct in_addr *)interface->bcast_addr; - - printf("Interface %s:\n", interface->name); - printf("\tIP: %s\n", inet_ntoa(*addr)); -+ printf("\tBCAST: %s\n", inet_ntoa(*bcast)); - printf("\tMAC: %s\n", - ether_ntoa((struct ether_addr *)interface->mac_addr)); - #ifdef __linux__ diff --git a/net-mgmt/mac-telnet/files/patch-src_interfaces.h b/net-mgmt/mac-telnet/files/patch-src_interfaces.h deleted file mode 100644 index 6f0fc858ea62..000000000000 --- a/net-mgmt/mac-telnet/files/patch-src_interfaces.h +++ /dev/null @@ -1,17 +0,0 @@ ---- src/interfaces.h.orig 2024-08-15 16:06:02 UTC -+++ src/interfaces.h -@@ -25,6 +25,7 @@ struct net_interface { - char name[256]; - unsigned char ipv4_addr[IPV4_ALEN]; - unsigned char mac_addr[ETH_ALEN]; -+ unsigned char bcast_addr[IPV4_ALEN]; - - /* used by mactelnetd */ - int socketfd; -@@ -57,4 +58,4 @@ extern int net_send_udp(const int socket, struct net_i - const unsigned char *destmac, const struct in_addr *sourceip, const int sourceport, - const struct in_addr *destip, const int destport, const unsigned char *data, const int datalen); - extern unsigned short in_cksum(unsigned short *addr, int len); --#endif -\ No newline at end of file -+#endif diff --git a/net-mgmt/mac-telnet/files/patch-src_mactelnet.c b/net-mgmt/mac-telnet/files/patch-src_mactelnet.c deleted file mode 100644 index d4dba703831d..000000000000 --- a/net-mgmt/mac-telnet/files/patch-src_mactelnet.c +++ /dev/null @@ -1,46 +0,0 @@ ---- src/mactelnet.c.orig 2024-08-12 21:08:19 UTC -+++ src/mactelnet.c -@@ -37,6 +37,7 @@ - #endif - #if defined(__FreeBSD__) || defined(__APPLE__) - #include <sys/types.h> -+#include <sys/mman.h> - #include <net/ethernet.h> - #else - #include <netinet/ether.h> -@@ -126,6 +127,8 @@ static unsigned int send_socket; - - static unsigned int send_socket; - -+static unsigned char *bcast_addr; -+ - static int handle_packet(unsigned char *data, int data_len); - - static void print_version() { -@@ -168,7 +171,7 @@ static int send_udp(struct mt_packet *packet, int retr - struct sockaddr_in socket_address; - socket_address.sin_family = AF_INET; - socket_address.sin_port = htons(MT_MACTELNET_PORT); -- socket_address.sin_addr.s_addr = htonl(INADDR_BROADCAST); -+ memcpy(&(socket_address.sin_addr), bcast_addr, IPV4_ALEN); - - sent_bytes = sendto(send_socket, packet->data, packet->size, 0, (struct sockaddr *)&socket_address, - sizeof(socket_address)); -@@ -470,6 +473,9 @@ static int find_interface() { - continue; - } - -+#if defined(__FreeBSD__) -+ setsockopt(testsocket, IPPROTO_IP, IP_ONESBCAST, &optval, sizeof(optval)); -+#endif - setsockopt(testsocket, SOL_SOCKET, SO_BROADCAST, &optval, sizeof(optval)); - setsockopt(testsocket, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)); - -@@ -488,6 +494,7 @@ static int find_interface() { - send_socket = testsocket; - memcpy(srcmac, interface->mac_addr, ETH_ALEN); - active_interface = interface; -+ bcast_addr = interface->bcast_addr; - - /* Send a SESSIONSTART message with the current device */ - init_packet(&data, MT_PTYPE_SESSIONSTART, srcmac, dstmac, sessionkey, 0); diff --git a/net-mgmt/mac-telnet/files/patch-src_mactelnetd.c b/net-mgmt/mac-telnet/files/patch-src_mactelnetd.c deleted file mode 100644 index 24c25cd212ee..000000000000 --- a/net-mgmt/mac-telnet/files/patch-src_mactelnetd.c +++ /dev/null @@ -1,33 +0,0 @@ ---- src/mactelnetd.c.orig 2024-08-15 17:08:22 UTC -+++ src/mactelnetd.c -@@ -254,6 +254,12 @@ static void setup_sockets() { - perror("SO_BROADCAST"); - continue; - } -+#if defined(__FreeBSD__) -+ if (setsockopt(interface->socketfd, IPPROTO_IP, IP_ONESBCAST, &optval, sizeof(optval)) == -1) { -+ perror("IP_ONESBCAST"); -+ continue; -+ } -+#endif - - setsockopt(interface->socketfd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)); - -@@ -290,7 +296,7 @@ static int send_udp(const struct mt_connection *conn, - struct sockaddr_in socket_address; - socket_address.sin_family = AF_INET; - socket_address.sin_port = htons(conn->srcport); -- socket_address.sin_addr.s_addr = htonl(INADDR_BROADCAST); -+ memcpy(&(socket_address.sin_addr), &conn->interface->bcast_addr, IPV4_ALEN); - - return sendto(conn->interface->socketfd, packet->data, packet->size, 0, (struct sockaddr *)&socket_address, - sizeof(socket_address)); -@@ -315,7 +321,7 @@ static int send_special_udp(struct net_interface *inte - struct sockaddr_in socket_address; - socket_address.sin_family = AF_INET; - socket_address.sin_port = htons(port); -- socket_address.sin_addr.s_addr = htonl(INADDR_BROADCAST); -+ memcpy(&(socket_address.sin_addr), &interface->bcast_addr, IPV4_ALEN); - - return sendto(interface->socketfd, packet->data, packet->size, 0, (struct sockaddr *)&socket_address, - sizeof(socket_address)); diff --git a/net-mgmt/mac-telnet/files/patch-src_mtwei.c b/net-mgmt/mac-telnet/files/patch-src_mtwei.c deleted file mode 100644 index cdebb288bcdd..000000000000 --- a/net-mgmt/mac-telnet/files/patch-src_mtwei.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mtwei.c.orig 2024-09-24 12:56:03 UTC -+++ src/mtwei.c -@@ -36,7 +36,7 @@ - #include <stdio.h> - #include <string.h> - #include <libintl.h> --#if defined(__linux__) -+#if defined(HAVE_SYS_RANDOM_H) - #include <sys/random.h> - #endif - diff --git a/net-mgmt/mac-telnet/files/patch-src_users.c b/net-mgmt/mac-telnet/files/patch-src_users.c deleted file mode 100644 index 65cc4329acd0..000000000000 --- a/net-mgmt/mac-telnet/files/patch-src_users.c +++ /dev/null @@ -1,90 +0,0 @@ ---- src/users.c.orig 2024-08-15 14:34:02 UTC -+++ src/users.c -@@ -211,6 +211,24 @@ struct mt_credentials *find_user(char *username) { - return NULL; - } - -+#if OPENSSL_VERSION_NUMBER < 0x030000000 // less than 3.0.0 -+/* -+ * Filter out colons from the decoded string. -+ * By default, the OPENSSL_buf2hexstr function in OpenSSL 1.1 -+ * uses colons as a byte separator, and this cannot be overridden. -+ */ -+static void remove_colons(char *s) { -+ const char *p = s; -+ char *q = s; -+ while (*p != '\0') { -+ *q = *p++; -+ q += (*q != ':'); -+ } -+ -+ *q = '\0'; -+} -+#endif -+ - int add_user(const char *username, const char *password) { - FILE *rfile; - FILE *wfile; -@@ -289,12 +307,27 @@ int add_user(const char *username, const char *passwor - continue; - } - fprintf(wfile, "%s:", username); -+#if OPENSSL_VERSION_NUMBER < 0x030000000 // less than 3.0.0 -+ char *output; -+ output = OPENSSL_buf2hexstr(newhash, MT_CRED_HASHLEN); -+ remove_colons(output); -+#else - char output[MT_CRED_HASHLEN * 2 + 1]; - OPENSSL_buf2hexstr_ex(output, sizeof(output), NULL, newhash, MT_CRED_HASHLEN, '\0'); -+#endif - fputs(output, wfile); - fputs(":", wfile); -+#if OPENSSL_VERSION_NUMBER < 0x030000000 // less than 3.0.0 -+ OPENSSL_free(output); -+ output = OPENSSL_buf2hexstr(newsalt, MT_CRED_SALTLEN); -+ remove_colons(output); -+#else - OPENSSL_buf2hexstr_ex(output, sizeof(output), NULL, newsalt, MT_CRED_SALTLEN, '\0'); -+#endif - fputs(output, wfile); -+#if OPENSSL_VERSION_NUMBER < 0x030000000 // less than 3.0.0 -+ OPENSSL_free(output); -+#endif - fputs("\n", wfile); - found = 1; - } else { -@@ -306,12 +339,27 @@ int add_user(const char *username, const char *passwor - if (!found && password != NULL) { - // Write username, salt, and hashed password to the file - fprintf(wfile, "%s:", username); -+#if OPENSSL_VERSION_NUMBER < 0x030000000 // less than 3.0.0 -+ char *output; -+ output = OPENSSL_buf2hexstr(newhash, MT_CRED_HASHLEN); -+ remove_colons(output); -+#else - char output[MT_CRED_HASHLEN * 2 + 1]; - OPENSSL_buf2hexstr_ex(output, sizeof(output), NULL, newhash, MT_CRED_HASHLEN, '\0'); -+#endif - fputs(output, wfile); - fputs(":", wfile); -+#if OPENSSL_VERSION_NUMBER < 0x030000000 // less than 3.0.0 -+ OPENSSL_free(output); -+ output = OPENSSL_buf2hexstr(newsalt, MT_CRED_SALTLEN); -+ remove_colons(output); -+#else - OPENSSL_buf2hexstr_ex(output, sizeof(output), NULL, newsalt, MT_CRED_SALTLEN, '\0'); -+#endif - fputs(output, wfile); -+#if OPENSSL_VERSION_NUMBER < 0x030000000 // less than 3.0.0 -+ OPENSSL_free(output); -+#endif - fputs("\n", wfile); - } - -@@ -327,4 +375,4 @@ int add_user(const char *username, const char *passwor - } - - return found ? 2 : 1; --} -\ No newline at end of file -+} diff --git a/net-mgmt/mac-telnet/pkg-plist b/net-mgmt/mac-telnet/pkg-plist index 35a54cebd956..dd294174ad95 100644 --- a/net-mgmt/mac-telnet/pkg-plist +++ b/net-mgmt/mac-telnet/pkg-plist @@ -7,5 +7,5 @@ share/locale/bg/LC_MESSAGES/mactelnet.mo share/locale/nb/LC_MESSAGES/mactelnet.mo share/man/man1/macping.1.gz share/man/man1/mactelnet.1.gz -share/man/man1/mactelnetd.1.gz share/man/man1/mndp.1.gz +share/man/man8/mactelnetd.8.gz diff --git a/net-mgmt/net-snmp/files/patch-Makefile.in b/net-mgmt/net-snmp/files/patch-Makefile.in index 34001fe318a6..ab24d0ccf525 100644 --- a/net-mgmt/net-snmp/files/patch-Makefile.in +++ b/net-mgmt/net-snmp/files/patch-Makefile.in @@ -5,7 +5,7 @@ freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h \ freebsd7.h freebsd8.h freebsd9.h freebsd10.h freebsd11.h \ - freebsd12.h freebsd13.h freebsd14.h freebsd.h \ -+ freebsd12.h freebsd13.h freebsd14.h freebsd15.h freebsd.h \ ++ freebsd12.h freebsd13.h freebsd14.h freebsd15.h freebsd16.h freebsd.h \ generic.h \ hpux.h irix.h kfreebsd.h linux.h mingw32.h mingw32msvc.h mips.h \ netbsd.h nto-qnx6.h osf5.h \ diff --git a/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd16.h b/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd16.h new file mode 100644 index 000000000000..fff6187daf87 --- /dev/null +++ b/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd16.h @@ -0,0 +1,6 @@ +--- /dev/null 2025-09-10 01:07:21.909920000 +0200 ++++ include/net-snmp/system/freebsd16.h 2025-09-10 01:07:12.250409000 +0200 +@@ -0,0 +1,3 @@ ++/* freebsd16 is a superset of freebsd15 for now */ ++#include "freebsd15.h" ++#define freebsd15 freebsd15 diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist index d22c9171137a..9102b2376cbb 100644 --- a/net-mgmt/net-snmp/pkg-plist +++ b/net-mgmt/net-snmp/pkg-plist @@ -188,6 +188,7 @@ include/net-snmp/system/freebsd12.h include/net-snmp/system/freebsd13.h include/net-snmp/system/freebsd14.h include/net-snmp/system/freebsd15.h +include/net-snmp/system/freebsd16.h include/net-snmp/system/freebsd2.h include/net-snmp/system/freebsd3.h include/net-snmp/system/freebsd4.h diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile index feaf775a0131..4ee0eef84155 100644 --- a/net-mgmt/netbox/Makefile +++ b/net-mgmt/netbox/Makefile @@ -26,7 +26,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt # RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django52>=5.2.3<5.3:www/py-django52@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-django-cors-headers>=4.7.0<5:www/py-dj52-django-cors-headers@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj52-django-debug-toolbar>=5.2.0<6:www/py-dj52-django-debug-toolbar@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj52-django-debug-toolbar>=5.2.0<7:www/py-dj52-django-debug-toolbar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-django-filter>=25.1<26:www/py-dj52-django-filter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-django-htmx>=1.23.2<2:www/py-dj52-django-htmx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj52-django-mptt>=0.17.0<0.18:www/py-dj52-django-mptt@${PY_FLAVOR} \ @@ -48,7 +48,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django52>=5.2.3<5.3:www/py-django52@${PY_FLA ${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.11<7:textproc/py-feedparser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.6<4:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonschema>=4.24.0<5:devel/py-jsonschema@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}markdown>=3.8<3.9:textproc/py-markdown@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=3.8<3.10:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mkdocs-material>=9.6.18<10:textproc/py-mkdocs-material@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mkdocstrings>=0.30.0<1:textproc/py-mkdocstrings@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mkdocstrings-python>0:textproc/py-mkdocstrings-python@${PY_FLAVOR} \ diff --git a/net-mgmt/netdata-go/Makefile b/net-mgmt/netdata-go/Makefile deleted file mode 100644 index 9659e77ba3a2..000000000000 --- a/net-mgmt/netdata-go/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -PORTNAME= netdata-go -DISTVERSIONPREFIX= v -DISTVERSION= 0.58.1 -PORTREVISION= 9 -CATEGORIES= net-mgmt - -MAINTAINER= driesm@FreeBSD.org -COMMENT= External netdata collection plugin written in Go -WWW= https://github.com/netdata/go.d.plugin - -LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/LICENSE - -USES= go:1.21,modules - -GO_MODULE= github.com/netdata/go.d.plugin -GO_TARGET= ./cmd/godplugin:${PREFIX}/libexec/netdata/plugins.d/god.plugin - -post-patch: - ${REINPLACE_CMD} -e 's|/etc/netdata|${PREFIX}/etc/netdata|g' ${WRKSRC}/cmd/godplugin/main.go - -post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/netdata/conf.d - ${INSTALL_DATA} ${WRKSRC}/config/go.d.conf ${STAGEDIR}${PREFIX}/lib/netdata/conf.d/go.d.conf.sample - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/netdata/conf.d/go.d - cd ${WRKSRC}/config/go.d && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/netdata/conf.d/go.d - (for file in ${STAGEDIR}${PREFIX}/lib/netdata/conf.d/go.d/*.conf; do \ - ${MV} $$file $$file".sample"; \ - done) - -.include <bsd.port.mk> diff --git a/net-mgmt/netdata-go/distinfo b/net-mgmt/netdata-go/distinfo deleted file mode 100644 index fc7c03f0f7aa..000000000000 --- a/net-mgmt/netdata-go/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1707576521 -SHA256 (go/net-mgmt_netdata-go/netdata-go-v0.58.1/v0.58.1.mod) = 5df32121f1d8ce0c1e8b839907bff44dc191f68e09a4963935f4f016b8c90753 -SIZE (go/net-mgmt_netdata-go/netdata-go-v0.58.1/v0.58.1.mod) = 6391 -SHA256 (go/net-mgmt_netdata-go/netdata-go-v0.58.1/v0.58.1.zip) = a3f3101d13cc5bd7b8ac082c6677898c5cc3290aab3ad3901cf89506f8a4d669 -SIZE (go/net-mgmt_netdata-go/netdata-go-v0.58.1/v0.58.1.zip) = 3095912 diff --git a/net-mgmt/netdata-go/pkg-descr b/net-mgmt/netdata-go/pkg-descr deleted file mode 100644 index b57326bb6036..000000000000 --- a/net-mgmt/netdata-go/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -go.d.plugin is a netdata external plugin. -It is an orchestrator for data collection modules written in go. -It runs as an independent process ps fax shows it. -It is started and stopped automatically by netdata. diff --git a/net-mgmt/netdata-go/pkg-plist b/net-mgmt/netdata-go/pkg-plist deleted file mode 100644 index c5a8e5e5ae80..000000000000 --- a/net-mgmt/netdata-go/pkg-plist +++ /dev/null @@ -1,82 +0,0 @@ -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/activemq.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/apache.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/bind.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/cassandra.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/chrony.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/cockroachdb.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/consul.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/coredns.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/couchbase.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/couchdb.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dns_query.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dnsdist.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dnsmasq.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dnsmasq_dhcp.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/docker.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/docker_engine.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dockerhub.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/elasticsearch.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/energid.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/envoy.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/example.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/filecheck.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/fluentd.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/freeradius.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/geth.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/haproxy.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/hdfs.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/httpcheck.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/isc_dhcpd.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/k8s_kubelet.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/k8s_kubeproxy.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/k8s_state.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/lighttpd.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/logind.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/logstash.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/mongodb.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/mysql.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/nginx.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/nginxplus.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/nginxvts.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/ntpd.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/nvidia_smi.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/nvme.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/openvpn.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/openvpn_status_log.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/pgbouncer.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/phpdaemon.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/phpfpm.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/pihole.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/pika.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/ping.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/portcheck.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/postgres.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/powerdns.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/powerdns_recursor.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/prometheus.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/proxysql.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/pulsar.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/rabbitmq.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/redis.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/scaleio.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/snmp.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/solr.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/springboot2.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/squidlog.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/supervisord.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/systemdunits.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/tengine.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/traefik.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/unbound.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/upsd.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/vcsa.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/vernemq.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/vsphere.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/web_log.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/whoisquery.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/windows.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/wireguard.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/x509check.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/zookeeper.conf.sample -libexec/netdata/plugins.d/god.plugin diff --git a/net-mgmt/prometheus3/Makefile b/net-mgmt/prometheus3/Makefile index 6848b982dee5..6dbcd440107d 100644 --- a/net-mgmt/prometheus3/Makefile +++ b/net-mgmt/prometheus3/Makefile @@ -1,7 +1,6 @@ PORTNAME= prometheus DISTVERSIONPREFIX= v -DISTVERSION= 3.5.0 -PORTREVISION= 2 +DISTVERSION= 3.6.0 CATEGORIES= net-mgmt MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod \ https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONFULL}/:ui diff --git a/net-mgmt/prometheus3/distinfo b/net-mgmt/prometheus3/distinfo index 6bbba81e5c7f..6d00c10c303e 100644 --- a/net-mgmt/prometheus3/distinfo +++ b/net-mgmt/prometheus3/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1752571020 -SHA256 (go/net-mgmt_prometheus3/prometheus-prometheus-v3.5.0_GH0/go.mod) = 6233234ceea2031a75041930e0931abf3e1123194a0ce3ca44c6468782611ba6 -SIZE (go/net-mgmt_prometheus3/prometheus-prometheus-v3.5.0_GH0/go.mod) = 12136 -SHA256 (go/net-mgmt_prometheus3/prometheus-prometheus-v3.5.0_GH0/prometheus-web-ui-3.5.0.tar.gz) = 8fec0e43c9b68e85d9dff0ba6cef29c6ba0cfe19ed54b3ff421a1656674b8abe -SIZE (go/net-mgmt_prometheus3/prometheus-prometheus-v3.5.0_GH0/prometheus-web-ui-3.5.0.tar.gz) = 3488940 -SHA256 (go/net-mgmt_prometheus3/prometheus-prometheus-v3.5.0_GH0/prometheus-prometheus-v3.5.0_GH0.tar.gz) = fadb33c398026e190f9335e90e214065b012b9cb454da121e072697ad307cb47 -SIZE (go/net-mgmt_prometheus3/prometheus-prometheus-v3.5.0_GH0/prometheus-prometheus-v3.5.0_GH0.tar.gz) = 5129940 +TIMESTAMP = 1758878297 +SHA256 (go/net-mgmt_prometheus3/prometheus-prometheus-v3.6.0_GH0/go.mod) = 4cacd2221e09a9109e63a8c7fb663ddec3c9462dc5393a85101f0b19c7dd5c3c +SIZE (go/net-mgmt_prometheus3/prometheus-prometheus-v3.6.0_GH0/go.mod) = 12171 +SHA256 (go/net-mgmt_prometheus3/prometheus-prometheus-v3.6.0_GH0/prometheus-web-ui-3.6.0.tar.gz) = 970d3decd4c32545a6d9163445483fe5d8cd75b8fe5bd851748685d9c433e01a +SIZE (go/net-mgmt_prometheus3/prometheus-prometheus-v3.6.0_GH0/prometheus-web-ui-3.6.0.tar.gz) = 3491191 +SHA256 (go/net-mgmt_prometheus3/prometheus-prometheus-v3.6.0_GH0/prometheus-prometheus-v3.6.0_GH0.tar.gz) = 90586300d083873125b45e25ba68ed1ef2c48202d392405732191fffd5d99d1b +SIZE (go/net-mgmt_prometheus3/prometheus-prometheus-v3.6.0_GH0/prometheus-prometheus-v3.6.0_GH0.tar.gz) = 5155788 diff --git a/net-mgmt/prometheus3/pkg-plist b/net-mgmt/prometheus3/pkg-plist index a5a5f82c33c0..cd592c6003dc 100644 --- a/net-mgmt/prometheus3/pkg-plist +++ b/net-mgmt/prometheus3/pkg-plist @@ -7,6 +7,7 @@ bin/promtool %%PORTDOCS%%%%DOCSDIR%%/configuration/configuration.md %%PORTDOCS%%%%DOCSDIR%%/configuration/https.md %%PORTDOCS%%%%DOCSDIR%%/configuration/index.md +%%PORTDOCS%%%%DOCSDIR%%/configuration/promtool.md %%PORTDOCS%%%%DOCSDIR%%/configuration/recording_rules.md %%PORTDOCS%%%%DOCSDIR%%/configuration/template_examples.md %%PORTDOCS%%%%DOCSDIR%%/configuration/template_reference.md diff --git a/net-mgmt/py-junos-eznc/Makefile b/net-mgmt/py-junos-eznc/Makefile index 9258c5406eb6..c2bcdd192044 100644 --- a/net-mgmt/py-junos-eznc/Makefile +++ b/net-mgmt/py-junos-eznc/Makefile @@ -1,6 +1,6 @@ PORTNAME= junos-eznc DISTVERSION= 2.7.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ WWW= https://github.com/Juniper/py-junos-eznc LICENSE= APACHE20 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}lxml5>=3.2.4:devel/py-lxml5@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ncclient>=0.6.15:net-mgmt/py-ncclient@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paramiko>=1.15.2:security/py-paramiko@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR} \ diff --git a/net-mgmt/py-napalm/Makefile b/net-mgmt/py-napalm/Makefile index 5d80e7f43c78..a5ee8fe70036 100644 --- a/net-mgmt/py-napalm/Makefile +++ b/net-mgmt/py-napalm/Makefile @@ -1,6 +1,6 @@ PORTNAME= napalm DISTVERSION= 5.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}lxml5>=4.3.0:devel/py-lxml5@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=4.3.0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}textfsm>=1.1.2:textproc/py-textfsm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}junos-eznc>=2.7.0:net-mgmt/py-junos-eznc@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ncclient>0:net-mgmt/py-ncclient@${PY_FLAVOR} \ diff --git a/net-mgmt/py-ncclient/Makefile b/net-mgmt/py-ncclient/Makefile index 496112cb00b3..abf689951140 100644 --- a/net-mgmt/py-ncclient/Makefile +++ b/net-mgmt/py-ncclient/Makefile @@ -1,6 +1,6 @@ PORTNAME= ncclient DISTVERSION= 0.6.15 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ WWW= https://github.com/ncclient/ncclient LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml5>=3.3.0:devel/py-lxml5@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paramiko>=1.15.0:security/py-paramiko@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} diff --git a/net-mgmt/py-netutils/Makefile b/net-mgmt/py-netutils/Makefile index 5efc070d3c36..bf5478bbef75 100644 --- a/net-mgmt/py-netutils/Makefile +++ b/net-mgmt/py-netutils/Makefile @@ -1,5 +1,5 @@ PORTNAME= netutils -DISTVERSION= 1.14.1 +DISTVERSION= 1.15.0 CATEGORIES= net-mgmt python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net-mgmt/py-netutils/distinfo b/net-mgmt/py-netutils/distinfo index e693ab3ed009..b3e560db7dea 100644 --- a/net-mgmt/py-netutils/distinfo +++ b/net-mgmt/py-netutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1752304592 -SHA256 (netutils-1.14.1.tar.gz) = ddf0c7d8f863214c2aaabe1d8ff5e20b2c5749eafad04a4847a97ae8cc9e28bc -SIZE (netutils-1.14.1.tar.gz) = 513249 +TIMESTAMP = 1757763521 +SHA256 (netutils-1.15.0.tar.gz) = 01d6cc5e527090089f924e4df0f7375213dbe476e0689e636da3b42db99be71f +SIZE (netutils-1.15.0.tar.gz) = 517296 diff --git a/net-mgmt/py-nxapi-plumbing/Makefile b/net-mgmt/py-nxapi-plumbing/Makefile index 8eee0a57057c..84e64aeea1ba 100644 --- a/net-mgmt/py-nxapi-plumbing/Makefile +++ b/net-mgmt/py-nxapi-plumbing/Makefile @@ -1,6 +1,6 @@ PORTNAME= nxapi-plumbing DISTVERSION= 0.5.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scp>=0:security/py-scp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${PY_FLAVOR} diff --git a/net-mgmt/py-opn-cli/Makefile b/net-mgmt/py-opn-cli/Makefile index deabb5291663..970739d35a98 100644 --- a/net-mgmt/py-opn-cli/Makefile +++ b/net-mgmt/py-opn-cli/Makefile @@ -1,6 +1,6 @@ PORTNAME= opn-cli DISTVERSION= 1.7.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_F ${PYTHON_PKGNAMEPREFIX}click>=8.0.1:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonpath-ng>=0:devel/py-jsonpath-ng@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ptable>=0:devel/py-ptable@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} diff --git a/net-mgmt/py-pyIOSXR/Makefile b/net-mgmt/py-pyIOSXR/Makefile index 7d147e4ba82f..4f2c4f8aff00 100644 --- a/net-mgmt/py-pyIOSXR/Makefile +++ b/net-mgmt/py-pyIOSXR/Makefile @@ -1,6 +1,6 @@ PORTNAME= pyIOSXR DISTVERSION= 0.53 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ WWW= https://github.com/fooelisa/pyiosxr LICENSE= APACHE20 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml5>=3.2.4:devel/py-lxml5@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netmiko>=1.4.3:security/py-netmiko@${PY_FLAVOR} USES= python diff --git a/net-mgmt/py-pyang/Makefile b/net-mgmt/py-pyang/Makefile index 3d37bdf7f119..e92cb3f7a88b 100644 --- a/net-mgmt/py-pyang/Makefile +++ b/net-mgmt/py-pyang/Makefile @@ -1,6 +1,6 @@ PORTNAME= pyang PORTVERSION= 1.7.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,7 +11,7 @@ WWW= https://github.com/mbj4668/pyang/ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/net-mgmt/py-pynetbox/Makefile b/net-mgmt/py-pynetbox/Makefile index 7627f93e86c5..b450b775146e 100644 --- a/net-mgmt/py-pynetbox/Makefile +++ b/net-mgmt/py-pynetbox/Makefile @@ -1,5 +1,6 @@ PORTNAME= pynetbox DISTVERSION= 7.5.0 +PORTREVISION= 1 CATEGORIES= net-mgmt python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,13 +12,15 @@ WWW= https://github.com/netbox-community/pynetbox LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} +BUILD_DEPENDS= ${PY_SETUPTOOLS} \ + ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.20<3:www/py-requests@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent distutils pytest +USE_PYTHON= autoplist concurrent pep517 pytest # Skip integration tests as they require Docker and a checked out git repository PYTEST_IGNORED_TESTS= integration @@ -29,7 +32,10 @@ OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0<2.0.0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} -DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" + +post-build-DOCS-on: + ${SETENV} PYTHONPATH=${WRKSRC} ${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ + -d ${WRKDIR} -b html ${WRKSRC}/docs ${WRKSRC}/build/sphinx/html post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/net-mgmt/resource-agents/Makefile b/net-mgmt/resource-agents/Makefile index 6a9c4f70dcba..36798e7fd21b 100644 --- a/net-mgmt/resource-agents/Makefile +++ b/net-mgmt/resource-agents/Makefile @@ -1,7 +1,7 @@ PORTNAME= resource-agents PORTVERSION= 4.13.0 DISTVERSIONPREFIX=v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MAINTAINER= ports@FreeBSD.org diff --git a/net-mgmt/rubygem-oxidized/Makefile b/net-mgmt/rubygem-oxidized/Makefile index 53b07aeaa18d..4c3d7a0b8fd2 100644 --- a/net-mgmt/rubygem-oxidized/Makefile +++ b/net-mgmt/rubygem-oxidized/Makefile @@ -1,5 +1,5 @@ PORTNAME= oxidized -PORTVERSION= 0.30.1 +PORTVERSION= 0.34.3 CATEGORIES= net-mgmt rubygems MASTER_SITES= RG @@ -13,12 +13,17 @@ RUN_DEPENDS= rubygem-asetus>=0.4<1:devel/rubygem-asetus \ rubygem-bcrypt_pbkdf>=1.0<2:security/rubygem-bcrypt_pbkdf \ rubygem-ed25519>=1.2<2:security/rubygem-ed25519 \ rubygem-net-ftp>=0.2:ftp/rubygem-net-ftp \ - rubygem-net-scp>=4.0:security/rubygem-net-scp \ - rubygem-net-ssh>=7.1,2<8,2:security/rubygem-net-ssh \ + rubygem-net-http-digest_auth>=1.4<2:www/rubygem-net-http-digest_auth \ + rubygem-net-scp>=4.1:security/rubygem-net-scp \ + rubygem-net-ssh>=7.3,2<8,2:security/rubygem-net-ssh \ rubygem-net-telnet>=0.2<1:security/rubygem-net-telnet \ - rubygem-psych3>=3.3<4:textproc/rubygem-psych3 \ - rubygem-rugged>=1.5<2:devel/rubygem-rugged \ - rubygem-slop>=4.10<5:devel/rubygem-slop + rubygem-ostruct>=0.6<1:devel/rubygem-ostruct \ + rubygem-psych>=5.0<6:textproc/rubygem-psych \ + rubygem-rugged>=1.6<2:devel/rubygem-rugged \ + rubygem-semantic_logger>=4.17.0:devel/rubygem-semantic_logger \ + rubygem-slop>=4.6<5:devel/rubygem-slop \ + rubygem-syslog>=0.3.0:devel/rubygem-syslog \ + rubygem-syslog_protocol>=0.9.2:devel/rubygem-syslog_protocol \ USES= gem shebangfix diff --git a/net-mgmt/rubygem-oxidized/distinfo b/net-mgmt/rubygem-oxidized/distinfo index cfc7fb2fd083..9ab89df73af3 100644 --- a/net-mgmt/rubygem-oxidized/distinfo +++ b/net-mgmt/rubygem-oxidized/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726749993 -SHA256 (rubygem/oxidized-0.30.1.gem) = 0cf880cb0c4c4c5912525793bc26e4b0584248a9657f415ae7002da927cfc967 -SIZE (rubygem/oxidized-0.30.1.gem) = 153600 +TIMESTAMP = 1757261693 +SHA256 (rubygem/oxidized-0.34.3.gem) = 4865c33d4711bf6379a59a82db61bb918ebe4d053307e12da18853713b06669a +SIZE (rubygem/oxidized-0.34.3.gem) = 193024 diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile index 443694e6321f..26f1c32ea42f 100644 --- a/net-mgmt/telegraf/Makefile +++ b/net-mgmt/telegraf/Makefile @@ -1,7 +1,6 @@ PORTNAME= telegraf DISTVERSIONPREFIX=v -DISTVERSION= 1.35.4 -PORTREVISION= 2 +DISTVERSION= 1.36.2 CATEGORIES= net-mgmt MAINTAINER= girgen@FreeBSD.org @@ -12,7 +11,7 @@ LICENSE= MIT ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 -USES= go:1.24,modules +USES= go:1.25,modules USE_RC_SUBR= telegraf diff --git a/net-mgmt/telegraf/distinfo b/net-mgmt/telegraf/distinfo index 576cfa31ec62..ab7ab9e74b72 100644 --- a/net-mgmt/telegraf/distinfo +++ b/net-mgmt/telegraf/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1755589322 -SHA256 (go/net-mgmt_telegraf/telegraf-v1.35.4/v1.35.4.mod) = 20001de4e02129bcd9358edc840a65387b20ca775b5bfd665b74128e307ca21a -SIZE (go/net-mgmt_telegraf/telegraf-v1.35.4/v1.35.4.mod) = 28907 -SHA256 (go/net-mgmt_telegraf/telegraf-v1.35.4/v1.35.4.zip) = d78f0a8f056d39618b8909db3fcfb94a26fc9fa7ecd1186095590b19e7ba2fe6 -SIZE (go/net-mgmt_telegraf/telegraf-v1.35.4/v1.35.4.zip) = 7387820 +TIMESTAMP = 1759217924 +SHA256 (go/net-mgmt_telegraf/telegraf-v1.36.2/v1.36.2.mod) = a4dd0516ec428ccc1bb1e4689a0e2b593ebb58f949c81837005cfca700905ebc +SIZE (go/net-mgmt_telegraf/telegraf-v1.36.2/v1.36.2.mod) = 29371 +SHA256 (go/net-mgmt_telegraf/telegraf-v1.36.2/v1.36.2.zip) = c87758c3ba5004bd49a594d9cb91ff3837724164acdf463aa280750cddd87d0f +SIZE (go/net-mgmt_telegraf/telegraf-v1.36.2/v1.36.2.zip) = 7446122 diff --git a/net-mgmt/telegraf/files/patch-gopsutil b/net-mgmt/telegraf/files/patch-gopsutil deleted file mode 100644 index 623b9e2e61da..000000000000 --- a/net-mgmt/telegraf/files/patch-gopsutil +++ /dev/null @@ -1,753 +0,0 @@ ---- vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_arm64.go.orig 2025-09-01 15:17:42.603499000 +0000 -+++ vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_arm64.go 2025-09-03 08:20:12.866056000 +0000 -@@ -52,7 +52,7 @@ - Flags uint32 - Device_type uint32 - Priority uint32 -- Id *byte -+ Id [sizeofPtr]byte - Sequence1 uint32 - Pad_cgo_0 [4]byte - } ---- vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_arm.go.orig 2025-09-01 15:17:42.603343000 +0000 -+++ vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_arm.go 2025-09-03 08:20:12.865772000 +0000 -@@ -50,7 +50,7 @@ - Flags uint32 - Device_type uint32 - Priority uint32 -- Id *byte -+ Id [sizeofPtr]byte - Sequence1 uint32 - } - ---- vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_amd64.go.orig 2025-09-01 15:17:42.603178000 +0000 -+++ vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_amd64.go 2025-09-03 08:20:12.865459000 +0000 -@@ -52,7 +52,7 @@ - Device_type uint32 - Priority uint32 - Pad_cgo_1 [4]byte -- ID *byte -+ ID [sizeofPtr]byte - Sequence1 uint32 - Pad_cgo_2 [4]byte - } ---- vendor/github.com/shirou/gopsutil/v4/disk/disk_openbsd.go.orig 2025-09-01 15:17:42.604526000 +0000 -+++ vendor/github.com/shirou/gopsutil/v4/disk/disk_openbsd.go 2025-09-03 08:20:12.866408000 +0000 -@@ -114,9 +114,7 @@ - func parseDiskstats(buf []byte) (Diskstats, error) { - var ds Diskstats - br := bytes.NewReader(buf) -- // err := binary.Read(br, binary.LittleEndian, &ds) -- err := common.Read(br, binary.LittleEndian, &ds) -- if err != nil { -+ if err := binary.Read(br, binary.LittleEndian, &ds); err != nil { - return ds, err - } - ---- vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd.go.orig 2025-09-01 15:17:42.602868000 +0000 -+++ vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd.go 2025-09-03 08:20:12.864783000 +0000 -@@ -154,9 +154,7 @@ - func parsedevstat(buf []byte) (devstat, error) { - var ds devstat - br := bytes.NewReader(buf) -- // err := binary.Read(br, binary.LittleEndian, &ds) -- err := common.Read(br, binary.LittleEndian, &ds) -- if err != nil { -+ if err := binary.Read(br, binary.LittleEndian, &ds); err != nil { - return ds, err - } - ---- vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_386.go.orig 2025-09-01 15:17:42.603028000 +0000 -+++ vendor/github.com/shirou/gopsutil/v4/disk/disk_freebsd_386.go 2025-09-03 08:20:12.865161000 +0000 -@@ -50,7 +50,7 @@ - Flags uint32 - Device_type uint32 - Priority uint32 -- Id *byte -+ Id [sizeofPtr]byte - Sequence1 uint32 - } - ---- vendor/github.com/shirou/gopsutil/v4/process/process_bsd.go.orig 2025-09-01 15:17:42.632928000 +0000 -+++ vendor/github.com/shirou/gopsutil/v4/process/process_bsd.go 2025-09-03 08:20:15.328852000 +0000 -@@ -71,6 +71,6 @@ - func parseKinfoProc(buf []byte) (KinfoProc, error) { - var k KinfoProc - br := bytes.NewReader(buf) -- err := common.Read(br, binary.LittleEndian, &k) -+ err := binary.Read(br, binary.LittleEndian, &k) - return k, err - } ---- vendor/github.com/shirou/gopsutil/v4/process/process_freebsd.go.orig 2025-09-01 15:17:42.633796000 +0000 -+++ vendor/github.com/shirou/gopsutil/v4/process/process_freebsd.go 2025-09-03 08:20:15.329256000 +0000 -@@ -79,7 +79,7 @@ - - var k kinfoFile - br := bytes.NewReader(buf) -- if err := common.Read(br, binary.LittleEndian, &k); err != nil { -+ if err := binary.Read(br, binary.LittleEndian, &k); err != nil { - return "", err - } - cwd := common.IntToString(k.Path[:]) -@@ -279,7 +279,7 @@ - if err != nil { - return nil, err - } -- pageSize := common.LittleEndian.Uint16([]byte(v)) -+ pageSize := binary.LittleEndian.Uint16([]byte(v)) - - return &MemoryInfoStat{ - RSS: uint64(k.Rssize) * uint64(pageSize), ---- vendor/github.com/shirou/gopsutil/v4/internal/common/binary.go.orig 2025-09-01 15:17:42.617027000 +0000 -+++ vendor/github.com/shirou/gopsutil/v4/internal/common/binary.go 2025-09-03 08:20:15.328241000 +0000 -@@ -1,638 +0,0 @@ --// SPDX-License-Identifier: BSD-3-Clause --package common -- --// Copyright 2009 The Go Authors. All rights reserved. --// Use of this source code is governed by a BSD-style --// license that can be found in the LICENSE file. -- --// Package binary implements simple translation between numbers and byte --// sequences and encoding and decoding of varints. --// --// Numbers are translated by reading and writing fixed-size values. --// A fixed-size value is either a fixed-size arithmetic --// type (int8, uint8, int16, float32, complex64, ...) --// or an array or struct containing only fixed-size values. --// --// The varint functions encode and decode single integer values using --// a variable-length encoding; smaller values require fewer bytes. --// For a specification, see --// http://code.google.com/apis/protocolbuffers/docs/encoding.html. --// --// This package favors simplicity over efficiency. Clients that require --// high-performance serialization, especially for large data structures, --// should look at more advanced solutions such as the encoding/gob --// package or protocol buffers. -- --import ( -- "errors" -- "io" -- "math" -- "reflect" --) -- --// A ByteOrder specifies how to convert byte sequences into --// 16-, 32-, or 64-bit unsigned integers. --type ByteOrder interface { -- Uint16([]byte) uint16 -- Uint32([]byte) uint32 -- Uint64([]byte) uint64 -- PutUint16([]byte, uint16) -- PutUint32([]byte, uint32) -- PutUint64([]byte, uint64) -- String() string --} -- --// LittleEndian is the little-endian implementation of ByteOrder. --var LittleEndian littleEndian -- --// BigEndian is the big-endian implementation of ByteOrder. --var BigEndian bigEndian -- --type littleEndian struct{} -- --func (littleEndian) Uint16(b []byte) uint16 { return uint16(b[0]) | uint16(b[1])<<8 } -- --func (littleEndian) PutUint16(b []byte, v uint16) { -- b[0] = byte(v) -- b[1] = byte(v >> 8) --} -- --func (littleEndian) Uint32(b []byte) uint32 { -- return uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24 --} -- --func (littleEndian) PutUint32(b []byte, v uint32) { -- b[0] = byte(v) -- b[1] = byte(v >> 8) -- b[2] = byte(v >> 16) -- b[3] = byte(v >> 24) --} -- --func (littleEndian) Uint64(b []byte) uint64 { -- return uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | -- uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56 --} -- --func (littleEndian) PutUint64(b []byte, v uint64) { -- b[0] = byte(v) -- b[1] = byte(v >> 8) -- b[2] = byte(v >> 16) -- b[3] = byte(v >> 24) -- b[4] = byte(v >> 32) -- b[5] = byte(v >> 40) -- b[6] = byte(v >> 48) -- b[7] = byte(v >> 56) --} -- --func (littleEndian) String() string { return "LittleEndian" } -- --func (littleEndian) GoString() string { return "binary.LittleEndian" } -- --type bigEndian struct{} -- --func (bigEndian) Uint16(b []byte) uint16 { return uint16(b[1]) | uint16(b[0])<<8 } -- --func (bigEndian) PutUint16(b []byte, v uint16) { -- b[0] = byte(v >> 8) -- b[1] = byte(v) --} -- --func (bigEndian) Uint32(b []byte) uint32 { -- return uint32(b[3]) | uint32(b[2])<<8 | uint32(b[1])<<16 | uint32(b[0])<<24 --} -- --func (bigEndian) PutUint32(b []byte, v uint32) { -- b[0] = byte(v >> 24) -- b[1] = byte(v >> 16) -- b[2] = byte(v >> 8) -- b[3] = byte(v) --} -- --func (bigEndian) Uint64(b []byte) uint64 { -- return uint64(b[7]) | uint64(b[6])<<8 | uint64(b[5])<<16 | uint64(b[4])<<24 | -- uint64(b[3])<<32 | uint64(b[2])<<40 | uint64(b[1])<<48 | uint64(b[0])<<56 --} -- --func (bigEndian) PutUint64(b []byte, v uint64) { -- b[0] = byte(v >> 56) -- b[1] = byte(v >> 48) -- b[2] = byte(v >> 40) -- b[3] = byte(v >> 32) -- b[4] = byte(v >> 24) -- b[5] = byte(v >> 16) -- b[6] = byte(v >> 8) -- b[7] = byte(v) --} -- --func (bigEndian) String() string { return "BigEndian" } -- --func (bigEndian) GoString() string { return "binary.BigEndian" } -- --// Read reads structured binary data from r into data. --// Data must be a pointer to a fixed-size value or a slice --// of fixed-size values. --// Bytes read from r are decoded using the specified byte order --// and written to successive fields of the data. --// When reading into structs, the field data for fields with --// blank (_) field names is skipped; i.e., blank field names --// may be used for padding. --// When reading into a struct, all non-blank fields must be exported. --func Read(r io.Reader, order ByteOrder, data any) error { -- // Fast path for basic types and slices. -- if n := intDataSize(data); n != 0 { -- var b [8]byte -- var bs []byte -- if n > len(b) { -- bs = make([]byte, n) -- } else { -- bs = b[:n] -- } -- if _, err := io.ReadFull(r, bs); err != nil { -- return err -- } -- switch data := data.(type) { -- case *int8: -- *data = int8(b[0]) -- case *uint8: -- *data = b[0] -- case *int16: -- *data = int16(order.Uint16(bs)) -- case *uint16: -- *data = order.Uint16(bs) -- case *int32: -- *data = int32(order.Uint32(bs)) -- case *uint32: -- *data = order.Uint32(bs) -- case *int64: -- *data = int64(order.Uint64(bs)) -- case *uint64: -- *data = order.Uint64(bs) -- case []int8: -- for i, x := range bs { // Easier to loop over the input for 8-bit values. -- data[i] = int8(x) -- } -- case []uint8: -- copy(data, bs) -- case []int16: -- for i := range data { -- data[i] = int16(order.Uint16(bs[2*i:])) -- } -- case []uint16: -- for i := range data { -- data[i] = order.Uint16(bs[2*i:]) -- } -- case []int32: -- for i := range data { -- data[i] = int32(order.Uint32(bs[4*i:])) -- } -- case []uint32: -- for i := range data { -- data[i] = order.Uint32(bs[4*i:]) -- } -- case []int64: -- for i := range data { -- data[i] = int64(order.Uint64(bs[8*i:])) -- } -- case []uint64: -- for i := range data { -- data[i] = order.Uint64(bs[8*i:]) -- } -- } -- return nil -- } -- -- // Fallback to reflect-based decoding. -- v := reflect.ValueOf(data) -- size := -1 -- switch v.Kind() { -- case reflect.Ptr: -- v = v.Elem() -- size = dataSize(v) -- case reflect.Slice: -- size = dataSize(v) -- } -- if size < 0 { -- return errors.New("binary.Read: invalid type " + reflect.TypeOf(data).String()) -- } -- d := &decoder{order: order, buf: make([]byte, size)} -- if _, err := io.ReadFull(r, d.buf); err != nil { -- return err -- } -- d.value(v) -- return nil --} -- --// Write writes the binary representation of data into w. --// Data must be a fixed-size value or a slice of fixed-size --// values, or a pointer to such data. --// Bytes written to w are encoded using the specified byte order --// and read from successive fields of the data. --// When writing structs, zero values are written for fields --// with blank (_) field names. --func Write(w io.Writer, order ByteOrder, data any) error { -- // Fast path for basic types and slices. -- if n := intDataSize(data); n != 0 { -- var b [8]byte -- var bs []byte -- if n > len(b) { -- bs = make([]byte, n) -- } else { -- bs = b[:n] -- } -- switch v := data.(type) { -- case *int8: -- bs = b[:1] -- b[0] = byte(*v) -- case int8: -- bs = b[:1] -- b[0] = byte(v) -- case []int8: -- for i, x := range v { -- bs[i] = byte(x) -- } -- case *uint8: -- bs = b[:1] -- b[0] = *v -- case uint8: -- bs = b[:1] -- b[0] = byte(v) -- case []uint8: -- bs = v -- case *int16: -- bs = b[:2] -- order.PutUint16(bs, uint16(*v)) -- case int16: -- bs = b[:2] -- order.PutUint16(bs, uint16(v)) -- case []int16: -- for i, x := range v { -- order.PutUint16(bs[2*i:], uint16(x)) -- } -- case *uint16: -- bs = b[:2] -- order.PutUint16(bs, *v) -- case uint16: -- bs = b[:2] -- order.PutUint16(bs, v) -- case []uint16: -- for i, x := range v { -- order.PutUint16(bs[2*i:], x) -- } -- case *int32: -- bs = b[:4] -- order.PutUint32(bs, uint32(*v)) -- case int32: -- bs = b[:4] -- order.PutUint32(bs, uint32(v)) -- case []int32: -- for i, x := range v { -- order.PutUint32(bs[4*i:], uint32(x)) -- } -- case *uint32: -- bs = b[:4] -- order.PutUint32(bs, *v) -- case uint32: -- bs = b[:4] -- order.PutUint32(bs, v) -- case []uint32: -- for i, x := range v { -- order.PutUint32(bs[4*i:], x) -- } -- case *int64: -- bs = b[:8] -- order.PutUint64(bs, uint64(*v)) -- case int64: -- bs = b[:8] -- order.PutUint64(bs, uint64(v)) -- case []int64: -- for i, x := range v { -- order.PutUint64(bs[8*i:], uint64(x)) -- } -- case *uint64: -- bs = b[:8] -- order.PutUint64(bs, *v) -- case uint64: -- bs = b[:8] -- order.PutUint64(bs, v) -- case []uint64: -- for i, x := range v { -- order.PutUint64(bs[8*i:], x) -- } -- } -- _, err := w.Write(bs) -- return err -- } -- -- // Fallback to reflect-based encoding. -- v := reflect.Indirect(reflect.ValueOf(data)) -- size := dataSize(v) -- if size < 0 { -- return errors.New("binary.Write: invalid type " + reflect.TypeOf(data).String()) -- } -- buf := make([]byte, size) -- e := &encoder{order: order, buf: buf} -- e.value(v) -- _, err := w.Write(buf) -- return err --} -- --// Size returns how many bytes Write would generate to encode the value v, which --// must be a fixed-size value or a slice of fixed-size values, or a pointer to such data. --// If v is neither of these, Size returns -1. --func Size(v any) int { -- return dataSize(reflect.Indirect(reflect.ValueOf(v))) --} -- --// dataSize returns the number of bytes the actual data represented by v occupies in memory. --// For compound structures, it sums the sizes of the elements. Thus, for instance, for a slice --// it returns the length of the slice times the element size and does not count the memory --// occupied by the header. If the type of v is not acceptable, dataSize returns -1. --func dataSize(v reflect.Value) int { -- if v.Kind() == reflect.Slice { -- if s := sizeof(v.Type().Elem()); s >= 0 { -- return s * v.Len() -- } -- return -1 -- } -- return sizeof(v.Type()) --} -- --// sizeof returns the size >= 0 of variables for the given type or -1 if the type is not acceptable. --func sizeof(t reflect.Type) int { -- switch t.Kind() { -- case reflect.Array: -- if s := sizeof(t.Elem()); s >= 0 { -- return s * t.Len() -- } -- -- case reflect.Struct: -- sum := 0 -- for i, n := 0, t.NumField(); i < n; i++ { -- s := sizeof(t.Field(i).Type) -- if s < 0 { -- return -1 -- } -- sum += s -- } -- return sum -- -- case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, -- reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, -- reflect.Float32, reflect.Float64, reflect.Complex64, reflect.Complex128, reflect.Ptr: -- return int(t.Size()) -- } -- -- return -1 --} -- --type coder struct { -- order ByteOrder -- buf []byte --} -- --type ( -- decoder coder -- encoder coder --) -- --func (d *decoder) uint8() uint8 { -- x := d.buf[0] -- d.buf = d.buf[1:] -- return x --} -- --func (e *encoder) uint8(x uint8) { -- e.buf[0] = x -- e.buf = e.buf[1:] --} -- --func (d *decoder) uint16() uint16 { -- x := d.order.Uint16(d.buf[0:2]) -- d.buf = d.buf[2:] -- return x --} -- --func (e *encoder) uint16(x uint16) { -- e.order.PutUint16(e.buf[0:2], x) -- e.buf = e.buf[2:] --} -- --func (d *decoder) uint32() uint32 { -- x := d.order.Uint32(d.buf[0:4]) -- d.buf = d.buf[4:] -- return x --} -- --func (e *encoder) uint32(x uint32) { -- e.order.PutUint32(e.buf[0:4], x) -- e.buf = e.buf[4:] --} -- --func (d *decoder) uint64() uint64 { -- x := d.order.Uint64(d.buf[0:8]) -- d.buf = d.buf[8:] -- return x --} -- --func (e *encoder) uint64(x uint64) { -- e.order.PutUint64(e.buf[0:8], x) -- e.buf = e.buf[8:] --} -- --func (d *decoder) int8() int8 { return int8(d.uint8()) } -- --func (e *encoder) int8(x int8) { e.uint8(uint8(x)) } -- --func (d *decoder) int16() int16 { return int16(d.uint16()) } -- --func (e *encoder) int16(x int16) { e.uint16(uint16(x)) } -- --func (d *decoder) int32() int32 { return int32(d.uint32()) } -- --func (e *encoder) int32(x int32) { e.uint32(uint32(x)) } -- --func (d *decoder) int64() int64 { return int64(d.uint64()) } -- --func (e *encoder) int64(x int64) { e.uint64(uint64(x)) } -- --func (d *decoder) value(v reflect.Value) { -- switch v.Kind() { -- case reflect.Array: -- l := v.Len() -- for i := 0; i < l; i++ { -- d.value(v.Index(i)) -- } -- -- case reflect.Struct: -- t := v.Type() -- l := v.NumField() -- for i := 0; i < l; i++ { -- // Note: Calling v.CanSet() below is an optimization. -- // It would be sufficient to check the field name, -- // but creating the StructField info for each field is -- // costly (run "go test -bench=ReadStruct" and compare -- // results when making changes to this code). -- if v = v.Field(i); v.CanSet() || t.Field(i).Name != "_" { -- d.value(v) -- } else { -- d.skip(v) -- } -- } -- -- case reflect.Slice: -- l := v.Len() -- for i := 0; i < l; i++ { -- d.value(v.Index(i)) -- } -- -- case reflect.Int8: -- v.SetInt(int64(d.int8())) -- case reflect.Int16: -- v.SetInt(int64(d.int16())) -- case reflect.Int32: -- v.SetInt(int64(d.int32())) -- case reflect.Int64: -- v.SetInt(d.int64()) -- -- case reflect.Uint8: -- v.SetUint(uint64(d.uint8())) -- case reflect.Uint16: -- v.SetUint(uint64(d.uint16())) -- case reflect.Uint32: -- v.SetUint(uint64(d.uint32())) -- case reflect.Uint64: -- v.SetUint(d.uint64()) -- -- case reflect.Float32: -- v.SetFloat(float64(math.Float32frombits(d.uint32()))) -- case reflect.Float64: -- v.SetFloat(math.Float64frombits(d.uint64())) -- -- case reflect.Complex64: -- v.SetComplex(complex( -- float64(math.Float32frombits(d.uint32())), -- float64(math.Float32frombits(d.uint32())), -- )) -- case reflect.Complex128: -- v.SetComplex(complex( -- math.Float64frombits(d.uint64()), -- math.Float64frombits(d.uint64()), -- )) -- } --} -- --func (e *encoder) value(v reflect.Value) { -- switch v.Kind() { -- case reflect.Array: -- l := v.Len() -- for i := 0; i < l; i++ { -- e.value(v.Index(i)) -- } -- -- case reflect.Struct: -- t := v.Type() -- l := v.NumField() -- for i := 0; i < l; i++ { -- // see comment for corresponding code in decoder.value() -- if v = v.Field(i); v.CanSet() || t.Field(i).Name != "_" { -- e.value(v) -- } else { -- e.skip(v) -- } -- } -- -- case reflect.Slice: -- l := v.Len() -- for i := 0; i < l; i++ { -- e.value(v.Index(i)) -- } -- -- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: -- switch v.Type().Kind() { -- case reflect.Int8: -- e.int8(int8(v.Int())) -- case reflect.Int16: -- e.int16(int16(v.Int())) -- case reflect.Int32: -- e.int32(int32(v.Int())) -- case reflect.Int64: -- e.int64(v.Int()) -- } -- -- case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: -- switch v.Type().Kind() { -- case reflect.Uint8: -- e.uint8(uint8(v.Uint())) -- case reflect.Uint16: -- e.uint16(uint16(v.Uint())) -- case reflect.Uint32: -- e.uint32(uint32(v.Uint())) -- case reflect.Uint64: -- e.uint64(v.Uint()) -- } -- -- case reflect.Float32, reflect.Float64: -- switch v.Type().Kind() { -- case reflect.Float32: -- e.uint32(math.Float32bits(float32(v.Float()))) -- case reflect.Float64: -- e.uint64(math.Float64bits(v.Float())) -- } -- -- case reflect.Complex64, reflect.Complex128: -- switch v.Type().Kind() { -- case reflect.Complex64: -- x := v.Complex() -- e.uint32(math.Float32bits(float32(real(x)))) -- e.uint32(math.Float32bits(float32(imag(x)))) -- case reflect.Complex128: -- x := v.Complex() -- e.uint64(math.Float64bits(real(x))) -- e.uint64(math.Float64bits(imag(x))) -- } -- } --} -- --func (d *decoder) skip(v reflect.Value) { -- d.buf = d.buf[dataSize(v):] --} -- --func (e *encoder) skip(v reflect.Value) { -- n := dataSize(v) -- for i := range e.buf[0:n] { -- e.buf[i] = 0 -- } -- e.buf = e.buf[n:] --} -- --// intDataSize returns the size of the data required to represent the data when encoded. --// It returns zero if the type cannot be implemented by the fast path in Read or Write. --func intDataSize(data any) int { -- switch data := data.(type) { -- case int8, *int8, *uint8: -- return 1 -- case []int8: -- return len(data) -- case []uint8: -- return len(data) -- case int16, *int16, *uint16: -- return 2 -- case []int16: -- return 2 * len(data) -- case []uint16: -- return 2 * len(data) -- case int32, *int32, *uint32: -- return 4 -- case []int32: -- return 4 * len(data) -- case []uint32: -- return 4 * len(data) -- case int64, *int64, *uint64: -- return 8 -- case []int64: -- return 8 * len(data) -- case []uint64: -- return 8 * len(data) -- } -- return 0 --} ---- vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd.go.orig 2025-09-01 15:17:42.625682000 +0000 -+++ vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd.go 2025-09-03 08:20:15.328569000 +0000 -@@ -61,8 +61,7 @@ - } - var bcs Bcachestats - br := bytes.NewReader(buf) -- err = common.Read(br, binary.LittleEndian, &bcs) -- if err != nil { -+ if err := binary.Read(br, binary.LittleEndian, &bcs); err != nil { - return nil, err - } - ret.Buffers = uint64(bcs.Numbufpages) * p diff --git a/net-mgmt/unifi9/Makefile b/net-mgmt/unifi9/Makefile index 49323cae6028..d22f9ec93517 100644 --- a/net-mgmt/unifi9/Makefile +++ b/net-mgmt/unifi9/Makefile @@ -1,5 +1,5 @@ PORTNAME= unifi9 -PORTVERSION= 9.3.45 +PORTVERSION= 9.4.19 PORTREVISION?= 0 CATEGORIES= net-mgmt java MASTER_SITES= http://dl.ubnt.com/unifi/%SUBDIR%/:unifi \ diff --git a/net-mgmt/unifi9/distinfo b/net-mgmt/unifi9/distinfo index e627649789e8..b237bfd0923b 100644 --- a/net-mgmt/unifi9/distinfo +++ b/net-mgmt/unifi9/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1754575420 -SHA256 (unifi9-9.3.45/unifi_sysvinit_all.deb) = f60a5763df978949e9c91b8c76f5c691b8aa2774a527a3d9ee4d518f9a5b16ab -SIZE (unifi9-9.3.45/unifi_sysvinit_all.deb) = 137388556 -SHA256 (unifi9-9.3.45/javax.activation-api-1.2.0.jar) = 43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393 -SIZE (unifi9-9.3.45/javax.activation-api-1.2.0.jar) = 56674 +TIMESTAMP = 1757944665 +SHA256 (unifi9-9.4.19/unifi_sysvinit_all.deb) = 95bbde1c98ce4690116be114e783adbc893bc7558518aaf01562f76fe037e570 +SIZE (unifi9-9.4.19/unifi_sysvinit_all.deb) = 137958618 +SHA256 (unifi9-9.4.19/javax.activation-api-1.2.0.jar) = 43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393 +SIZE (unifi9-9.4.19/javax.activation-api-1.2.0.jar) = 56674 diff --git a/net-mgmt/victoria-logs/Makefile b/net-mgmt/victoria-logs/Makefile index 389955c97f0b..4d564216b466 100644 --- a/net-mgmt/victoria-logs/Makefile +++ b/net-mgmt/victoria-logs/Makefile @@ -1,7 +1,6 @@ PORTNAME= victoria-logs -PORTVERSION= 1.32.0 +PORTVERSION= 1.34.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= samm@FreeBSD.org diff --git a/net-mgmt/victoria-logs/distinfo b/net-mgmt/victoria-logs/distinfo index bd39e6600077..566f40fdbd15 100644 --- a/net-mgmt/victoria-logs/distinfo +++ b/net-mgmt/victoria-logs/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1756877909 -SHA256 (go/net-mgmt_victoria-logs/victoria-logs-v1.32.0/v1.32.0.mod) = acf605656d2b19bc4524b239c73f98e3827c433e8898c189297997b235a9152f -SIZE (go/net-mgmt_victoria-logs/victoria-logs-v1.32.0/v1.32.0.mod) = 958 -SHA256 (go/net-mgmt_victoria-logs/victoria-logs-v1.32.0/v1.32.0.zip) = df15e59c1c994a4bef0dfd2b3c3f37bb28398c8d37d3ffacadcc350bbe850c16 -SIZE (go/net-mgmt_victoria-logs/victoria-logs-v1.32.0/v1.32.0.zip) = 2907554 +TIMESTAMP = 1758605685 +SHA256 (go/net-mgmt_victoria-logs/victoria-logs-v1.34.0/v1.34.0.mod) = 500417abcc66403fa0881b17bbe99c6915bf285601b1d22029f55b255fdd1eed +SIZE (go/net-mgmt_victoria-logs/victoria-logs-v1.34.0/v1.34.0.mod) = 958 +SHA256 (go/net-mgmt_victoria-logs/victoria-logs-v1.34.0/v1.34.0.zip) = c838728453daedf49e663cbe226945067596dabb0467454b091759fef7824912 +SIZE (go/net-mgmt_victoria-logs/victoria-logs-v1.34.0/v1.34.0.zip) = 2931046 diff --git a/net-mgmt/victoria-logs/pkg-plist b/net-mgmt/victoria-logs/pkg-plist index 61e2860d3e6a..8b755d335b10 100644 --- a/net-mgmt/victoria-logs/pkg-plist +++ b/net-mgmt/victoria-logs/pkg-plist @@ -2,7 +2,6 @@ bin/victoria-logs bin/vlogscli %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md %%PORTDOCS%%%%DOCSDIR%%/FAQ.md -%%PORTDOCS%%%%DOCSDIR%%/LogsQL.md %%PORTDOCS%%%%DOCSDIR%%/QuickStart.md %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/Roadmap.md @@ -40,4 +39,5 @@ bin/vlogscli %%PORTDOCS%%%%DOCSDIR%%/vlagent.md %%PORTDOCS%%%%DOCSDIR%%/metrics.md %%PORTDOCS%%%%DOCSDIR%%/vlagent-metrics.md +%%PORTDOCS%%%%DOCSDIR%%/logsql.md @dir(%%VICTORIA_USER%%,%%VICTORIA_GROUP%%,750) %%VICTORIA_DATA%% diff --git a/net-mgmt/victoria-metrics/Makefile b/net-mgmt/victoria-metrics/Makefile index 65abb771c070..681b851a1fd9 100644 --- a/net-mgmt/victoria-metrics/Makefile +++ b/net-mgmt/victoria-metrics/Makefile @@ -1,7 +1,7 @@ PORTNAME?= victoria-metrics -PORTVERSION= 1.123.0 # don't forget to update BUILDINFO_TAG +PORTVERSION= 1.126.0 # don't forget to update BUILDINFO_TAG DISTVERSIONPREFIX= v -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES= net-mgmt MAINTAINER= danfe@FreeBSD.org @@ -11,10 +11,10 @@ WWW= https://victoriametrics.com/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= gmake go:1.24,no_targets +USES= gmake go:1.25,no_targets USE_RC_SUBR?= ${PORTNAME} MAKE_ENV= PKG_TAG=v${PORTVERSION} GOOS=${OPSYS:tl} \ - BUILDINFO_TAG=tags-v${PORTVERSION}-0-gfbe5ddc \ + BUILDINFO_TAG=tags-v${PORTVERSION}-0-gaa42963 \ DATEINFO_TAG=${_GET_DATE:sh} ALL_TARGET= ${PORTNAME}-pure diff --git a/net-mgmt/victoria-metrics/distinfo b/net-mgmt/victoria-metrics/distinfo index 4b4cd12b11c5..358825537494 100644 --- a/net-mgmt/victoria-metrics/distinfo +++ b/net-mgmt/victoria-metrics/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754052859 -SHA256 (VictoriaMetrics-VictoriaMetrics-v1.123.0_GH0.tar.gz) = fac29199ea949c420800564a0aeae33bd21539916cdfdccaf6617695083c54ec -SIZE (VictoriaMetrics-VictoriaMetrics-v1.123.0_GH0.tar.gz) = 37769067 +TIMESTAMP = 1757681862 +SHA256 (VictoriaMetrics-VictoriaMetrics-v1.126.0_GH0.tar.gz) = 460871ab460183220624df41b4400419e3635615803374c6a8f5844d159e0988 +SIZE (VictoriaMetrics-VictoriaMetrics-v1.126.0_GH0.tar.gz) = 41162635 diff --git a/net-mgmt/victoria-metrics/files/patch-benchmarks_Makefile b/net-mgmt/victoria-metrics/files/patch-benchmarks_Makefile deleted file mode 100644 index 215eb55c0f16..000000000000 --- a/net-mgmt/victoria-metrics/files/patch-benchmarks_Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- benchmarks/Makefile.orig 2025-08-01 12:54:19 UTC -+++ benchmarks/Makefile -@@ -35,11 +35,8 @@ - tsbs: tsbs-build tsbs-generate-data tsbs-load-data tsbs-generate-queries tsbs-run-queries - - TSBS_SCALE := 100000 --# If GNU date is available, use it; otherwise, fall back to the standard date command --# User can install GNU date on macOS via `brew install coreutils` --DATE_CMD := $(shell which gdate 2>/dev/null || echo date) --TSBS_START := $(shell $(DATE_CMD) -u -d "1 day ago 00:00:00" +"%Y-%m-%dT%H:%M:%SZ") --TSBS_END := $(shell $(DATE_CMD) -u -d "00:00:00" +"%Y-%m-%dT%H:%M:%SZ") -+TSBS_START := $(shell date -u -v-1d -v0H -v0M -v0S +"%Y-%m-%dT%H:%M:%SZ") -+TSBS_END := $(shell date -u -v0H -v0M -v0S +"%Y-%m-%dT%H:%M:%SZ") - TSBS_STEP := 80s - TSBS_QUERIES := 1000 - TSBS_WORKERS := 4 diff --git a/net-mgmt/victoria-metrics/pkg-plist b/net-mgmt/victoria-metrics/pkg-plist index f8e3e7f12c2c..15ac487e5f52 100644 --- a/net-mgmt/victoria-metrics/pkg-plist +++ b/net-mgmt/victoria-metrics/pkg-plist @@ -200,9 +200,11 @@ bin/victoria-metrics %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/grafana.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/graphite.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/influxdb.md +%%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/kafka.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/newrelic.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/opentsdb.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/prometheus.md +%%PORTDOCS%%%%DOCSDIR%%/victoriametrics/integrations/pubsub.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/keyConcepts/_index.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/keyConcepts/counter.webp %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/keyConcepts/data_collection.webp @@ -242,5 +244,6 @@ bin/victoria-metrics %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/stream-aggregation/configuration-total.webp %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/stream-aggregation/configuration.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/url-examples.md +%%PORTDOCS%%%%DOCSDIR%%/victoriametrics/victoria_metrics_flags.md %%PORTDOCS%%%%DOCSDIR%%/victoriametrics/victoriametrics-datasource.md @dir(%%VICTORIA_USER%%,%%VICTORIA_GROUP%%,750) %%VICTORIA_DATA%% diff --git a/net-mgmt/vmutils/Makefile b/net-mgmt/vmutils/Makefile index 81fa7ca916df..faa8e86c8244 100644 --- a/net-mgmt/vmutils/Makefile +++ b/net-mgmt/vmutils/Makefile @@ -1,5 +1,4 @@ PORTNAME= vmutils -PORTREVISION= 1 COMMENT= Ancillary utilities and agent for VictoriaMetrics diff --git a/net-mgmt/vmutils/pkg-plist b/net-mgmt/vmutils/pkg-plist index 506a8e0534a2..81ff6ce8f5cc 100644 --- a/net-mgmt/vmutils/pkg-plist +++ b/net-mgmt/vmutils/pkg-plist @@ -7,10 +7,12 @@ bin/vmrestore @sample etc/prometheus/prometheus.yml.sample %%PORTDOCS%%%%DOCSDIR%%/vmagent.md %%PORTDOCS%%%%DOCSDIR%%/vmagent.webp +%%PORTDOCS%%%%DOCSDIR%%/vmagent_flags.md %%PORTDOCS%%%%DOCSDIR%%/vmalert-tool.md %%PORTDOCS%%%%DOCSDIR%%/vmalert.md %%PORTDOCS%%%%DOCSDIR%%/vmalert_cluster.excalidraw %%PORTDOCS%%%%DOCSDIR%%/vmalert_cluster.webp +%%PORTDOCS%%%%DOCSDIR%%/vmalert_flags.md %%PORTDOCS%%%%DOCSDIR%%/vmalert_ha.excalidraw %%PORTDOCS%%%%DOCSDIR%%/vmalert_ha.webp %%PORTDOCS%%%%DOCSDIR%%/vmalert_multicluster.excalidraw @@ -44,4 +46,7 @@ bin/vmrestore %%PORTDOCS%%%%DOCSDIR%%/vmgateway-overview.webp %%PORTDOCS%%%%DOCSDIR%%/vmgateway-rate-limiting.webp %%PORTDOCS%%%%DOCSDIR%%/vmgateway.md +%%PORTDOCS%%%%DOCSDIR%%/vminsert_flags.md %%PORTDOCS%%%%DOCSDIR%%/vmrestore.md +%%PORTDOCS%%%%DOCSDIR%%/vmselect_flags.md +%%PORTDOCS%%%%DOCSDIR%%/vmstorage_flags.md |