diff options
Diffstat (limited to '')
70 files changed, 108 insertions, 1110 deletions
diff --git a/net-mgmt/adguard-exporter/Makefile b/net-mgmt/adguard-exporter/Makefile index 8e28849dc65a..57242cef0157 100644 --- a/net-mgmt/adguard-exporter/Makefile +++ b/net-mgmt/adguard-exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= adguard-exporter DISTVERSIONPREFIX= v DISTVERSION= 1.14 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= net-mgmt MAINTAINER= christer.edwards@gmail.com diff --git a/net-mgmt/alertmanager/Makefile b/net-mgmt/alertmanager/Makefile index 8926b778eabb..cc2cf32c4446 100644 --- a/net-mgmt/alertmanager/Makefile +++ b/net-mgmt/alertmanager/Makefile @@ -1,7 +1,7 @@ PORTNAME= alertmanager PORTVERSION= 0.26.0 DISTVERSIONPREFIX= v -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= net-mgmt MAINTAINER= michal@hanu.la diff --git a/net-mgmt/bandwhich/Makefile b/net-mgmt/bandwhich/Makefile index bfc874dd6666..8e035b6f3af0 100644 --- a/net-mgmt/bandwhich/Makefile +++ b/net-mgmt/bandwhich/Makefile @@ -1,7 +1,7 @@ PORTNAME= bandwhich DISTVERSIONPREFIX= v DISTVERSION= 0.23.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-mgmt MAINTAINER= petteri.valkonen@iki.fi diff --git a/net-mgmt/blackbox_exporter/Makefile b/net-mgmt/blackbox_exporter/Makefile index c8178fd70c47..187cec6d5f15 100644 --- a/net-mgmt/blackbox_exporter/Makefile +++ b/net-mgmt/blackbox_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= blackbox_exporter DISTVERSIONPREFIX= v DISTVERSION= 0.27.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MAINTAINER= eduardo@FreeBSD.org diff --git a/net-mgmt/bosun/Makefile b/net-mgmt/bosun/Makefile index f70367a0f1ac..03e20b3b02c7 100644 --- a/net-mgmt/bosun/Makefile +++ b/net-mgmt/bosun/Makefile @@ -1,7 +1,7 @@ PORTNAME= bosun DISTVERSION= 0.9.0 DISTVERSIONSUFFIX= -preview -PORTREVISION= 30 +PORTREVISION= 31 CATEGORIES= net-mgmt MAINTAINER= langer.markus@gmail.com diff --git a/net-mgmt/carbon-relay-ng/Makefile b/net-mgmt/carbon-relay-ng/Makefile index 62831bc9f13b..8d1848302733 100644 --- a/net-mgmt/carbon-relay-ng/Makefile +++ b/net-mgmt/carbon-relay-ng/Makefile @@ -1,6 +1,6 @@ PORTNAME= carbon-relay-ng DISTVERSION= 0.10.0 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= net-mgmt MAINTAINER= a.andersson.thn@gmail.com diff --git a/net-mgmt/carbonzipper/Makefile b/net-mgmt/carbonzipper/Makefile index 82e25394960d..ea3e099d88ab 100644 --- a/net-mgmt/carbonzipper/Makefile +++ b/net-mgmt/carbonzipper/Makefile @@ -1,6 +1,6 @@ PORTNAME= carbonzipper DISTVERSION= 0.74 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= net-mgmt MAINTAINER= a.andersson.thn@gmail.com diff --git a/net-mgmt/check_wg/Makefile b/net-mgmt/check_wg/Makefile index 3262eae34091..29c3104d4a57 100644 --- a/net-mgmt/check_wg/Makefile +++ b/net-mgmt/check_wg/Makefile @@ -1,6 +1,7 @@ PORTNAME= check_wg DISTVERSIONPREFIX= v DISTVERSION= 0.0.8 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= dsh@bamus.cz diff --git a/net-mgmt/fli/Makefile b/net-mgmt/fli/Makefile index e7df35d0a890..bc508aba9028 100644 --- a/net-mgmt/fli/Makefile +++ b/net-mgmt/fli/Makefile @@ -1,7 +1,7 @@ PORTNAME= fli DISTVERSIONPREFIX= v DISTVERSION= 0.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MAINTAINER= olgeni@FreeBSD.org diff --git a/net-mgmt/geom-exporter/Makefile b/net-mgmt/geom-exporter/Makefile index afcbf11ea2a0..af2a45ee28b0 100644 --- a/net-mgmt/geom-exporter/Makefile +++ b/net-mgmt/geom-exporter/Makefile @@ -1,6 +1,6 @@ PORTNAME= geom-exporter DISTVERSION= 0.1.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net-mgmt MASTER_SITES= CRATESIO MASTER_SITE_SUBDIR= freebsd-${PORTNAME}/${DISTVERSION} diff --git a/net-mgmt/gping/Makefile b/net-mgmt/gping/Makefile index 0af4faab3771..14d91f305403 100644 --- a/net-mgmt/gping/Makefile +++ b/net-mgmt/gping/Makefile @@ -1,7 +1,7 @@ PORTNAME= gping DISTVERSIONPREFIX= gping-v DISTVERSION= 1.20.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MAINTAINER= ehaupt@FreeBSD.org diff --git a/net-mgmt/grok_exporter/Makefile b/net-mgmt/grok_exporter/Makefile index 32313de9720c..00c5b45090ab 100644 --- a/net-mgmt/grok_exporter/Makefile +++ b/net-mgmt/grok_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= grok_exporter DISTVERSIONPREFIX=v DISTVERSION= 1.0.0.RC4 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= net-mgmt MAINTAINER= gasol.wu@gmail.com diff --git a/net-mgmt/icingadb/Makefile b/net-mgmt/icingadb/Makefile index c51dce5dfbcd..bd5d07266eb1 100644 --- a/net-mgmt/icingadb/Makefile +++ b/net-mgmt/icingadb/Makefile @@ -1,7 +1,7 @@ PORTNAME= icingadb DISTVERSIONPREFIX= v DISTVERSION= 1.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MAINTAINER= dvl@FreeBSD.org 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/intel-snap/Makefile b/net-mgmt/intel-snap/Makefile index 49cb5b5e9afe..2345cb801793 100644 --- a/net-mgmt/intel-snap/Makefile +++ b/net-mgmt/intel-snap/Makefile @@ -1,6 +1,6 @@ PORTNAME= intel-snap PORTVERSION= 0.0.1 -PORTREVISION= 30 +PORTREVISION= 31 CATEGORIES= net-mgmt MAINTAINER= ports@FreeBSD.org diff --git a/net-mgmt/kapacitor/Makefile b/net-mgmt/kapacitor/Makefile index b78bb1b51b51..672b0a6dd5d3 100644 --- a/net-mgmt/kapacitor/Makefile +++ b/net-mgmt/kapacitor/Makefile @@ -1,7 +1,7 @@ PORTNAME= kapacitor DISTVERSIONPREFIX= v DISTVERSION= 1.5.1 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= net-mgmt MAINTAINER= cheffo@freebsd-bg.org 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/mqtt2prometheus/Makefile b/net-mgmt/mqtt2prometheus/Makefile index 66118dc52639..c068eedc0f67 100644 --- a/net-mgmt/mqtt2prometheus/Makefile +++ b/net-mgmt/mqtt2prometheus/Makefile @@ -1,7 +1,7 @@ PORTNAME= mqtt2prometheus DISTVERSIONPREFIX= v DISTVERSION= 0.1.7 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net-mgmt MAINTAINER= manu@FreeBSD.org 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/Makefile b/net-mgmt/netdata/Makefile index bd4f0c84c95e..b3b7cc4bf27e 100644 --- a/net-mgmt/netdata/Makefile +++ b/net-mgmt/netdata/Makefile @@ -1,7 +1,7 @@ PORTNAME= netdata DISTVERSIONPREFIX= v DISTVERSION= 2.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/:netdata \ https://raw.githubusercontent.com/netdata/netdata/refs/tags/v${DISTVERSION}/src/go/:goplugin \ diff --git a/net-mgmt/nfs-exporter/Makefile b/net-mgmt/nfs-exporter/Makefile index 3149e99cdb9c..73f8dba7a691 100644 --- a/net-mgmt/nfs-exporter/Makefile +++ b/net-mgmt/nfs-exporter/Makefile @@ -1,6 +1,6 @@ PORTNAME= nfs-exporter DISTVERSION= 0.4.4 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net-mgmt MASTER_SITES= CRATESIO MASTER_SITE_SUBDIR= freebsd-${PORTNAME}/${DISTVERSION} diff --git a/net-mgmt/nsd_exporter/Makefile b/net-mgmt/nsd_exporter/Makefile index b43465570a35..a45507922ecc 100644 --- a/net-mgmt/nsd_exporter/Makefile +++ b/net-mgmt/nsd_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= nsd_exporter PORTVERSION= 0.3.1 DISTVERSIONPREFIX= v -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= net-mgmt MAINTAINER= zi@FreeBSD.org diff --git a/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile b/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile index 0732ab526ba1..fa49ddd9ae25 100644 --- a/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile +++ b/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile @@ -1,6 +1,6 @@ PORTNAME= nvidia_gpu_prometheus_exporter DISTVERSION= g20181028 -PORTREVISION= 30 +PORTREVISION= 31 CATEGORIES= net-mgmt MAINTAINER= 0mp@FreeBSD.org diff --git a/net-mgmt/php-fpm_exporter/Makefile b/net-mgmt/php-fpm_exporter/Makefile index 46ce5c1d8441..ed06222bf41b 100644 --- a/net-mgmt/php-fpm_exporter/Makefile +++ b/net-mgmt/php-fpm_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= php-fpm_exporter DISTVERSIONPREFIX=v DISTVERSION= 2.2.0 -PORTREVISION= 27 +PORTREVISION= 28 CATEGORIES= net-mgmt MAINTAINER= freebsd.org@neant.ro diff --git a/net-mgmt/phpfpm_exporter/Makefile b/net-mgmt/phpfpm_exporter/Makefile index f748175a8e4c..7f18be30dee7 100644 --- a/net-mgmt/phpfpm_exporter/Makefile +++ b/net-mgmt/phpfpm_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= phpfpm_exporter DISTVERSIONPREFIX= v DISTVERSION= 0.6.1 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= net-mgmt MAINTAINER= gasol.wu@gmail.com diff --git a/net-mgmt/ping_exporter/Makefile b/net-mgmt/ping_exporter/Makefile index 0b593e76d68f..6f2e8732d4a3 100644 --- a/net-mgmt/ping_exporter/Makefile +++ b/net-mgmt/ping_exporter/Makefile @@ -1,6 +1,6 @@ PORTNAME= ping_exporter DISTVERSION= 1.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MAINTAINER= ivy@FreeBSD.org diff --git a/net-mgmt/prometheus-bird-exporter/Makefile b/net-mgmt/prometheus-bird-exporter/Makefile index 976753003fdb..990ae3c6b335 100644 --- a/net-mgmt/prometheus-bird-exporter/Makefile +++ b/net-mgmt/prometheus-bird-exporter/Makefile @@ -1,6 +1,6 @@ PORTNAME= prometheus-bird-exporter DISTVERSION= 1.4.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MAINTAINER= ivy@FreeBSD.org diff --git a/net-mgmt/prometheus-collectd-exporter/Makefile b/net-mgmt/prometheus-collectd-exporter/Makefile index 5c6c6f309292..e9024db0dfca 100644 --- a/net-mgmt/prometheus-collectd-exporter/Makefile +++ b/net-mgmt/prometheus-collectd-exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= prometheus-collectd-exporter PORTVERSION= 0.5.0 DISTVERSIONPREFIX= v -PORTREVISION= 30 +PORTREVISION= 31 CATEGORIES= net-mgmt MAINTAINER= dsp@php.net diff --git a/net-mgmt/prometheus1/Makefile b/net-mgmt/prometheus1/Makefile index 84982bb1e19c..7f78b5f7ee0d 100644 --- a/net-mgmt/prometheus1/Makefile +++ b/net-mgmt/prometheus1/Makefile @@ -1,7 +1,7 @@ PORTNAME= prometheus PORTVERSION= 1.8.2 DISTVERSIONPREFIX= v -PORTREVISION= 33 +PORTREVISION= 34 CATEGORIES= net-mgmt PKGNAMESUFFIX= 1 diff --git a/net-mgmt/prometheus3/Makefile b/net-mgmt/prometheus3/Makefile index 6848b982dee5..eb746962c3f3 100644 --- a/net-mgmt/prometheus3/Makefile +++ b/net-mgmt/prometheus3/Makefile @@ -1,7 +1,7 @@ PORTNAME= prometheus DISTVERSIONPREFIX= v -DISTVERSION= 3.5.0 -PORTREVISION= 2 +DISTVERSION= 3.6.0 +PORTREVISION= 1 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/promscale/Makefile b/net-mgmt/promscale/Makefile index c4a5c6184d91..17c6960f498c 100644 --- a/net-mgmt/promscale/Makefile +++ b/net-mgmt/promscale/Makefile @@ -1,6 +1,6 @@ PORTNAME= promscale DISTVERSION= 0.17.0 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= net-mgmt MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod DISTFILES= go.mod:gomod diff --git a/net-mgmt/promxy/Makefile b/net-mgmt/promxy/Makefile index 9cae80e178a3..9f7a715e1fdd 100644 --- a/net-mgmt/promxy/Makefile +++ b/net-mgmt/promxy/Makefile @@ -1,7 +1,7 @@ PORTNAME= promxy DISTVERSIONPREFIX= v DISTVERSION= 0.0.93 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MAINTAINER= timp87@gmail.com diff --git a/net-mgmt/pushgateway/Makefile b/net-mgmt/pushgateway/Makefile index 71c2971ac772..e392e39f4621 100644 --- a/net-mgmt/pushgateway/Makefile +++ b/net-mgmt/pushgateway/Makefile @@ -1,7 +1,7 @@ PORTNAME= pushgateway DISTVERSIONPREFIX= v DISTVERSION= 1.11.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= dutra@FreeBSD.org 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/rs-aggregate/Makefile b/net-mgmt/rs-aggregate/Makefile index e02c4d251062..14d60266565c 100644 --- a/net-mgmt/rs-aggregate/Makefile +++ b/net-mgmt/rs-aggregate/Makefile @@ -1,7 +1,7 @@ PORTNAME= rs-aggregate DISTVERSIONPREFIX= v DISTVERSION= 0.3.2 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= net-mgmt MAINTAINER= marcel@herrbischoff.com diff --git a/net-mgmt/rubygem-oxidized-web/Makefile b/net-mgmt/rubygem-oxidized-web/Makefile index 27526f0d8b62..8c75acd1f77f 100644 --- a/net-mgmt/rubygem-oxidized-web/Makefile +++ b/net-mgmt/rubygem-oxidized-web/Makefile @@ -1,6 +1,5 @@ PORTNAME= oxidized-web -PORTVERSION= 0.14.0 -PORTREVISION= 2 +PORTVERSION= 0.17.1 CATEGORIES= net-mgmt rubygems MASTER_SITES= RG @@ -14,13 +13,13 @@ RUN_DEPENDS= rubygem-charlock_holmes>=0.7.5:textproc/rubygem-charlock_holmes \ rubygem-emk-sinatra-url-for>=0.2:www/rubygem-emk-sinatra-url-for \ rubygem-haml>=6.0:www/rubygem-haml \ rubygem-htmlentities>=4.3:textproc/rubygem-htmlentities \ - rubygem-json>=1.7.0:devel/rubygem-json \ + rubygem-json>=2.3.0:devel/rubygem-json \ rubygem-oxidized>=0.26:net-mgmt/rubygem-oxidized \ - rubygem-puma>=3.11.4:www/rubygem-puma \ + rubygem-puma6>=6.6.0:www/rubygem-puma6 \ rubygem-rack-test>=2.1.0:www/rubygem-rack-test \ rubygem-sass>=3.3:textproc/rubygem-sass \ - rubygem-sinatra-contrib>=3.0.0:www/rubygem-sinatra-contrib \ - rubygem-sinatra>=3.0.0:www/rubygem-sinatra + rubygem-sinatra-contrib>=4.1.1:www/rubygem-sinatra-contrib \ + rubygem-sinatra>=4.1.1:www/rubygem-sinatra USES= gem diff --git a/net-mgmt/rubygem-oxidized-web/distinfo b/net-mgmt/rubygem-oxidized-web/distinfo index 71495a67a36e..fc4b2a1e56a3 100644 --- a/net-mgmt/rubygem-oxidized-web/distinfo +++ b/net-mgmt/rubygem-oxidized-web/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726768904 -SHA256 (rubygem/oxidized-web-0.14.0.gem) = 021d50681a5edb782f38030531aeee281789a265a9618d5072dd25f2649fc155 -SIZE (rubygem/oxidized-web-0.14.0.gem) = 937984 +TIMESTAMP = 1757247507 +SHA256 (rubygem/oxidized-web-0.17.1.gem) = a9d156911e877e0bb9735ebd45c7248e30ce207ef930ebb406a3f0f1293e8ccd +SIZE (rubygem/oxidized-web-0.17.1.gem) = 958976 diff --git a/net-mgmt/rubygem-oxidized-web/files/patch-lib_oxidized_web_webapp.rb b/net-mgmt/rubygem-oxidized-web/files/patch-lib_oxidized_web_webapp.rb deleted file mode 100644 index 9171b3e7696b..000000000000 --- a/net-mgmt/rubygem-oxidized-web/files/patch-lib_oxidized_web_webapp.rb +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/oxidized/web/webapp.rb.orig 2025-01-13 18:59:48 UTC -+++ lib/oxidized/web/webapp.rb -@@ -17,6 +17,7 @@ module Oxidized - helpers Sinatra::UrlForHelper - set :public_folder, proc { File.join(root, 'public') } - set :haml, { escape_html: false } -+ set :host_authorization, { permitted_hosts: [] } - - get '/' do - redirect url_for('/nodes') diff --git a/net-mgmt/rubygem-oxidized-web/files/patch-oxidized-web.gemspec b/net-mgmt/rubygem-oxidized-web/files/patch-oxidized-web.gemspec deleted file mode 100644 index b8b93ee486fa..000000000000 --- a/net-mgmt/rubygem-oxidized-web/files/patch-oxidized-web.gemspec +++ /dev/null @@ -1,11 +0,0 @@ ---- oxidized-web.gemspec.orig 2025-01-13 18:59:26 UTC -+++ oxidized-web.gemspec -@@ -27,7 +27,7 @@ Gem::Specification.new do |s| - s.add_runtime_dependency(%q<htmlentities>.freeze, ["~> 4.3".freeze]) - s.add_runtime_dependency(%q<json>.freeze, ["~> 2.3".freeze]) - s.add_runtime_dependency(%q<oxidized>.freeze, ["~> 0.26".freeze]) -- s.add_runtime_dependency(%q<puma>.freeze, [">= 3.11.4".freeze, "< 6.5.0".freeze]) -+ s.add_runtime_dependency(%q<puma>.freeze, [">= 3.11.4".freeze, "< 7.0".freeze]) - s.add_runtime_dependency(%q<sinatra>.freeze, [">= 1.4.6".freeze, "< 5.0".freeze]) - s.add_runtime_dependency(%q<sinatra-contrib>.freeze, [">= 1.4.6".freeze, "< 5.0".freeze]) - s.add_development_dependency(%q<bundler>.freeze, ["~> 2.2".freeze]) 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/semaphore/Makefile b/net-mgmt/semaphore/Makefile index 27d4c8941a24..2e5d024e7b4d 100644 --- a/net-mgmt/semaphore/Makefile +++ b/net-mgmt/semaphore/Makefile @@ -1,7 +1,7 @@ PORTNAME= semaphore PORTVERSION= 2.9.2 DISTVERSIONPREFIX= v -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= net-mgmt MAINTAINER= egypcio@FreeBSD.org diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile index 8f147d3fe2a8..37569395997e 100644 --- a/net-mgmt/telegraf/Makefile +++ b/net-mgmt/telegraf/Makefile @@ -1,6 +1,7 @@ PORTNAME= telegraf DISTVERSIONPREFIX=v -DISTVERSION= 1.36.1 +DISTVERSION= 1.36.2 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= girgen@FreeBSD.org @@ -11,7 +12,7 @@ LICENSE= MIT ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 -USES= go:modules +USES= go:1.25,modules USE_RC_SUBR= telegraf diff --git a/net-mgmt/telegraf/distinfo b/net-mgmt/telegraf/distinfo index 9f29234e8d0c..ab7ab9e74b72 100644 --- a/net-mgmt/telegraf/distinfo +++ b/net-mgmt/telegraf/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1757404090 -SHA256 (go/net-mgmt_telegraf/telegraf-v1.36.1/v1.36.1.mod) = 1864c2659a392593b66a649c96208c7bf06941d7a928634fd7b8d7254edf31dd -SIZE (go/net-mgmt_telegraf/telegraf-v1.36.1/v1.36.1.mod) = 29068 -SHA256 (go/net-mgmt_telegraf/telegraf-v1.36.1/v1.36.1.zip) = 0ca8a70b5bb8c4c1d9cc5993ce10ab69ef84dae76751f7e28b7b0566fd0d03a1 -SIZE (go/net-mgmt_telegraf/telegraf-v1.36.1/v1.36.1.zip) = 7439838 +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/thanos/Makefile b/net-mgmt/thanos/Makefile index e7a4c4877c4e..b5310b6f5bc3 100644 --- a/net-mgmt/thanos/Makefile +++ b/net-mgmt/thanos/Makefile @@ -1,7 +1,7 @@ PORTNAME= thanos DISTVERSIONPREFIX= v DISTVERSION= 0.39.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MAINTAINER= alven@FreeBSD.org diff --git a/net-mgmt/unbound_exporter/Makefile b/net-mgmt/unbound_exporter/Makefile index ec42d04dcbb0..6444a2808058 100644 --- a/net-mgmt/unbound_exporter/Makefile +++ b/net-mgmt/unbound_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= unbound_exporter PORTVERSION= 0.4.6 DISTVERSIONPREFIX= v -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= net-mgmt MAINTAINER= aduitsis@cpan.org diff --git a/net-mgmt/victoria-logs/Makefile b/net-mgmt/victoria-logs/Makefile index b90fada0f21a..62ee62db8fe5 100644 --- a/net-mgmt/victoria-logs/Makefile +++ b/net-mgmt/victoria-logs/Makefile @@ -1,6 +1,7 @@ PORTNAME= victoria-logs -PORTVERSION= 1.33.1 +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 44be285d5b89..566f40fdbd15 100644 --- a/net-mgmt/victoria-logs/distinfo +++ b/net-mgmt/victoria-logs/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1757622523 -SHA256 (go/net-mgmt_victoria-logs/victoria-logs-v1.33.1/v1.33.1.mod) = 1824cce18f5918f5710f0eb3d6f4d9b46aafeb6883df6d893b2c49f50757e3af -SIZE (go/net-mgmt_victoria-logs/victoria-logs-v1.33.1/v1.33.1.mod) = 958 -SHA256 (go/net-mgmt_victoria-logs/victoria-logs-v1.33.1/v1.33.1.zip) = 8e9b215a87184b7bb89b8103431b9fa1100110a08df2bfea97c66fa3296e9f7b -SIZE (go/net-mgmt_victoria-logs/victoria-logs-v1.33.1/v1.33.1.zip) = 2921431 +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-metrics/Makefile b/net-mgmt/victoria-metrics/Makefile index 681b851a1fd9..984ff53f6497 100644 --- a/net-mgmt/victoria-metrics/Makefile +++ b/net-mgmt/victoria-metrics/Makefile @@ -1,7 +1,7 @@ PORTNAME?= victoria-metrics PORTVERSION= 1.126.0 # don't forget to update BUILDINFO_TAG DISTVERSIONPREFIX= v -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MAINTAINER= danfe@FreeBSD.org diff --git a/net-mgmt/vmutils/Makefile b/net-mgmt/vmutils/Makefile index faa8e86c8244..81fa7ca916df 100644 --- a/net-mgmt/vmutils/Makefile +++ b/net-mgmt/vmutils/Makefile @@ -1,4 +1,5 @@ PORTNAME= vmutils +PORTREVISION= 1 COMMENT= Ancillary utilities and agent for VictoriaMetrics diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile index 025bf95bacd8..d0ce369330e3 100644 --- a/net-mgmt/zabbix6-server/Makefile +++ b/net-mgmt/zabbix6-server/Makefile @@ -1,5 +1,5 @@ PORTNAME= zabbix6 -DISTVERSION= 6.0.41 +DISTVERSION= 6.0.42 PORTREVISION?= 0 CATEGORIES= net-mgmt MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ diff --git a/net-mgmt/zabbix6-server/distinfo b/net-mgmt/zabbix6-server/distinfo index 3d8f2b0e8d95..665155bb3f6e 100644 --- a/net-mgmt/zabbix6-server/distinfo +++ b/net-mgmt/zabbix6-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756185644 -SHA256 (zabbix-6.0.41.tar.gz) = 13976dc13752315e11211f74784aa1fb691e0d899e2967840d13343ee0387713 -SIZE (zabbix-6.0.41.tar.gz) = 41250295 +TIMESTAMP = 1759904702 +SHA256 (zabbix-6.0.42.tar.gz) = 0257b9d7b75bbaace3981318a89940b58d3517d05df96eeca5e8234c7c932560 +SIZE (zabbix-6.0.42.tar.gz) = 41389270 diff --git a/net-mgmt/zabbix7-server/Makefile b/net-mgmt/zabbix7-server/Makefile index 478eb7cd9d09..acad9dac82b6 100644 --- a/net-mgmt/zabbix7-server/Makefile +++ b/net-mgmt/zabbix7-server/Makefile @@ -1,5 +1,5 @@ PORTNAME= zabbix7 -DISTVERSION= 7.0.18 +DISTVERSION= 7.0.19 PORTREVISION?= 0 CATEGORIES= net-mgmt MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ diff --git a/net-mgmt/zabbix7-server/distinfo b/net-mgmt/zabbix7-server/distinfo index 16ce708bb08b..21e5e0d55e43 100644 --- a/net-mgmt/zabbix7-server/distinfo +++ b/net-mgmt/zabbix7-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756185558 -SHA256 (zabbix-7.0.18.tar.gz) = 9125cee21441ffdaaa1893ee123273ef8d030a1509086cfade8cdd0b1802ba98 -SIZE (zabbix-7.0.18.tar.gz) = 46113850 +TIMESTAMP = 1759904286 +SHA256 (zabbix-7.0.19.tar.gz) = 30bef0173493b199377c9061b34e8a2e16a28eb0d6f7e9c7b942433e4b75367f +SIZE (zabbix-7.0.19.tar.gz) = 46506321 diff --git a/net-mgmt/zabbix72-server/Makefile b/net-mgmt/zabbix72-server/Makefile index 48a81572e453..447b2271b677 100644 --- a/net-mgmt/zabbix72-server/Makefile +++ b/net-mgmt/zabbix72-server/Makefile @@ -1,5 +1,5 @@ PORTNAME= zabbix72 -DISTVERSION= 7.2.12 +DISTVERSION= 7.2.13 PORTREVISION?= 0 CATEGORIES= net-mgmt MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ diff --git a/net-mgmt/zabbix72-server/distinfo b/net-mgmt/zabbix72-server/distinfo index 2f1f9cc5da18..1c143fd29885 100644 --- a/net-mgmt/zabbix72-server/distinfo +++ b/net-mgmt/zabbix72-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756185659 -SHA256 (zabbix-7.2.12.tar.gz) = 3768a72fa1ac549611dedfd79d35418c3f187fbcff678f97006343f2831a80b2 -SIZE (zabbix-7.2.12.tar.gz) = 41859546 +TIMESTAMP = 1759904424 +SHA256 (zabbix-7.2.13.tar.gz) = 44b51a09897e83b7d25cd706f88c0462224991d780881d6157d88fd804cc3a6c +SIZE (zabbix-7.2.13.tar.gz) = 42079877 diff --git a/net-mgmt/zabbix74-server/Makefile b/net-mgmt/zabbix74-server/Makefile index 3e28004d5489..57c2f5086401 100644 --- a/net-mgmt/zabbix74-server/Makefile +++ b/net-mgmt/zabbix74-server/Makefile @@ -1,5 +1,5 @@ PORTNAME= zabbix74 -DISTVERSION= 7.4.2 +DISTVERSION= 7.4.3 PORTREVISION?= 0 CATEGORIES= net-mgmt MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ diff --git a/net-mgmt/zabbix74-server/distinfo b/net-mgmt/zabbix74-server/distinfo index 65977a6bb00d..b8a80b6e61f9 100644 --- a/net-mgmt/zabbix74-server/distinfo +++ b/net-mgmt/zabbix74-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756188394 -SHA256 (zabbix-7.4.2.tar.gz) = 08d2d584d1390b1cebf0e515280eaf3611405d6fec9867690e4038bd259c3efc -SIZE (zabbix-7.4.2.tar.gz) = 42772578 +TIMESTAMP = 1759904654 +SHA256 (zabbix-7.4.3.tar.gz) = 67551435a5fb90e00c57b0cac793b4d21714368f53901c039b0504130f9ff738 +SIZE (zabbix-7.4.3.tar.gz) = 43112039 diff --git a/net-mgmt/zabbix74-server/pkg-plist.frontend b/net-mgmt/zabbix74-server/pkg-plist.frontend index 45b9fb22f201..14242159fa13 100644 --- a/net-mgmt/zabbix74-server/pkg-plist.frontend +++ b/net-mgmt/zabbix74-server/pkg-plist.frontend @@ -374,6 +374,7 @@ %%WWWDIR%%/app/controllers/CControllerUserroleList.php %%WWWDIR%%/app/controllers/CControllerUserroleUpdate.php %%WWWDIR%%/app/controllers/CControllerValidate.php +%%WWWDIR%%/app/controllers/CControllerValidateApiExists.php %%WWWDIR%%/app/controllers/CControllerValueMapCheck.php %%WWWDIR%%/app/controllers/CControllerValueMapEdit.php %%WWWDIR%%/app/controllers/CControllerWebScenarioStepCheck.php |