summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/Makefile3
-rw-r--r--net/asterisk18/Makefile2
-rw-r--r--net/asterisk18/distinfo6
-rw-r--r--net/asterisk20/Makefile2
-rw-r--r--net/asterisk20/distinfo6
-rw-r--r--net/asterisk22/Makefile2
-rw-r--r--net/asterisk22/distinfo6
-rw-r--r--net/benthos/Makefile2
-rw-r--r--net/bird3/Makefile4
-rw-r--r--net/bird3/distinfo6
-rw-r--r--net/bird3/files/patch-00-kernel-Fix-crash-for-merge-paths38
-rw-r--r--net/bird3/files/patch-01-Table-not-feeding-twice39
-rw-r--r--net/bird3/files/patch-02-kernel-trace-the-final-result53
-rw-r--r--net/bird3/files/patch-03-BGP-fix-locking-order176
-rw-r--r--net/bird3/files/patch-04-BFD-Fix-session-locking-order400
-rw-r--r--net/bird3/files/patch-05-mainloop-dropped-old-socket86
-rw-r--r--net/bird3/files/patch-06-cli-allocate-tx-buffers134
-rw-r--r--net/bird3/files/patch-07-cli-flushing-tmp-linpool29
-rw-r--r--net/bird3/files/patch-08-kernel-feed-only-once274
-rw-r--r--net/bird3/files/patch-09-graceful-recovery311
-rw-r--r--net/bird3/files/patch-10-stonehenge116
-rw-r--r--net/bird3/files/patch-11-route-attribute-storage80
-rw-r--r--net/bird3/files/patch-12-BGP-tx-bucket-storage84
-rw-r--r--net/bird3/files/patch-13-allocate-normalization-buckets100
-rw-r--r--net/bird3/files/patch-14-BGP-fix-dislpay-name25
-rw-r--r--net/bird3/files/patch-15-BGP-fixed-deterministic-med-crashes65
-rw-r--r--net/bird3/files/patch-16-Table-old-best-route-refeed-fix87
-rw-r--r--net/bosh-bootloader/Makefile2
-rw-r--r--net/bosh-cli/Makefile2
-rw-r--r--net/cf/Makefile2
-rw-r--r--net/cloudquery/Makefile2
-rw-r--r--net/concourse-fly/Makefile2
-rw-r--r--net/containernetworking-plugins/Makefile2
-rw-r--r--net/croc/Makefile2
-rw-r--r--net/dhcpcd/Makefile2
-rw-r--r--net/dhcpcd/distinfo6
-rw-r--r--net/evans/Makefile2
-rw-r--r--net/fb303/Makefile2
-rw-r--r--net/fb303/distinfo6
-rw-r--r--net/gemget/Makefile2
-rw-r--r--net/geoipupdate/Makefile2
-rw-r--r--net/gitlab-agent/Makefile2
-rw-r--r--net/gitlab-agent/distinfo10
-rw-r--r--net/go-bapu/Makefile2
-rw-r--r--net/go-cs/Makefile2
-rw-r--r--net/go-tcping/Makefile2
-rw-r--r--net/gobgp/Makefile2
-rw-r--r--net/google-cloud-sdk/Makefile2
-rw-r--r--net/google-cloud-sdk/distinfo6
-rw-r--r--net/goreplay/Makefile2
-rw-r--r--net/gorss/Makefile2
-rw-r--r--net/gotify-server/Makefile11
-rw-r--r--net/gotify-server/distinfo14
-rw-r--r--net/grpcox/Makefile2
-rw-r--r--net/grpcui/Makefile2
-rw-r--r--net/grpcurl/Makefile2
-rw-r--r--net/gscloud/Makefile2
-rw-r--r--net/haproxy/Makefile24
-rw-r--r--net/hostapd-devel/Makefile4
-rw-r--r--net/hostapd-devel/distinfo6
-rw-r--r--net/ipinfo-cli/Makefile2
-rw-r--r--net/kafka/Makefile10
-rw-r--r--net/kafka/distinfo6
-rw-r--r--net/kafka/pkg-plist62
-rw-r--r--net/kf6-kcalendarcore/distinfo6
-rw-r--r--net/kf6-kcontacts/distinfo6
-rw-r--r--net/kf6-kdav/distinfo6
-rw-r--r--net/kf6-kholidays/distinfo6
-rw-r--r--net/kf6-syndication/distinfo6
-rw-r--r--net/krakend-ce/Makefile1
-rw-r--r--net/kube-apiserver/Makefile2
-rw-r--r--net/kube-controller-manager/Makefile2
-rw-r--r--net/kube-scheduler/Makefile2
-rw-r--r--net/lavinmq/Makefile71
-rw-r--r--net/lavinmq/distinfo40
-rw-r--r--net/librespeed-cli/Makefile2
-rw-r--r--net/librespeed-go/Makefile2
-rw-r--r--net/linux-rl9-sdl2_net/Makefile25
-rw-r--r--net/linux-rl9-sdl2_net/distinfo7
-rw-r--r--net/linux-rl9-sdl2_net/pkg-plist.aarch646
-rw-r--r--net/linux-rl9-sdl2_net/pkg-plist.amd646
-rw-r--r--net/madonctl/Makefile2
-rw-r--r--net/mvfst/Makefile2
-rw-r--r--net/mvfst/distinfo6
-rw-r--r--net/mvfst/pkg-plist2
-rw-r--r--net/nats-nkeys/Makefile2
-rw-r--r--net/nats-nsc/Makefile2
-rw-r--r--net/nats-server/Makefile2
-rw-r--r--net/nats-streaming-server/Makefile2
-rw-r--r--net/nats-top/Makefile2
-rw-r--r--net/natscli/Makefile2
-rw-r--r--net/nsq/Makefile2
-rw-r--r--net/ooni-mini/Makefile2
-rw-r--r--net/openbgpd8/Makefile16
-rw-r--r--net/openbgpd8/distinfo6
-rw-r--r--net/openbgpd8/files/openbgplgd.in31
-rw-r--r--net/openbgpd8/files/patch-bgplgd.8.in21
-rw-r--r--net/openbgpd8/pkg-plist4
-rw-r--r--net/openldap25-server/Makefile8
-rw-r--r--net/openldap25-server/distinfo6
-rw-r--r--net/openldap26-server/Makefile6
-rw-r--r--net/openldap26-server/distinfo6
-rw-r--r--net/p5-Net-Whois-RIPE/Makefile2
-rw-r--r--net/p5-RPC-XML/Makefile12
-rw-r--r--net/py-eventlet/Makefile2
-rw-r--r--net/py-eventlet/distinfo6
-rw-r--r--net/py-uritools/Makefile2
-rw-r--r--net/py-uritools/distinfo6
-rw-r--r--net/py-urllib3-future/Makefile11
-rw-r--r--net/py-urllib3-future/distinfo6
-rw-r--r--net/qrcp/Makefile2
-rw-r--r--net/rabbitmq/Makefile6
-rw-r--r--net/rabbitmq/distinfo6
-rw-r--r--net/rabbitmq/pkg-plist532
-rw-r--r--net/rclone/Makefile5
-rw-r--r--net/rclone/distinfo10
-rw-r--r--net/redpanda-connect/Makefile2
-rw-r--r--net/revsocks/Makefile2
-rw-r--r--net/rospo/Makefile1
-rw-r--r--net/rubygem-activestorage-gitlab/Makefile28
-rw-r--r--net/rubygem-activestorage-gitlab/distinfo3
-rw-r--r--net/rubygem-activestorage-gitlab/pkg-descr11
-rw-r--r--net/rubygem-amq-protocol/Makefile2
-rw-r--r--net/rubygem-amq-protocol/distinfo6
-rw-r--r--net/rubygem-apollo_upload_server/Makefile3
-rw-r--r--net/rubygem-fog-vsphere/Makefile2
-rw-r--r--net/rubygem-fog-vsphere/distinfo6
-rw-r--r--net/rubygem-gitlab-kas-grpc/distinfo6
-rw-r--r--net/rubygem-google-cloud-bigtable-admin-v2/Makefile6
-rw-r--r--net/rubygem-google-cloud-bigtable-admin-v2/distinfo6
-rw-r--r--net/rubygem-google-cloud-bigtable-v2/Makefile4
-rw-r--r--net/rubygem-google-cloud-bigtable-v2/distinfo6
-rw-r--r--net/rubygem-google-cloud-env/Makefile2
-rw-r--r--net/rubygem-google-cloud-env/distinfo6
-rw-r--r--net/rubygem-google-cloud-location/Makefile4
-rw-r--r--net/rubygem-google-cloud-location/distinfo6
-rw-r--r--net/rubygem-google-cloud-logging-v2/Makefile4
-rw-r--r--net/rubygem-google-cloud-logging-v2/distinfo6
-rw-r--r--net/rubygem-google-cloud-monitoring-dashboard-v1/Makefile4
-rw-r--r--net/rubygem-google-cloud-monitoring-dashboard-v1/distinfo6
-rw-r--r--net/rubygem-google-cloud-monitoring-metrics_scope-v1/Makefile4
-rw-r--r--net/rubygem-google-cloud-monitoring-metrics_scope-v1/distinfo6
-rw-r--r--net/rubygem-google-cloud-monitoring-v3/Makefile4
-rw-r--r--net/rubygem-google-cloud-monitoring-v3/distinfo6
-rw-r--r--net/rubygem-google-cloud-monitoring/Makefile2
-rw-r--r--net/rubygem-google-cloud-monitoring/distinfo6
-rw-r--r--net/rubygem-google-cloud-pubsub-v1/Makefile6
-rw-r--r--net/rubygem-google-cloud-pubsub-v1/distinfo6
-rw-r--r--net/rubygem-google-cloud-spanner-admin-database-v1/Makefile6
-rw-r--r--net/rubygem-google-cloud-spanner-admin-database-v1/distinfo6
-rw-r--r--net/rubygem-google-cloud-spanner-admin-instance-v1/Makefile6
-rw-r--r--net/rubygem-google-cloud-spanner-admin-instance-v1/distinfo6
-rw-r--r--net/rubygem-google-cloud-spanner-v1/Makefile4
-rw-r--r--net/rubygem-google-cloud-spanner-v1/distinfo6
-rw-r--r--net/rubygem-google-cloud-spanner/Makefile3
-rw-r--r--net/rubygem-google-cloud-spanner/files/patch-gemspec11
-rw-r--r--net/rubygem-google-cloud-storage_transfer-v1/Makefile4
-rw-r--r--net/rubygem-google-cloud-storage_transfer-v1/distinfo6
-rw-r--r--net/rubygem-google-cloud-storage_transfer/Makefile2
-rw-r--r--net/rubygem-google-cloud-storage_transfer/distinfo6
-rw-r--r--net/rubygem-google-cloud-trace-v1/Makefile4
-rw-r--r--net/rubygem-google-cloud-trace-v1/distinfo6
-rw-r--r--net/rubygem-google-cloud-trace-v2/Makefile4
-rw-r--r--net/rubygem-google-cloud-trace-v2/distinfo6
-rw-r--r--net/rubygem-oauth2-gitlab/Makefile11
-rw-r--r--net/rubygem-oauth2-gitlab/distinfo6
-rw-r--r--net/rubygem-oauth2/Makefile11
-rw-r--r--net/rubygem-oauth2/distinfo6
-rw-r--r--net/rubygem-t/Makefile4
-rw-r--r--net/rubygem-t/distinfo6
-rw-r--r--net/rubygem-train-core/Makefile2
-rw-r--r--net/rubygem-train-core/distinfo6
-rw-r--r--net/rubygem-train-winrm/Makefile4
-rw-r--r--net/rubygem-train-winrm/distinfo6
-rw-r--r--net/rubygem-train-winrm/files/patch-gemspec14
-rw-r--r--net/rubygem-train/Makefile4
-rw-r--r--net/rubygem-train/distinfo6
-rw-r--r--net/rubygem-twitter/Makefile2
-rw-r--r--net/rubygem-twitter/distinfo6
-rw-r--r--net/rubygem-x/Makefile2
-rw-r--r--net/rubygem-x/distinfo6
-rw-r--r--net/s5cmd/Makefile2
-rw-r--r--net/slackcat/Makefile2
-rw-r--r--net/speedtest-go/Makefile2
-rw-r--r--net/spoofdpi/Makefile2
-rw-r--r--net/stc/Makefile2
-rw-r--r--net/storj/Makefile2
-rw-r--r--net/tcplog_dumper/Makefile3
-rw-r--r--net/tcplog_dumper/distinfo6
-rw-r--r--net/termshark/Makefile2
-rw-r--r--net/tunneller/Makefile2
-rw-r--r--net/v2ray/Makefile1
-rw-r--r--net/vtun/Makefile2
-rw-r--r--net/wangle/Makefile2
-rw-r--r--net/wangle/distinfo6
-rw-r--r--net/wgcf/Makefile1
-rw-r--r--net/wireguard-go/Makefile2
-rw-r--r--net/wireproxy/Makefile2
-rw-r--r--net/wlvncc/Makefile4
-rw-r--r--net/wlvncc/distinfo6
-rw-r--r--net/xapsd/Makefile1
-rw-r--r--net/ziina/Makefile21
-rw-r--r--net/ziina/distinfo5
-rw-r--r--net/ziina/pkg-descr7
-rw-r--r--net/zsync/Makefile3
-rw-r--r--net/zsync/distinfo5
206 files changed, 978 insertions, 2762 deletions
diff --git a/net/Makefile b/net/Makefile
index 858b4d9dd186..a506cd0dcda5 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -448,7 +448,6 @@
SUBDIR += linux-c7-tcp_wrappers-libs
SUBDIR += linux-rl9-avahi-libs
SUBDIR += linux-rl9-openldap
- SUBDIR += linux-rl9-sdl2_net
SUBDIR += linux-rl9-sdl_net
SUBDIR += linux-rl9-tcp_wrappers-libs
SUBDIR += liveMedia
@@ -1260,6 +1259,7 @@
SUBDIR += rtg
SUBDIR += rtpproxy
SUBDIR += rtptools
+ SUBDIR += rubygem-activestorage-gitlab
SUBDIR += rubygem-activestorage52
SUBDIR += rubygem-activestorage60
SUBDIR += rubygem-activestorage61
@@ -1715,6 +1715,7 @@
SUBDIR += zapret
SUBDIR += zebra-server
SUBDIR += zerotier
+ SUBDIR += ziina
SUBDIR += zillion
SUBDIR += zmap
SUBDIR += zsync
diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile
index 7f35182f0889..9f6a8b917fcc 100644
--- a/net/asterisk18/Makefile
+++ b/net/asterisk18/Makefile
@@ -1,5 +1,5 @@
PORTNAME= asterisk
-PORTVERSION= 18.26.1
+PORTVERSION= 18.26.2
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
diff --git a/net/asterisk18/distinfo b/net/asterisk18/distinfo
index 7460510f0034..fecdce73872d 100644
--- a/net/asterisk18/distinfo
+++ b/net/asterisk18/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1736505904
-SHA256 (asterisk/asterisk-18.26.1.tar.gz) = 5df5d1c3885428b8bf03e78d7b8c3079d4512679137ef1d47e865dc2058aa825
-SIZE (asterisk/asterisk-18.26.1.tar.gz) = 28565082
+TIMESTAMP = 1748020917
+SHA256 (asterisk/asterisk-18.26.2.tar.gz) = 745689c84d63ae94dfa0b3d4bdde3c6907b72472018532f757d9c0d169705964
+SIZE (asterisk/asterisk-18.26.2.tar.gz) = 28568510
SHA256 (asterisk/asterisk-core-sounds-en-g729-1.6.1.tar.gz) = 306ec9f38de9859e3f750ecff1385187945021919ea936c02e890134a04bae33
SIZE (asterisk/asterisk-core-sounds-en-g729-1.6.1.tar.gz) = 1557751
SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/asterisk20/Makefile b/net/asterisk20/Makefile
index db47bd050928..17b082270e80 100644
--- a/net/asterisk20/Makefile
+++ b/net/asterisk20/Makefile
@@ -1,5 +1,5 @@
PORTNAME= asterisk
-DISTVERSION= 20.14.0
+DISTVERSION= 20.14.1
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
diff --git a/net/asterisk20/distinfo b/net/asterisk20/distinfo
index 863cb2748d8c..43e51311ded1 100644
--- a/net/asterisk20/distinfo
+++ b/net/asterisk20/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1746865242
-SHA256 (asterisk/asterisk-20.14.0.tar.gz) = f9152e87467d5b57a898e3bc69bcded87b8525db21e5bf06ea361120af838ce6
-SIZE (asterisk/asterisk-20.14.0.tar.gz) = 28438237
+TIMESTAMP = 1748000917
+SHA256 (asterisk/asterisk-20.14.1.tar.gz) = fa0f953740eed079d5aaadf88f7f7131a053c61e4bc961faed0f30ba77f52ac9
+SIZE (asterisk/asterisk-20.14.1.tar.gz) = 28439201
SHA256 (asterisk/asterisk-core-sounds-en-g729-1.6.tar.gz) = b49dec15e07bb9bff6af0da3a07180651a38ef54d3ea54a3f20c35f081ed8714
SIZE (asterisk/asterisk-core-sounds-en-g729-1.6.tar.gz) = 1557798
SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/asterisk22/Makefile b/net/asterisk22/Makefile
index 41826adfd475..dd97550b7fa1 100644
--- a/net/asterisk22/Makefile
+++ b/net/asterisk22/Makefile
@@ -1,5 +1,5 @@
PORTNAME= asterisk
-DISTVERSION= 22.4.0
+DISTVERSION= 22.4.1
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
diff --git a/net/asterisk22/distinfo b/net/asterisk22/distinfo
index 8d20afcdf021..421733b1e607 100644
--- a/net/asterisk22/distinfo
+++ b/net/asterisk22/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1746767807
-SHA256 (asterisk/asterisk-22.4.0.tar.gz) = 7fb2a95769de30b9d5c672ff071b64d939c2f62576a302033caf9e4c3b6996b7
-SIZE (asterisk/asterisk-22.4.0.tar.gz) = 26323494
+TIMESTAMP = 1747994304
+SHA256 (asterisk/asterisk-22.4.1.tar.gz) = 92a6312edb3db16bbd1126423fb88517dca2408d681d53cf09939cb299b4b894
+SIZE (asterisk/asterisk-22.4.1.tar.gz) = 26324437
SHA256 (asterisk/asterisk-core-sounds-en-g729-1.6.tar.gz) = b49dec15e07bb9bff6af0da3a07180651a38ef54d3ea54a3f20c35f081ed8714
SIZE (asterisk/asterisk-core-sounds-en-g729-1.6.tar.gz) = 1557798
SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/benthos/Makefile b/net/benthos/Makefile
index d4f2d8422a15..eee35b1bf990 100644
--- a/net/benthos/Makefile
+++ b/net/benthos/Makefile
@@ -1,7 +1,7 @@
PORTNAME= benthos
DISTVERSIONPREFIX= v
DISTVERSION= 4.27.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net
MAINTAINER= olgeni@FreeBSD.org
diff --git a/net/bird3/Makefile b/net/bird3/Makefile
index 8c27bcafdc41..e2ab2236fc95 100644
--- a/net/bird3/Makefile
+++ b/net/bird3/Makefile
@@ -1,7 +1,7 @@
PORTNAME= bird
-DISTVERSION= 3.0.0
+DISTVERSION= 3.1.1
CATEGORIES= net
-MASTER_SITES= https://bird.network.cz/download/
+MASTER_SITES= https://bird.nic.cz/download/
PKGNAMESUFFIX= 3
MAINTAINER= olivier@FreeBSD.org
diff --git a/net/bird3/distinfo b/net/bird3/distinfo
index 66fda3f7d35c..afb1fadf1af4 100644
--- a/net/bird3/distinfo
+++ b/net/bird3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734554961
-SHA256 (bird-3.0.0.tar.gz) = 8130440a2e273ba6456df2fb3acb43da7cb4d566f94a294a3a52a1b118f2512a
-SIZE (bird-3.0.0.tar.gz) = 2641569
+TIMESTAMP = 1747656270
+SHA256 (bird-3.1.1.tar.gz) = 297251974ff883e4ef03fccd6c912d116ed49ff2f1c63b66d1dba5f07094444a
+SIZE (bird-3.1.1.tar.gz) = 2725214
diff --git a/net/bird3/files/patch-00-kernel-Fix-crash-for-merge-paths b/net/bird3/files/patch-00-kernel-Fix-crash-for-merge-paths
deleted file mode 100644
index d008d4cf070c..000000000000
--- a/net/bird3/files/patch-00-kernel-Fix-crash-for-merge-paths
+++ /dev/null
@@ -1,38 +0,0 @@
-From b6caccfd45fb639b6dd3a8d140d3c5ba4cc79311 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Thu, 19 Dec 2024 11:00:15 +0100
-Subject: [PATCH] Kernel: Fix crash for merge paths on if no route is in BIRD
-
-There was a missing check for a NULL return value.
-Also fixed an indenting error.
-
-Thanks to Radu Anghel for reporting it:
-https://bird.network.cz/pipermail/bird-users/2024-December/017977.html
----
- nest/rt-table.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nest/rt-table.c b/nest/rt-table.c
-index fd8bb50dd..05191d743 100644
---- nest/rt-table.c
-+++ nest/rt-table.c
-@@ -5265,14 +5265,14 @@ krt_export_net(struct channel *c, const net_addr *a, linpool *lp)
- if (c->ra_mode == RA_MERGED)
- {
- struct rt_export_feed *feed = rt_net_feed(c->table, a, NULL);
-- if (!feed->count_routes)
-+ if (!feed || !feed->count_routes)
- return NULL;
-
- if (!bmap_test(&c->export_accepted_map, feed->block[0].id))
- return NULL;
-
- return rt_export_merged(c, feed, lp, 1);
-- }
-+ }
-
- static _Thread_local rte best;
- best = rt_net_best(c->table, a);
---
-GitLab
-
diff --git a/net/bird3/files/patch-01-Table-not-feeding-twice b/net/bird3/files/patch-01-Table-not-feeding-twice
deleted file mode 100644
index 4fb40a644fb2..000000000000
--- a/net/bird3/files/patch-01-Table-not-feeding-twice
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0a2f92ad205d96d0be0945ecf2bb740b68d5a3c1 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Thu, 19 Dec 2024 11:54:05 +0100
-Subject: [PATCH] Table: not feeding twice, once is enough
-
-If there is no feed pending, the requested one should be
-activated immediately, otherwise it is activated only after
-the full run, effectively running first a full feed and
-then the requested one.
----
- nest/rt-export.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/nest/rt-export.c b/nest/rt-export.c
-index 7368447de..7d51e54cf 100644
---- nest/rt-export.c
-+++ nest/rt-export.c
-@@ -357,8 +357,16 @@ rt_export_refeed_feeder(struct rt_export_feeder *f, struct rt_feeding_request *r
- if (!rfr)
- return;
-
-- rfr->next = f->feed_pending;
-- f->feed_pending = rfr;
-+ if (f->feeding)
-+ {
-+ rfr->next = f->feed_pending;
-+ f->feed_pending = rfr;
-+ }
-+ else
-+ {
-+ rfr->next = NULL;
-+ f->feeding = rfr;
-+ }
- }
-
- void rt_export_refeed_request(struct rt_export_request *rer, struct rt_feeding_request *rfr)
---
-GitLab
-
diff --git a/net/bird3/files/patch-02-kernel-trace-the-final-result b/net/bird3/files/patch-02-kernel-trace-the-final-result
deleted file mode 100644
index a3c97320f30e..000000000000
--- a/net/bird3/files/patch-02-kernel-trace-the-final-result
+++ /dev/null
@@ -1,53 +0,0 @@
-From ab74652f96c301dd2d2d2a831dd1a159ae1d5e02 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Thu, 19 Dec 2024 12:28:27 +0100
-Subject: [PATCH] Kernel: when channel traces, we have to trace the final
- result
-
-Otherwise it looks like we are sending too much traffic to netlink
-every other while, which is not true. Now we can disambiguate between
-in-kernel updates and ignored routes.
----
- sysdep/unix/krt.c | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
-index 2770b8be2..34882b88f 100644
---- sysdep/unix/krt.c
-+++ sysdep/unix/krt.c
-@@ -672,7 +672,7 @@ krt_preexport(struct channel *C, rte *e)
- }
-
- static void
--krt_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *net,
-+krt_rt_notify(struct proto *P, struct channel *ch, const net_addr *net,
- rte *new, const rte *old)
- {
- struct krt_proto *p = (struct krt_proto *) P;
-@@ -688,13 +688,21 @@ krt_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *net,
- case KPS_IDLE:
- case KPS_PRUNING:
- if (new && bmap_test(&p->seen_map, new->id))
-- /* Already installed and seen in the kernel dump */
-- return;
-+ if (ch->debug & D_ROUTES)
-+ {
-+ /* Already installed and seen in the kernel dump */
-+ log(L_TRACE "%s.%s: %N already in kernel",
-+ P->name, ch->name, net);
-+ return;
-+ }
-
- /* fall through */
- case KPS_SCANNING:
- /* Actually replace the route */
- krt_replace_rte(p, net, new, old);
-+ if (ch->debug & D_ROUTES)
-+ log(L_TRACE "%s.%s: %N %s kernel",
-+ P->name, ch->name, net, old ? "replaced in" : "added to");
- break;
-
- }
---
-GitLab
-
diff --git a/net/bird3/files/patch-03-BGP-fix-locking-order b/net/bird3/files/patch-03-BGP-fix-locking-order
deleted file mode 100644
index 51b73c26f8f8..000000000000
--- a/net/bird3/files/patch-03-BGP-fix-locking-order
+++ /dev/null
@@ -1,176 +0,0 @@
-From 6779e5da698feb9b9e02411859ad81885ba46c01 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Fri, 20 Dec 2024 11:28:00 +0100
-Subject: [PATCH] BGP: fix locking order error on dynamic protocol spawn
-
-We missed that the protocol spawner violates the prescribed
-locking order. When the rtable level is locked, no new protocol can be
-started, thus we need to:
-
-* create the protocol from a clean mainloop context
-* in protocol start hook, take the socket
-
-Testsuite: cf-bgp-autopeer
-Fixes: #136
-
-Thanks to Job Snijders <job@fastly.com> for reporting:
-https://trubka.network.cz/pipermail/bird-users/2024-December/017980.html
----
- nest/proto.c | 19 +++++++++++++++++++
- nest/protocol.h | 2 ++
- proto/bgp/bgp.c | 46 +++++++++++++++++++++++++++++++++++-----------
- 3 files changed, 56 insertions(+), 11 deletions(-)
-
-diff --git a/nest/proto.c b/nest/proto.c
-index dded84f51..678697d69 100644
---- nest/proto.c
-+++ nest/proto.c
-@@ -1867,6 +1867,25 @@ proto_spawn(struct proto_config *cf, uint disabled)
- return p;
- }
-
-+bool
-+proto_disable(struct proto *p)
-+{
-+ ASSERT_DIE(birdloop_inside(&main_birdloop));
-+ bool changed = !p->disabled;
-+ p->disabled = 1;
-+ proto_rethink_goal(p);
-+ return changed;
-+}
-+
-+bool
-+proto_enable(struct proto *p)
-+{
-+ ASSERT_DIE(birdloop_inside(&main_birdloop));
-+ bool changed = p->disabled;
-+ p->disabled = 0;
-+ proto_rethink_goal(p);
-+ return changed;
-+}
-
- /**
- * DOC: Graceful restart recovery
-diff --git a/nest/protocol.h b/nest/protocol.h
-index 25ed6f553..cf7ecb898 100644
---- nest/protocol.h
-+++ nest/protocol.h
-@@ -78,6 +78,8 @@ void proto_build(struct protocol *); /* Called from protocol to register itself
- void protos_preconfig(struct config *);
- void protos_commit(struct config *new, struct config *old, int type);
- struct proto * proto_spawn(struct proto_config *cf, uint disabled);
-+bool proto_disable(struct proto *p);
-+bool proto_enable(struct proto *p);
- void protos_dump_all(struct dump_request *);
-
- #define GA_UNKNOWN 0 /* Attribute not recognized */
-diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
-index 5fc2b5fff..3170e3a42 100644
---- proto/bgp/bgp.c
-+++ proto/bgp/bgp.c
-@@ -378,8 +378,6 @@ bgp_startup(struct bgp_proto *p)
- if (p->postponed_sk)
- {
- /* Apply postponed incoming connection */
-- sk_reloop(p->postponed_sk, p->p.loop);
--
- bgp_setup_conn(p, &p->incoming_conn);
- bgp_setup_sk(&p->incoming_conn, p->postponed_sk);
- bgp_send_open(&p->incoming_conn);
-@@ -583,6 +581,9 @@ bgp_graceful_close_conn(struct bgp_conn *conn, int subcode, byte *data, uint len
- static void
- bgp_down(struct bgp_proto *p)
- {
-+ /* Check that the dynamic BGP socket has been picked up */
-+ ASSERT_DIE(p->postponed_sk == NULL);
-+
- if (bgp_start_state(p) > BSS_PREPARE)
- {
- bgp_setup_auth(p, 0);
-@@ -617,8 +618,8 @@ bgp_decision(void *vp)
- bgp_down(p);
- }
-
--static struct bgp_proto *
--bgp_spawn(struct bgp_proto *pp, ip_addr remote_ip)
-+static void
-+bgp_spawn(struct bgp_proto *pp, struct birdsock *sk)
- {
- struct symbol *sym;
- char fmt[SYM_MAX_LEN];
-@@ -635,9 +636,16 @@ bgp_spawn(struct bgp_proto *pp, ip_addr remote_ip)
- cfg_mem = NULL;
-
- /* Just pass remote_ip to bgp_init() */
-- ((struct bgp_config *) sym->proto)->remote_ip = remote_ip;
-+ ((struct bgp_config *) sym->proto)->remote_ip = sk->daddr;
-+
-+ /* Create the protocol disabled initially */
-+ SKIP_BACK_DECLARE(struct bgp_proto, p, p, proto_spawn(sym->proto, 1));
-
-- return (void *) proto_spawn(sym->proto, 0);
-+ /* Pass the socket */
-+ p->postponed_sk = sk;
-+
-+ /* And enable the protocol */
-+ proto_enable(&p->p);
- }
-
- void
-@@ -1489,10 +1497,15 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
- /* For dynamic BGP, spawn new instance and postpone the socket */
- if (bgp_is_dynamic(p))
- {
-- p = bgp_spawn(p, sk->daddr);
-- p->postponed_sk = sk;
-- rmove(sk, p->p.pool);
-- goto leave;
-+ UNLOCK_DOMAIN(rtable, bgp_listen_domain);
-+
-+ /* The dynamic protocol must be in the START state */
-+ ASSERT_DIE(p->p.proto_state == PS_START);
-+ birdloop_leave(p->p.loop);
-+
-+ /* Now we have a clean mainloop */
-+ bgp_spawn(p, sk);
-+ return 0;
- }
-
- rmove(sk, p->p.pool);
-@@ -1806,7 +1819,6 @@ bgp_start(struct proto *P)
- p->incoming_conn.state = BS_IDLE;
- p->neigh = NULL;
- p->bfd_req = NULL;
-- p->postponed_sk = NULL;
- p->gr_ready = 0;
- p->gr_active_num = 0;
-
-@@ -1848,6 +1860,16 @@ bgp_start(struct proto *P)
- channel_graceful_restart_lock(&c->c);
- }
-
-+ /* Now it's the last chance to move the postponed socket to this BGP,
-+ * as bgp_start is the only hook running from main loop. */
-+ if (p->postponed_sk)
-+ {
-+ LOCK_DOMAIN(rtable, bgp_listen_domain);
-+ rmove(p->postponed_sk, p->p.pool);
-+ sk_reloop(p->postponed_sk, p->p.loop);
-+ UNLOCK_DOMAIN(rtable, bgp_listen_domain);
-+ }
-+
- /*
- * Before attempting to create the connection, we need to lock the port,
- * so that we are the only instance attempting to talk with that neighbor.
-@@ -1999,6 +2021,8 @@ bgp_init(struct proto_config *CF)
- p->remote_ip = cf->remote_ip;
- p->remote_as = cf->remote_as;
-
-+ p->postponed_sk = NULL;
-+
- /* Hack: We use cf->remote_ip just to pass remote_ip from bgp_spawn() */
- if (cf->c.parent)
- cf->remote_ip = IPA_NONE;
---
-GitLab
-
diff --git a/net/bird3/files/patch-04-BFD-Fix-session-locking-order b/net/bird3/files/patch-04-BFD-Fix-session-locking-order
deleted file mode 100644
index 3f5500500691..000000000000
--- a/net/bird3/files/patch-04-BFD-Fix-session-locking-order
+++ /dev/null
@@ -1,400 +0,0 @@
-From 83495362789d961914c4bfaa590e31cb17370ed0 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Sat, 21 Dec 2024 19:02:22 +0100
-Subject: [PATCH] BFD: Fix session reconfiguration locking order
-
-The sessions have to be updated asynchronously to avoid
-cross-locking between protocols.
-
-Testsuite: cf-ibgp-bfd-switch, cf-ibgp-multi-bfd-auth
-Fixes: #139
-
-Thanks to Daniel Suchy <danny@danysek.cz> for reporting:
-https://trubka.network.cz/pipermail/bird-users/2024-December/017984.html
----
- nest/bfd.h | 7 ++-
- proto/bfd/bfd.c | 144 +++++++++++++++++++++++---------------------
- proto/bfd/bfd.h | 21 +------
- proto/bfd/config.Y | 42 +++++--------
- proto/bfd/packets.c | 4 +-
- 5 files changed, 98 insertions(+), 120 deletions(-)
-
-diff --git a/nest/bfd.h b/nest/bfd.h
-index 5dacff5d7..c046152f8 100644
---- nest/bfd.h
-+++ nest/bfd.h
-@@ -18,8 +18,11 @@ struct bfd_options {
- u32 min_tx_int;
- u32 idle_tx_int;
- u8 multiplier;
-- u8 passive;
-- u8 passive_set;
-+ PACKED enum bfd_opt_passive {
-+ BFD_OPT_PASSIVE_UNKNOWN = 0,
-+ BFD_OPT_PASSIVE,
-+ BFD_OPT_NOT_PASSIVE,
-+ } passive;
- u8 mode;
- u8 auth_type; /* Authentication type (BFD_AUTH_*) */
- list *passwords; /* Passwords for authentication */
-diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
-index 34f992b93..4997f803a 100644
---- proto/bfd/bfd.c
-+++ proto/bfd/bfd.c
-@@ -172,17 +172,17 @@ static void bfd_free_iface(struct bfd_iface *ifa);
- * BFD sessions
- */
-
--static inline struct bfd_session_config
--bfd_merge_options(const struct bfd_iface_config *cf, const struct bfd_options *opts)
-+static inline struct bfd_options
-+bfd_merge_options(const struct bfd_options *bottom, const struct bfd_options *top)
- {
-- return (struct bfd_session_config) {
-- .min_rx_int = opts->min_rx_int ?: cf->min_rx_int,
-- .min_tx_int = opts->min_tx_int ?: cf->min_tx_int,
-- .idle_tx_int = opts->idle_tx_int ?: cf->idle_tx_int,
-- .multiplier = opts->multiplier ?: cf->multiplier,
-- .passive = opts->passive_set ? opts->passive : cf->passive,
-- .auth_type = opts->auth_type ?: cf->auth_type,
-- .passwords = opts->passwords ?: cf->passwords,
-+ return (struct bfd_options) {
-+ .min_rx_int = top->min_rx_int ?: bottom->min_rx_int,
-+ .min_tx_int = top->min_tx_int ?: bottom->min_tx_int,
-+ .idle_tx_int = top->idle_tx_int ?: bottom->idle_tx_int,
-+ .multiplier = top->multiplier ?: bottom->multiplier,
-+ .passive = top->passive ?: bottom->passive,
-+ .auth_type = top->auth_type ?: bottom->auth_type,
-+ .passwords = top->passwords ?: bottom->passwords,
- };
- }
-
-@@ -478,7 +478,7 @@ bfd_add_session(struct bfd_proto *p, ip_addr addr, ip_addr local, struct iface *
- HASH_INSERT(p->session_hash_id, HASH_ID, s);
- HASH_INSERT(p->session_hash_ip, HASH_IP, s);
-
-- s->cf = bfd_merge_options(ifa->cf, opts);
-+ s->cf = bfd_merge_options(&ifa->cf->opts, opts);
-
- /* Initialization of state variables - see RFC 5880 6.8.1 */
- s->loc_state = BFD_STATE_DOWN;
-@@ -561,26 +561,58 @@ bfd_remove_session(struct bfd_proto *p, struct bfd_session *s)
- birdloop_leave(p->p.loop);
- }
-
-+struct bfd_reconfigure_sessions_deferred_call {
-+ struct deferred_call dc;
-+ struct bfd_proto *p;
-+ config_ref old_config;
-+};
-+
- static void
--bfd_reconfigure_session(struct bfd_proto *p, struct bfd_session *s)
-+bfd_reconfigure_sessions(struct deferred_call *dc)
- {
-- if (EMPTY_LIST(s->request_list))
-- return;
-+ SKIP_BACK_DECLARE(struct bfd_reconfigure_sessions_deferred_call,
-+ brsdc, dc, dc);
-
-- ASSERT_DIE(birdloop_inside(p->p.loop));
-+ struct bfd_proto *p = brsdc->p;
-+ birdloop_enter(p->p.loop);
-
-- SKIP_BACK_DECLARE(struct bfd_request, req, n, HEAD(s->request_list));
-- s->cf = bfd_merge_options(s->ifa->cf, &req->opts);
-+ HASH_WALK(p->session_hash_id, next_id, s)
-+ {
-+ if (!EMPTY_LIST(s->request_list))
-+ {
-+ SKIP_BACK_DECLARE(struct bfd_request, req, n, HEAD(s->request_list));
-+ struct bfd_options opts = bfd_merge_options(&s->ifa->cf->opts, &req->opts);
-
-- u32 tx = (s->loc_state == BFD_STATE_UP) ? s->cf.min_tx_int : s->cf.idle_tx_int;
-- bfd_session_set_min_tx(s, tx);
-- bfd_session_set_min_rx(s, s->cf.min_rx_int);
-- s->detect_mult = s->cf.multiplier;
-- s->passive = s->cf.passive;
-+#define CHK(x) (opts.x != s->cf.x) ||
-+ bool reload = MACRO_FOREACH(CHK,
-+ min_rx_int,
-+ min_tx_int,
-+ idle_tx_int,
-+ multiplier,
-+ passive) false; /* terminating the || chain */
-+#undef CHK
-
-- bfd_session_control_tx_timer(s, 0);
-+ s->cf = opts;
-+
-+ if (reload)
-+ {
-+ u32 tx = (s->loc_state == BFD_STATE_UP) ? s->cf.min_tx_int : s->cf.idle_tx_int;
-+ bfd_session_set_min_tx(s, tx);
-+ bfd_session_set_min_rx(s, s->cf.min_rx_int);
-+ s->detect_mult = s->cf.multiplier;
-+ s->passive = s->cf.passive;
-+
-+ bfd_session_control_tx_timer(s, 0);
-+
-+ TRACE(D_EVENTS, "Session to %I reconfigured", s->addr);
-+ }
-+ }
-+ }
-+ HASH_WALK_END;
-+ birdloop_leave(p->p.loop);
-
-- TRACE(D_EVENTS, "Session to %I reconfigured", s->addr);
-+ /* Now the config is clean */
-+ OBSREF_CLEAR(brsdc->old_config);
- }
-
-
-@@ -589,10 +621,12 @@ bfd_reconfigure_session(struct bfd_proto *p, struct bfd_session *s)
- */
-
- static struct bfd_iface_config bfd_default_iface = {
-- .min_rx_int = BFD_DEFAULT_MIN_RX_INT,
-- .min_tx_int = BFD_DEFAULT_MIN_TX_INT,
-- .idle_tx_int = BFD_DEFAULT_IDLE_TX_INT,
-- .multiplier = BFD_DEFAULT_MULTIPLIER,
-+ .opts = {
-+ .min_rx_int = BFD_DEFAULT_MIN_RX_INT,
-+ .min_tx_int = BFD_DEFAULT_MIN_TX_INT,
-+ .idle_tx_int = BFD_DEFAULT_IDLE_TX_INT,
-+ .multiplier = BFD_DEFAULT_MULTIPLIER,
-+ },
- };
-
- static inline struct bfd_iface_config *
-@@ -650,24 +684,6 @@ bfd_free_iface(struct bfd_iface *ifa)
- mb_free(ifa);
- }
-
--static void
--bfd_reconfigure_iface(struct bfd_proto *p UNUSED, struct bfd_iface *ifa, struct bfd_config *nc)
--{
-- struct bfd_iface_config *new = bfd_find_iface_config(nc, ifa->iface);
-- struct bfd_iface_config *old = ifa->cf;
--
-- /* Check options that are handled in bfd_reconfigure_session() */
-- ifa->changed =
-- (new->min_rx_int != old->min_rx_int) ||
-- (new->min_tx_int != old->min_tx_int) ||
-- (new->idle_tx_int != old->idle_tx_int) ||
-- (new->multiplier != old->multiplier) ||
-- (new->passive != old->passive);
--
-- /* This should be probably changed to not access ifa->cf from the BFD thread */
-- ifa->cf = new;
--}
--
-
- /*
- * BFD requests
-@@ -900,20 +916,7 @@ bfd_request_session(pool *p, ip_addr addr, ip_addr local,
- void
- bfd_update_request(struct bfd_request *req, const struct bfd_options *opts)
- {
-- struct bfd_session *s = req->session;
--
-- if (!memcmp(opts, &req->opts, sizeof(const struct bfd_options)))
-- return;
--
- req->opts = *opts;
--
-- if (s)
-- {
-- struct bfd_proto *p = s->ifa->bfd;
-- birdloop_enter(p->p.loop);
-- bfd_reconfigure_session(p, s);
-- birdloop_leave(p->p.loop);
-- }
- }
-
- static void
-@@ -1193,21 +1196,22 @@ bfd_reconfigure(struct proto *P, struct proto_config *c)
- (new->zero_udp6_checksum_rx != old->zero_udp6_checksum_rx))
- return 0;
-
-- birdloop_mask_wakeups(p->p.loop);
--
- WALK_LIST(ifa, p->iface_list)
-- bfd_reconfigure_iface(p, ifa, new);
--
-- HASH_WALK(p->session_hash_id, next_id, s)
-- {
-- if (s->ifa->changed)
-- bfd_reconfigure_session(p, s);
-- }
-- HASH_WALK_END;
-+ ifa->cf = bfd_find_iface_config(new, ifa->iface);
-
- bfd_reconfigure_neighbors(p, new);
-
-- birdloop_unmask_wakeups(p->p.loop);
-+ /* Sessions get reconfigured after all the config is applied */
-+ struct bfd_reconfigure_sessions_deferred_call brsdc = {
-+ .dc.hook = bfd_reconfigure_sessions,
-+ .p = p,
-+ };
-+ SKIP_BACK_DECLARE(struct bfd_reconfigure_sessions_deferred_call,
-+ brsdcp, dc, defer_call(&brsdc.dc, sizeof brsdc));
-+
-+ /* We need to keep the old config alive until all the sessions get
-+ * reconfigured */
-+ OBSREF_SET(brsdcp->old_config, P->cf->global);
-
- return 1;
- }
-diff --git a/proto/bfd/bfd.h b/proto/bfd/bfd.h
-index 578ce8755..107829b72 100644
---- proto/bfd/bfd.h
-+++ proto/bfd/bfd.h
-@@ -54,24 +54,7 @@ struct bfd_config
- struct bfd_iface_config
- {
- struct iface_patt i;
-- u32 min_rx_int;
-- u32 min_tx_int;
-- u32 idle_tx_int;
-- u8 multiplier;
-- u8 passive;
-- u8 auth_type; /* Authentication type (BFD_AUTH_*) */
-- list *passwords; /* Passwords for authentication */
--};
--
--struct bfd_session_config
--{
-- u32 min_rx_int;
-- u32 min_tx_int;
-- u32 idle_tx_int;
-- u8 multiplier;
-- u8 passive;
-- u8 auth_type; /* Authentication type (BFD_AUTH_*) */
-- list *passwords; /* Passwords for authentication */
-+ struct bfd_options opts;
- };
-
- struct bfd_neighbor
-@@ -146,7 +129,7 @@ struct bfd_session
- u32 loc_id; /* Local session ID (local discriminator) */
- u32 rem_id; /* Remote session ID (remote discriminator) */
-
-- struct bfd_session_config cf; /* Static configuration parameters */
-+ struct bfd_options cf; /* Static configuration parameters */
-
- u32 des_min_tx_int; /* Desired min rx interval, local option */
- u32 des_min_tx_new; /* Used for des_min_tx_int change */
-diff --git a/proto/bfd/config.Y b/proto/bfd/config.Y
-index 9e9919c4e..56d1ffac4 100644
---- proto/bfd/config.Y
-+++ proto/bfd/config.Y
-@@ -86,44 +86,37 @@ bfd_iface_start:
- add_tail(&BFD_CFG->patt_list, NODE this_ipatt);
- init_list(&this_ipatt->ipn_list);
-
-- BFD_IFACE->min_rx_int = BFD_DEFAULT_MIN_RX_INT;
-- BFD_IFACE->min_tx_int = BFD_DEFAULT_MIN_TX_INT;
-- BFD_IFACE->idle_tx_int = BFD_DEFAULT_IDLE_TX_INT;
-- BFD_IFACE->multiplier = BFD_DEFAULT_MULTIPLIER;
-+ this_bfd_opts = &BFD_IFACE->opts;
-+
-+ this_bfd_opts->min_rx_int = BFD_DEFAULT_MIN_RX_INT;
-+ this_bfd_opts->min_tx_int = BFD_DEFAULT_MIN_TX_INT;
-+ this_bfd_opts->idle_tx_int = BFD_DEFAULT_IDLE_TX_INT;
-+ this_bfd_opts->multiplier = BFD_DEFAULT_MULTIPLIER;
-
- reset_passwords();
- };
-
- bfd_iface_finish:
- {
-- BFD_IFACE->passwords = get_passwords();
-+ this_bfd_opts->passwords = get_passwords();
-
-- if (!BFD_IFACE->auth_type != !BFD_IFACE->passwords)
-+ if (!this_bfd_opts->auth_type != !this_bfd_opts->passwords)
- cf_warn("Authentication and password options should be used together");
-
-- if (BFD_IFACE->passwords)
-+ if (this_bfd_opts->passwords)
- {
- struct password_item *pass;
-- WALK_LIST(pass, *BFD_IFACE->passwords)
-+ WALK_LIST(pass, *this_bfd_opts->passwords)
- {
- if (pass->alg)
- cf_error("Password algorithm option not available in BFD protocol");
-
-- pass->alg = bfd_auth_type_to_hash_alg[BFD_IFACE->auth_type];
-+ pass->alg = bfd_auth_type_to_hash_alg[this_bfd_opts->auth_type];
- }
- }
--};
-
--bfd_iface_item:
-- INTERVAL expr_us { BFD_IFACE->min_rx_int = BFD_IFACE->min_tx_int = $2; }
-- | MIN RX INTERVAL expr_us { BFD_IFACE->min_rx_int = $4; }
-- | MIN TX INTERVAL expr_us { BFD_IFACE->min_tx_int = $4; }
-- | IDLE TX INTERVAL expr_us { BFD_IFACE->idle_tx_int = $4; }
-- | MULTIPLIER expr { BFD_IFACE->multiplier = $2; }
-- | PASSIVE bool { BFD_IFACE->passive = $2; }
-- | AUTHENTICATION bfd_auth_type { BFD_IFACE->auth_type = $2; }
-- | password_list {}
-- ;
-+ this_bfd_opts = NULL;
-+};
-
- bfd_auth_type:
- NONE { $$ = BFD_AUTH_NONE; }
-@@ -134,14 +127,9 @@ bfd_auth_type:
- | METICULOUS KEYED SHA1 { $$ = BFD_AUTH_METICULOUS_KEYED_SHA1; }
- ;
-
--bfd_iface_opts:
-- /* empty */
-- | bfd_iface_opts bfd_iface_item ';'
-- ;
--
- bfd_iface_opt_list:
- /* empty */
-- | '{' bfd_iface_opts '}'
-+ | '{' bfd_items '}'
- ;
-
- bfd_iface:
-@@ -194,7 +182,7 @@ bfd_item:
- | MIN TX INTERVAL expr_us { this_bfd_opts->min_tx_int = $4; }
- | IDLE TX INTERVAL expr_us { this_bfd_opts->idle_tx_int = $4; }
- | MULTIPLIER expr { this_bfd_opts->multiplier = $2; }
-- | PASSIVE bool { this_bfd_opts->passive = $2; this_bfd_opts->passive_set = 1; }
-+ | PASSIVE bool { this_bfd_opts->passive = $2 ? BFD_OPT_PASSIVE : BFD_OPT_NOT_PASSIVE; }
- | GRACEFUL { this_bfd_opts->mode = BGP_BFD_GRACEFUL; }
- | AUTHENTICATION bfd_auth_type { this_bfd_opts->auth_type = $2; }
- | password_list {}
-diff --git a/proto/bfd/packets.c b/proto/bfd/packets.c
-index 1ceb470c1..f8bd63d73 100644
---- proto/bfd/packets.c
-+++ proto/bfd/packets.c
-@@ -109,7 +109,7 @@ const u8 bfd_auth_type_to_hash_alg[] = {
- static void
- bfd_fill_authentication(struct bfd_proto *p, struct bfd_session *s, struct bfd_ctl_packet *pkt)
- {
-- struct bfd_session_config *cf = &s->cf;
-+ struct bfd_options *cf = &s->cf;
- struct password_item *pass = password_find(cf->passwords, 0);
- uint meticulous = 0;
-
-@@ -179,7 +179,7 @@ bfd_fill_authentication(struct bfd_proto *p, struct bfd_session *s, struct bfd_c
- static int
- bfd_check_authentication(struct bfd_proto *p, struct bfd_session *s, struct bfd_ctl_packet *pkt)
- {
-- struct bfd_session_config *cf = &s->cf;
-+ struct bfd_options *cf = &s->cf;
- const char *err_dsc = NULL;
- uint err_val = 0;
- uint auth_type = 0;
---
-GitLab
-
diff --git a/net/bird3/files/patch-05-mainloop-dropped-old-socket b/net/bird3/files/patch-05-mainloop-dropped-old-socket
deleted file mode 100644
index eea4d1d26af2..000000000000
--- a/net/bird3/files/patch-05-mainloop-dropped-old-socket
+++ /dev/null
@@ -1,86 +0,0 @@
-From 3d1f19e335f55c8cfa3cb7ca9d7b88ca03173d8e Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Sun, 22 Dec 2024 21:32:28 +0100
-Subject: [PATCH] Mainloop: Dropped old socket prioritization magic
-
-This is now done in worker threads and the mainloop needs to do other things,
-most notably kernel and CLI, with less overhead of repeatedly checking poll.
----
- sysdep/unix/io-loop.c | 2 +-
- sysdep/unix/io.c | 21 +++++++--------------
- 2 files changed, 8 insertions(+), 15 deletions(-)
-
-diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
-index f69189e06..a72c69a03 100644
---- sysdep/unix/io-loop.c
-+++ sysdep/unix/io-loop.c
-@@ -1403,7 +1403,7 @@ bool task_still_in_limit(void)
- {
- static u64 main_counter = 0;
- if (this_birdloop == &main_birdloop)
-- return (++main_counter % 2048); /* This is a hack because of no accounting in mainloop */
-+ return (++main_counter % 512); /* This is a hack because of no accounting in mainloop */
- else
- return ns_now() < account_last + this_thread->max_loop_time_ns;
- }
-diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
-index f9785c074..51395e1e9 100644
---- sysdep/unix/io.c
-+++ sysdep/unix/io.c
-@@ -53,14 +53,15 @@
-
- /* Maximum number of calls of tx handler for one socket in one
- * poll iteration. Should be small enough to not monopolize CPU by
-- * one protocol instance.
-+ * one protocol instance. But as most of the problems are now offloaded
-+ * to worker threads, too low values may actually bring problems with
-+ * latency.
- */
--#define MAX_STEPS 4
-+#define MAX_STEPS 2048
-
- /* Maximum number of calls of rx handler for all sockets in one poll
-- iteration. RX callbacks are often much more costly so we limit
-- this to gen small latencies */
--#define MAX_RX_STEPS 4
-+ iteration. RX callbacks are often a little bit more costly. */
-+#define MAX_RX_STEPS 512
-
-
- /*
-@@ -2581,8 +2582,6 @@ io_init(void)
- srandom((uint) (now ^ (now >> 32)));
- }
-
--static int short_loops = 0;
--#define SHORT_LOOP_MAX 10
- #define WORK_EVENTS_MAX 10
-
- sock *stored_sock;
-@@ -2670,10 +2669,9 @@ io_loop(void)
- {
- if (pfd.pfd.data[0].revents & POLLIN)
- {
-- /* IO loop reload requested */
-+ /* Somebody sent an event to mainloop */
- pipe_drain(&main_birdloop.thread->wakeup);
- atomic_fetch_and_explicit(&main_birdloop.thread_transition, ~LTT_PING, memory_order_acq_rel);
-- continue;
- }
-
- times_update();
-@@ -2719,11 +2717,6 @@ io_loop(void)
- main_birdloop.sock_active = sk_next(s);
- }
-
-- short_loops++;
-- if (events && (short_loops < SHORT_LOOP_MAX))
-- continue;
-- short_loops = 0;
--
- int count = 0;
- main_birdloop.sock_active = stored_sock;
- if (main_birdloop.sock_active == NULL)
---
-GitLab
-
diff --git a/net/bird3/files/patch-06-cli-allocate-tx-buffers b/net/bird3/files/patch-06-cli-allocate-tx-buffers
deleted file mode 100644
index 0e9af5de5d63..000000000000
--- a/net/bird3/files/patch-06-cli-allocate-tx-buffers
+++ /dev/null
@@ -1,134 +0,0 @@
-From de9dbee796876f5b621e40e0082612aad746cac1 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Sun, 22 Dec 2024 22:10:38 +0100
-Subject: [PATCH] CLI: allocate TX buffers as pages, not by malloc
-
-Every malloc risks heap bloating and these blocks are already
-the same size as pages.
----
- nest/cli.c | 59 ++++++++++++++++++++++++++++++++++++++++++------------
- nest/cli.h | 2 +-
- 2 files changed, 47 insertions(+), 14 deletions(-)
-
-diff --git a/nest/cli.c b/nest/cli.c
-index 3b8e6f468..b33ffd437 100644
---- nest/cli.c
-+++ nest/cli.c
-@@ -81,13 +81,14 @@ cli_alloc_out(cli *c, int size)
- o = c->tx_buf;
- else
- {
-- o = mb_alloc(c->pool, sizeof(struct cli_out) + CLI_TX_BUF_SIZE);
-+ o = alloc_page();
-+ c->tx_pending_count++;
- if (c->tx_write)
- c->tx_write->next = o;
- else
- c->tx_buf = o;
- o->wpos = o->outpos = o->buf;
-- o->end = o->buf + CLI_TX_BUF_SIZE;
-+ o->end = (void *) o + page_size;
- }
- c->tx_write = o;
- if (!c->tx_pos)
-@@ -167,19 +168,18 @@ cli_hello(cli *c)
- static void
- cli_free_out(cli *c)
- {
-- struct cli_out *o, *p;
-+ for (struct cli_out *o = c->tx_buf, *n; o; o = n)
-+ {
-+ n = o->next;
-+ free_page(o);
-+ c->tx_pending_count--;
-+ }
-
-- if (o = c->tx_buf)
-- {
-- o->wpos = o->outpos = o->buf;
-- while (p = o->next)
-- {
-- o->next = p->next;
-- mb_free(p);
-- }
-- }
-+ c->tx_buf = NULL;
- c->tx_write = c->tx_pos = NULL;
- c->async_msg_size = 0;
-+
-+ ASSERT_DIE(c->tx_pending_count == 0);
- }
-
- void
-@@ -189,6 +189,38 @@ cli_written(cli *c)
- ev_schedule(c->event);
- }
-
-+/* A dummy resource to show and free memory pages allocated for pending TX */
-+struct cli_tx_resource {
-+ resource r;
-+ struct cli *c;
-+};
-+
-+static void
-+cli_tx_resource_free(resource *r)
-+{
-+ cli_free_out(SKIP_BACK(struct cli_tx_resource, r, r)->c);
-+}
-+
-+static void
-+cli_tx_resource_dump(struct dump_request *dreq UNUSED, resource *r UNUSED) {}
-+
-+static struct resmem
-+cli_tx_resource_memsize(resource *r)
-+{
-+ return (struct resmem) {
-+ .effective = SKIP_BACK(struct cli_tx_resource, r, r)->c->tx_pending_count * page_size,
-+ .overhead = sizeof(struct cli_tx_resource),
-+ };
-+}
-+
-+static struct resclass cli_tx_resource_class = {
-+ .name = "CLI TX buffers",
-+ .size = sizeof (struct cli_tx_resource),
-+ .free = cli_tx_resource_free,
-+ .dump = cli_tx_resource_dump,
-+ .memsize = cli_tx_resource_memsize,
-+};
-+
-
- static byte *cli_rh_pos;
- static uint cli_rh_len;
-@@ -272,7 +304,8 @@ cli *
- cli_new(struct birdsock *sock, struct cli_config *cf)
- {
- pool *p = rp_new(cli_pool, the_bird_domain.the_bird, "CLI");
-- cli *c = mb_alloc(p, sizeof(cli));
-+ struct cli_tx_resource *ctr = ralloc(p, &cli_tx_resource_class);
-+ cli *c = ctr->c = mb_alloc(p, sizeof(cli));
-
- bzero(c, sizeof(cli));
- c->pool = p;
-diff --git a/nest/cli.h b/nest/cli.h
-index d86ec3801..671be04d8 100644
---- nest/cli.h
-+++ nest/cli.h
-@@ -17,7 +17,6 @@
- #include "conf/conf.h"
-
- #define CLI_RX_BUF_SIZE 4096
--#define CLI_TX_BUF_SIZE 4096
- #define CLI_MAX_ASYNC_QUEUE 4096
-
- #define CLI_MSG_SIZE 500
-@@ -49,6 +48,7 @@ typedef struct cli {
- uint log_mask; /* Mask of allowed message levels */
- uint log_threshold; /* When free < log_threshold, store only important messages */
- uint async_msg_size; /* Total size of async messages queued in tx_buf */
-+ uint tx_pending_count; /* How many blocks are pending */
- } cli;
-
- struct cli_config {
---
-GitLab
-
diff --git a/net/bird3/files/patch-07-cli-flushing-tmp-linpool b/net/bird3/files/patch-07-cli-flushing-tmp-linpool
deleted file mode 100644
index c05321812dac..000000000000
--- a/net/bird3/files/patch-07-cli-flushing-tmp-linpool
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5fd0fd77e293328f354e7f6ed22632ba6ff96593 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Sun, 22 Dec 2024 22:26:44 +0100
-Subject: [PATCH] CLI: Flushing tmp_linpool after every shown net.
-
-There is no reason to keep the allocated objects through multiple nets.
----
- nest/rt-show.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/nest/rt-show.c b/nest/rt-show.c
-index 3986da83d..aa9209ca5 100644
---- nest/rt-show.c
-+++ nest/rt-show.c
-@@ -282,8 +282,9 @@ rt_show_cont(struct cli *c)
- rt_show_table(d);
-
- RT_FEED_WALK(&d->tab->req, f)
-- if (f->count_routes)
-- rt_show_net(d, f);
-+ TMP_SAVED
-+ if (f->count_routes)
-+ rt_show_net(d, f);
-
- if (rt_export_feed_active(&d->tab->req))
- rt_feeder_unsubscribe(&d->tab->req);
---
-GitLab
-
diff --git a/net/bird3/files/patch-08-kernel-feed-only-once b/net/bird3/files/patch-08-kernel-feed-only-once
deleted file mode 100644
index 33a98cbc4795..000000000000
--- a/net/bird3/files/patch-08-kernel-feed-only-once
+++ /dev/null
@@ -1,274 +0,0 @@
-From 0fa80d7c79428e5370740a2eba5605b65131ebd6 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Mon, 23 Dec 2024 11:58:05 +0100
-Subject: [PATCH] Kernel: feed only once during startup
-
-There was an inefficiency in the initial scan state machine,
-causing routes to be fed several times instead of just once.
-Now the export startup is postponed until first krt_scan()
-finishes and we actually can do the pruning with full information.
----
- nest/proto.c | 4 ++-
- nest/protocol.h | 2 ++
- sysdep/unix/krt.c | 69 ++++++++++++++++++++++++++++-------------------
- sysdep/unix/krt.h | 5 ++--
- 4 files changed, 48 insertions(+), 32 deletions(-)
-
-diff --git a/nest/proto.c b/nest/proto.c
-index 678697d69..6fa74e9f1 100644
---- nest/proto.c
-+++ nest/proto.c
-@@ -676,9 +676,11 @@ void channel_notify_basic(void *);
- void channel_notify_accepted(void *);
- void channel_notify_merged(void *);
-
--static void
-+void
- channel_start_export(struct channel *c)
- {
-+ ASSERT_DIE(birdloop_inside(c->proto->loop));
-+
- if (rt_export_get_state(&c->out_req) != TES_DOWN)
- bug("%s.%s: Attempted to start channel's already started export", c->proto->name, c->name);
-
-diff --git a/nest/protocol.h b/nest/protocol.h
-index cf7ecb898..2bfa1628a 100644
---- nest/protocol.h
-+++ nest/protocol.h
-@@ -747,6 +747,8 @@ int proto_configure_channel(struct proto *p, struct channel **c, struct channel_
-
- void channel_set_state(struct channel *c, uint state);
-
-+void channel_start_export(struct channel *c);
-+
- void channel_add_obstacle(struct channel *c);
- void channel_del_obstacle(struct channel *c);
-
-diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
-index 34882b88f..1658dd6fe 100644
---- sysdep/unix/krt.c
-+++ sysdep/unix/krt.c
-@@ -342,6 +342,8 @@ krt_learn_async(struct krt_proto *p, rte *e, int new)
- /* Hook defined in nest/rt-table.c ... to be refactored away later */
- rte *krt_export_net(struct channel *c, const net_addr *a, linpool *lp);
-
-+static void krt_rt_notify(struct proto *P, struct channel *ch, const net_addr *net, rte *new, const rte *old);
-+
- static int
- krt_same_dest(rte *k, rte *e)
- {
-@@ -361,6 +363,11 @@ krt_same_dest(rte *k, rte *e)
- void
- krt_got_route(struct krt_proto *p, rte *e, s8 src)
- {
-+ /* If we happen to get an asynchronous route notification
-+ * before initialization, we wait for the scan. */
-+ if (p->sync_state == KPS_INIT)
-+ return;
-+
- rte *new = NULL;
- e->pflags = 0;
-
-@@ -391,10 +398,6 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
-
- /* The rest is for KRT_SRC_BIRD (or KRT_SRC_UNKNOWN) */
-
-- /* We wait for the initial feed to have correct installed state */
-- if (!p->ready)
-- goto ignore;
--
- /* Get the exported version */
- new = krt_export_net(p->p.main_channel, e->net, krt_filter_lp);
-
-@@ -423,10 +426,6 @@ aseen:
- krt_trace_in(p, e, "already seen");
- goto done;
-
--ignore:
-- krt_trace_in(p, e, "ignored");
-- goto done;
--
- update:
- krt_trace_in(p, new, "updating");
- krt_replace_rte(p, e->net, new, e);
-@@ -447,12 +446,21 @@ krt_init_scan(struct krt_proto *p)
- {
- switch (p->sync_state)
- {
-+ case KPS_INIT:
-+ /* Allow exports now */
-+ p->p.rt_notify = krt_rt_notify;
-+ channel_start_export(p->p.main_channel);
-+ rt_refresh_begin(&p->p.main_channel->in_req);
-+ p->sync_state = KPS_FIRST_SCAN;
-+ return 1;
-+
- case KPS_IDLE:
- rt_refresh_begin(&p->p.main_channel->in_req);
- bmap_reset(&p->seen_map, 1024);
- p->sync_state = KPS_SCANNING;
- return 1;
-
-+ case KPS_FIRST_SCAN:
- case KPS_SCANNING:
- bug("Kernel scan double-init");
-
-@@ -470,14 +478,17 @@ krt_prune(struct krt_proto *p)
- {
- switch (p->sync_state)
- {
-+ case KPS_INIT:
- case KPS_IDLE:
- bug("Kernel scan prune without scan");
-
- case KPS_SCANNING:
-+ channel_request_full_refeed(p->p.main_channel);
-+ /* fall through */
-+ case KPS_FIRST_SCAN:
- p->sync_state = KPS_PRUNING;
- KRT_TRACE(p, D_EVENTS, "Pruning table %s", p->p.main_channel->table->name);
- rt_refresh_end(&p->p.main_channel->in_req);
-- channel_request_full_refeed(p->p.main_channel);
- break;
-
- case KPS_PRUNING:
-@@ -549,7 +560,7 @@ krt_scan_all(timer *t UNUSED)
- krt_do_scan(NULL);
-
- WALK_LIST2(p, n, krt_proto_list, krt_node)
-- if (p->sync_state == KPS_SCANNING)
-+ if ((p->sync_state == KPS_SCANNING) || (p->sync_state == KPS_FIRST_SCAN))
- krt_prune(p);
- }
-
-@@ -644,6 +655,9 @@ krt_scan_timer_kick(struct krt_proto *p)
- static int
- krt_preexport(struct channel *C, rte *e)
- {
-+ /* The export should not start before proper sync */
-+ ASSERT_DIE(SKIP_BACK(struct krt_proto, p, C->proto)->sync_state != KPS_INIT);
-+
- if (e->src->owner == &C->proto->sources)
- #ifdef CONFIG_SINGLE_ROUTE
- return 1;
-@@ -659,15 +673,6 @@ krt_preexport(struct channel *C, rte *e)
- return -1;
- }
-
-- /* Before first scan we don't touch the routes */
-- if (!SKIP_BACK(struct krt_proto, p, C->proto)->ready)
-- {
-- if (C->debug & D_ROUTES)
-- log(L_TRACE "%s.%s not ready yet to accept route for %N",
-- C->proto->name, C->name, e->net);
-- return -1;
-- }
--
- return 0;
- }
-
-@@ -685,18 +690,24 @@ krt_rt_notify(struct proto *P, struct channel *ch, const net_addr *net,
-
- switch (p->sync_state)
- {
-+ case KPS_INIT:
-+ bug("Routes in init state should have been rejected by preexport.");
-+
- case KPS_IDLE:
- case KPS_PRUNING:
- if (new && bmap_test(&p->seen_map, new->id))
-+ {
- if (ch->debug & D_ROUTES)
- {
- /* Already installed and seen in the kernel dump */
- log(L_TRACE "%s.%s: %N already in kernel",
- P->name, ch->name, net);
-- return;
- }
-+ return;
-+ }
-
- /* fall through */
-+ case KPS_FIRST_SCAN:
- case KPS_SCANNING:
- /* Actually replace the route */
- krt_replace_rte(p, net, new, old);
-@@ -732,7 +743,6 @@ krt_reload_routes(struct channel *C, struct rt_feeding_request *rfr)
-
- if (KRT_CF->learn)
- {
-- p->reload = 1;
- krt_scan_timer_kick(p);
- }
-
-@@ -749,15 +759,18 @@ krt_export_fed(struct channel *C)
- {
- struct krt_proto *p = (void *) C->proto;
-
-- p->ready = 1;
-- p->initialized = 1;
--
- switch (p->sync_state)
- {
-+ case KPS_INIT:
-+ bug("KRT export started before scan");
-+
- case KPS_IDLE:
- krt_scan_timer_kick(p);
- break;
-
-+ case KPS_FIRST_SCAN:
-+ bug("KRT export done before first scan");
-+
- case KPS_SCANNING:
- break;
-
-@@ -831,7 +844,8 @@ krt_init(struct proto_config *CF)
- p->p.main_channel = proto_add_channel(&p->p, proto_cf_main_channel(CF));
-
- p->p.preexport = krt_preexport;
-- p->p.rt_notify = krt_rt_notify;
-+ /* Not setting rt_notify here to not start exports, must wait for the first scan
-+ * and then we can start exports manually */
- p->p.iface_sub.if_notify = krt_if_notify;
- p->p.reload_routes = krt_reload_routes;
- p->p.export_fed = krt_export_fed;
-@@ -887,7 +901,7 @@ krt_shutdown(struct proto *P)
- return PS_FLUSH;
-
- /* FIXME we should flush routes even when persist during reconfiguration */
-- if (p->initialized && !KRT_CF->persist && (P->down_code != PDC_CMD_GR_DOWN))
-+ if ((p->sync_state != KPS_INIT) && !KRT_CF->persist && (P->down_code != PDC_CMD_GR_DOWN))
- {
- struct rt_export_feeder req = (struct rt_export_feeder)
- {
-@@ -922,8 +936,7 @@ krt_shutdown(struct proto *P)
- static void
- krt_cleanup(struct krt_proto *p)
- {
-- p->ready = 0;
-- p->initialized = 0;
-+ p->sync_state = KPS_INIT;
-
- krt_sys_shutdown(p);
- rem_node(&p->krt_node);
-diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h
-index 394e74010..14be715f8 100644
---- sysdep/unix/krt.h
-+++ sysdep/unix/krt.h
-@@ -59,10 +59,9 @@ struct krt_proto {
- struct bmap seen_map; /* Routes seen during last periodic scan */
- node krt_node; /* Node in krt_proto_list */
- byte af; /* Kernel address family (AF_*) */
-- byte ready; /* Initial feed has been finished */
-- byte initialized; /* First scan has been finished */
-- byte reload; /* Next scan is doing reload */
- PACKED enum krt_prune_state {
-+ KPS_INIT,
-+ KPS_FIRST_SCAN,
- KPS_IDLE,
- KPS_SCANNING,
- KPS_PRUNING,
---
-GitLab
-
diff --git a/net/bird3/files/patch-09-graceful-recovery b/net/bird3/files/patch-09-graceful-recovery
deleted file mode 100644
index d576f80ebc42..000000000000
--- a/net/bird3/files/patch-09-graceful-recovery
+++ /dev/null
@@ -1,311 +0,0 @@
-From f7639a9fafa7411ebd1f2af56c270b970ac09f3d Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Mon, 23 Dec 2024 21:06:26 +0100
-Subject: [PATCH] Graceful recovery: converted to obstacles
-
-Yet another refcounting mechanism had a locking collision.
----
- nest/proto.c | 178 ++++++++++++++++++++++++++----------------------
- nest/protocol.h | 14 +++-
- 2 files changed, 110 insertions(+), 82 deletions(-)
-
-diff --git a/nest/proto.c b/nest/proto.c
-index 6fa74e9f1..caf99829b 100644
---- nest/proto.c
-+++ nest/proto.c
-@@ -31,15 +31,8 @@ static list STATIC_LIST_INIT(protocol_list);
- #define CD(c, msg, args...) ({ if (c->debug & D_STATES) log(L_TRACE "%s.%s: " msg, c->proto->name, c->name ?: "?", ## args); })
- #define PD(p, msg, args...) ({ if (p->debug & D_STATES) log(L_TRACE "%s: " msg, p->name, ## args); })
-
--static timer *gr_wait_timer;
--
--#define GRS_NONE 0
--#define GRS_INIT 1
--#define GRS_ACTIVE 2
--#define GRS_DONE 3
--
--static int graceful_restart_state;
--static u32 graceful_restart_locks;
-+static struct graceful_recovery_context _graceful_recovery_context;
-+OBSREF(struct graceful_recovery_context) graceful_recovery_context;
-
- static char *p_states[] = { "DOWN", "START", "UP", "STOP" };
- static char *c_states[] = { "DOWN", "START", "UP", "STOP", "RESTART" };
-@@ -912,7 +905,7 @@ channel_do_stop(struct channel *c)
- ev_postpone(&c->reimport_event);
-
- c->gr_wait = 0;
-- if (c->gr_lock)
-+ if (OBSREF_GET(c->gr_lock))
- channel_graceful_restart_unlock(c);
-
- CALL(c->class->shutdown, c);
-@@ -1407,7 +1400,7 @@ proto_start(struct proto *p)
- DBG("Kicking %s up\n", p->name);
- PD(p, "Starting");
-
-- if (graceful_restart_state == GRS_INIT)
-+ if (OBSREF_GET(graceful_recovery_context))
- p->gr_recovery = 1;
-
- if (p->cf->loop_order != DOMAIN_ORDER(the_bird))
-@@ -1921,7 +1914,45 @@ proto_enable(struct proto *p)
- *
- */
-
--static void graceful_restart_done(timer *t);
-+/**
-+ * graceful_restart_done - finalize graceful restart
-+ * @t: unused
-+ *
-+ * When there are no locks on graceful restart, the functions finalizes the
-+ * graceful restart recovery. Protocols postponing route export until the end of
-+ * the recovery are awakened and the export to them is enabled.
-+ */
-+static void
-+graceful_recovery_done(struct callback *_ UNUSED)
-+{
-+ ASSERT_DIE(birdloop_inside(&main_birdloop));
-+ ASSERT_DIE(_graceful_recovery_context.grc_state == GRS_ACTIVE);
-+
-+ tm_stop(&_graceful_recovery_context.wait_timer);
-+ log(L_INFO "Graceful recovery done");
-+
-+ WALK_TLIST(proto, p, &global_proto_list)
-+ PROTO_LOCKED_FROM_MAIN(p)
-+ {
-+ p->gr_recovery = 0;
-+
-+ struct channel *c;
-+ WALK_LIST(c, p->channels)
-+ {
-+ ASSERT_DIE(!OBSREF_GET(c->gr_lock));
-+
-+ /* Resume postponed export of routes */
-+ if ((c->channel_state == CS_UP) && c->gr_wait && p->rt_notify)
-+ channel_start_export(c);
-+
-+ /* Cleanup */
-+ c->gr_wait = 0;
-+ }
-+ }
-+
-+ _graceful_recovery_context.grc_state = GRS_DONE;
-+}
-+
-
- /**
- * graceful_restart_recovery - request initial graceful restart recovery
-@@ -1933,7 +1964,30 @@ static void graceful_restart_done(timer *t);
- void
- graceful_restart_recovery(void)
- {
-- graceful_restart_state = GRS_INIT;
-+ obstacle_target_init(
-+ &_graceful_recovery_context.obstacles,
-+ &_graceful_recovery_context.obstacles_cleared,
-+ &root_pool, "Graceful recovery");
-+
-+ OBSREF_SET(graceful_recovery_context, &_graceful_recovery_context);
-+ _graceful_recovery_context.grc_state = GRS_INIT;
-+}
-+
-+static void
-+graceful_recovery_timeout(timer *t UNUSED)
-+{
-+ log(L_INFO "Graceful recovery timeout");
-+ WALK_TLIST(proto, p, &global_proto_list)
-+ PROTO_LOCKED_FROM_MAIN(p)
-+ {
-+ struct channel *c;
-+ WALK_LIST(c, p->channels)
-+ if (OBSREF_GET(c->gr_lock))
-+ {
-+ log(L_INFO "Graceful recovery: Not waiting for %s.%s", p->name, c->name);
-+ OBSREF_CLEAR(c->gr_lock);
-+ }
-+ }
- }
-
- /**
-@@ -1946,73 +2000,35 @@ graceful_restart_recovery(void)
- void
- graceful_restart_init(void)
- {
-- if (!graceful_restart_state)
-+ if (!OBSREF_GET(graceful_recovery_context))
- return;
-
-- log(L_INFO "Graceful restart started");
-+ log(L_INFO "Graceful recovery started");
-
-- if (!graceful_restart_locks)
-- {
-- graceful_restart_done(NULL);
-- return;
-- }
-+ _graceful_recovery_context.grc_state = GRS_ACTIVE;
-
-- graceful_restart_state = GRS_ACTIVE;
-- gr_wait_timer = tm_new_init(proto_pool, graceful_restart_done, NULL, 0, 0);
-+ _graceful_recovery_context.wait_timer = (timer) { .hook = graceful_recovery_timeout };
- u32 gr_wait = atomic_load_explicit(&global_runtime, memory_order_relaxed)->gr_wait;
-- tm_start(gr_wait_timer, gr_wait S);
--}
--
--/**
-- * graceful_restart_done - finalize graceful restart
-- * @t: unused
-- *
-- * When there are no locks on graceful restart, the functions finalizes the
-- * graceful restart recovery. Protocols postponing route export until the end of
-- * the recovery are awakened and the export to them is enabled. All other
-- * related state is cleared. The function is also called when the graceful
-- * restart wait timer fires (but there are still some locks).
-- */
--static void
--graceful_restart_done(timer *t)
--{
-- log(L_INFO "Graceful restart done");
-- graceful_restart_state = GRS_DONE;
--
-- WALK_TLIST(proto, p, &global_proto_list)
-- {
-- if (!p->gr_recovery)
-- continue;
--
-- struct channel *c;
-- WALK_LIST(c, p->channels)
-- {
-- /* Resume postponed export of routes */
-- if ((c->channel_state == CS_UP) && c->gr_wait && p->rt_notify)
-- channel_start_export(c);
-+ tm_start(&_graceful_recovery_context.wait_timer, gr_wait S);
-
-- /* Cleanup */
-- c->gr_wait = 0;
-- c->gr_lock = 0;
-- }
--
-- p->gr_recovery = 0;
-- }
-+ callback_init(&_graceful_recovery_context.obstacles_cleared, graceful_recovery_done, &main_birdloop);
-
-- graceful_restart_locks = 0;
--
-- rfree(t);
-+ /* The last clearing of obstacle reference will cause
-+ * the graceful recovery finish immediately. */
-+ OBSREF_CLEAR(graceful_recovery_context);
- }
-
- void
- graceful_restart_show_status(void)
- {
-- if (graceful_restart_state != GRS_ACTIVE)
-+ if (_graceful_recovery_context.grc_state != GRS_ACTIVE)
- return;
-
- cli_msg(-24, "Graceful restart recovery in progress");
-- cli_msg(-24, " Waiting for %d channels to recover", graceful_restart_locks);
-- cli_msg(-24, " Wait timer is %t/%u", tm_remains(gr_wait_timer),
-+ cli_msg(-24, " Waiting for %u channels to recover",
-+ obstacle_target_count(&_graceful_recovery_context.obstacles));
-+ cli_msg(-24, " Wait timer is %t/%u",
-+ tm_remains(&_graceful_recovery_context.wait_timer),
- atomic_load_explicit(&global_runtime, memory_order_relaxed)->gr_wait);
- }
-
-@@ -2032,14 +2048,22 @@ graceful_restart_show_status(void)
- void
- channel_graceful_restart_lock(struct channel *c)
- {
-- ASSERT(graceful_restart_state == GRS_INIT);
-- ASSERT(c->proto->gr_recovery);
-+ ASSERT_DIE(birdloop_inside(&main_birdloop));
-
-- if (c->gr_lock)
-+ if (OBSREF_GET(c->gr_lock))
- return;
-
-- c->gr_lock = 1;
-- graceful_restart_locks++;
-+ switch (_graceful_recovery_context.grc_state)
-+ {
-+ case GRS_INIT:
-+ case GRS_ACTIVE:
-+ OBSREF_SET(c->gr_lock, &_graceful_recovery_context);
-+ break;
-+
-+ case GRS_NONE:
-+ case GRS_DONE:
-+ break;
-+ }
- }
-
- /**
-@@ -2052,18 +2076,10 @@ channel_graceful_restart_lock(struct channel *c)
- void
- channel_graceful_restart_unlock(struct channel *c)
- {
-- if (!c->gr_lock)
-- return;
--
-- c->gr_lock = 0;
-- graceful_restart_locks--;
--
-- if ((graceful_restart_state == GRS_ACTIVE) && !graceful_restart_locks)
-- tm_start(gr_wait_timer, 0);
-+ OBSREF_CLEAR(c->gr_lock);
- }
-
-
--
- /**
- * protos_dump_all - dump status of all protocols
- *
-@@ -2615,9 +2631,9 @@ channel_show_info(struct channel *c)
- cli_msg(-1006, " Input filter: %s", filter_name(c->in_filter));
- cli_msg(-1006, " Output filter: %s", filter_name(c->out_filter));
-
-- if (graceful_restart_state == GRS_ACTIVE)
-+ if (_graceful_recovery_context.grc_state == GRS_ACTIVE)
- cli_msg(-1006, " GR recovery: %s%s",
-- c->gr_lock ? " pending" : "",
-+ OBSREF_GET(c->gr_lock) ? " pending" : "",
- c->gr_wait ? " waiting" : "");
-
- channel_show_limit(&c->rx_limit, "Receive limit:", c->limit_active & (1 << PLD_RX), c->limit_actions[PLD_RX]);
-diff --git a/nest/protocol.h b/nest/protocol.h
-index 2bfa1628a..ec561b263 100644
---- nest/protocol.h
-+++ nest/protocol.h
-@@ -659,7 +659,7 @@ struct channel {
-
- u8 channel_state;
- u8 reloadable; /* Hook reload_routes() is allowed on the channel */
-- u8 gr_lock; /* Graceful restart mechanism should wait for this channel */
-+ OBSREF(struct graceful_recovery_context) gr_lock; /* Graceful restart mechanism should wait for this channel */
- u8 gr_wait; /* Route export to channel is postponed until graceful restart */
-
- u32 obstacles; /* External obstacles remaining before cleanup */
-@@ -763,4 +763,16 @@ void *channel_config_new(const struct channel_class *cc, const char *name, uint
- void *channel_config_get(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto);
- int channel_reconfigure(struct channel *c, struct channel_config *cf);
-
-+struct graceful_recovery_context {
-+ struct obstacle_target obstacles;
-+ struct callback obstacles_cleared;
-+ enum {
-+ GRS_NONE,
-+ GRS_INIT,
-+ GRS_ACTIVE,
-+ GRS_DONE,
-+ } grc_state;
-+ timer wait_timer;
-+};
-+
- #endif
---
-GitLab
-
diff --git a/net/bird3/files/patch-10-stonehenge b/net/bird3/files/patch-10-stonehenge
deleted file mode 100644
index a640442dae8d..000000000000
--- a/net/bird3/files/patch-10-stonehenge
+++ /dev/null
@@ -1,116 +0,0 @@
-From f6ef8b5b58c674dd270b40aa57d20d2d638c48e9 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Tue, 24 Dec 2024 12:18:39 +0100
-Subject: [PATCH] Stonehenge: multi-slab allocator
-
-To mid-term allocate and free lots of small blocks in a fast pace,
-mb_alloc is too slow and causes heap bloating. We can already allocate
-blocks from slabs, and if we allow for a little bit of inefficiency,
-we can just use multiple slabs with stepped sizes.
-
-This technique is already used in ea_list allocation which is gonna be
-converted to Stonehenge.
----
- lib/resource.h | 14 ++++++++++++
- lib/slab.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 76 insertions(+)
-
-diff --git a/lib/resource.h b/lib/resource.h
-index 48bf1f9ba..12b788510 100644
---- lib/resource.h
-+++ lib/resource.h
-@@ -139,6 +139,20 @@ void *sl_allocz(slab *);
- void sl_free(void *);
- void sl_delete(slab *);
-
-+/* A whole stonehenge of slabs */
-+
-+typedef struct stonehenge stonehenge;
-+typedef struct sth_block {
-+ void *block;
-+ bool large;
-+} sth_block;
-+
-+stonehenge *sth_new(pool *);
-+sth_block sth_alloc(stonehenge *, uint size);
-+sth_block sth_allocz(stonehenge *, uint size);
-+void sth_free(sth_block);
-+void sth_delete(stonehenge *);
-+
- /*
- * Low-level memory allocation functions, please don't use
- * outside resource manager and possibly sysdep code.
-diff --git a/lib/slab.c b/lib/slab.c
-index ca971f9fb..d68bfef1e 100644
---- lib/slab.c
-+++ lib/slab.c
-@@ -469,4 +469,66 @@ slab_lookup(resource *r, unsigned long a)
- return NULL;
- }
-
-+static const uint stonehenge_sizes[] = { 56, 112, 168, 288, 448, 800, 1344 };
-+
-+struct stonehenge {
-+ pool *p;
-+ slab *s[ARRAY_SIZE(stonehenge_sizes)];
-+};
-+
-+sth_block
-+sth_alloc(stonehenge *sth, uint size)
-+{
-+ for (uint i=0; i<ARRAY_SIZE(stonehenge_sizes); i++)
-+ if (size <= stonehenge_sizes[i])
-+ {
-+ if (!sth->s[i])
-+ sth->s[i] = sl_new(sth->p, stonehenge_sizes[i]);
-+
-+ return (sth_block) { .block = sl_alloc(sth->s[i]), };
-+ }
-+
-+ return (sth_block) {
-+ .block = mb_alloc(sth->p, size),
-+ .large = 1,
-+ };
-+}
-+
-+sth_block
-+sth_allocz(stonehenge *sth, uint size)
-+{
-+ sth_block b = sth_alloc(sth, size);
-+ bzero(b.block, size);
-+ return b;
-+}
-+
-+void
-+sth_free(sth_block b)
-+{
-+ if (b.large)
-+ mb_free(b.block);
-+ else
-+ sl_free(b.block);
-+}
-+
-+stonehenge *
-+sth_new(pool *pp)
-+{
-+ stonehenge tmps = {
-+ .p = rp_new(pp, pp->domain, "Stonehenge"),
-+ };
-+
-+ stonehenge *s = sth_alloc(&tmps, sizeof(stonehenge)).block;
-+ *s = tmps;
-+ return s;
-+}
-+
-+void sth_delete(stonehenge *s)
-+{
-+ pool *p = s->p;
-+ sth_free((sth_block) { s });
-+ rp_free(p);
-+}
-+
-+
- #endif
---
-GitLab
-
diff --git a/net/bird3/files/patch-11-route-attribute-storage b/net/bird3/files/patch-11-route-attribute-storage
deleted file mode 100644
index 5097846203eb..000000000000
--- a/net/bird3/files/patch-11-route-attribute-storage
+++ /dev/null
@@ -1,80 +0,0 @@
-From 8b389a503ef56aa69aa456fabebd562abe247119 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Tue, 24 Dec 2024 13:12:58 +0100
-Subject: [PATCH] Route attribute storage moved to Stonehenge
-
----
- nest/rt-attr.c | 29 ++++++++---------------------
- 1 file changed, 8 insertions(+), 21 deletions(-)
-
-diff --git a/nest/rt-attr.c b/nest/rt-attr.c
-index a0f7d5718..8d651efb2 100644
---- nest/rt-attr.c
-+++ nest/rt-attr.c
-@@ -204,9 +204,7 @@ DOMAIN(attrs) attrs_domain;
-
- pool *rta_pool;
-
--/* Assuming page size of 4096, these are magic values for slab allocation */
--static const uint ea_slab_sizes[] = { 56, 112, 168, 288, 448, 800, 1344 };
--static slab *ea_slab[ARRAY_SIZE(ea_slab_sizes)];
-+static stonehenge *ea_sth;
-
- static slab *rte_src_slab;
-
-@@ -1583,24 +1581,18 @@ ea_lookup_slow(ea_list *o, u32 squash_upto, enum ea_stored oid)
- return rr;
- }
-
-- struct ea_storage *r = NULL;
- uint elen = ea_list_size(o);
- uint sz = elen + sizeof(struct ea_storage);
-- for (uint i=0; i<ARRAY_SIZE(ea_slab_sizes); i++)
-- if (sz <= ea_slab_sizes[i])
-- {
-- r = sl_alloc(ea_slab[i]);
-- break;
-- }
-+ sth_block b = sth_alloc(ea_sth, sz);
-
-- int huge = r ? 0 : EALF_HUGE;;
-- if (huge)
-- r = mb_alloc(rta_pool, sz);
-+ struct ea_storage *r = b.block;
-
- ea_list_copy(r->l, o, elen);
- ea_list_ref(r->l);
-
-- r->l->flags |= huge;
-+ if (b.large)
-+ r->l->flags |= EALF_HUGE;
-+
- r->l->stored = oid;
- r->hash_key = h;
- atomic_store_explicit(&r->uc, 1, memory_order_release);
-@@ -1668,10 +1660,7 @@ ea_free_deferred(struct deferred_call *dc)
-
- /* And now we can free the object, finally */
- ea_list_unref(r->l);
-- if (r->l->flags & EALF_HUGE)
-- mb_free(r);
-- else
-- sl_free(r);
-+ sth_free((sth_block) { r, !!(r->l->flags & EALF_HUGE) });
-
- RTA_UNLOCK;
- }
-@@ -1722,9 +1711,7 @@ rta_init(void)
- RTA_LOCK;
- rta_pool = rp_new(&root_pool, attrs_domain.attrs, "Attributes");
-
-- for (uint i=0; i<ARRAY_SIZE(ea_slab_sizes); i++)
-- ea_slab[i] = sl_new(rta_pool, ea_slab_sizes[i]);
--
-+ ea_sth = sth_new(rta_pool);
- SPINHASH_INIT(rta_hash_table, RTAH, rta_pool, &global_work_list);
-
- rte_src_init();
---
-GitLab
-
diff --git a/net/bird3/files/patch-12-BGP-tx-bucket-storage b/net/bird3/files/patch-12-BGP-tx-bucket-storage
deleted file mode 100644
index 513824f86769..000000000000
--- a/net/bird3/files/patch-12-BGP-tx-bucket-storage
+++ /dev/null
@@ -1,84 +0,0 @@
-From fdb5c4920b45139fb3c37e1144643c0f756364b6 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Tue, 24 Dec 2024 13:22:56 +0100
-Subject: [PATCH] BGP: TX bucket storage moved to Stonehenge
-
----
- proto/bgp/attrs.c | 11 +++++++----
- proto/bgp/bgp.h | 4 ++--
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
-index a2feaef53..725c469ff 100644
---- proto/bgp/attrs.c
-+++ proto/bgp/attrs.c
-@@ -1734,13 +1734,16 @@ bgp_get_bucket(struct bgp_ptx_private *c, ea_list *new)
- uint size = sizeof(struct bgp_bucket) + ea_size;
-
- /* Allocate the bucket */
-- b = mb_alloc(c->pool, size);
-+ sth_block blk = sth_alloc(c->sth, size);
-+ b = blk.block;
- *b = (struct bgp_bucket) { };
- init_list(&b->prefixes);
- b->hash = hash;
-
- /* Copy the ea_list */
- ea_list_copy(b->eattrs, new, ea_size);
-+ if (blk.large)
-+ b->eattrs->flags |= EALF_HUGE;
-
- /* Insert the bucket to bucket hash */
- HASH_INSERT2(c->bucket_hash, RBH, c->pool, b);
-@@ -1764,7 +1767,7 @@ static void
- bgp_free_bucket(struct bgp_ptx_private *c, struct bgp_bucket *b)
- {
- HASH_REMOVE2(c->bucket_hash, RBH, c->pool, b);
-- mb_free(b);
-+ sth_free((sth_block) { b, !!(b->eattrs->flags & EALF_HUGE) });
- }
-
- int
-@@ -2086,6 +2089,7 @@ bgp_init_pending_tx(struct bgp_channel *c)
-
- bpp->lock = dom;
- bpp->pool = p;
-+ bpp->sth = sth_new(p);
- bpp->c = c;
-
- bgp_init_bucket_table(bpp);
-@@ -2160,8 +2164,7 @@ bgp_free_pending_tx(struct bgp_channel *bc)
- HASH_WALK_END;
-
- HASH_FREE(c->bucket_hash);
-- sl_delete(c->bucket_slab);
-- c->bucket_slab = NULL;
-+ sth_delete(c->sth);
-
- rp_free(c->pool);
-
-diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
-index 202e78ba3..dac6e84ea 100644
---- proto/bgp/bgp.h
-+++ proto/bgp/bgp.h
-@@ -452,7 +452,8 @@ struct bgp_ptx_private {
- struct { BGP_PTX_PUBLIC; };
- struct bgp_ptx_private **locked_at;
-
-- pool *pool; /* Resource pool for TX related allocations */
-+ pool *pool; /* Pool for infrequent long-term blocks */
-+ stonehenge *sth; /* Bucket allocator */
-
- HASH(struct bgp_bucket) bucket_hash; /* Hash table of route buckets */
- struct bgp_bucket *withdraw_bucket; /* Withdrawn routes */
-@@ -461,7 +462,6 @@ struct bgp_ptx_private {
- HASH(struct bgp_prefix) prefix_hash; /* Hash table of pending prefices */
-
- slab *prefix_slab; /* Slab holding prefix nodes */
-- slab *bucket_slab; /* Slab holding buckets to send */
-
- char bmp; /* This is a fake ptx for BMP encoding */
- };
---
-GitLab
-
diff --git a/net/bird3/files/patch-13-allocate-normalization-buckets b/net/bird3/files/patch-13-allocate-normalization-buckets
deleted file mode 100644
index 60ff582d71c5..000000000000
--- a/net/bird3/files/patch-13-allocate-normalization-buckets
+++ /dev/null
@@ -1,100 +0,0 @@
-From c3c12e1b4ff908211b156a182a5027f2b11b0709 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Tue, 24 Dec 2024 16:16:55 +0100
-Subject: [PATCH] Allocate the normalization buckets on stack
-
-Even though allocating from tmp_linpool is quite cheap,
-it isn't cheap when the block is larger than a page, which is the case here.
-Instead, we now allocate just the result which typically fits in a page,
-avoiding a necessity of a malloc().
----
- nest/rt-attr.c | 37 ++++++++++++++++++++++++-------------
- 1 file changed, 24 insertions(+), 13 deletions(-)
-
-diff --git a/nest/rt-attr.c b/nest/rt-attr.c
-index 8d651efb2..9d5e10980 100644
---- nest/rt-attr.c
-+++ nest/rt-attr.c
-@@ -967,8 +967,8 @@ ea_list_size(ea_list *o)
- * and creates the final structure useful for storage or fast searching.
- * The method is a bucket sort.
- *
-- * Returns the final ea_list with some excess memory at the end,
-- * allocated from the tmp_linpool. The adata is linked from the original places.
-+ * Returns the final ea_list allocated from the tmp_linpool.
-+ * The adata is linked from the original places.
- */
- ea_list *
- ea_normalize(ea_list *e, u32 upto)
-@@ -976,21 +976,17 @@ ea_normalize(ea_list *e, u32 upto)
- /* We expect some work to be actually needed. */
- ASSERT_DIE(!BIT32_TEST(&upto, e->stored));
-
-- /* Allocate the output */
-- ea_list *out = tmp_allocz(ea_class_max * sizeof(eattr) + sizeof(ea_list));
-- *out = (ea_list) {
-- .flags = EALF_SORTED,
-- };
--
-+ /* Allocate the buckets locally */
-+ eattr *buckets = allocz(ea_class_max * sizeof(eattr));
- uint min_id = ~0, max_id = 0;
-
-- eattr *buckets = out->attrs;
-+ ea_list *next = NULL;
-
- /* Walk the attribute lists, one after another. */
- for (; e; e = e->next)
- {
-- if (!out->next && BIT32_TEST(&upto, e->stored))
-- out->next = e;
-+ if (!next && BIT32_TEST(&upto, e->stored))
-+ next = e;
-
- for (int i = 0; i < e->count; i++)
- {
-@@ -1000,7 +996,7 @@ ea_normalize(ea_list *e, u32 upto)
- if (id < min_id)
- min_id = id;
-
-- if (out->next)
-+ if (next)
- {
- /* Underlay: check whether the value is duplicate */
- if (buckets[id].id && buckets[id].fresh)
-@@ -1026,6 +1022,18 @@ ea_normalize(ea_list *e, u32 upto)
- }
- }
-
-+ /* Find out how big the output actually is. */
-+ uint len = 0;
-+ for (uint id = min_id; id <= max_id; id++)
-+ if (buckets[id].id && !(buckets[id].undef && buckets[id].fresh))
-+ len++;
-+
-+ ea_list *out = tmp_alloc(sizeof(ea_list) + len * sizeof(eattr));
-+ *out = (ea_list) {
-+ .flags = EALF_SORTED,
-+ .next = next,
-+ };
-+
- /* And now we just walk the list from beginning to end and collect
- * everything to the beginning of the list.
- * Walking just that part which is inhabited for sure. */
-@@ -1044,9 +1052,12 @@ ea_normalize(ea_list *e, u32 upto)
-
- /* Move the attribute to the beginning */
- ASSERT_DIE(out->count < id);
-- buckets[out->count++] = buckets[id];
-+ ASSERT_DIE(out->count < len);
-+ out->attrs[out->count++] = buckets[id];
- }
-
-+ ASSERT_DIE(out->count == len);
-+
- /* We want to bisect only if the list is long enough */
- if (out->count > 5)
- out->flags |= EALF_BISECT;
---
-GitLab
-
diff --git a/net/bird3/files/patch-14-BGP-fix-dislpay-name b/net/bird3/files/patch-14-BGP-fix-dislpay-name
deleted file mode 100644
index faf53ec128ef..000000000000
--- a/net/bird3/files/patch-14-BGP-fix-dislpay-name
+++ /dev/null
@@ -1,25 +0,0 @@
-From b58bfcad683f46da9470ad87e8c78e423e04ff97 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Fri, 27 Dec 2024 16:22:59 +0100
-Subject: [PATCH] BGP: fix display name of bgp_otc attribute
-
----
- proto/bgp/attrs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
-index 725c469ff..5dc06be51 100644
---- proto/bgp/attrs.c
-+++ proto/bgp/attrs.c
-@@ -1192,7 +1192,7 @@ static union bgp_attr_desc bgp_attr_table[BGP_ATTR_MAX] = {
- .decode = bgp_decode_large_community,
- },
- [BA_ONLY_TO_CUSTOMER] = {
-- .name = "otc",
-+ .name = "bgp_otc",
- .type = T_INT,
- .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
- .encode = bgp_encode_u32,
---
-GitLab
-
diff --git a/net/bird3/files/patch-15-BGP-fixed-deterministic-med-crashes b/net/bird3/files/patch-15-BGP-fixed-deterministic-med-crashes
deleted file mode 100644
index 15f3fac00287..000000000000
--- a/net/bird3/files/patch-15-BGP-fixed-deterministic-med-crashes
+++ /dev/null
@@ -1,65 +0,0 @@
-From c5b07695ce810e4345ed1811eadfce935c83b324 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Tue, 7 Jan 2025 11:08:04 +0100
-Subject: [PATCH] BGP: fixed deterministic med crashes
-
-There were several places of forgotten NULL checks.
-
-Thanks to Alarig Le Lay <alarig@swordarmor.fr> for reporting:
-https://trubka.network.cz/pipermail/bird-users/2024-December/017990.html
----
- nest/rt-table.c | 14 ++++++++++++--
- proto/bgp/attrs.c | 8 ++++----
- 2 files changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/nest/rt-table.c b/nest/rt-table.c
-index 05191d743..fc6d0d4e0 100644
---- nest/rt-table.c
-+++ nest/rt-table.c
-@@ -2024,12 +2024,22 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, struct n
- do_recalculate:
- /* Add the new route to the list right behind the old one */
- if (new_stored)
-+ {
-+ /* There is the same piece of code several lines farther. Needs refactoring.
-+ * The old_stored check is needed because of the possible jump from deterministic med */
-+ if (old_stored)
- {
- atomic_store_explicit(&new_stored->next, atomic_load_explicit(&old_stored->next, memory_order_relaxed), memory_order_release);
- atomic_store_explicit(&old_stored->next, new_stored, memory_order_release);
--
-- table->rt_count++;
- }
-+ else
-+ {
-+ atomic_store_explicit(&new_stored->next, NULL, memory_order_release);
-+ atomic_store_explicit(last_ptr, new_stored, memory_order_release);
-+ }
-+
-+ table->rt_count++;
-+ }
-
- /* Find a new optimal route (if there is any) */
- struct rte_storage * _Atomic *bp = &local_sentinel.next;
-diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
-index 5dc06be51..db6542343 100644
---- proto/bgp/attrs.c
-+++ proto/bgp/attrs.c
-@@ -2689,10 +2689,10 @@ bgp_rte_recalculate(struct rtable_private *table, net *net,
- struct rte_storage *new_stored, struct rte_storage *old_stored, struct rte_storage *old_best_stored)
- {
- struct rte_storage *key_stored = new_stored ? new_stored : old_stored;
-- const struct rte *new = &new_stored->rte,
-- *old = &old_stored->rte,
-- *old_best = &old_best_stored->rte,
-- *key = &key_stored->rte;
-+ const struct rte *new = RTE_OR_NULL(new_stored),
-+ *old = RTE_OR_NULL(old_stored),
-+ *old_best = RTE_OR_NULL(old_best_stored),
-+ *key = RTE_OR_NULL(key_stored);
-
- u32 lpref = rt_get_preference(key);
- u32 lasn = bgp_get_neighbor(key);
---
-GitLab
-
diff --git a/net/bird3/files/patch-16-Table-old-best-route-refeed-fix b/net/bird3/files/patch-16-Table-old-best-route-refeed-fix
deleted file mode 100644
index 60dc7cece2a2..000000000000
--- a/net/bird3/files/patch-16-Table-old-best-route-refeed-fix
+++ /dev/null
@@ -1,87 +0,0 @@
-From 2e14832d36c83b2ab5b7fb28b701de554fa5fdd9 Mon Sep 17 00:00:00 2001
-From: Maria Matejka <mq@ucw.cz>
-Date: Tue, 7 Jan 2025 12:13:57 +0100
-Subject: [PATCH] Table: old best route refeed fix
-
-When refeeding with RA_OPTIMAL, the old best routes weren't announced,
-leading to weird behavior of protocols, mostly kernel. Fixed.
----
- nest/rt-table.c | 30 ++++++++++++++++++++++++++----
- 1 file changed, 26 insertions(+), 4 deletions(-)
-
-diff --git a/nest/rt-table.c b/nest/rt-table.c
-index fc6d0d4e0..18a445a62 100644
---- nest/rt-table.c
-+++ nest/rt-table.c
-@@ -1485,11 +1485,18 @@ channel_notify_basic(void *_channel)
- rte *new = &u->feed->block[i];
- rte *old = NULL;
- for (uint o = oldpos; o < u->feed->count_routes; o++)
-- if (new->src == u->feed->block[o].src)
-+ if ((c->ra_mode == RA_ANY) && (new->src == u->feed->block[o].src))
- {
- old = &u->feed->block[o];
- break;
- }
-+ else if ((c->ra_mode == RA_OPTIMAL) && (
-+ bmap_test(&c->export_accepted_map, u->feed->block[o].id) ||
-+ bmap_test(&c->export_rejected_map, u->feed->block[o].id)))
-+ {
-+ ASSERT_DIE(!old);
-+ old = &u->feed->block[o];
-+ }
-
- rt_notify_basic(c, new, old);
-
-@@ -2542,10 +2549,14 @@ rt_feed_net_best(struct rt_exporter *e, struct rcu_unwinder *u, u32 index, bool
- last_in_net = atomic_load_explicit(&n->best.last, memory_order_acquire);
- first = rt_net_feed_validate_first(tr, first_in_net, last_in_net, first);
-
-- uint ecnt = 0;
-+ uint ecnt = 0, ocnt = 0;
- for (const struct rt_pending_export *rpe = first; rpe;
- rpe = atomic_load_explicit(&rpe->next, memory_order_acquire))
-+ {
- ecnt++;
-+ if (rpe->it.old)
-+ ocnt++;
-+ }
-
- if (ecnt) {
- const net_addr *a = (first->it.new ?: first->it.old)->net;
-@@ -2558,10 +2569,11 @@ rt_feed_net_best(struct rt_exporter *e, struct rcu_unwinder *u, u32 index, bool
- if (!ecnt && (!best || prefilter && !prefilter(f, best->rte.net)))
- return NULL;
-
-- struct rt_export_feed *feed = rt_alloc_feed(!!best, ecnt);
-+ struct rt_export_feed *feed = rt_alloc_feed(!!best + ocnt, ecnt);
-+ uint bpos = 0;
- if (best)
- {
-- feed->block[0] = best->rte;
-+ feed->block[bpos++] = best->rte;
- feed->ni = NET_TO_INDEX(best->rte.net);
- }
- else
-@@ -2575,8 +2587,18 @@ rt_feed_net_best(struct rt_exporter *e, struct rcu_unwinder *u, u32 index, bool
- if (e >= ecnt)
- RT_READ_RETRY(tr);
- else
-+ {
- feed->exports[e++] = rpe->it.seq;
-+ if (rpe->it.old)
-+ {
-+ ASSERT_DIE(bpos < !!best + ocnt);
-+ feed->block[bpos] = *rpe->it.old;
-+ feed->block[bpos].flags |= REF_OBSOLETE;
-+ bpos++;
-+ }
-+ }
-
-+ ASSERT_DIE(bpos == !!best + ocnt);
- ASSERT_DIE(e == ecnt);
- }
-
---
-GitLab
-
diff --git a/net/bosh-bootloader/Makefile b/net/bosh-bootloader/Makefile
index 76f1773b73ba..0957822cbc26 100644
--- a/net/bosh-bootloader/Makefile
+++ b/net/bosh-bootloader/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bosh-bootloader
PORTVERSION= 7.6.0
-PORTREVISION= 26
+PORTREVISION= 27
CATEGORIES= net sysutils
MAINTAINER= dumbbell@FreeBSD.org
diff --git a/net/bosh-cli/Makefile b/net/bosh-cli/Makefile
index 8a25cc188d84..d3ea6818d852 100644
--- a/net/bosh-cli/Makefile
+++ b/net/bosh-cli/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bosh-cli
PORTVERSION= 5.5.0
-PORTREVISION= 25
+PORTREVISION= 26
CATEGORIES= net sysutils
MAINTAINER= dumbbell@FreeBSD.org
diff --git a/net/cf/Makefile b/net/cf/Makefile
index c1b261a0e6f5..b84801494425 100644
--- a/net/cf/Makefile
+++ b/net/cf/Makefile
@@ -1,7 +1,7 @@
PORTNAME= cf
PORTVERSION= 6.49.0
DISTVERSIONPREFIX= v
-PORTREVISION= 25
+PORTREVISION= 26
CATEGORIES= net
MAINTAINER= dumbbell@FreeBSD.org
diff --git a/net/cloudquery/Makefile b/net/cloudquery/Makefile
index 2c2fcd962423..b98d171a5bbc 100644
--- a/net/cloudquery/Makefile
+++ b/net/cloudquery/Makefile
@@ -1,7 +1,7 @@
PORTNAME= cloudquery
DISTVERSIONPREFIX= v
DISTVERSION= 0.32.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net
MAINTAINER= se@FreeBSD.org
diff --git a/net/concourse-fly/Makefile b/net/concourse-fly/Makefile
index 7585ce8da5b1..c1015ee43878 100644
--- a/net/concourse-fly/Makefile
+++ b/net/concourse-fly/Makefile
@@ -1,6 +1,6 @@
PORTNAME= concourse
PORTVERSION= 6.7.1
-PORTREVISION= 24
+PORTREVISION= 25
CATEGORIES= net sysutils
MASTER_SITES= LOCAL/dumbbell/concourse/
PKGNAMESUFFIX= -fly
diff --git a/net/containernetworking-plugins/Makefile b/net/containernetworking-plugins/Makefile
index 39643f5664f7..4353a24a3f9a 100644
--- a/net/containernetworking-plugins/Makefile
+++ b/net/containernetworking-plugins/Makefile
@@ -1,7 +1,7 @@
PORTNAME= containernetworking-plugins
DISTVERSIONPREFIX= freebsd-v
DISTVERSION= 0.5
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net
MAINTAINER= dfr@FreeBSD.org
diff --git a/net/croc/Makefile b/net/croc/Makefile
index aa443047d1a7..0a5231e7331e 100644
--- a/net/croc/Makefile
+++ b/net/croc/Makefile
@@ -1,7 +1,7 @@
PORTNAME= croc
PORTVERSION= 10.0.13
DISTVERSIONPREFIX= v
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MAINTAINER= olgeni@FreeBSD.org
diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile
index a055b445c774..34649b0cbc36 100644
--- a/net/dhcpcd/Makefile
+++ b/net/dhcpcd/Makefile
@@ -1,5 +1,5 @@
PORTNAME= dhcpcd
-DISTVERSION= 10.2.2
+DISTVERSION= 10.2.3
CATEGORIES= net
MASTER_SITES= https://github.com/NetworkConfiguration/${PORTNAME}/releases/download/v${DISTVERSION}/
diff --git a/net/dhcpcd/distinfo b/net/dhcpcd/distinfo
index 66b2435f6931..232bfeb2f81b 100644
--- a/net/dhcpcd/distinfo
+++ b/net/dhcpcd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740499857
-SHA256 (dhcpcd-10.2.2.tar.xz) = 5f257b02f874b3b8cb031e5be79c99cf9cbd4f65eae2a50c9b1beddafb3f51bc
-SIZE (dhcpcd-10.2.2.tar.xz) = 275700
+TIMESTAMP = 1747631204
+SHA256 (dhcpcd-10.2.3.tar.xz) = 4137a382d1a203bffdf8e757bbdfd0032433d06e5c69a3785b88b83251f89616
+SIZE (dhcpcd-10.2.3.tar.xz) = 276216
diff --git a/net/evans/Makefile b/net/evans/Makefile
index ec68a8a94b1f..d35f924c13bf 100644
--- a/net/evans/Makefile
+++ b/net/evans/Makefile
@@ -1,7 +1,7 @@
PORTNAME= evans
DISTVERSIONPREFIX= v
DISTVERSION= 0.10.11
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= net
MAINTAINER= lcook@FreeBSD.org
diff --git a/net/fb303/Makefile b/net/fb303/Makefile
index 9c94cf75845d..5a53502dad7d 100644
--- a/net/fb303/Makefile
+++ b/net/fb303/Makefile
@@ -1,6 +1,6 @@
PORTNAME= fb303
DISTVERSIONPREFIX= v
-DISTVERSION= 2025.05.12.00
+DISTVERSION= 2025.05.26.00
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
diff --git a/net/fb303/distinfo b/net/fb303/distinfo
index bfc0edc35811..596b2c6dd222 100644
--- a/net/fb303/distinfo
+++ b/net/fb303/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747102742
-SHA256 (facebook-fb303-v2025.05.12.00_GH0.tar.gz) = fafae635c104056f3db94cee30b3159017dcf427a635a656bdeed33edead7dfa
-SIZE (facebook-fb303-v2025.05.12.00_GH0.tar.gz) = 265966
+TIMESTAMP = 1748334339
+SHA256 (facebook-fb303-v2025.05.26.00_GH0.tar.gz) = 6b72fb0e0186915c8226fe540356fa2c9d6d3b22b94297cc2e932517c5857039
+SIZE (facebook-fb303-v2025.05.26.00_GH0.tar.gz) = 264329
diff --git a/net/gemget/Makefile b/net/gemget/Makefile
index cfa58be3a524..58935c46e386 100644
--- a/net/gemget/Makefile
+++ b/net/gemget/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gemget
DISTVERSIONPREFIX= v
DISTVERSION= 1.9.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MAINTAINER= codeleaves@yahoo.com
diff --git a/net/geoipupdate/Makefile b/net/geoipupdate/Makefile
index e4bdddbb65c9..12b86ab2e049 100644
--- a/net/geoipupdate/Makefile
+++ b/net/geoipupdate/Makefile
@@ -1,7 +1,7 @@
PORTNAME= geoipupdate
PORTVERSION= 7.1.0
DISTVERSIONPREFIX= v
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net geography
MAINTAINER= adamw@FreeBSD.org
diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index 9442fc9d92d4..8aae2990842e 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS= git>=0:devel/git \
golangci-lint>=0:devel/golangci-lint
USES= go:modules,1.23
-GO_MODULE= gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v17
+GO_MODULE= gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18
_BUILD_DATE= $$(date -u "+%Y-%m-%d-%H%M UTC")
GO_TARGET= ./cmd/kas
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index f0ad922f0408..714d51b2d8d1 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1746703450
-SHA256 (go/net_gitlab-agent/gitlab-agent-v17.11.2/v17.11.2.mod) = 6c36855cd351c829e5b19c5aa99876db58a2b4bd7b934e05497e7777faa64f8f
-SIZE (go/net_gitlab-agent/gitlab-agent-v17.11.2/v17.11.2.mod) = 9293
-SHA256 (go/net_gitlab-agent/gitlab-agent-v17.11.2/v17.11.2.zip) = 08c74935d6a0ba77a11eade2b3ca11c20bf3f8619dae652e1e286757dfdaa654
-SIZE (go/net_gitlab-agent/gitlab-agent-v17.11.2/v17.11.2.zip) = 1555390
+TIMESTAMP = 1747896517
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.0.1/v18.0.1.mod) = 0c2121b2efd0904b758621ebeefb6d8ac0a504c59ec144b7b59fc05ab4a73ae8
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.0.1/v18.0.1.mod) = 9417
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.0.1/v18.0.1.zip) = 291e3857ee0fe801cb66852f98ed7f0fdb58dc78a60e4162eb79dd52c45d8e39
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.0.1/v18.0.1.zip) = 1606170
diff --git a/net/go-bapu/Makefile b/net/go-bapu/Makefile
index 727f726d8d1a..013d43f3c33a 100644
--- a/net/go-bapu/Makefile
+++ b/net/go-bapu/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bapu
PORTVERSION= 0.3.0
-PORTREVISION= 25
+PORTREVISION= 26
CATEGORIES= net
MASTER_SITES= https://bitbucket.org/carlostrub/bapu/get/
PKGNAMEPREFIX= go-
diff --git a/net/go-cs/Makefile b/net/go-cs/Makefile
index 749066dcf518..66f2a9360270 100644
--- a/net/go-cs/Makefile
+++ b/net/go-cs/Makefile
@@ -1,7 +1,7 @@
PORTNAME= go-cs
PORTVERSION= 0.9
DISTVERSIONPREFIX= v
-PORTREVISION= 26
+PORTREVISION= 27
CATEGORIES= net
MAINTAINER= akosela@andykosela.com
diff --git a/net/go-tcping/Makefile b/net/go-tcping/Makefile
index a4cf752aaf72..77460bb09c64 100644
--- a/net/go-tcping/Makefile
+++ b/net/go-tcping/Makefile
@@ -1,7 +1,7 @@
PORTNAME= tcping
DISTVERSIONPREFIX= v
DISTVERSION= 2.7.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${PORTNAME}/${DISTVERSIONFULL}/:gomod
PKGNAMEPREFIX= go-
diff --git a/net/gobgp/Makefile b/net/gobgp/Makefile
index 6fc37ca0e638..daa5fe878235 100644
--- a/net/gobgp/Makefile
+++ b/net/gobgp/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gobgp
PORTVERSION= 3.25.0
DISTVERSIONPREFIX= v
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net
DIST_SUBDIR= gobgp
diff --git a/net/google-cloud-sdk/Makefile b/net/google-cloud-sdk/Makefile
index af50ec2f875a..67e820db181f 100644
--- a/net/google-cloud-sdk/Makefile
+++ b/net/google-cloud-sdk/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-sdk
-DISTVERSION= 522.0.0
+DISTVERSION= 523.0.1
CATEGORIES= net
MASTER_SITES= https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/
DISTNAME= google-cloud-sdk-${PORTVERSION}-linux-x86_64
diff --git a/net/google-cloud-sdk/distinfo b/net/google-cloud-sdk/distinfo
index 0f27573e40f3..d6360396635b 100644
--- a/net/google-cloud-sdk/distinfo
+++ b/net/google-cloud-sdk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747219017
-SHA256 (google-cloud-sdk-522.0.0-linux-x86_64.tar.gz) = 4cea65b3129b193dcbed03ae0504ca46f10b776a4ffb73c1a0530abe84f5d184
-SIZE (google-cloud-sdk-522.0.0-linux-x86_64.tar.gz) = 148716792
+TIMESTAMP = 1748197644
+SHA256 (google-cloud-sdk-523.0.1-linux-x86_64.tar.gz) = 3326d8dfc1bbb34f2feee345582f4a25dcec33edf78acd397daa4065714f086a
+SIZE (google-cloud-sdk-523.0.1-linux-x86_64.tar.gz) = 148823863
diff --git a/net/goreplay/Makefile b/net/goreplay/Makefile
index 1f947c7b4e9b..9238e5928b88 100644
--- a/net/goreplay/Makefile
+++ b/net/goreplay/Makefile
@@ -1,7 +1,7 @@
PORTNAME= goreplay
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.2
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= net
MAINTAINER= bofh@FreeBSD.org
diff --git a/net/gorss/Makefile b/net/gorss/Makefile
index 207d4ccf6248..963183b420fd 100644
--- a/net/gorss/Makefile
+++ b/net/gorss/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gorss
PORTVERSION= 0.4
DISTVERSIONPREFIX= v
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= net www
MAINTAINER= ports@FreeBSD.org
diff --git a/net/gotify-server/Makefile b/net/gotify-server/Makefile
index 791b99b9f633..980bbedd4b0c 100644
--- a/net/gotify-server/Makefile
+++ b/net/gotify-server/Makefile
@@ -1,7 +1,6 @@
PORTNAME= gotify-server
-PORTVERSION= 2.6.1
+PORTVERSION= 2.6.3
DISTVERSIONPREFIX= v
-PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= https://github.com/mfechner/freebsd-net-gotify-server/raw/refs/heads/main/:yarn_cache
DISTNAME= server
@@ -15,7 +14,7 @@ LICENSE= MIT
BUILD_DEPENDS= yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \
-USES= go:modules,1.22 nodejs:build
+USES= go:modules,1.24 nodejs:build
USE_RC_SUBR= gotify_server
GO_MODULE= github.com/gotify/server/v2
@@ -70,9 +69,9 @@ post-install:
# To update
# 1. comment DISTFILES
# 2. Run 'make makesum'
-# 3. Uncomment DITSFILES
-# 4. Run 'make make-yarn-cache'
-# 5. Upload yarn cache
+# 3. Run 'make make-yarn-cache'
+# 4. Upload yarn cache
+# 5. Uncomment DITSFILES
# 6. Run 'make makesum'
make-yarn-cache: patch
diff --git a/net/gotify-server/distinfo b/net/gotify-server/distinfo
index cd495b0d9e1e..22c3abb429bd 100644
--- a/net/gotify-server/distinfo
+++ b/net/gotify-server/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1734332740
-SHA256 (go/net_gotify-server/server/gotify-server-yarn-offline-cache-2.6.1.tar.gz) = 30438c27e2b8edde804b43ffe74999e7e8f33e694fbee6c03018d19ad4523191
-SIZE (go/net_gotify-server/server/gotify-server-yarn-offline-cache-2.6.1.tar.gz) = 54030953
-SHA256 (go/net_gotify-server/server/v2.6.1.mod) = acf7ba5da9fc000080647ad2ae0a58e7d35feb2b63bc75f7eb5df8e8fdcd3c0e
-SIZE (go/net_gotify-server/server/v2.6.1.mod) = 2141
-SHA256 (go/net_gotify-server/server/v2.6.1.zip) = 92a5d60d2120a3cfe3d7f910d4abfed695489199b243186e644d3ef10942b397
-SIZE (go/net_gotify-server/server/v2.6.1.zip) = 727645
+TIMESTAMP = 1748321011
+SHA256 (go/net_gotify-server/server/gotify-server-yarn-offline-cache-2.6.3.tar.gz) = 6d25f0d1d4501c79bc18067078643d80554e2839361fc795cb153fea1f8b0a55
+SIZE (go/net_gotify-server/server/gotify-server-yarn-offline-cache-2.6.3.tar.gz) = 54031121
+SHA256 (go/net_gotify-server/server/v2.6.3.mod) = f365848732e5f9711d130a4ef355c225ef0a7550b777874895a287fd9fb3be8a
+SIZE (go/net_gotify-server/server/v2.6.3.mod) = 2119
+SHA256 (go/net_gotify-server/server/v2.6.3.zip) = e79d170cbbb3dcfecddb2793896186d56521a6be3dfbf8fac3ac42c831b90b9d
+SIZE (go/net_gotify-server/server/v2.6.3.zip) = 728447
diff --git a/net/grpcox/Makefile b/net/grpcox/Makefile
index c46bf4de73e3..326b427c3477 100644
--- a/net/grpcox/Makefile
+++ b/net/grpcox/Makefile
@@ -1,7 +1,7 @@
PORTNAME= grpcox
DISTVERSIONPREFIX= v
DISTVERSION= 1.0.0
-PORTREVISION= 24
+PORTREVISION= 25
CATEGORIES= net www
MAINTAINER= yuri@FreeBSD.org
diff --git a/net/grpcui/Makefile b/net/grpcui/Makefile
index d6d6cb46470d..2b45671ed258 100644
--- a/net/grpcui/Makefile
+++ b/net/grpcui/Makefile
@@ -1,7 +1,7 @@
PORTNAME= grpcui
DISTVERSIONPREFIX= v
DISTVERSION= 1.5.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net www
MAINTAINER= yuri@FreeBSD.org
diff --git a/net/grpcurl/Makefile b/net/grpcurl/Makefile
index 01215fd9ec9c..ca2ec0dd1113 100644
--- a/net/grpcurl/Makefile
+++ b/net/grpcurl/Makefile
@@ -1,7 +1,7 @@
PORTNAME= grpcurl
DISTVERSIONPREFIX= v
DISTVERSION= 1.9.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MAINTAINER= nc@FreeBSD.org
diff --git a/net/gscloud/Makefile b/net/gscloud/Makefile
index 463e0b59286c..ae3512718c7d 100644
--- a/net/gscloud/Makefile
+++ b/net/gscloud/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gscloud
DISTVERSIONPREFIX= v
DISTVERSION= 0.13.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= net devel
MAINTAINER= egypcio@FreeBSD.org
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 68f090875e6a..b6ce33370eca 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -10,15 +10,17 @@ WWW= https://www.haproxy.org
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
-FLAVORS= default lua
+FLAVORS= default lua wolfssl
FLAVOR?= ${FLAVORS:[1]}
USES= compiler:c++11-lang cpe gmake
USE_RC_SUBR= haproxy
-default_CONFLICTS_INSTALL= haproxy-lua
-lua_CONFLICTS_INSTALL= haproxy-devel
+default_CONFLICTS_INSTALL= haproxy-lua haproxy-wolfssl
+lua_CONFLICTS_INSTALL= haproxy-devel haproxy-wolfssl
lua_PKGNAMESUFFIX= -lua
+wolfssl_CONFLICTS_INSTALL= haproxy-devel haproxy-lua
+wolfssl_PKGNAMESUFFIX= -wolfssl
CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy20 haproxy22 haproxy23 haproxy24 haproxy25 haproxy26
@@ -32,16 +34,17 @@ MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
MAKE_ARGS_i386= USE_LIBATOMIC=
MAKE_ARGS_powerpc= USE_LIBATOMIC=
-OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS PROMEX
-OPTIONS_RADIO= PCRE
+OPTIONS_DEFINE= DOCS EXAMPLES LUA DEVICEATLAS PROMEX
+OPTIONS_RADIO= PCRE SSL
OPTIONS_RADIO_PCRE= DPCRE DPCRE2 SPCRE SPCRE2
+OPTIONS_RADIO_SSL= OPENSSL WOLFSSL
DPCRE_DESC= Link pcre(1) dynamically
DPCRE2_DESC= Link pcre2 dynamically
SPCRE_DESC= Link pcre(1) statically
SPCRE2_DESC= Link pcre2 statically
DEVICEATLAS_DESC= DeviceAtlas Device Detection support
PROMEX_DESC= Enable Prometheus exporter
-OPTIONS_DEFAULT= DPCRE2 OPENSSL PROMEX
+OPTIONS_DEFAULT= DPCRE2 PROMEX
DPCRE_LIB_DEPENDS= libpcre.so:devel/pcre
DPCRE_MAKE_ARGS= USE_PCRE=1 USE_PCRE_JIT=1
@@ -58,11 +61,20 @@ OPENSSL_USES= ssl
OPENSSL_MAKE_ARGS= USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC}
LUA_USES= lua:53
LUA_MAKE_ARGS= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER}
+WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl
+WOLFSSL_MAKE_ARGS= USE_OPENSSL_WOLFSSL=1 USE_QUIC=1
+WOLFSSL_CFLAGS= -I${LOCALBASE}/include/wolfssl
.if ${FLAVOR:U} == lua
OPTIONS_DEFAULT+= LUA
.endif
+.if ${FLAVOR:U} == wolfssl
+OPTIONS_DEFAULT+= WOLFSSL
+.else
+OPTIONS_DEFAULT+= OPENSSL
+.endif
+
.include <bsd.port.pre.mk>
.if ${SSL_DEFAULT:Mlibressl*} || ${SSL_DEFAULT:M*quictls}
diff --git a/net/hostapd-devel/Makefile b/net/hostapd-devel/Makefile
index edf354f42fa8..bfb2579a7327 100644
--- a/net/hostapd-devel/Makefile
+++ b/net/hostapd-devel/Makefile
@@ -11,8 +11,8 @@ WWW= https://w1.fi/hostapd/
USE_GITHUB= yes
GH_ACCOUNT= cschuber
GH_PROJECT= hostap
-GH_TAGNAME= 9fa657a73
-COMMIT_DATE= 2025.04.25
+GH_TAGNAME= 54930b62b
+COMMIT_DATE= 2025.05.08
LICENSE= BSD3CLAUSE
diff --git a/net/hostapd-devel/distinfo b/net/hostapd-devel/distinfo
index 08b6474654dc..7d74519e6a4b 100644
--- a/net/hostapd-devel/distinfo
+++ b/net/hostapd-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745940421
-SHA256 (cschuber-hostap-2025.04.25-9fa657a73_GH0.tar.gz) = 3686944c19668aa8630b167b6a7a7f12ddbd64cc1077d48a83c275e1ee049770
-SIZE (cschuber-hostap-2025.04.25-9fa657a73_GH0.tar.gz) = 5290405
+TIMESTAMP = 1747800844
+SHA256 (cschuber-hostap-2025.05.08-54930b62b_GH0.tar.gz) = 945b6a16ef7e6071309f1aa02168e05de26ec91b7e4cf8f6eb556fcd649012bb
+SIZE (cschuber-hostap-2025.05.08-54930b62b_GH0.tar.gz) = 5291910
diff --git a/net/ipinfo-cli/Makefile b/net/ipinfo-cli/Makefile
index 4d6c2f5d5a68..b4863fa3e095 100644
--- a/net/ipinfo-cli/Makefile
+++ b/net/ipinfo-cli/Makefile
@@ -1,7 +1,7 @@
PORTNAME= ipinfo
DISTVERSIONPREFIX= ipinfo-
DISTVERSION= 3.3.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net
MAINTAINER= dutra@FreeBSD.org
diff --git a/net/kafka/Makefile b/net/kafka/Makefile
index 65dadfbca678..d037b6b7228c 100644
--- a/net/kafka/Makefile
+++ b/net/kafka/Makefile
@@ -1,8 +1,8 @@
PORTNAME= kafka
-DISTVERSION= 3.7.1
+DISTVERSION= 3.9.1
CATEGORIES= net java
-MASTER_SITES= APACHE/${PORTNAME}/${PORTVERSION}/
-DISTNAME= ${PORTNAME}_2.13-${PORTVERSION}
+MASTER_SITES= APACHE/${PORTNAME}/${DISTVERSION}/
+DISTNAME= ${PORTNAME}_2.13-${DISTVERSION}
MAINTAINER= timp87@gmail.com
COMMENT= Distributed streaming platform
@@ -81,7 +81,7 @@ PLIST_SUB= KAFKA_DBDIR=${KAFKA_DBDIR} \
KAFKA_GROUP=${KAFKA_GROUP} \
KAFKA_LOGDIR=${KAFKA_LOGDIR} \
KAFKA_USER=${KAFKA_USER} \
- PORTVERSION=${PORTVERSION}
+ PORTVERSION=${DISTVERSION}
OPTIONS_DEFINE= DOCS
@@ -119,6 +119,6 @@ do-install:
do-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${EXTRACT_CMD} -xf ${WRKSRC}/site-docs/${PORTNAME}_2.13-${PORTVERSION}-site-docs.tgz -C ${STAGEDIR}${DOCSDIR}
+ ${EXTRACT_CMD} -xf ${WRKSRC}/site-docs/${PORTNAME}_2.13-${DISTVERSION}-site-docs.tgz -C ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
diff --git a/net/kafka/distinfo b/net/kafka/distinfo
index 897a5cf73dc8..b3a7ec1b20e0 100644
--- a/net/kafka/distinfo
+++ b/net/kafka/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1719715557
-SHA256 (kafka_2.13-3.7.1.tgz) = 62acae4a143dd983dc7eb4804d5744ba0c50b199b508f599ef001020e2558fc9
-SIZE (kafka_2.13-3.7.1.tgz) = 120235344
+TIMESTAMP = 1747853069
+SHA256 (kafka_2.13-3.9.1.tgz) = dd4399816e678946cab76e3bd1686103555e69bc8f2ab8686cda71aa15bc31a3
+SIZE (kafka_2.13-3.9.1.tgz) = 122110298
diff --git a/net/kafka/pkg-plist b/net/kafka/pkg-plist
index d24b75e2aa22..7b7c5837e9c9 100644
--- a/net/kafka/pkg-plist
+++ b/net/kafka/pkg-plist
@@ -43,13 +43,12 @@
%%DATADIR%%/libs/argparse4j-0.7.0.jar
%%DATADIR%%/libs/audience-annotations-0.12.0.jar
%%DATADIR%%/libs/caffeine-2.9.3.jar
-%%DATADIR%%/libs/checker-qual-3.19.0.jar
%%DATADIR%%/libs/commons-beanutils-1.9.4.jar
%%DATADIR%%/libs/commons-cli-1.4.jar
%%DATADIR%%/libs/commons-collections-3.2.2.jar
%%DATADIR%%/libs/commons-digester-2.1.jar
-%%DATADIR%%/libs/commons-io-2.11.0.jar
-%%DATADIR%%/libs/commons-lang3-3.8.1.jar
+%%DATADIR%%/libs/commons-io-2.14.0.jar
+%%DATADIR%%/libs/commons-lang3-3.12.0.jar
%%DATADIR%%/libs/commons-logging-1.2.jar
%%DATADIR%%/libs/commons-validator-1.7.jar
%%DATADIR%%/libs/connect-api-%%PORTVERSION%%.jar
@@ -71,6 +70,7 @@
%%DATADIR%%/libs/jackson-datatype-jdk8-2.16.2.jar
%%DATADIR%%/libs/jackson-jaxrs-base-2.16.2.jar
%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.16.2.jar
+%%DATADIR%%/libs/jackson-module-afterburner-2.16.2.jar
%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.16.2.jar
%%DATADIR%%/libs/jackson-module-scala_2.13-2.16.2.jar
%%DATADIR%%/libs/jakarta.activation-api-1.2.2.jar
@@ -91,23 +91,23 @@
%%DATADIR%%/libs/jersey-container-servlet-core-2.39.1.jar
%%DATADIR%%/libs/jersey-hk2-2.39.1.jar
%%DATADIR%%/libs/jersey-server-2.39.1.jar
-%%DATADIR%%/libs/jetty-client-9.4.54.v20240208.jar
-%%DATADIR%%/libs/jetty-continuation-9.4.54.v20240208.jar
-%%DATADIR%%/libs/jetty-http-9.4.54.v20240208.jar
-%%DATADIR%%/libs/jetty-io-9.4.54.v20240208.jar
-%%DATADIR%%/libs/jetty-security-9.4.54.v20240208.jar
-%%DATADIR%%/libs/jetty-server-9.4.54.v20240208.jar
-%%DATADIR%%/libs/jetty-servlet-9.4.54.v20240208.jar
-%%DATADIR%%/libs/jetty-servlets-9.4.54.v20240208.jar
-%%DATADIR%%/libs/jetty-util-9.4.54.v20240208.jar
-%%DATADIR%%/libs/jetty-util-ajax-9.4.54.v20240208.jar
+%%DATADIR%%/libs/jetty-client-9.4.57.v20241219.jar
+%%DATADIR%%/libs/jetty-continuation-9.4.57.v20241219.jar
+%%DATADIR%%/libs/jetty-http-9.4.57.v20241219.jar
+%%DATADIR%%/libs/jetty-io-9.4.57.v20241219.jar
+%%DATADIR%%/libs/jetty-security-9.4.57.v20241219.jar
+%%DATADIR%%/libs/jetty-server-9.4.57.v20241219.jar
+%%DATADIR%%/libs/jetty-servlet-9.4.57.v20241219.jar
+%%DATADIR%%/libs/jetty-servlets-9.4.57.v20241219.jar
+%%DATADIR%%/libs/jetty-util-9.4.57.v20241219.jar
+%%DATADIR%%/libs/jetty-util-ajax-9.4.57.v20241219.jar
%%DATADIR%%/libs/jline-3.25.1.jar
%%DATADIR%%/libs/jopt-simple-5.0.4.jar
%%DATADIR%%/libs/jose4j-0.9.4.jar
%%DATADIR%%/libs/jsr305-3.0.2.jar
%%DATADIR%%/libs/kafka-clients-%%PORTVERSION%%.jar
%%DATADIR%%/libs/kafka-group-coordinator-%%PORTVERSION%%.jar
-%%DATADIR%%/libs/kafka-log4j-appender-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/kafka-group-coordinator-api-%%PORTVERSION%%.jar
%%DATADIR%%/libs/kafka-metadata-%%PORTVERSION%%.jar
%%DATADIR%%/libs/kafka-raft-%%PORTVERSION%%.jar
%%DATADIR%%/libs/kafka-server-%%PORTVERSION%%.jar
@@ -121,34 +121,35 @@
%%DATADIR%%/libs/kafka-streams-test-utils-%%PORTVERSION%%.jar
%%DATADIR%%/libs/kafka-tools-%%PORTVERSION%%.jar
%%DATADIR%%/libs/kafka-tools-api-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/kafka-transaction-coordinator-%%PORTVERSION%%.jar
%%DATADIR%%/libs/kafka_2.13-%%PORTVERSION%%.jar
%%DATADIR%%/libs/lz4-java-1.8.0.jar
-%%DATADIR%%/libs/maven-artifact-3.8.8.jar
+%%DATADIR%%/libs/maven-artifact-3.9.6.jar
%%DATADIR%%/libs/metrics-core-2.2.0.jar
%%DATADIR%%/libs/metrics-core-4.1.12.1.jar
-%%DATADIR%%/libs/netty-buffer-4.1.110.Final.jar
-%%DATADIR%%/libs/netty-codec-4.1.110.Final.jar
-%%DATADIR%%/libs/netty-common-4.1.110.Final.jar
-%%DATADIR%%/libs/netty-handler-4.1.110.Final.jar
-%%DATADIR%%/libs/netty-resolver-4.1.110.Final.jar
-%%DATADIR%%/libs/netty-transport-4.1.110.Final.jar
-%%DATADIR%%/libs/netty-transport-classes-epoll-4.1.110.Final.jar
-%%DATADIR%%/libs/netty-transport-native-epoll-4.1.110.Final.jar
-%%DATADIR%%/libs/netty-transport-native-unix-common-4.1.110.Final.jar
+%%DATADIR%%/libs/netty-buffer-4.1.119.Final.jar
+%%DATADIR%%/libs/netty-codec-4.1.119.Final.jar
+%%DATADIR%%/libs/netty-common-4.1.119.Final.jar
+%%DATADIR%%/libs/netty-handler-4.1.119.Final.jar
+%%DATADIR%%/libs/netty-resolver-4.1.119.Final.jar
+%%DATADIR%%/libs/netty-transport-4.1.119.Final.jar
+%%DATADIR%%/libs/netty-transport-classes-epoll-4.1.119.Final.jar
+%%DATADIR%%/libs/netty-transport-native-epoll-4.1.119.Final.jar
+%%DATADIR%%/libs/netty-transport-native-unix-common-4.1.119.Final.jar
%%DATADIR%%/libs/opentelemetry-proto-1.0.0-alpha.jar
%%DATADIR%%/libs/osgi-resource-locator-1.0.3.jar
%%DATADIR%%/libs/paranamer-2.8.jar
%%DATADIR%%/libs/pcollections-4.0.1.jar
-%%DATADIR%%/libs/plexus-utils-3.3.1.jar
-%%DATADIR%%/libs/protobuf-java-3.23.4.jar
+%%DATADIR%%/libs/plexus-utils-3.5.1.jar
+%%DATADIR%%/libs/protobuf-java-3.25.5.jar
%%DATADIR%%/libs/reflections-0.10.2.jar
%%DATADIR%%/libs/reload4j-1.2.25.jar
%%DATADIR%%/libs/rocksdbjni-7.9.2.jar
%%DATADIR%%/libs/scala-collection-compat_2.13-2.10.0.jar
%%DATADIR%%/libs/scala-java8-compat_2.13-1.0.2.jar
-%%DATADIR%%/libs/scala-library-2.13.12.jar
-%%DATADIR%%/libs/scala-logging_2.13-3.9.4.jar
-%%DATADIR%%/libs/scala-reflect-2.13.12.jar
+%%DATADIR%%/libs/scala-library-2.13.15.jar
+%%DATADIR%%/libs/scala-logging_2.13-3.9.5.jar
+%%DATADIR%%/libs/scala-reflect-2.13.15.jar
%%DATADIR%%/libs/slf4j-api-1.7.36.jar
%%DATADIR%%/libs/slf4j-reload4j-1.7.36.jar
%%DATADIR%%/libs/snappy-java-1.1.10.5.jar
@@ -156,7 +157,8 @@
%%DATADIR%%/libs/trogdor-%%PORTVERSION%%.jar
%%DATADIR%%/libs/zookeeper-3.8.4.jar
%%DATADIR%%/libs/zookeeper-jute-3.8.4.jar
-%%DATADIR%%/libs/zstd-jni-1.5.6-3.jar
+%%DATADIR%%/libs/zstd-jni-1.5.6-4.jar
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/README.md
%%PORTDOCS%%%%DOCSDIR%%/site-docs/api.html
%%PORTDOCS%%%%DOCSDIR%%/site-docs/configuration.html
%%PORTDOCS%%%%DOCSDIR%%/site-docs/connect.html
diff --git a/net/kf6-kcalendarcore/distinfo b/net/kf6-kcalendarcore/distinfo
index 48f7ccf682c6..b2648a521af8 100644
--- a/net/kf6-kcalendarcore/distinfo
+++ b/net/kf6-kcalendarcore/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743798878
-SHA256 (KDE/frameworks/6.13.0/kcalendarcore-6.13.0.tar.xz) = e1504a851f39fbf9beac05d622ca46ebbd6e9f2b1106e71c5d4bbf7ca7fa1f41
-SIZE (KDE/frameworks/6.13.0/kcalendarcore-6.13.0.tar.xz) = 310788
+TIMESTAMP = 1746358559
+SHA256 (KDE/frameworks/6.14/kcalendarcore-6.14.0.tar.xz) = 702bfc2edfced4d0903365657434fd8c2dc0b8f66d0ce96e4ea0b6950ef8798b
+SIZE (KDE/frameworks/6.14/kcalendarcore-6.14.0.tar.xz) = 311748
diff --git a/net/kf6-kcontacts/distinfo b/net/kf6-kcontacts/distinfo
index 253177796342..c99f367a3cef 100644
--- a/net/kf6-kcontacts/distinfo
+++ b/net/kf6-kcontacts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743798878
-SHA256 (KDE/frameworks/6.13.0/kcontacts-6.13.0.tar.xz) = c3f389f9e41f2aaebe5c6b2c6fbc33927f64423cb24cc240f61e93dbc057506f
-SIZE (KDE/frameworks/6.13.0/kcontacts-6.13.0.tar.xz) = 209400
+TIMESTAMP = 1746358559
+SHA256 (KDE/frameworks/6.14/kcontacts-6.14.0.tar.xz) = 64fd6f2692dc5bea9bc720f52bfdb2880771d82db27e1c9c0f61ac846e503729
+SIZE (KDE/frameworks/6.14/kcontacts-6.14.0.tar.xz) = 209296
diff --git a/net/kf6-kdav/distinfo b/net/kf6-kdav/distinfo
index dff6760e7adf..b7c71b45b94c 100644
--- a/net/kf6-kdav/distinfo
+++ b/net/kf6-kdav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743798878
-SHA256 (KDE/frameworks/6.13.0/kdav-6.13.0.tar.xz) = d767e8f5158d7f4c1f588f17286177145880d80cfb2e215f554a6c820f86b0d9
-SIZE (KDE/frameworks/6.13.0/kdav-6.13.0.tar.xz) = 69340
+TIMESTAMP = 1746358559
+SHA256 (KDE/frameworks/6.14/kdav-6.14.0.tar.xz) = a92b95fb0612c79c5874e7a85f48369c3a00d2c1d2d94c77656229c945e77c2a
+SIZE (KDE/frameworks/6.14/kdav-6.14.0.tar.xz) = 69344
diff --git a/net/kf6-kholidays/distinfo b/net/kf6-kholidays/distinfo
index 42f76e331049..f2fd1bdfe151 100644
--- a/net/kf6-kholidays/distinfo
+++ b/net/kf6-kholidays/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743798879
-SHA256 (KDE/frameworks/6.13.0/kholidays-6.13.0.tar.xz) = 37d2aeafb2c7695f76ddc098d07646eb7f65a03aee7c8b5fed0ab7c4ef264775
-SIZE (KDE/frameworks/6.13.0/kholidays-6.13.0.tar.xz) = 257072
+TIMESTAMP = 1746358560
+SHA256 (KDE/frameworks/6.14/kholidays-6.14.0.tar.xz) = 6dd66fcbaafc8d45045aca27e334e1f60df6afd9a070b1f32996ba0497277177
+SIZE (KDE/frameworks/6.14/kholidays-6.14.0.tar.xz) = 257240
diff --git a/net/kf6-syndication/distinfo b/net/kf6-syndication/distinfo
index d2f089f2e687..addc0ede42df 100644
--- a/net/kf6-syndication/distinfo
+++ b/net/kf6-syndication/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743798879
-SHA256 (KDE/frameworks/6.13.0/syndication-6.13.0.tar.xz) = 1fe07a581705659753f995a7ee09977bf528b020a65978349b9722862da08fb7
-SIZE (KDE/frameworks/6.13.0/syndication-6.13.0.tar.xz) = 569492
+TIMESTAMP = 1746358560
+SHA256 (KDE/frameworks/6.14/syndication-6.14.0.tar.xz) = 14e5ac6f632dc3022f6a32b9c8e5bd00896bdda5fad8585745023b2539561a19
+SIZE (KDE/frameworks/6.14/syndication-6.14.0.tar.xz) = 569496
diff --git a/net/krakend-ce/Makefile b/net/krakend-ce/Makefile
index 5708cd0a9987..66d502c4cb36 100644
--- a/net/krakend-ce/Makefile
+++ b/net/krakend-ce/Makefile
@@ -1,6 +1,7 @@
PORTNAME= krakend-ce
DISTVERSIONPREFIX= v
DISTVERSION= 2.9.4
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= alster@vinterdalen.se
diff --git a/net/kube-apiserver/Makefile b/net/kube-apiserver/Makefile
index 6b25ac64715e..f9e6b4e32277 100644
--- a/net/kube-apiserver/Makefile
+++ b/net/kube-apiserver/Makefile
@@ -1,7 +1,7 @@
PORTNAME= kube-apiserver
PORTVERSION= 1.27.2
DISTVERSIONPREFIX= v
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net
MAINTAINER= loic.blot@unix-experience.fr
diff --git a/net/kube-controller-manager/Makefile b/net/kube-controller-manager/Makefile
index 7ee62e430eff..8c6b546f381b 100644
--- a/net/kube-controller-manager/Makefile
+++ b/net/kube-controller-manager/Makefile
@@ -1,7 +1,7 @@
PORTNAME= kube-controller-manager
PORTVERSION= 1.27.2
DISTVERSIONPREFIX= v
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net
MAINTAINER= loic.blot@unix-experience.fr
diff --git a/net/kube-scheduler/Makefile b/net/kube-scheduler/Makefile
index 57624d2cae94..2a5f28622be4 100644
--- a/net/kube-scheduler/Makefile
+++ b/net/kube-scheduler/Makefile
@@ -1,7 +1,7 @@
PORTNAME= kube-scheduler
PORTVERSION= 1.27.2
DISTVERSIONPREFIX= v
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net
MAINTAINER= loic.blot@unix-experience.fr
diff --git a/net/lavinmq/Makefile b/net/lavinmq/Makefile
index 86d209dccf0c..d27d57820c3c 100644
--- a/net/lavinmq/Makefile
+++ b/net/lavinmq/Makefile
@@ -1,8 +1,43 @@
PORTNAME= lavinmq
DISTVERSIONPREFIX= v
-DISTVERSION= 1.2.14
+DISTVERSION= 2.3.0
CATEGORIES= net
+# JavaScripts
+MASTER_SITES+= https://github.com/chartjs/Chart.js/releases/download/v4.0.1/:chartjs \
+ https://github.com/cloudamqp/amqp-client.js/releases/download/v3.1.1/:amqpclient \
+ https://moment.github.io/luxon/es6/:luxon \
+ https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@1.3.1/dist/:chartjsadapter \
+ https://unpkg.com/@stoplight/elements@8.2.0/:elements \
+ https://raw.githubusercontent.com/eclipse-paho/paho.mqtt.javascript/master/src/:paho
+
+DISTFILES+= chart.js-4.0.1.tgz:chartjs \
+ amqp-websocket-client.mjs:amqpclient \
+ amqp-websocket-client.mjs.map:amqpclient \
+ luxon.js:luxon \
+ chartjs-adapter-luxon.esm.js:chartjsadapter \
+ web-components.min.js:elements \
+ styles.min.css:elements \
+ paho-mqtt.js:paho
+
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \
+ 84codes-lz4.cr-${_LZ4}_GH0.tar.gz \
+ 84codes-systemd.cr-v2.0.0_GH0.tar.gz \
+ cloudamqp-amq-protocol.cr-v1.1.15_GH0.tar.gz \
+ cloudamqp-amqp-client.cr-v1.3.1_GH0.tar.gz \
+ 84codes-mqtt-protocol.cr-${_MQTT}_GH0.tar.gz \
+ chart.js-${_CHARTJS}.tgz
+
+# Crystal library versions
+_LZ4= 96d714f7593c66ca7425872fd26c7b1286806d3d
+_MQTT= d01a1210ed7adfed9aa5cd055f1788a45d9c4d52
+
+# JavaScript library versions
+_CHARTJS= 4.0.1
+_ELEMENTS= 8.2.0
+_AMQP_CLIENT= 3.1.1
+_CHARTJS_ADAPTER= 1.3.1
+
MAINTAINER= dch@FreeBSD.org
COMMENT= Next-generation AMQP 0.9.1 based message broker
WWW= https://www.lavinmq.com/
@@ -16,13 +51,11 @@ BUILD_DEPENDS= crystal:lang/crystal \
USES= pkgconfig ssl:build
USE_GITHUB= yes
GH_ACCOUNT= cloudamqp
-GH_TUPLE= \
- 84codes:lz4.cr:6cc0d0096207821222317ee02ea23d5296ad4023:a/deps/lz4.cr \
+GH_TUPLE= 84codes:lz4.cr:${_LZ4}:a/deps/lz4.cr \
84codes:systemd.cr:v2.0.0:systemd/deps/systemd.cr \
- cloudamqp:amq-protocol.cr:v1.1.14:proto/deps/amq-protocol.cr \
- cloudamqp:amqp-client.cr:v1.2.3:client/deps/amqp-client.cr \
- luislavena:radix:v0.4.1:radix/deps/radix \
- tbrand:router.cr:v0.2.8:router/deps/router.cr
+ cloudamqp:amq-protocol.cr:v1.1.15:proto/deps/amq-protocol.cr \
+ cloudamqp:amqp-client.cr:v1.3.1:client/deps/amqp-client.cr \
+ 84codes:mqtt-protocol.cr:${_MQTT}:mqtt/deps/mqtt-protocol.cr
USE_RC_SUBR= lavinmq
@@ -39,7 +72,7 @@ SHARDS_ENV= --time --verbose --production --release --no-color --stats \
.include <bsd.port.options.mk>
.if ${SSL_DEFAULT:Mopenssl} || ${SSL_DEFAULT:Mopenssl3*}
-BROKEN= fails to compile: undefined symbol: EVP_MD_size
+BROKEN= fails to compile: undefined symbol: EVP_MD_size
.endif
post-extract:
@@ -58,6 +91,28 @@ post-extract:
-e 's,/tmp/lavinmq-http.sock,/var/run/lavinmq/http.sock,' \
-e 's,/tmp/lavinmq.sock,/var/run/lavinmq/amqp.sock,' \
${WRKSRC}/extras/lavinmq.ini
+# setup javaScript directories
+ ${MKDIR} ${WRKSRC}/static/js/lib \
+ ${WRKSRC}/static/js/lib/chunks
+# extract Chart.js files from tarball
+ ${TAR} -xOf ${DISTDIR}/chart.js-${_CHARTJS}.tgz package/dist/chart.js \
+ > ${WRKSRC}/static/js/lib/chart.js
+ ${TAR} -xOf ${DISTDIR}/chart.js-${_CHARTJS}.tgz package/dist/chunks/helpers.segment.js \
+ > ${WRKSRC}/static/js/lib/chunks/helpers.segment.js
+# copy AMQP WebSocket client files
+ ${CP} ${DISTDIR}/amqp-websocket-client.mjs ${WRKSRC}/static/js/lib/
+ ${CP} ${DISTDIR}/amqp-websocket-client.mjs.map ${WRKSRC}/static/js/lib/
+# copy luxon and Chart.js adapter
+ ${CP} ${DISTDIR}/luxon.js ${WRKSRC}/static/js/lib/
+ ${CP} ${DISTDIR}/chartjs-adapter-luxon.esm.js ${WRKSRC}/static/js/lib/
+ ${SED} -i '' \
+ -e "s|\(import { _adapters } from\).*|\1 './chart.js'|; s|\(import { DateTime } from\).*|\1 './luxon.js'|" \
+ ${WRKSRC}/static/js/lib/chartjs-adapter-luxon.esm.js
+# copy stoplight Elements files
+ ${CP} ${DISTDIR}/web-components.min.js ${WRKSRC}/static/js/lib/elements-${_ELEMENTS}.js
+ ${CP} ${DISTDIR}/styles.min.css ${WRKSRC}/static/js/lib/elements-${_ELEMENTS}.css
+# copy paho MQTT
+ ${CP} ${DISTDIR}/paho-mqtt.js ${WRKSRC}/static/js/lib/
do-build:
${MKDIR} ${WRKDIR}/man1
diff --git a/net/lavinmq/distinfo b/net/lavinmq/distinfo
index 9c0c5ecd0cd6..4a0fe5e3324e 100644
--- a/net/lavinmq/distinfo
+++ b/net/lavinmq/distinfo
@@ -1,15 +1,29 @@
-TIMESTAMP = 1718876848
-SHA256 (cloudamqp-lavinmq-v1.2.14_GH0.tar.gz) = cdf14de7c31a70e69e4f79d3a45622b6bd798ba7663209985e4e27b1e19a8ef9
-SIZE (cloudamqp-lavinmq-v1.2.14_GH0.tar.gz) = 413101
-SHA256 (84codes-lz4.cr-6cc0d0096207821222317ee02ea23d5296ad4023_GH0.tar.gz) = 2c6a79de1c5b488459a752c0b6e8d6b743dab9940cac1b113a37b06b8bf352fa
-SIZE (84codes-lz4.cr-6cc0d0096207821222317ee02ea23d5296ad4023_GH0.tar.gz) = 6710
+TIMESTAMP = 1748024362
+SHA256 (chart.js-4.0.1.tgz) = 461dae2edc0eda7beeb16c7030ab630ab5129aedd3fc6de9a036f6dfe488556f
+SIZE (chart.js-4.0.1.tgz) = 793292
+SHA256 (amqp-websocket-client.mjs) = a779d8417536e31e44eaceeef5ae745e5f0b95f16cf13a45e6ac5dcaadfd1c47
+SIZE (amqp-websocket-client.mjs) = 82795
+SHA256 (amqp-websocket-client.mjs.map) = 797db087b848af4427e5632d3205fb2ceede7379cb049a2b37c8d2d408b2eec9
+SIZE (amqp-websocket-client.mjs.map) = 86911
+SHA256 (luxon.js) = b83748173e228de065fae3256042d88ce656d6cabf6c4eedaa4703a8cf09a730
+SIZE (luxon.js) = 256400
+SHA256 (chartjs-adapter-luxon.esm.js) = fa02364f717191a48067215aaf9ff93b54ff52e2de64704270742e1d15d1b6df
+SIZE (chartjs-adapter-luxon.esm.js) = 2531
+SHA256 (web-components.min.js) = 598862da6d551769ebad9d61d4e3037535de573a13d3e0bd1ded4c5fc65c5885
+SIZE (web-components.min.js) = 1942514
+SHA256 (styles.min.css) = 119784e23ffc39b6fa3fdb3df93f391f8250e8af141b78dfc3b6bed86079f93b
+SIZE (styles.min.css) = 296065
+SHA256 (paho-mqtt.js) = a0c734a00a2172d579ca1ff4f92fb366bccb40974005bdad5ea7a2f0326ac158
+SIZE (paho-mqtt.js) = 90293
+SHA256 (cloudamqp-lavinmq-v2.3.0_GH0.tar.gz) = ff8d4f013de7c3b04298f967e1119935fca299d4580108c5fef7a27fcae54653
+SIZE (cloudamqp-lavinmq-v2.3.0_GH0.tar.gz) = 1076000
+SHA256 (84codes-lz4.cr-96d714f7593c66ca7425872fd26c7b1286806d3d_GH0.tar.gz) = 6a851169d1382a35aecff253d24f6acbaaa92b906a24b5edd903637bd212f380
+SIZE (84codes-lz4.cr-96d714f7593c66ca7425872fd26c7b1286806d3d_GH0.tar.gz) = 7298
SHA256 (84codes-systemd.cr-v2.0.0_GH0.tar.gz) = 4dd0c6f838542f97338866aef36de7b464c06112c4434e4db48aa65586b68ef3
SIZE (84codes-systemd.cr-v2.0.0_GH0.tar.gz) = 4339
-SHA256 (cloudamqp-amq-protocol.cr-v1.1.14_GH0.tar.gz) = 886fa823404fb2d548884f582809bf8129724b75fe2b2670109053d373251b88
-SIZE (cloudamqp-amq-protocol.cr-v1.1.14_GH0.tar.gz) = 17800
-SHA256 (cloudamqp-amqp-client.cr-v1.2.3_GH0.tar.gz) = cb249c1743e0d78a21d1816cb455d663449d9be0636ba976a4effa7f9ddfeee2
-SIZE (cloudamqp-amqp-client.cr-v1.2.3_GH0.tar.gz) = 22948
-SHA256 (luislavena-radix-v0.4.1_GH0.tar.gz) = 5f207eb769101d94726eb476eb5f9b4603482c7941396ab4c85866722b7497b1
-SIZE (luislavena-radix-v0.4.1_GH0.tar.gz) = 13847
-SHA256 (tbrand-router.cr-v0.2.8_GH0.tar.gz) = a64540dbd57bc2feba50a432b37d3647f4ab72ee16058746623f3f024b5f3f25
-SIZE (tbrand-router.cr-v0.2.8_GH0.tar.gz) = 5132
+SHA256 (cloudamqp-amq-protocol.cr-v1.1.15_GH0.tar.gz) = 2650924ad06f80a12d4f3eeaf800da45e7d74304289692a4b26576e5bfada85a
+SIZE (cloudamqp-amq-protocol.cr-v1.1.15_GH0.tar.gz) = 18077
+SHA256 (cloudamqp-amqp-client.cr-v1.3.1_GH0.tar.gz) = 2534b98bf64a17e075871f82fcf6bdee6d6d9dba5fc29472afe61bf6f1a5388e
+SIZE (cloudamqp-amqp-client.cr-v1.3.1_GH0.tar.gz) = 24043
+SHA256 (84codes-mqtt-protocol.cr-d01a1210ed7adfed9aa5cd055f1788a45d9c4d52_GH0.tar.gz) = dbb3484fb728854ddcd288bacb9629a01b912312f6b17dc336cd8c1700a9bc10
+SIZE (84codes-mqtt-protocol.cr-d01a1210ed7adfed9aa5cd055f1788a45d9c4d52_GH0.tar.gz) = 17147
diff --git a/net/librespeed-cli/Makefile b/net/librespeed-cli/Makefile
index 31e9d13c04e1..9c13e43cd8ad 100644
--- a/net/librespeed-cli/Makefile
+++ b/net/librespeed-cli/Makefile
@@ -1,7 +1,7 @@
PORTNAME= librespeed-cli
DISTVERSIONPREFIX= v
DISTVERSION= 1.0.10
-PORTREVISION= 22
+PORTREVISION= 23
CATEGORIES= net www
MAINTAINER= driesm@FreeBSD.org
diff --git a/net/librespeed-go/Makefile b/net/librespeed-go/Makefile
index 69560fbb17ed..ddd018c64d1d 100644
--- a/net/librespeed-go/Makefile
+++ b/net/librespeed-go/Makefile
@@ -1,7 +1,7 @@
PORTNAME= librespeed-go
DISTVERSIONPREFIX= v
DISTVERSION= 1.1.5
-PORTREVISION= 23
+PORTREVISION= 24
CATEGORIES= net www
MAINTAINER= driesm@FreeBSD.org
diff --git a/net/linux-rl9-sdl2_net/Makefile b/net/linux-rl9-sdl2_net/Makefile
deleted file mode 100644
index fdf023fc3c7e..000000000000
--- a/net/linux-rl9-sdl2_net/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-PORTNAME= sdl2_net
-PORTVERSION= 2.2.0
-DISTVERSIONSUFFIX= -3.el9
-CATEGORIES= net linux
-MASTER_SITES= EPEL9
-DISTNAME= SDL2_net-${DISTVERSIONFULL}
-
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Small sample cross-platform networking library (Rocky Linux ${LINUX_DIST_VER})
-WWW= https://github.com/libsdl-org/SDL_net
-
-LICENSE= ZLIB
-
-USES= linux:rl9
-USE_LDCONFIG= yes
-USE_LINUX= sdl20
-USE_LINUX_RPM= yes
-
-CONFLICTS= linux-c7-${PORTNAME}
-DESCR= ${PORTSDIR}/${PKGCATEGORY}/${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/SDL2_net
-
-OPTIONS_DEFINE= DOCS
-
-.include <bsd.port.mk>
diff --git a/net/linux-rl9-sdl2_net/distinfo b/net/linux-rl9-sdl2_net/distinfo
deleted file mode 100644
index 47e5407ddbe8..000000000000
--- a/net/linux-rl9-sdl2_net/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1739910913
-SHA256 (rocky/s/SDL2_net-2.2.0-3.el9.aarch64.rpm) = 03a8171960c304d676eea819d5e3742a511b87ba1ca8abfe3e3b0bf990372916
-SIZE (rocky/s/SDL2_net-2.2.0-3.el9.aarch64.rpm) = 19952
-SHA256 (rocky/s/SDL2_net-2.2.0-3.el9.x86_64.rpm) = d512a9d07e351288387dcfe664b62071c6113d3380dddd658f5c3b38d21e4dc5
-SIZE (rocky/s/SDL2_net-2.2.0-3.el9.x86_64.rpm) = 19931
-SHA256 (rocky/s/SDL2_net-2.2.0-3.el9.src.rpm) = 4e38a31c1faf644e7557b65f02ec173a249d47136f1073d77b9e0a96fbd8f811
-SIZE (rocky/s/SDL2_net-2.2.0-3.el9.src.rpm) = 8707507
diff --git a/net/linux-rl9-sdl2_net/pkg-plist.aarch64 b/net/linux-rl9-sdl2_net/pkg-plist.aarch64
deleted file mode 100644
index 40a9dd9ee3a1..000000000000
--- a/net/linux-rl9-sdl2_net/pkg-plist.aarch64
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/.build-id/5d/c083dfbec8b658a36a10c0d061667dec9e1130
-usr/lib64/libSDL2_net-2.0.so.0
-usr/lib64/libSDL2_net-2.0.so.0.200.0
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-usr/share/licenses/SDL2_net/LICENSE.txt
diff --git a/net/linux-rl9-sdl2_net/pkg-plist.amd64 b/net/linux-rl9-sdl2_net/pkg-plist.amd64
deleted file mode 100644
index 6e19c7c2569d..000000000000
--- a/net/linux-rl9-sdl2_net/pkg-plist.amd64
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/.build-id/f5/62c13a889c1ec3797aab73032e562d58266ac5
-usr/lib64/libSDL2_net-2.0.so.0
-usr/lib64/libSDL2_net-2.0.so.0.200.0
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-usr/share/licenses/SDL2_net/LICENSE.txt
diff --git a/net/madonctl/Makefile b/net/madonctl/Makefile
index bd43688926f6..0c7f689bf33f 100644
--- a/net/madonctl/Makefile
+++ b/net/madonctl/Makefile
@@ -1,7 +1,7 @@
PORTNAME= madonctl
PORTVERSION= 2.3.2
DISTVERSIONPREFIX= v
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= net
MAINTAINER= sunpoet@FreeBSD.org
diff --git a/net/mvfst/Makefile b/net/mvfst/Makefile
index 6eb2201bf0ba..2c746f72e1dc 100644
--- a/net/mvfst/Makefile
+++ b/net/mvfst/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mvfst
DISTVERSIONPREFIX= v
-DISTVERSION= 2025.05.12.00
+DISTVERSION= 2025.05.26.00
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
diff --git a/net/mvfst/distinfo b/net/mvfst/distinfo
index c75bb6cb8893..4d76a5d03981 100644
--- a/net/mvfst/distinfo
+++ b/net/mvfst/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747102743
-SHA256 (facebook-mvfst-v2025.05.12.00_GH0.tar.gz) = 4e2b9cb907bab79219e08259fd8f828f2aaf8ca86186c605e99c8a605516889b
-SIZE (facebook-mvfst-v2025.05.12.00_GH0.tar.gz) = 2085536
+TIMESTAMP = 1748334343
+SHA256 (facebook-mvfst-v2025.05.26.00_GH0.tar.gz) = d56d87ee6efb45fe8f8986f28edabd7252b46de50533d86b14cbfcf46dc1a470
+SIZE (facebook-mvfst-v2025.05.26.00_GH0.tar.gz) = 2088492
diff --git a/net/mvfst/pkg-plist b/net/mvfst/pkg-plist
index 59c1a9c2f644..2c394edcc3d7 100644
--- a/net/mvfst/pkg-plist
+++ b/net/mvfst/pkg-plist
@@ -59,7 +59,7 @@ include/quic/common/IntervalSet.h
include/quic/common/NetworkData.h
include/quic/common/Optional.h
include/quic/common/QuicBuffer.h
-include/quic/common/SmallCollections.h
+include/quic/common/QuicRange.h
include/quic/common/SocketUtil.h
include/quic/common/TimePoints.h
include/quic/common/TimeUtil.h
diff --git a/net/nats-nkeys/Makefile b/net/nats-nkeys/Makefile
index 1660d0562f37..7fdb0e71b4e4 100644
--- a/net/nats-nkeys/Makefile
+++ b/net/nats-nkeys/Makefile
@@ -1,7 +1,7 @@
PORTNAME= nkeys
PORTVERSION= 0.4.7
DISTVERSIONPREFIX= v
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= net
PKGNAMEPREFIX= nats-
diff --git a/net/nats-nsc/Makefile b/net/nats-nsc/Makefile
index 119af24b6af6..253d804e6c24 100644
--- a/net/nats-nsc/Makefile
+++ b/net/nats-nsc/Makefile
@@ -1,7 +1,7 @@
PORTNAME= nsc
PORTVERSION= 2.10.0
DISTVERSIONPREFIX=v
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
PKGNAMEPREFIX= nats-
diff --git a/net/nats-server/Makefile b/net/nats-server/Makefile
index 7028e0065261..7ec0d533d6f6 100644
--- a/net/nats-server/Makefile
+++ b/net/nats-server/Makefile
@@ -1,7 +1,7 @@
PORTNAME= nats-server
DISTVERSION= 2.10.23
DISTVERSIONPREFIX= v
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MAINTAINER= olgeni@FreeBSD.org
diff --git a/net/nats-streaming-server/Makefile b/net/nats-streaming-server/Makefile
index 7d64f861d3ce..bfd030ffa9a7 100644
--- a/net/nats-streaming-server/Makefile
+++ b/net/nats-streaming-server/Makefile
@@ -1,7 +1,7 @@
PORTNAME= nats-streaming-server
PORTVERSION= 0.25.5
DISTVERSIONPREFIX= v
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net
MAINTAINER= olgeni@FreeBSD.org
diff --git a/net/nats-top/Makefile b/net/nats-top/Makefile
index 31d44223dfdf..ab41ba4458ff 100644
--- a/net/nats-top/Makefile
+++ b/net/nats-top/Makefile
@@ -1,7 +1,7 @@
PORTNAME= nats-top
PORTVERSION= 0.6.2
DISTVERSIONPREFIX= v
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MAINTAINER= olgeni@FreeBSD.org
diff --git a/net/natscli/Makefile b/net/natscli/Makefile
index cbf5efbbd18d..07847f90bdd7 100644
--- a/net/natscli/Makefile
+++ b/net/natscli/Makefile
@@ -1,7 +1,7 @@
PORTNAME= natscli
PORTVERSION= 0.1.5
DISTVERSIONPREFIX= v
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MAINTAINER= olgeni@FreeBSD.org
diff --git a/net/nsq/Makefile b/net/nsq/Makefile
index ce92468b6530..016f863a9ef7 100644
--- a/net/nsq/Makefile
+++ b/net/nsq/Makefile
@@ -1,7 +1,7 @@
PORTNAME= nsq
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= net
MAINTAINER= jhixson@FreeBSD.org
diff --git a/net/ooni-mini/Makefile b/net/ooni-mini/Makefile
index 9a41f701545c..29c360e16676 100644
--- a/net/ooni-mini/Makefile
+++ b/net/ooni-mini/Makefile
@@ -1,7 +1,7 @@
PORTNAME= ooni-mini
DISTVERSIONPREFIX= v
DISTVERSION= 0.23.0
-PORTREVISION= 24
+PORTREVISION= 25
CATEGORIES= net www benchmarks
MAINTAINER= egypcio@FreeBSD.org
diff --git a/net/openbgpd8/Makefile b/net/openbgpd8/Makefile
index 6a6779aeffde..3008034d4aed 100644
--- a/net/openbgpd8/Makefile
+++ b/net/openbgpd8/Makefile
@@ -1,5 +1,5 @@
PORTNAME= openbgpd
-PORTVERSION= 8.6
+PORTVERSION= 8.8
CATEGORIES= net
MASTER_SITES= OPENBSD/OpenBGPD
PKGNAMESUFFIX= 8
@@ -14,16 +14,28 @@ LICENSE_FILE= ${FILESDIR}/COPYING
LIB_DEPENDS= libevent.so:devel/libevent
USES= autoreconf libtool localbase pathfix uidfix
-USE_RC_SUBR= ${PORTNAME}
+USE_RC_SUBR= ${PORTNAME} openbgplgd
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+CONFIGURE_ARGS="--with-wwwrunstatedir=/var/run"
+
+OPTIONS_DEFINE= BGPLGD
+OPTIONS_SUB= BGPLGD
+OPTIONS_DEFAULT= BGPLGD
+
+BGPLGD_DESC= Build with Looking Glass Daemon
+BGPLGD_CONFIGURE_WITH= bgplgd
SUB_FILES= pkg-message
USERS= _bgpd
GROUPS= _bgpd
+BGPLGD_USERS+= _bgplgd
+BGPLGD_GROUPS+= _bgplgd
+
+
CONFLICTS= zebra quagga
.include <bsd.port.mk>
diff --git a/net/openbgpd8/distinfo b/net/openbgpd8/distinfo
index d3ce6957abc2..a207375d3729 100644
--- a/net/openbgpd8/distinfo
+++ b/net/openbgpd8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1726850950
-SHA256 (openbgpd-8.6.tar.gz) = 6ca51db42a341858c5b91a66ca1ac0592812908febec8b1671df87014f471972
-SIZE (openbgpd-8.6.tar.gz) = 851232
+TIMESTAMP = 1742397943
+SHA256 (openbgpd-8.8.tar.gz) = b4e12f1ef1b570d7244d11903c597a0109a1aa246bd7b99d0a7069a2604f9cdf
+SIZE (openbgpd-8.8.tar.gz) = 860314
diff --git a/net/openbgpd8/files/openbgplgd.in b/net/openbgpd8/files/openbgplgd.in
new file mode 100644
index 000000000000..535ce580b561
--- /dev/null
+++ b/net/openbgpd8/files/openbgplgd.in
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# PROVIDE: bgplgd
+# REQUIRE: LOGIN abi
+# BEFORE: securelevel
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable openbgpd:
+#
+# openbgplgd_enable="YES"
+# openbgplgd_flags="<set as needed>"
+#
+# See bgplgd(8) for openbgplgd_flags
+
+. /etc/rc.subr
+
+name=openbgpdlgd
+rcvar=openbgplgd_enable
+
+extra_commands=reload
+command="%%PREFIX%%/sbin/bgplgd"
+
+: ${openbgplgd_enable=NO}
+
+check_process()
+{
+ /bin/pgrep -j none -U 0 -f %%PREFIX%%/sbin/bgplgd
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/openbgpd8/files/patch-bgplgd.8.in b/net/openbgpd8/files/patch-bgplgd.8.in
new file mode 100644
index 000000000000..325b2a1d8dd0
--- /dev/null
+++ b/net/openbgpd8/files/patch-bgplgd.8.in
@@ -0,0 +1,21 @@
+--- src/bgplgd/bgplgd.8.in.orig 2025-04-28 17:23:51.692826000 +0200
++++ src/bgplgd/bgplgd.8.in 2025-04-28 17:24:32.798038000 +0200
+@@ -180,7 +180,7 @@
+ .Dl socket \&"@RUNSTATEDIR@/bgpd.rsock\&" restricted
+ .Pp
+ An example setup in
+-.Xr httpd 8
++.Xr obhttpd 8
+ is:
+ .Bd -literal -offset indent
+ location "/bgplgd/*" {
+@@ -191,7 +191,7 @@
+ .Sh SEE ALSO
+ .Xr bgpctl 8 ,
+ .Xr bgpd 8 ,
+-.Xr httpd 8
++.Xr obhttpd 8
+ .Sh HISTORY
+ The
+ .Nm
+
diff --git a/net/openbgpd8/pkg-plist b/net/openbgpd8/pkg-plist
index dca577427c8d..99c99ebae8d2 100644
--- a/net/openbgpd8/pkg-plist
+++ b/net/openbgpd8/pkg-plist
@@ -1,8 +1,8 @@
sbin/bgpctl
sbin/bgpd
-sbin/bgplgd
+%%BGPLGD%%sbin/bgplgd
share/man/man5/bgpd.conf.5.gz
share/man/man8/bgpctl.8.gz
share/man/man8/bgpd.8.gz
-share/man/man8/bgplgd.8.gz
+%%BGPLGD%%share/man/man8/bgplgd.8.gz
@sample etc/bgpd.conf.sample
diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile
index afda0dcf21d9..a67c7c5c9618 100644
--- a/net/openldap25-server/Makefile
+++ b/net/openldap25-server/Makefile
@@ -1,5 +1,5 @@
PORTNAME= openldap
-DISTVERSION= 2.5.19
+DISTVERSION= 2.5.20
PORTREVISION= ${OPENLDAP_PORTREVISION}
CATEGORIES= net databases
MASTER_SITES= https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
@@ -46,10 +46,10 @@ CONFLICTS_INSTALL= ${PORTNAME}2[0-46-9]-server ${PORTNAME}-server
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
-PORTREVISION_CLIENT= 1
-PORTREVISION_SERVER= 1
+PORTREVISION_CLIENT= 0
+PORTREVISION_SERVER= 0
OPENLDAP_SHLIB_MAJOR= 0
-OPENLDAP_SHLIB_MINOR= 1.14
+OPENLDAP_SHLIB_MINOR= 1.15
OPENLDAP_MAJOR= ${DISTVERSION:R}
OPTIONS_DEFINE= DEBUG FETCH GSSAPI
diff --git a/net/openldap25-server/distinfo b/net/openldap25-server/distinfo
index 235a8e47702d..3a7223163703 100644
--- a/net/openldap25-server/distinfo
+++ b/net/openldap25-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732840944
-SHA256 (openldap-2.5.19.tgz) = 56e2936c7169aa7547cfc93d5c87db46aa05e98dee6321590c3ada92e1fbb66c
-SIZE (openldap-2.5.19.tgz) = 6458108
+TIMESTAMP = 1748064908
+SHA256 (openldap-2.5.20.tgz) = 19a97f5fb459c8f7700566b195371f39acbf226f97e10181b734559f8c61081c
+SIZE (openldap-2.5.20.tgz) = 6462390
diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile
index fb0468a5cf52..68ab7a2079fb 100644
--- a/net/openldap26-server/Makefile
+++ b/net/openldap26-server/Makefile
@@ -1,5 +1,5 @@
PORTNAME= openldap
-DISTVERSION= 2.6.9
+DISTVERSION= 2.6.10
PORTREVISION= ${OPENLDAP_PORTREVISION}
CATEGORIES= net databases
MASTER_SITES= https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
@@ -46,8 +46,8 @@ CONFLICTS_INSTALL= ${PORTNAME}2[0-57-9]-server ${PORTNAME}-server
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-PORTREVISION_CLIENT= 1
-PORTREVISION_SERVER= 1
+PORTREVISION_CLIENT= 0
+PORTREVISION_SERVER= 0
OPENLDAP_SHLIB_MAJOR= 2
OPENLDAP_SHLIB_MINOR= 0.200
diff --git a/net/openldap26-server/distinfo b/net/openldap26-server/distinfo
index bcc5eec2a031..9165d2bdefbf 100644
--- a/net/openldap26-server/distinfo
+++ b/net/openldap26-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732840058
-SHA256 (openldap-2.6.9.tgz) = 2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff
-SIZE (openldap-2.6.9.tgz) = 6516669
+TIMESTAMP = 1748065406
+SHA256 (openldap-2.6.10.tgz) = c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516
+SIZE (openldap-2.6.10.tgz) = 6517089
diff --git a/net/p5-Net-Whois-RIPE/Makefile b/net/p5-Net-Whois-RIPE/Makefile
index fa288fbe726a..82a3f2513b8d 100644
--- a/net/p5-Net-Whois-RIPE/Makefile
+++ b/net/p5-Net-Whois-RIPE/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:AASSAD
PKGNAMEPREFIX= p5-
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Implementation of RIPE Whois
WWW= https://metacpan.org/release/Net-Whois-RIPE
diff --git a/net/p5-RPC-XML/Makefile b/net/p5-RPC-XML/Makefile
index 286bfbbef592..608143e7552e 100644
--- a/net/p5-RPC-XML/Makefile
+++ b/net/p5-RPC-XML/Makefile
@@ -1,5 +1,6 @@
PORTNAME= RPC-XML
PORTVERSION= 0.82
+PORTREVISION= 1
CATEGORIES= net www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -12,9 +13,12 @@ LICENSE= ART20 LGPL21
LICENSE_COMB= dual
BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= p5-XML-Parser>=2.31:textproc/p5-XML-Parser \
- p5-libwww>=5.834:www/p5-libwww
-TEST_DEPENDS= p5-DateTime-Format-ISO8601>=0.07:devel/p5-DateTime-Format-ISO8601
+RUN_DEPENDS= p5-HTTP-Daemon>=6.12:www/p5-HTTP-Daemon \
+ p5-HTTP-Message>=6.26:www/p5-HTTP-Message \
+ p5-Scalar-List-Utils>=1.55,1:lang/p5-Scalar-List-Utils \
+ p5-XML-Parser>=2.46:textproc/p5-XML-Parser \
+ p5-libwww>=6.51:www/p5-libwww
+TEST_DEPENDS= p5-Test-Simple>=1.302183:devel/p5-Test-Simple
USES= gmake perl5
USE_PERL5= configure
@@ -23,7 +27,7 @@ NO_ARCH= yes
OPTIONS_DEFINE= XS
-XS_BUILD_DEPENDS= p5-XML-LibXML>=1.85:textproc/p5-XML-LibXML
+XS_BUILD_DEPENDS= p5-XML-LibXML>=2.0206,1:textproc/p5-XML-LibXML
XS_RUN_DEPENDS= ${XS_BUILD_DEPENDS}
.include <bsd.port.mk>
diff --git a/net/py-eventlet/Makefile b/net/py-eventlet/Makefile
index 0c296f8ec8d7..ddf1fac85f17 100644
--- a/net/py-eventlet/Makefile
+++ b/net/py-eventlet/Makefile
@@ -1,5 +1,5 @@
PORTNAME= eventlet
-PORTVERSION= 0.39.1
+PORTVERSION= 0.40.0
CATEGORIES= net python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-eventlet/distinfo b/net/py-eventlet/distinfo
index 40422bcba2a6..4105f4ca393e 100644
--- a/net/py-eventlet/distinfo
+++ b/net/py-eventlet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742070450
-SHA256 (eventlet-0.39.1.tar.gz) = 4a8a6475282d4021edde06ba335228c230b911b8d014577ddb33114c2b0c0510
-SIZE (eventlet-0.39.1.tar.gz) = 562432
+TIMESTAMP = 1747715456
+SHA256 (eventlet-0.40.0.tar.gz) = f659d735e06795a26167b666008798c7a203fcd8119b08b84036e41076432ff1
+SIZE (eventlet-0.40.0.tar.gz) = 562849
diff --git a/net/py-uritools/Makefile b/net/py-uritools/Makefile
index b296acd38aad..afa41ad7efbc 100644
--- a/net/py-uritools/Makefile
+++ b/net/py-uritools/Makefile
@@ -1,5 +1,5 @@
PORTNAME= uritools
-PORTVERSION= 4.0.3
+PORTVERSION= 5.0.0
CATEGORIES= net python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-uritools/distinfo b/net/py-uritools/distinfo
index 7534612b5b2b..87d8287b2571 100644
--- a/net/py-uritools/distinfo
+++ b/net/py-uritools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1717003910
-SHA256 (uritools-4.0.3.tar.gz) = ee06a182a9c849464ce9d5fa917539aacc8edd2a4924d1b7aabeeecabcae3bc2
-SIZE (uritools-4.0.3.tar.gz) = 24184
+TIMESTAMP = 1747546570
+SHA256 (uritools-5.0.0.tar.gz) = 68180cad154062bd5b5d9ffcdd464f8de6934414b25462ae807b00b8df9345de
+SIZE (uritools-5.0.0.tar.gz) = 22730
diff --git a/net/py-urllib3-future/Makefile b/net/py-urllib3-future/Makefile
index 3aa16f88ccf8..5e5d6fc8c8a2 100644
--- a/net/py-urllib3-future/Makefile
+++ b/net/py-urllib3-future/Makefile
@@ -1,5 +1,5 @@
PORTNAME= urllib3-future
-PORTVERSION= 2.12.919
+PORTVERSION= 2.12.921
CATEGORIES= net python
MASTER_SITES= PYPI \
https://github.com/jawah/urllib3.future/releases/download/${PORTVERSION}/
@@ -29,6 +29,11 @@ WS_DESC= WebSockets support
BROTLI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}brotli>=1.0.9:archivers/py-brotli@${PY_FLAVOR}
SOCKS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-socks>=2.0<2.6.1_99:net/py-python-socks@${PY_FLAVOR}
WS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wsproto>=1.2<2:net/py-wsproto@${PY_FLAVOR}
-ZSTD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zstandard>=0.18.0:archivers/py-zstandard@${PY_FLAVOR}
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MZSTD} && ${PYTHON_REL} < 31400
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}zstandard>=0.18.0:archivers/py-zstandard@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/py-urllib3-future/distinfo b/net/py-urllib3-future/distinfo
index 4cd42f53bffb..999842a0636d 100644
--- a/net/py-urllib3-future/distinfo
+++ b/net/py-urllib3-future/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745936210
-SHA256 (urllib3_future-2.12.919.tar.gz) = ce90c1ef08b265eccf29676f759a3a30a36b6ccc8a9e97d3473ea4b26f586d52
-SIZE (urllib3_future-2.12.919.tar.gz) = 1071199
+TIMESTAMP = 1747715458
+SHA256 (urllib3_future-2.12.921.tar.gz) = 88c8d742eda4fba2b18a87c82ec941b0508864f3913c509d7b8cbef5f9935ee2
+SIZE (urllib3_future-2.12.921.tar.gz) = 1082398
diff --git a/net/qrcp/Makefile b/net/qrcp/Makefile
index b397f185f2e1..c63ea251d85c 100644
--- a/net/qrcp/Makefile
+++ b/net/qrcp/Makefile
@@ -1,7 +1,7 @@
PORTNAME= qrcp
DISTVERSIONPREFIX= v
DISTVERSION= 0.11.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MAINTAINER= tagattie@FreeBSD.org
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index d6a4fbedfb73..50b3b64019f7 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,9 +1,7 @@
PORTNAME= rabbitmq
-DISTVERSION= 4.0.7
+DISTVERSION= 4.1.0
CATEGORIES= net
MASTER_SITES= https://github.com/rabbitmq/rabbitmq-server/releases/download/v${DISTVERSION}/
-# https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.12.12/rabbitmq-server-generic-unix-3.12.12.tar.xz
-# https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.12.13/rabbitmq-server_3.12.13.orig.tar.xz
DISTNAME= ${PORTNAME}-server-generic-unix-${DISTVERSION}
MAINTAINER= erlang@FreeBSD.org
@@ -14,13 +12,11 @@ LICENSE= MPL20
LICENSE_FILE= ${WRKSRC}/LICENSE-MPL-RabbitMQ
RUN_DEPENDS= erlang-runtime${_ERLANG_VER}>=${_ERLANG_VER}:lang/erlang-runtime${_ERLANG_VER}
-# ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR}
USES= cpe shebangfix tar:xz
CPE_VENDOR= pivotal_software
USE_LOCALE= en_US.UTF-8
USE_RC_SUBR= rabbitmq
-# SHEBANG_FILES= plugins/rabbitmq_management-*/priv/www/cli/rabbitmqadmin
NO_ARCH= yes
NO_BUILD= yes
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index d005393fcc07..85550f20ad22 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743152894
-SHA256 (rabbitmq-server-generic-unix-4.0.7.tar.xz) = 926fc05a87f7a0e8211615a92aeff15b5b4a2bc92e46443d19dedc0c99ebd150
-SIZE (rabbitmq-server-generic-unix-4.0.7.tar.xz) = 16284232
+TIMESTAMP = 1748424070
+SHA256 (rabbitmq-server-generic-unix-4.1.0.tar.xz) = 9a9c6e1c6a36512e596bbea623caa0d25c80c2fae7092d030327301ddaee5aae
+SIZE (rabbitmq-server-generic-unix-4.1.0.tar.xz) = 26087336
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index 0b8fc48c0bdd..5bbfe3e76f6a 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -25,6 +25,7 @@ lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_client-%%VERSION%%/ebin/amqp10_cl
lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_client-%%VERSION%%/ebin/amqp10_client_frame_reader.beam
lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_client-%%VERSION%%/ebin/amqp10_client_session.beam
lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_client-%%VERSION%%/ebin/amqp10_client_sessions_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_client-%%VERSION%%/ebin/amqp10_client_socket.beam
lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_client-%%VERSION%%/ebin/amqp10_client_sup.beam
lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_client-%%VERSION%%/ebin/amqp10_client_types.beam
lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_client-%%VERSION%%/ebin/amqp10_msg.beam
@@ -35,6 +36,7 @@ lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_common-%%VERSION%%/ebin/amqp10_fr
lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_common-%%VERSION%%/ebin/amqp10_framing0.beam
lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_common-%%VERSION%%/ebin/amqp10_util.beam
lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_common-%%VERSION%%/ebin/serial_number.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_common-%%VERSION%%/include/amqp10_filtex.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_common-%%VERSION%%/include/amqp10_framing.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_common-%%VERSION%%/include/amqp10_types.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/amqp_client-%%VERSION%%/ebin/amqp_auth_mechanisms.beam
@@ -76,64 +78,84 @@ lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.6.0/ebin/aten_sink.beam
lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.6.0/ebin/aten_sup.beam
lib/rabbitmq_server-%%VERSION%%/plugins/base64url-1.0.1/ebin/base64url.app
lib/rabbitmq_server-%%VERSION%%/plugins/base64url-1.0.1/ebin/base64url.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy.app
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_app.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_bstr.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_children.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_clear.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_clock.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_compress_h.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_constraints.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_decompress_h.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_handler.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_http.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_http2.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_loop.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_metrics_h.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_middleware.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_req.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_rest.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_router.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_static.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_stream.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_stream_h.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_sub_protocol.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_tls.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_tracer_h.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.12.0/ebin/cowboy_websocket.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_base64url.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_cookie.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_date.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_hpack.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_http.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_http2.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_http2_machine.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_http_hd.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_http_struct_hd.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_http_te.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_iolists.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_link.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_mimetypes.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_multipart.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_qs.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_spdy.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_sse.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_uri.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_uri_template.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cow_ws.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/ebin/cowlib.app
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/include/cow_inline.hrl
-lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.13.0/include/cow_parse.hrl
-lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.4.0/ebin/credentials_obfuscation.app
-lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.4.0/ebin/credentials_obfuscation.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.4.0/ebin/credentials_obfuscation_app.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.4.0/ebin/credentials_obfuscation_pbe.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.4.0/ebin/credentials_obfuscation_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.4.0/ebin/credentials_obfuscation_svc.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.4.0/include/credentials_obfuscation.hrl
-lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.4.0/include/otp_crypto.hrl
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy.app
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_app.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_bstr.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_children.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_clear.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_clock.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_compress_h.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_constraints.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_decompress_h.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_handler.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_http.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_http2.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_http3.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_loop.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_metrics_h.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_middleware.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_quicer.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_req.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_rest.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_router.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_static.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_stream.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_stream_h.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_sub_protocol.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_tls.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_tracer_h.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.13.0/ebin/cowboy_websocket.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_base64url.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_cookie.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_date.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_deflate.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_hpack.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_http.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_http1.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_http2.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_http2_machine.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_http3.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_http3_machine.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_http_hd.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_http_struct_hd.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_http_te.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_iolists.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_link.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_mimetypes.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_multipart.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_qpack.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_qs.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_spdy.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_sse.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_uri.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_uri_template.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cow_ws.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/ebin/cowlib.app
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/include/cow_inline.hrl
+lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.14.0/include/cow_parse.hrl
+lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.5.0/ebin/credentials_obfuscation.app
+lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.5.0/ebin/credentials_obfuscation.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.5.0/ebin/credentials_obfuscation_app.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.5.0/ebin/credentials_obfuscation_pbe.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.5.0/ebin/credentials_obfuscation_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.5.0/ebin/credentials_obfuscation_svc.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.5.0/include/credentials_obfuscation.hrl
+lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.5.0/include/otp_crypto.hrl
+lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-3.5.0/priv/schema/credentials_obfuscation.schema
+lib/rabbitmq_server-%%VERSION%%/plugins/csv-3.2.1/ebin/Elixir.CSV.Decoding.Decoder.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/csv-3.2.1/ebin/Elixir.CSV.Decoding.Parser.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/csv-3.2.1/ebin/Elixir.CSV.Defaults.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/csv-3.2.1/ebin/Elixir.CSV.Encode.Any.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/csv-3.2.1/ebin/Elixir.CSV.Encode.BitString.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/csv-3.2.1/ebin/Elixir.CSV.Encode.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/csv-3.2.1/ebin/Elixir.CSV.Encoding.Encoder.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/csv-3.2.1/ebin/Elixir.CSV.EscapeSequenceError.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/csv-3.2.1/ebin/Elixir.CSV.RowLengthError.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/csv-3.2.1/ebin/Elixir.CSV.StrayEscapeCharacterError.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/csv-3.2.1/ebin/Elixir.CSV.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/csv-3.2.1/ebin/csv.app
lib/rabbitmq_server-%%VERSION%%/plugins/cuttlefish-3.4.0/ebin/conf_parse.beam
lib/rabbitmq_server-%%VERSION%%/plugins/cuttlefish-3.4.0/ebin/cuttlefish.app
lib/rabbitmq_server-%%VERSION%%/plugins/cuttlefish-3.4.0/ebin/cuttlefish.beam
@@ -159,70 +181,97 @@ lib/rabbitmq_server-%%VERSION%%/plugins/cuttlefish-3.4.0/ebin/cuttlefish_validat
lib/rabbitmq_server-%%VERSION%%/plugins/cuttlefish-3.4.0/ebin/cuttlefish_variable.beam
lib/rabbitmq_server-%%VERSION%%/plugins/cuttlefish-3.4.0/ebin/cuttlefish_vmargs.beam
lib/rabbitmq_server-%%VERSION%%/plugins/cuttlefish-3.4.0/priv/erlang_vm.schema
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/auth_pb.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd.app
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_app.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_auth.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_auth_gen.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_cluster.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_cluster_gen.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_compare.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_conn.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_conn_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_data_coercion.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_election.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_election_gen.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_grpc.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_health_gen.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_kv.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_kv_gen.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_lease.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_lease_gen.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_lease_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_lock.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_lock_gen.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_maintenance.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_maintenance_gen.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_op.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_stream.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_watch.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/eetcd_watch_gen.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/gogo_pb.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/health_pb.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/kv_pb.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/ebin/router_pb.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/include/eetcd.hrl
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/priv/protos/auth.proto
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/priv/protos/gogo.proto
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/priv/protos/kv.proto
-lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.3.6/priv/protos/router.proto
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/auth_pb.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd.app
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_app.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_auth.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_auth_gen.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_cluster.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_cluster_gen.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_compare.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_conn.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_conn_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_data_coercion.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_election.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_election_gen.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_grpc.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_health_gen.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_kv.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_kv_gen.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_lease.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_lease_gen.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_lease_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_lock.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_lock_gen.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_maintenance.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_maintenance_gen.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_op.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_stream.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_watch.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/eetcd_watch_gen.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/gogo_pb.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/health_pb.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/kv_pb.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/ebin/router_pb.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/include/eetcd.hrl
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/priv/protos/auth.proto
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/priv/protos/gogo.proto
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/priv/protos/kv.proto
+lib/rabbitmq_server-%%VERSION%%/plugins/eetcd-0.5.0/priv/protos/router.proto
lib/rabbitmq_server-%%VERSION%%/plugins/enough-0.1.0/ebin/enough.app
lib/rabbitmq_server-%%VERSION%%/plugins/enough-0.1.0/ebin/enough.beam
lib/rabbitmq_server-%%VERSION%%/plugins/gen_batch_server-0.8.8/ebin/gen_batch_server.app
lib/rabbitmq_server-%%VERSION%%/plugins/gen_batch_server-0.8.8/ebin/gen_batch_server.beam
lib/rabbitmq_server-%%VERSION%%/plugins/getopt-1.0.3/ebin/getopt.app
lib/rabbitmq_server-%%VERSION%%/plugins/getopt-1.0.3/ebin/getopt.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/gun-1.3.3/ebin/gun.app
-lib/rabbitmq_server-%%VERSION%%/plugins/gun-1.3.3/ebin/gun.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/gun-1.3.3/ebin/gun_app.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/gun-1.3.3/ebin/gun_content_handler.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/gun-1.3.3/ebin/gun_data_h.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/gun-1.3.3/ebin/gun_http.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/gun-1.3.3/ebin/gun_http2.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/gun-1.3.3/ebin/gun_sse_h.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/gun-1.3.3/ebin/gun_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/gun-1.3.3/ebin/gun_tcp.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/gun-1.3.3/ebin/gun_tls.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/gun-1.3.3/ebin/gun_ws.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/gun-1.3.3/ebin/gun_ws_h.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun.app
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_app.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_conns_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_content_handler.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_cookies.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_cookies_list.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_data_h.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_default_event_h.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_event.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_http.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_http2.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_http3.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_pool.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_pool_events_h.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_pools_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_protocols.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_public_suffix.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_quicer.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_raw.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_socks.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_sse_h.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_tcp.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_tcp_proxy.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_tls.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_tls_proxy.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_tls_proxy_cb.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_tls_proxy_http2_connect.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_tunnel.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_ws.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_ws_h.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/gun-2.2.0/ebin/gun_ws_protocol.beam
lib/rabbitmq_server-%%VERSION%%/plugins/horus-0.3.1/ebin/horus.app
lib/rabbitmq_server-%%VERSION%%/plugins/horus-0.3.1/ebin/horus.beam
lib/rabbitmq_server-%%VERSION%%/plugins/horus-0.3.1/ebin/horus_cover.beam
lib/rabbitmq_server-%%VERSION%%/plugins/horus-0.3.1/ebin/horus_utils.beam
lib/rabbitmq_server-%%VERSION%%/plugins/horus-0.3.1/include/horus.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/horus-0.3.1/priv/horus_cover_helper.erl
+lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.11.10/ebin/Elixir.Inspect.JOSE.JWK.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.11.10/ebin/Elixir.JOSE.JWA.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.11.10/ebin/Elixir.JOSE.JWE.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.11.10/ebin/Elixir.JOSE.JWK.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.11.10/ebin/Elixir.JOSE.JWS.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.11.10/ebin/Elixir.JOSE.JWT.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.11.10/ebin/Elixir.JOSE.beam
lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.11.10/ebin/jose.app
lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.11.10/ebin/jose.beam
lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.11.10/ebin/jose_app.beam
@@ -345,6 +394,35 @@ lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.11.10/include/jose_jws.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.11.10/include/jose_jwt.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.11.10/include/jose_public_key.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.11.10/priv/.keep
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Decoder.BitString.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Decoder.DefaultImplementations.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Decoder.Error.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Decoder.List.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Decoder.UnexpectedEndOfBufferError.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Decoder.UnexpectedTokenError.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Decoder.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Encoder.Any.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Encoder.Atom.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Encoder.BitString.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Encoder.Error.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Encoder.Float.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Encoder.HashDict.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Encoder.Helpers.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Encoder.Integer.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Encoder.List.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Encoder.Map.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Encoder.Record.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Encoder.Tuple.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Encoder.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Logger.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Parser.Array.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Parser.Number.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Parser.Object.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Parser.String.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Parser.Unicode.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.Parser.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/Elixir.JSON.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/json-1.4.1/ebin/json.app
lib/rabbitmq_server-%%VERSION%%/plugins/khepri-0.16.0/ebin/khepri.app
lib/rabbitmq_server-%%VERSION%%/plugins/khepri-0.16.0/ebin/khepri.beam
lib/rabbitmq_server-%%VERSION%%/plugins/khepri-0.16.0/ebin/khepri_adv.beam
@@ -368,24 +446,25 @@ lib/rabbitmq_server-%%VERSION%%/plugins/khepri-0.16.0/ebin/khepri_tx.beam
lib/rabbitmq_server-%%VERSION%%/plugins/khepri-0.16.0/ebin/khepri_tx_adv.beam
lib/rabbitmq_server-%%VERSION%%/plugins/khepri-0.16.0/ebin/khepri_utils.beam
lib/rabbitmq_server-%%VERSION%%/plugins/khepri-0.16.0/include/khepri.hrl
-lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.1/ebin/khepri_mnesia_migration.app
-lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.1/ebin/khepri_mnesia_migration_app.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.1/ebin/khepri_mnesia_migration_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.1/ebin/kmm_utils.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.1/ebin/m2k_cluster_sync.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.1/ebin/m2k_cluster_sync_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.1/ebin/m2k_export.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.1/ebin/m2k_subscriber.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.1/ebin/m2k_table_copy.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.1/ebin/m2k_table_copy_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.1/ebin/m2k_table_copy_sup_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.1/ebin/mnesia_to_khepri.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.1/ebin/mnesia_to_khepri_converter.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.1/ebin/mnesia_to_khepri_example_converter.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.2/ebin/khepri_mnesia_migration.app
+lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.2/ebin/khepri_mnesia_migration_app.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.2/ebin/khepri_mnesia_migration_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.2/ebin/kmm_utils.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.2/ebin/m2k_cluster_sync.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.2/ebin/m2k_cluster_sync_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.2/ebin/m2k_export.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.2/ebin/m2k_subscriber.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.2/ebin/m2k_table_copy.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.2/ebin/m2k_table_copy_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.2/ebin/m2k_table_copy_sup_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.2/ebin/mnesia_to_khepri.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.2/ebin/mnesia_to_khepri_converter.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/khepri_mnesia_migration-0.7.2/ebin/mnesia_to_khepri_example_converter.beam
lib/rabbitmq_server-%%VERSION%%/plugins/oauth2_client-%%VERSION%%/ebin/jwt_helper.beam
lib/rabbitmq_server-%%VERSION%%/plugins/oauth2_client-%%VERSION%%/ebin/oauth2_client.app
lib/rabbitmq_server-%%VERSION%%/plugins/oauth2_client-%%VERSION%%/ebin/oauth2_client.beam
lib/rabbitmq_server-%%VERSION%%/plugins/oauth2_client-%%VERSION%%/include/oauth2_client.hrl
+lib/rabbitmq_server-%%VERSION%%/plugins/oauth2_client-%%VERSION%%/include/types.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.8.2/ebin/observer_cli.app
lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.8.2/ebin/observer_cli.beam
lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.8.2/ebin/observer_cli_application.beam
@@ -401,25 +480,25 @@ lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.8.2/ebin/observer_cli_pro
lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.8.2/ebin/observer_cli_store.beam
lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.8.2/ebin/observer_cli_system.beam
lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.8.2/include/observer_cli.hrl
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris.app
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_app.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_bench.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_bloom.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_counters.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_ets.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_log.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_log_shared.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_member.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_replica.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_replica_reader.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_replica_reader_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_retention.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_server_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_tracking.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_util.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.5/ebin/osiris_writer.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris.app
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_app.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_bench.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_bloom.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_counters.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_ets.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_log.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_log_shared.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_member.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_replica.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_replica_reader.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_replica_reader_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_retention.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_server_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_tracking.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_util.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/osiris-1.8.6/ebin/osiris_writer.beam
lib/rabbitmq_server-%%VERSION%%/plugins/prometheus-4.11.0/ebin/prometheus.app
lib/rabbitmq_server-%%VERSION%%/plugins/prometheus-4.11.0/ebin/prometheus.beam
lib/rabbitmq_server-%%VERSION%%/plugins/prometheus-4.11.0/ebin/prometheus_boolean.beam
@@ -457,48 +536,51 @@ lib/rabbitmq_server-%%VERSION%%/plugins/quantile_estimator-0.2.1/ebin/quantile.b
lib/rabbitmq_server-%%VERSION%%/plugins/quantile_estimator-0.2.1/ebin/quantile_estimator.app
lib/rabbitmq_server-%%VERSION%%/plugins/quantile_estimator-0.2.1/ebin/quantile_estimator.beam
lib/rabbitmq_server-%%VERSION%%/plugins/quantile_estimator-0.2.1/include/quantile_estimator.hrl
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra.app
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_app.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_aux.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_bench.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_counters.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_dbg.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_directory.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_env.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_ets_queue.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_file.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_file_handle.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_flru.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_leaderboard.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_lib.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_log.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_log_cache.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_log_ets.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_log_meta.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_log_pre_init.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_log_reader.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_log_segment.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_log_segment_writer.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_log_snapshot.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_log_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_log_wal.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_log_wal_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_machine.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_machine_ets.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_machine_simple.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_metrics_ets.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_monitors.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_server.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_server_proc.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_server_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_server_sup_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_snapshot.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_system.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_system_recover.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_system_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.15.2/ebin/ra_systems_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra.app
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_app.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_aux.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_bench.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_counters.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_dbg.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_directory.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_env.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_ets_queue.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_file.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_file_handle.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_flru.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_leaderboard.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_lib.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_log.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_log_ets.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_log_meta.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_log_pre_init.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_log_read_plan.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_log_reader.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_log_segment.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_log_segment_writer.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_log_snapshot.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_log_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_log_wal.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_log_wal_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_lol.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_machine.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_machine_ets.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_machine_simple.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_metrics_ets.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_monitors.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_mt.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_range.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_server.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_server_proc.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_server_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_server_sup_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_snapshot.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_system.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_system_recover.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_system_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.16.8/ebin/ra_systems_sup.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/amqqueue.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/background_gc.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/code_server_cache.beam
@@ -520,6 +602,7 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_access_control.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_alarm.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_amqp1_0.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_amqp_filtex.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_amqp_management.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_amqp_reader.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_amqp_session.beam
@@ -647,6 +730,7 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_message_i
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_metrics.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_mirror_queue_misc.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_mnesia.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_msg_size_metrics.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_msg_store.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_msg_store_gc.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_networking.beam
@@ -702,7 +786,6 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_trace.bea
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_tracking.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_tracking_store.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_upgrade_preparation.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_uri.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_variable_queue.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_version.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/rabbit_vhost.beam
@@ -724,6 +807,8 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/include/amqqueue_v2.h
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/include/internal_user.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/include/mc.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/include/rabbit_amqp.hrl
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/include/rabbit_amqp_metrics.hrl
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/include/rabbit_amqp_reader.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/include/rabbit_global_counters.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/include/rabbit_khepri.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/include/vhost.hrl
@@ -831,7 +916,9 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/ebin/Elixir.RabbitMQ.CLI.Ctl.Commands.AddUaaKeyCommand.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/ebin/rabbit_auth_backend_oauth2.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/ebin/rabbit_auth_backend_oauth2_app.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/ebin/rabbit_oauth2_config.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/ebin/rabbit_oauth2_provider.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/ebin/rabbit_oauth2_rar.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/ebin/rabbit_oauth2_resource_server.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/ebin/rabbit_oauth2_schema.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/ebin/rabbit_oauth2_scope.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/ebin/rabbitmq_auth_backend_oauth2.app
@@ -840,6 +927,7 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/ebin/uaa_jwt_jwk.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/ebin/uaa_jwt_jwt.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/ebin/wildcard.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/include/oauth2.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%/priv/schema/rabbitmq_auth_backend_oauth2.schema
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_mechanism_ssl-%%VERSION%%/ebin/rabbit_auth_mechanism_ssl.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_mechanism_ssl-%%VERSION%%/ebin/rabbit_auth_mechanism_ssl_app.beam
@@ -922,6 +1010,7 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rab
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_nodes.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_oauth_bootstrap.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_reset_handler.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_schema.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_stats.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_sup.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_sup_sup.beam
@@ -937,6 +1026,7 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rab
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_cluster_name.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_connection.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_connection_channels.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_connection_sessions.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_connection_user_name.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_connections.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_connections_vhost.beam
@@ -961,6 +1051,8 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rab
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_health_check_node_is_quorum_critical.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_health_check_port_listener.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_health_check_protocol_listener.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_health_check_quorum_queues_without_elected_leaders.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_health_check_quorum_queues_without_elected_leaders_across_all_vhosts.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_health_check_virtual_hosts.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_healthchecks.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/ebin/rabbit_mgmt_wm_limit.beam
@@ -1016,16 +1108,21 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/sch
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/api/index.html
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/cli/index.html
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/cli/rabbitmqadmin
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/css/dark.css
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/css/evil.css
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/css/light.css
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/css/main.css
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/favicon.ico
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/img/auto.svg
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/img/bg-binary.png
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/img/bg-green-dark.png
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/img/bg-red-dark.png
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/img/bg-red.png
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/img/bg-yellow-dark.png
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/img/collapse.png
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/img/dark.svg
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/img/expand.png
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/img/light.svg
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/img/rabbitmqlogo-master-copy.svg
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/img/rabbitmqlogo.svg
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/index.html
@@ -1055,6 +1152,7 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/js/prefs.js
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/js/sammy-0.7.6.js
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/js/sammy-0.7.6.min.js
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/js/theme-switcher.js
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/js/tmpl/404.ejs
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/js/tmpl/add-binding.ejs
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/js/tmpl/binary.ejs
@@ -1094,6 +1192,7 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/js/tmpl/queues.ejs
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/js/tmpl/rate-options.ejs
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/js/tmpl/registry.ejs
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/js/tmpl/sessions-list.ejs
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/js/tmpl/status.ejs
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/js/tmpl/topic-permissions.ejs
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%/priv/www/js/tmpl/user.ejs
@@ -1176,10 +1275,6 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_peer_discovery_etcd-%%VERSION%%
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_peer_discovery_k8s-%%VERSION%%/ebin/rabbit_peer_discovery_k8s.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_peer_discovery_k8s-%%VERSION%%/ebin/rabbitmq_peer_discovery_k8s.app
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_peer_discovery_k8s-%%VERSION%%/ebin/rabbitmq_peer_discovery_k8s.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_peer_discovery_k8s-%%VERSION%%/ebin/rabbitmq_peer_discovery_k8s_app.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_peer_discovery_k8s-%%VERSION%%/ebin/rabbitmq_peer_discovery_k8s_node_monitor.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_peer_discovery_k8s-%%VERSION%%/ebin/rabbitmq_peer_discovery_k8s_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_peer_discovery_k8s-%%VERSION%%/include/rabbit_peer_discovery_k8s.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_peer_discovery_k8s-%%VERSION%%/priv/schema/rabbitmq_peer_discovery_k8s.schema
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_prelaunch-%%VERSION%%/ebin/rabbit_boot_state.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_prelaunch-%%VERSION%%/ebin/rabbit_boot_state_sup.beam
@@ -1205,6 +1300,7 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_prometheus-%%VERSION%%/ebin/pro
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_prometheus-%%VERSION%%/ebin/prometheus_rabbitmq_core_metrics_collector.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_prometheus-%%VERSION%%/ebin/prometheus_rabbitmq_dynamic_collector.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_prometheus-%%VERSION%%/ebin/prometheus_rabbitmq_global_metrics_collector.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_prometheus-%%VERSION%%/ebin/prometheus_rabbitmq_message_size_metrics_collector.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_prometheus-%%VERSION%%/ebin/rabbit_prometheus_app.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_prometheus-%%VERSION%%/ebin/rabbit_prometheus_dispatcher.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_prometheus-%%VERSION%%/ebin/rabbit_prometheus_handler.beam
@@ -1362,6 +1458,7 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_dispatch-%%VERSION%%/ebin/r
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_dispatch-%%VERSION%%/ebin/webmachine_log.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_dispatch-%%VERSION%%/ebin/webmachine_log_handler.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_dispatch-%%VERSION%%/include/rabbitmq_web_dispatch_records.hrl
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_dispatch-%%VERSION%%/priv/schema/rabbitmq_web_dispatch.schema
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_mqtt-%%VERSION%%/ebin/Elixir.RabbitMQ.CLI.Ctl.Commands.ListWebMqttConnectionsCommand.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_mqtt-%%VERSION%%/ebin/rabbit_web_mqtt_app.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_mqtt-%%VERSION%%/ebin/rabbit_web_mqtt_handler.beam
@@ -1397,25 +1494,25 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%/
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%/priv/pencil.cur
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%/priv/stomp.js
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%/priv/temp-queue.html
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch.app
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch.appup
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_acceptor.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_acceptors_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_app.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_conns_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_conns_sup_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_crc32c.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_embedded_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_listener_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_protocol.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_proxy_header.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_server.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_server_proxy.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_ssl.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_tcp.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_transport.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch.app
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch.appup
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_acceptor.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_acceptors_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_app.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_conns_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_conns_sup_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_crc32c.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_embedded_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_listener_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_protocol.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_proxy_header.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_server.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_server_proxy.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_ssl.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_tcp.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.2.0/ebin/ranch_transport.beam
lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.5.6/ebin/recon.app
lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.5.6/ebin/recon.beam
lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.5.6/ebin/recon_alloc.beam
@@ -1423,13 +1520,13 @@ lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.5.6/ebin/recon_lib.beam
lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.5.6/ebin/recon_map.beam
lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.5.6/ebin/recon_rec.beam
lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.5.6/ebin/recon_trace.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/redbug-2.1.0/ebin/redbug.app
-lib/rabbitmq_server-%%VERSION%%/plugins/redbug-2.1.0/ebin/redbug.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/redbug-2.1.0/ebin/redbug_compiler.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/redbug-2.1.0/ebin/redbug_dtop.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/redbug-2.1.0/ebin/redbug_lexer.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/redbug-2.1.0/ebin/redbug_parser.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/redbug-2.1.0/ebin/redbug_targ.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/redbug-2.0.7/ebin/redbug.app
+lib/rabbitmq_server-%%VERSION%%/plugins/redbug-2.0.7/ebin/redbug.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/redbug-2.0.7/ebin/redbug_compiler.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/redbug-2.0.7/ebin/redbug_dtop.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/redbug-2.0.7/ebin/redbug_lexer.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/redbug-2.0.7/ebin/redbug_parser.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/redbug-2.0.7/ebin/redbug_targ.beam
lib/rabbitmq_server-%%VERSION%%/plugins/seshat-0.6.1/ebin/seshat.app
lib/rabbitmq_server-%%VERSION%%/plugins/seshat-0.6.1/ebin/seshat.beam
lib/rabbitmq_server-%%VERSION%%/plugins/seshat-0.6.1/ebin/seshat_app.beam
@@ -1475,6 +1572,7 @@ lib/rabbitmq_server-%%VERSION%%/plugins/thoas-1.2.1/ebin/thoas.beam
lib/rabbitmq_server-%%VERSION%%/plugins/thoas-1.2.1/ebin/thoas_decode.beam
lib/rabbitmq_server-%%VERSION%%/plugins/thoas-1.2.1/ebin/thoas_encode.beam
lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-defaults
+lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-defaults.orig
lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-diagnostics
lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-env
lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-plugins
diff --git a/net/rclone/Makefile b/net/rclone/Makefile
index 7452a17d077f..678b888ce77c 100644
--- a/net/rclone/Makefile
+++ b/net/rclone/Makefile
@@ -1,7 +1,6 @@
PORTNAME= rclone
DISTVERSIONPREFIX= v
-DISTVERSION= 1.69.1
-PORTREVISION= 3
+DISTVERSION= 1.69.3
CATEGORIES= net
MAINTAINER= tremere@cainites.net
@@ -14,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfuse.so:filesystems/fusefs-libs
RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss
-USES= cpe go:1.23,modules
+USES= cpe go:modules
GO_MODULE= github.com/rclone/rclone
GO_BUILDFLAGS= -ldflags -s -tags cmount
diff --git a/net/rclone/distinfo b/net/rclone/distinfo
index d2b493caa135..6b6bb93adff7 100644
--- a/net/rclone/distinfo
+++ b/net/rclone/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1739708088
-SHA256 (go/net_rclone/rclone-v1.69.1/v1.69.1.mod) = 1be77b52090f7a50ec5b0e3f54ad8e1a992e4fc380b64998813b1b63f39905c1
-SIZE (go/net_rclone/rclone-v1.69.1/v1.69.1.mod) = 11360
-SHA256 (go/net_rclone/rclone-v1.69.1/v1.69.1.zip) = acae4ce89fc49d909d92e7d234b33712ab57da03fec144028ece30c6842fcd5a
-SIZE (go/net_rclone/rclone-v1.69.1/v1.69.1.zip) = 18052005
+TIMESTAMP = 1747911393
+SHA256 (go/net_rclone/rclone-v1.69.3/v1.69.3.mod) = 19bebef91aaacf58649cce4514a5c5a4fd5840d559b17003c5fb3f63909ba5a5
+SIZE (go/net_rclone/rclone-v1.69.3/v1.69.3.mod) = 11362
+SHA256 (go/net_rclone/rclone-v1.69.3/v1.69.3.zip) = f316bf0c29cdec57c285ee137f4f1149ec7cd601e6ecfac72476f08aceade21a
+SIZE (go/net_rclone/rclone-v1.69.3/v1.69.3.zip) = 18061058
diff --git a/net/redpanda-connect/Makefile b/net/redpanda-connect/Makefile
index 46d6d169c3f0..c4be4d7b5f48 100644
--- a/net/redpanda-connect/Makefile
+++ b/net/redpanda-connect/Makefile
@@ -1,7 +1,7 @@
PORTNAME= connect
DISTVERSIONPREFIX= v
DISTVERSION= 4.38.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
PKGNAMEPREFIX= redpanda-
diff --git a/net/revsocks/Makefile b/net/revsocks/Makefile
index 822ece6db784..0e172aab1783 100644
--- a/net/revsocks/Makefile
+++ b/net/revsocks/Makefile
@@ -1,7 +1,7 @@
PORTNAME= revsocks
DISTVERSIONPREFIX= v
DISTVERSION= 2.8
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= net
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/net/rospo/Makefile b/net/rospo/Makefile
index 76a0f2e8f744..72068e989f92 100644
--- a/net/rospo/Makefile
+++ b/net/rospo/Makefile
@@ -1,6 +1,7 @@
PORTNAME= rospo
DISTVERSIONPREFIX= v
DISTVERSION= 0.14.0
+PORTREVISION= 1
CATEGORIES= net net-vpn sysutils
MAINTAINER= fuz@FreeBSD.org
diff --git a/net/rubygem-activestorage-gitlab/Makefile b/net/rubygem-activestorage-gitlab/Makefile
new file mode 100644
index 000000000000..aa7f53cc97cc
--- /dev/null
+++ b/net/rubygem-activestorage-gitlab/Makefile
@@ -0,0 +1,28 @@
+PORTNAME= activestorage
+PORTVERSION= ${RAILS_VERSION}
+CATEGORIES= net rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Attach cloud and local files in Rails applications
+WWW= https://github.com/rails/rails/tree/main/activestorage \
+ https://rubyonrails.org/
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actionpack-gitlab \
+ rubygem-activejob-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activejob-gitlab \
+ rubygem-activerecord-gitlab>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activerecord-gitlab \
+ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \
+ rubygem-marcel>=1.0<2:devel/rubygem-marcel
+
+USES= gem
+
+NO_ARCH= yes
+
+PORTSCOUT= limit:^7\.1\.
+
+.include "${.CURDIR}/../../www/gitlab/Makefile.common"
+.include <bsd.port.mk>
diff --git a/net/rubygem-activestorage-gitlab/distinfo b/net/rubygem-activestorage-gitlab/distinfo
new file mode 100644
index 000000000000..705479df0713
--- /dev/null
+++ b/net/rubygem-activestorage-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1734888818
+SHA256 (rubygem/activestorage-7.1.5.1.gem) = ae6b8b076858c666eaad6f896d786b67654235e861e24a83f61f1cc97b43ff63
+SIZE (rubygem/activestorage-7.1.5.1.gem) = 67584
diff --git a/net/rubygem-activestorage-gitlab/pkg-descr b/net/rubygem-activestorage-gitlab/pkg-descr
new file mode 100644
index 000000000000..48422441ebc3
--- /dev/null
+++ b/net/rubygem-activestorage-gitlab/pkg-descr
@@ -0,0 +1,11 @@
+Active Storage makes it simple to upload and reference files in cloud services
+like Amazon S3, Google Cloud Storage, or Microsoft Azure Storage, and attach
+those files to Active Records. Supports having one main service and mirrors in
+other services for redundancy. It also provides a disk service for testing or
+local deployments, but the focus is on cloud storage.
+
+Files can be uploaded from the server to the cloud or directly from the client
+to the cloud.
+
+Image files can furthermore be transformed using on-demand variants for quality,
+aspect ratio, size, or any other MiniMagick or Vips supported transformation.
diff --git a/net/rubygem-amq-protocol/Makefile b/net/rubygem-amq-protocol/Makefile
index deab5789a4c1..e8a6ed19800c 100644
--- a/net/rubygem-amq-protocol/Makefile
+++ b/net/rubygem-amq-protocol/Makefile
@@ -1,5 +1,5 @@
PORTNAME= amq-protocol
-PORTVERSION= 2.3.3
+PORTVERSION= 2.3.4
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-amq-protocol/distinfo b/net/rubygem-amq-protocol/distinfo
index e7421676ad0c..efdd3be839f4 100644
--- a/net/rubygem-amq-protocol/distinfo
+++ b/net/rubygem-amq-protocol/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739963316
-SHA256 (rubygem/amq-protocol-2.3.3.gem) = 85b42738290913a35dcc487a2ca0dd260a4150b40ed1954c9c1932df466abc1f
-SIZE (rubygem/amq-protocol-2.3.3.gem) = 46592
+TIMESTAMP = 1747716366
+SHA256 (rubygem/amq-protocol-2.3.4.gem) = 98be5b9244e28dc66acc8351a254dbf45d996c5a0b7d49ab3ff8b72b0d2e6308
+SIZE (rubygem/amq-protocol-2.3.4.gem) = 46592
diff --git a/net/rubygem-apollo_upload_server/Makefile b/net/rubygem-apollo_upload_server/Makefile
index 1ba6a42c566e..8d0a4c6d89f0 100644
--- a/net/rubygem-apollo_upload_server/Makefile
+++ b/net/rubygem-apollo_upload_server/Makefile
@@ -1,5 +1,6 @@
PORTNAME= apollo_upload_server
PORTVERSION= 2.1.6
+PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -10,7 +11,7 @@ WWW= https://github.com/jetruby/apollo_upload_server-ruby
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= rubygem-actionpack70>=6.1.6:www/rubygem-actionpack70 \
+RUN_DEPENDS= rubygem-actionpack-gitlab>=6.1.6:www/rubygem-actionpack-gitlab \
rubygem-graphql>=1.8:devel/rubygem-graphql
USES= gem
diff --git a/net/rubygem-fog-vsphere/Makefile b/net/rubygem-fog-vsphere/Makefile
index b39540a2053d..e1b8bb105630 100644
--- a/net/rubygem-fog-vsphere/Makefile
+++ b/net/rubygem-fog-vsphere/Makefile
@@ -1,5 +1,5 @@
PORTNAME= fog-vsphere
-PORTVERSION= 3.7.0
+PORTVERSION= 3.7.1
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-fog-vsphere/distinfo b/net/rubygem-fog-vsphere/distinfo
index e73d46a8ad5e..fffce494b945 100644
--- a/net/rubygem-fog-vsphere/distinfo
+++ b/net/rubygem-fog-vsphere/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1723201149
-SHA256 (rubygem/fog-vsphere-3.7.0.gem) = 99f922b79518ed5c777f3daa987ee608ed419cbb8aacc2cea4f75ee7b1edcbaf
-SIZE (rubygem/fog-vsphere-3.7.0.gem) = 97280
+TIMESTAMP = 1747547480
+SHA256 (rubygem/fog-vsphere-3.7.1.gem) = e5cee970b33c92e2edc50e8954ad55c91e65293a058c4724a3a5a4190646ef43
+SIZE (rubygem/fog-vsphere-3.7.1.gem) = 317440
diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo
index f9d7101dc764..14dc3709abb5 100644
--- a/net/rubygem-gitlab-kas-grpc/distinfo
+++ b/net/rubygem-gitlab-kas-grpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746703509
-SHA256 (rubygem/gitlab-kas-grpc-17.11.2.gem) = f2b9054dcf636346e89549e9478a684a38bf03bf853332e84154ec3a9856ae1c
-SIZE (rubygem/gitlab-kas-grpc-17.11.2.gem) = 10752
+TIMESTAMP = 1747896531
+SHA256 (rubygem/gitlab-kas-grpc-18.0.1.gem) = 1111e68d28063d9f37eb16b60ebe2ba4b00a11a8555071a602953b19f88a6cdf
+SIZE (rubygem/gitlab-kas-grpc-18.0.1.gem) = 10752
diff --git a/net/rubygem-google-cloud-bigtable-admin-v2/Makefile b/net/rubygem-google-cloud-bigtable-admin-v2/Makefile
index 052614f8ddbc..0e19d71c1a92 100644
--- a/net/rubygem-google-cloud-bigtable-admin-v2/Makefile
+++ b/net/rubygem-google-cloud-bigtable-admin-v2/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-bigtable-admin-v2
-PORTVERSION= 1.9.0
+PORTVERSION= 1.10.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -12,9 +12,9 @@ WWW= https://cloud.google.com/ruby/docs/reference/google-cloud-bigtable-admin-v
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-gapic-common>=0.25.0<2.0:devel/rubygem-gapic-common \
+RUN_DEPENDS= rubygem-gapic-common>=1.0<2:devel/rubygem-gapic-common \
rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors \
- rubygem-grpc-google-iam-v1>=1.1<2:devel/rubygem-grpc-google-iam-v1
+ rubygem-grpc-google-iam-v1>=1.11<2:devel/rubygem-grpc-google-iam-v1
USES= gem
diff --git a/net/rubygem-google-cloud-bigtable-admin-v2/distinfo b/net/rubygem-google-cloud-bigtable-admin-v2/distinfo
index 2d8dd4816833..7be216c3d177 100644
--- a/net/rubygem-google-cloud-bigtable-admin-v2/distinfo
+++ b/net/rubygem-google-cloud-bigtable-admin-v2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745936402
-SHA256 (rubygem/google-cloud-bigtable-admin-v2-1.9.0.gem) = b867bea0c3452a03e5ec559d3e1a33d57abedb2b0efa55540478d041c646092c
-SIZE (rubygem/google-cloud-bigtable-admin-v2-1.9.0.gem) = 132096
+TIMESTAMP = 1747716368
+SHA256 (rubygem/google-cloud-bigtable-admin-v2-1.10.0.gem) = ab1251d4837f979b4bb721e72e0fa5b18c36b5baf8a8138c23e2eebc54b08f17
+SIZE (rubygem/google-cloud-bigtable-admin-v2-1.10.0.gem) = 132096
diff --git a/net/rubygem-google-cloud-bigtable-v2/Makefile b/net/rubygem-google-cloud-bigtable-v2/Makefile
index 16add52b93fb..da9a831ae6d0 100644
--- a/net/rubygem-google-cloud-bigtable-v2/Makefile
+++ b/net/rubygem-google-cloud-bigtable-v2/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-bigtable-v2
-PORTVERSION= 1.6.0
+PORTVERSION= 1.7.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -12,7 +12,7 @@ WWW= https://cloud.google.com/ruby/docs/reference/google-cloud-bigtable-v2/late
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-gapic-common>=0.25.0<2.0:devel/rubygem-gapic-common \
+RUN_DEPENDS= rubygem-gapic-common>=1.0<2:devel/rubygem-gapic-common \
rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors
USES= gem
diff --git a/net/rubygem-google-cloud-bigtable-v2/distinfo b/net/rubygem-google-cloud-bigtable-v2/distinfo
index d2767939d404..1b676bc30a64 100644
--- a/net/rubygem-google-cloud-bigtable-v2/distinfo
+++ b/net/rubygem-google-cloud-bigtable-v2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742405564
-SHA256 (rubygem/google-cloud-bigtable-v2-1.6.0.gem) = 43f5859e0737021a700bfc1d2088c45d1327df32ed0c0a0b455faa349c2566c2
-SIZE (rubygem/google-cloud-bigtable-v2-1.6.0.gem) = 74752
+TIMESTAMP = 1747716370
+SHA256 (rubygem/google-cloud-bigtable-v2-1.7.0.gem) = 2ee1a476a6284c192f489b1a188a4f392ac2939d647d23b9bbda66a11231fbf0
+SIZE (rubygem/google-cloud-bigtable-v2-1.7.0.gem) = 74752
diff --git a/net/rubygem-google-cloud-env/Makefile b/net/rubygem-google-cloud-env/Makefile
index 50ad09b38f37..88fb60c5bc6c 100644
--- a/net/rubygem-google-cloud-env/Makefile
+++ b/net/rubygem-google-cloud-env/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-env
-PORTVERSION= 2.2.2
+PORTVERSION= 2.3.0
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-google-cloud-env/distinfo b/net/rubygem-google-cloud-env/distinfo
index ccfca43e8d6b..4df30f0729e7 100644
--- a/net/rubygem-google-cloud-env/distinfo
+++ b/net/rubygem-google-cloud-env/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742070728
-SHA256 (rubygem/google-cloud-env-2.2.2.gem) = 94bed40e05a67e9468ce1cb38389fba9a90aa8fc62fc9e173204c1dca59e21e7
-SIZE (rubygem/google-cloud-env-2.2.2.gem) = 33792
+TIMESTAMP = 1747547486
+SHA256 (rubygem/google-cloud-env-2.3.0.gem) = db80b120fc163d1b83ffe8c0bc82e9ad0025ef0d51d987068c7278677ee5caf7
+SIZE (rubygem/google-cloud-env-2.3.0.gem) = 33792
diff --git a/net/rubygem-google-cloud-location/Makefile b/net/rubygem-google-cloud-location/Makefile
index 53b89d88599b..86c9e45ce580 100644
--- a/net/rubygem-google-cloud-location/Makefile
+++ b/net/rubygem-google-cloud-location/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-location
-PORTVERSION= 0.10.0
+PORTVERSION= 1.1.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -12,7 +12,7 @@ WWW= https://cloud.google.com/ruby/docs/reference/google-cloud-location/latest/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-gapic-common>=0.25.0<2.0:devel/rubygem-gapic-common \
+RUN_DEPENDS= rubygem-gapic-common>=1.0<2:devel/rubygem-gapic-common \
rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors
USES= gem
diff --git a/net/rubygem-google-cloud-location/distinfo b/net/rubygem-google-cloud-location/distinfo
index e1269b640ad7..f6b84be1552c 100644
--- a/net/rubygem-google-cloud-location/distinfo
+++ b/net/rubygem-google-cloud-location/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738606601
-SHA256 (rubygem/google-cloud-location-0.10.0.gem) = 9244b465b6d7b404c65b4a9c3dcf7336da16724a9cad4e221de82792db934dc0
-SIZE (rubygem/google-cloud-location-0.10.0.gem) = 30720
+TIMESTAMP = 1747716372
+SHA256 (rubygem/google-cloud-location-1.1.0.gem) = 50c46ee63ce9a89ced4b79e9fd4c010686322a463a550b683d3740a2f43dc81b
+SIZE (rubygem/google-cloud-location-1.1.0.gem) = 30720
diff --git a/net/rubygem-google-cloud-logging-v2/Makefile b/net/rubygem-google-cloud-logging-v2/Makefile
index f045f0e47f9a..aa8681b3711f 100644
--- a/net/rubygem-google-cloud-logging-v2/Makefile
+++ b/net/rubygem-google-cloud-logging-v2/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-logging-v2
-PORTVERSION= 1.2.0
+PORTVERSION= 1.3.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -13,7 +13,7 @@ WWW= https://cloud.google.com/ruby/docs/reference/google-cloud-logging-v2/lates
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-gapic-common>=0.25.0<2.0:devel/rubygem-gapic-common \
+RUN_DEPENDS= rubygem-gapic-common>=1.0<2:devel/rubygem-gapic-common \
rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors
USES= gem
diff --git a/net/rubygem-google-cloud-logging-v2/distinfo b/net/rubygem-google-cloud-logging-v2/distinfo
index cb6e1193c733..c6140053bf59 100644
--- a/net/rubygem-google-cloud-logging-v2/distinfo
+++ b/net/rubygem-google-cloud-logging-v2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740836330
-SHA256 (rubygem/google-cloud-logging-v2-1.2.0.gem) = a0551d31835c82f6df1191a6fcc3c7df0c92ccbf7fb4c51693c055911534d4f2
-SIZE (rubygem/google-cloud-logging-v2-1.2.0.gem) = 113152
+TIMESTAMP = 1747716374
+SHA256 (rubygem/google-cloud-logging-v2-1.3.0.gem) = c5c33c126a4ba8035917539136f955b0e2c04b05df214be621957a73cad5ac06
+SIZE (rubygem/google-cloud-logging-v2-1.3.0.gem) = 113664
diff --git a/net/rubygem-google-cloud-monitoring-dashboard-v1/Makefile b/net/rubygem-google-cloud-monitoring-dashboard-v1/Makefile
index a305fdd77b4e..46c768130def 100644
--- a/net/rubygem-google-cloud-monitoring-dashboard-v1/Makefile
+++ b/net/rubygem-google-cloud-monitoring-dashboard-v1/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-monitoring-dashboard-v1
-PORTVERSION= 1.2.0
+PORTVERSION= 1.3.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -13,7 +13,7 @@ WWW= https://cloud.google.com/ruby/docs/reference/google-cloud-monitoring-dashb
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-gapic-common>=0.25.0<2.0:devel/rubygem-gapic-common \
+RUN_DEPENDS= rubygem-gapic-common>=1.0<2:devel/rubygem-gapic-common \
rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors
USES= gem
diff --git a/net/rubygem-google-cloud-monitoring-dashboard-v1/distinfo b/net/rubygem-google-cloud-monitoring-dashboard-v1/distinfo
index f6e5a3daca3a..3da99e7d585c 100644
--- a/net/rubygem-google-cloud-monitoring-dashboard-v1/distinfo
+++ b/net/rubygem-google-cloud-monitoring-dashboard-v1/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740836332
-SHA256 (rubygem/google-cloud-monitoring-dashboard-v1-1.2.0.gem) = ef9c7ac8688ab246ee0ac1d23ccb43ac433317c66134bbd57847c0bbdb1ee288
-SIZE (rubygem/google-cloud-monitoring-dashboard-v1-1.2.0.gem) = 68096
+TIMESTAMP = 1747716376
+SHA256 (rubygem/google-cloud-monitoring-dashboard-v1-1.3.0.gem) = 6cfd451c7d665325ed76443a24c457aac51e3c1fa1a37e07925afe81a6e9e066
+SIZE (rubygem/google-cloud-monitoring-dashboard-v1-1.3.0.gem) = 68096
diff --git a/net/rubygem-google-cloud-monitoring-metrics_scope-v1/Makefile b/net/rubygem-google-cloud-monitoring-metrics_scope-v1/Makefile
index d245dd6b47ad..8a7b0994e21d 100644
--- a/net/rubygem-google-cloud-monitoring-metrics_scope-v1/Makefile
+++ b/net/rubygem-google-cloud-monitoring-metrics_scope-v1/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-monitoring-metrics_scope-v1
-PORTVERSION= 1.2.0
+PORTVERSION= 1.3.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -12,7 +12,7 @@ WWW= https://cloud.google.com/ruby/docs/reference/google-cloud-monitoring-metri
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-gapic-common>=0.25.0<2.0:devel/rubygem-gapic-common \
+RUN_DEPENDS= rubygem-gapic-common>=1.0<2:devel/rubygem-gapic-common \
rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors
USES= gem
diff --git a/net/rubygem-google-cloud-monitoring-metrics_scope-v1/distinfo b/net/rubygem-google-cloud-monitoring-metrics_scope-v1/distinfo
index 6f3496b5f6b0..b6653c369ebd 100644
--- a/net/rubygem-google-cloud-monitoring-metrics_scope-v1/distinfo
+++ b/net/rubygem-google-cloud-monitoring-metrics_scope-v1/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738606605
-SHA256 (rubygem/google-cloud-monitoring-metrics_scope-v1-1.2.0.gem) = 4846113733c111eb2c53e6fbd609707ec414869e82165bb09e02ed5c1d6675bd
-SIZE (rubygem/google-cloud-monitoring-metrics_scope-v1-1.2.0.gem) = 43520
+TIMESTAMP = 1747716378
+SHA256 (rubygem/google-cloud-monitoring-metrics_scope-v1-1.3.0.gem) = 1e6fcffd1c89aa17b0a954549f0d3f31d282d9b6ce5fdac16f848ed39c22ff2d
+SIZE (rubygem/google-cloud-monitoring-metrics_scope-v1-1.3.0.gem) = 43520
diff --git a/net/rubygem-google-cloud-monitoring-v3/Makefile b/net/rubygem-google-cloud-monitoring-v3/Makefile
index 6d03439ee684..c6b7edcd3e73 100644
--- a/net/rubygem-google-cloud-monitoring-v3/Makefile
+++ b/net/rubygem-google-cloud-monitoring-v3/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-monitoring-v3
-PORTVERSION= 1.5.0
+PORTVERSION= 1.6.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -13,7 +13,7 @@ WWW= https://cloud.google.com/ruby/docs/reference/google-cloud-monitoring-v3/la
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-gapic-common>=0.25.0<2.0:devel/rubygem-gapic-common \
+RUN_DEPENDS= rubygem-gapic-common>=1.0<2:devel/rubygem-gapic-common \
rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors
USES= gem
diff --git a/net/rubygem-google-cloud-monitoring-v3/distinfo b/net/rubygem-google-cloud-monitoring-v3/distinfo
index caa6c5eca780..59034e18e2d1 100644
--- a/net/rubygem-google-cloud-monitoring-v3/distinfo
+++ b/net/rubygem-google-cloud-monitoring-v3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740836334
-SHA256 (rubygem/google-cloud-monitoring-v3-1.5.0.gem) = 783752cbb4f45f2618df8ce68ee26a6af244e564e80e4e95fab85b455b3e0b77
-SIZE (rubygem/google-cloud-monitoring-v3-1.5.0.gem) = 175104
+TIMESTAMP = 1747716380
+SHA256 (rubygem/google-cloud-monitoring-v3-1.6.0.gem) = f03055ac6612a0f3d7205fb3502144d402bd1e09055430abf34663c69c9e646c
+SIZE (rubygem/google-cloud-monitoring-v3-1.6.0.gem) = 175616
diff --git a/net/rubygem-google-cloud-monitoring/Makefile b/net/rubygem-google-cloud-monitoring/Makefile
index 01262b36c601..b2b7bef5a70a 100644
--- a/net/rubygem-google-cloud-monitoring/Makefile
+++ b/net/rubygem-google-cloud-monitoring/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-monitoring
-PORTVERSION= 1.9.0
+PORTVERSION= 1.9.1
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-google-cloud-monitoring/distinfo b/net/rubygem-google-cloud-monitoring/distinfo
index 7a12daa735a6..3cd0d147fb87 100644
--- a/net/rubygem-google-cloud-monitoring/distinfo
+++ b/net/rubygem-google-cloud-monitoring/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738606603
-SHA256 (rubygem/google-cloud-monitoring-1.9.0.gem) = ed5813941814c352136ee83301d27621dda9dbcf589c4eade7f3d315988d3467
-SIZE (rubygem/google-cloud-monitoring-1.9.0.gem) = 20480
+TIMESTAMP = 1747547492
+SHA256 (rubygem/google-cloud-monitoring-1.9.1.gem) = e05877ac6fe0f9933fed8d92785c88a09a8c498462a7ed456c16757ce2427053
+SIZE (rubygem/google-cloud-monitoring-1.9.1.gem) = 20480
diff --git a/net/rubygem-google-cloud-pubsub-v1/Makefile b/net/rubygem-google-cloud-pubsub-v1/Makefile
index ede5d1b00ab5..032aae775a43 100644
--- a/net/rubygem-google-cloud-pubsub-v1/Makefile
+++ b/net/rubygem-google-cloud-pubsub-v1/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-pubsub-v1
-PORTVERSION= 1.8.1
+PORTVERSION= 1.9.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -12,9 +12,9 @@ WWW= https://cloud.google.com/ruby/docs/reference/google-cloud-pubsub-v1/latest
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-gapic-common>=0.25.0<2.0:devel/rubygem-gapic-common \
+RUN_DEPENDS= rubygem-gapic-common>=1.0<2:devel/rubygem-gapic-common \
rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors \
- rubygem-google-iam-v1>=0.7<2.0:devel/rubygem-google-iam-v1
+ rubygem-google-iam-v1>=1.3<2:devel/rubygem-google-iam-v1
USES= gem
diff --git a/net/rubygem-google-cloud-pubsub-v1/distinfo b/net/rubygem-google-cloud-pubsub-v1/distinfo
index 641b508ce362..32144292d8a7 100644
--- a/net/rubygem-google-cloud-pubsub-v1/distinfo
+++ b/net/rubygem-google-cloud-pubsub-v1/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745936404
-SHA256 (rubygem/google-cloud-pubsub-v1-1.8.1.gem) = 2bfc45905e18c21c7917ac4e181f62e40774e8fc20d618ab3ee35cce74906390
-SIZE (rubygem/google-cloud-pubsub-v1-1.8.1.gem) = 95232
+TIMESTAMP = 1747716382
+SHA256 (rubygem/google-cloud-pubsub-v1-1.9.0.gem) = e6f06b9633ca180670956443911c6fac8c9334bdb648cc172bf0d4ff266f1b79
+SIZE (rubygem/google-cloud-pubsub-v1-1.9.0.gem) = 94720
diff --git a/net/rubygem-google-cloud-spanner-admin-database-v1/Makefile b/net/rubygem-google-cloud-spanner-admin-database-v1/Makefile
index 068d22ece36a..bd3e017dbc24 100644
--- a/net/rubygem-google-cloud-spanner-admin-database-v1/Makefile
+++ b/net/rubygem-google-cloud-spanner-admin-database-v1/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-spanner-admin-database-v1
-PORTVERSION= 1.6.0
+PORTVERSION= 1.7.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -13,9 +13,9 @@ WWW= https://cloud.google.com/ruby/docs/reference/google-cloud-spanner-admin-da
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-gapic-common>=0.25.0<2.0:devel/rubygem-gapic-common \
+RUN_DEPENDS= rubygem-gapic-common>=1.0<2:devel/rubygem-gapic-common \
rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors \
- rubygem-grpc-google-iam-v1>=1.1<2:devel/rubygem-grpc-google-iam-v1
+ rubygem-grpc-google-iam-v1>=1.11<2:devel/rubygem-grpc-google-iam-v1
USES= gem
diff --git a/net/rubygem-google-cloud-spanner-admin-database-v1/distinfo b/net/rubygem-google-cloud-spanner-admin-database-v1/distinfo
index 58cd34662d72..16d2657c7b0d 100644
--- a/net/rubygem-google-cloud-spanner-admin-database-v1/distinfo
+++ b/net/rubygem-google-cloud-spanner-admin-database-v1/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739930308
-SHA256 (rubygem/google-cloud-spanner-admin-database-v1-1.6.0.gem) = 08d57b51b208f48fc3af50b0298d58711f5cc0c82fabe61773e9348e0c96dbc3
-SIZE (rubygem/google-cloud-spanner-admin-database-v1-1.6.0.gem) = 115712
+TIMESTAMP = 1747716384
+SHA256 (rubygem/google-cloud-spanner-admin-database-v1-1.7.0.gem) = 034fb2dd23c759c3aef8b67c3456e8d785f461fbfc20fad18d3cb125141668ea
+SIZE (rubygem/google-cloud-spanner-admin-database-v1-1.7.0.gem) = 115712
diff --git a/net/rubygem-google-cloud-spanner-admin-instance-v1/Makefile b/net/rubygem-google-cloud-spanner-admin-instance-v1/Makefile
index 5fbab049af0a..a14c9abc9185 100644
--- a/net/rubygem-google-cloud-spanner-admin-instance-v1/Makefile
+++ b/net/rubygem-google-cloud-spanner-admin-instance-v1/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-spanner-admin-instance-v1
-PORTVERSION= 1.6.0
+PORTVERSION= 2.1.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -12,9 +12,9 @@ WWW= https://cloud.google.com/ruby/docs/reference/google-cloud-spanner-admin-in
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-gapic-common>=0.25.0<2.0:devel/rubygem-gapic-common \
+RUN_DEPENDS= rubygem-gapic-common>=1.0<2:devel/rubygem-gapic-common \
rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors \
- rubygem-grpc-google-iam-v1>=1.1<2:devel/rubygem-grpc-google-iam-v1
+ rubygem-grpc-google-iam-v1>=1.11<2:devel/rubygem-grpc-google-iam-v1
USES= gem
diff --git a/net/rubygem-google-cloud-spanner-admin-instance-v1/distinfo b/net/rubygem-google-cloud-spanner-admin-instance-v1/distinfo
index 5c7bec2d7b41..a4aa9200f1c6 100644
--- a/net/rubygem-google-cloud-spanner-admin-instance-v1/distinfo
+++ b/net/rubygem-google-cloud-spanner-admin-instance-v1/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738606611
-SHA256 (rubygem/google-cloud-spanner-admin-instance-v1-1.6.0.gem) = 1775b56518665854b27af393378761e6ff9b12156d746168df7bb14ce0138d54
-SIZE (rubygem/google-cloud-spanner-admin-instance-v1-1.6.0.gem) = 111104
+TIMESTAMP = 1747716386
+SHA256 (rubygem/google-cloud-spanner-admin-instance-v1-2.1.0.gem) = 10b2ead3c610888335d8d3ce73124290ebdfa644f9ed708ed115969df902f90f
+SIZE (rubygem/google-cloud-spanner-admin-instance-v1-2.1.0.gem) = 111104
diff --git a/net/rubygem-google-cloud-spanner-v1/Makefile b/net/rubygem-google-cloud-spanner-v1/Makefile
index 922d6ad4faaf..d66a41ff68e7 100644
--- a/net/rubygem-google-cloud-spanner-v1/Makefile
+++ b/net/rubygem-google-cloud-spanner-v1/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-spanner-v1
-PORTVERSION= 1.7.0
+PORTVERSION= 1.8.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -13,7 +13,7 @@ WWW= https://cloud.google.com/ruby/docs/reference/google-cloud-spanner-v1/lates
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-gapic-common>=0.25.0<2.0:devel/rubygem-gapic-common \
+RUN_DEPENDS= rubygem-gapic-common>=1.0<2:devel/rubygem-gapic-common \
rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors
USES= gem
diff --git a/net/rubygem-google-cloud-spanner-v1/distinfo b/net/rubygem-google-cloud-spanner-v1/distinfo
index 8bc51d806c7b..9230f8468cb8 100644
--- a/net/rubygem-google-cloud-spanner-v1/distinfo
+++ b/net/rubygem-google-cloud-spanner-v1/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740836336
-SHA256 (rubygem/google-cloud-spanner-v1-1.7.0.gem) = 9e2b7f34a016db5d73e51d067dc1fba7463f6658c24c4e742a29545526a4bf72
-SIZE (rubygem/google-cloud-spanner-v1-1.7.0.gem) = 83968
+TIMESTAMP = 1747716388
+SHA256 (rubygem/google-cloud-spanner-v1-1.8.0.gem) = d28fe44abcc51e54fb4e6c7b391f9abddc7421bd0571ee9917257342b4ac536d
+SIZE (rubygem/google-cloud-spanner-v1-1.8.0.gem) = 83968
diff --git a/net/rubygem-google-cloud-spanner/Makefile b/net/rubygem-google-cloud-spanner/Makefile
index 96511e479812..504e960088e1 100644
--- a/net/rubygem-google-cloud-spanner/Makefile
+++ b/net/rubygem-google-cloud-spanner/Makefile
@@ -1,5 +1,6 @@
PORTNAME= google-cloud-spanner
PORTVERSION= 2.26.0
+PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -16,7 +17,7 @@ RUN_DEPENDS= rubygem-bigdecimal>=3.0<4:math/rubygem-bigdecimal \
rubygem-concurrent-ruby>=1.0<2:devel/rubygem-concurrent-ruby \
rubygem-google-cloud-core>=1.7<2:net/rubygem-google-cloud-core \
rubygem-google-cloud-spanner-admin-database-v1>=1.4<2:net/rubygem-google-cloud-spanner-admin-database-v1 \
- rubygem-google-cloud-spanner-admin-instance-v1>=1.6<2:net/rubygem-google-cloud-spanner-admin-instance-v1 \
+ rubygem-google-cloud-spanner-admin-instance-v1>=1.6<3:net/rubygem-google-cloud-spanner-admin-instance-v1 \
rubygem-google-cloud-spanner-v1>=1.6<2:net/rubygem-google-cloud-spanner-v1
USES= gem
diff --git a/net/rubygem-google-cloud-spanner/files/patch-gemspec b/net/rubygem-google-cloud-spanner/files/patch-gemspec
new file mode 100644
index 000000000000..3831d4b808fb
--- /dev/null
+++ b/net/rubygem-google-cloud-spanner/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- google-cloud-spanner.gemspec.orig 2025-05-20 10:51:00 UTC
++++ google-cloud-spanner.gemspec
+@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
+ s.add_runtime_dependency(%q<concurrent-ruby>.freeze, ["~> 1.0".freeze])
+ s.add_runtime_dependency(%q<google-cloud-core>.freeze, ["~> 1.7".freeze])
+ s.add_runtime_dependency(%q<google-cloud-spanner-admin-database-v1>.freeze, ["~> 1.4".freeze])
+- s.add_runtime_dependency(%q<google-cloud-spanner-admin-instance-v1>.freeze, ["~> 1.6".freeze])
++ s.add_runtime_dependency(%q<google-cloud-spanner-admin-instance-v1>.freeze, [">= 1.6".freeze], ["< 3".freeze])
+ s.add_runtime_dependency(%q<google-cloud-spanner-v1>.freeze, ["~> 1.6".freeze])
+ end
+
diff --git a/net/rubygem-google-cloud-storage_transfer-v1/Makefile b/net/rubygem-google-cloud-storage_transfer-v1/Makefile
index f7bf96b4c48d..eee23aa6ae06 100644
--- a/net/rubygem-google-cloud-storage_transfer-v1/Makefile
+++ b/net/rubygem-google-cloud-storage_transfer-v1/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-storage_transfer-v1
-PORTVERSION= 1.4.0
+PORTVERSION= 1.5.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -13,7 +13,7 @@ WWW= https://cloud.google.com/ruby/docs/reference/google-cloud-storage_transfer
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-gapic-common>=0.25.0<2:devel/rubygem-gapic-common \
+RUN_DEPENDS= rubygem-gapic-common>=1.0<2:devel/rubygem-gapic-common \
rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors
USES= gem
diff --git a/net/rubygem-google-cloud-storage_transfer-v1/distinfo b/net/rubygem-google-cloud-storage_transfer-v1/distinfo
index 678d3925fc05..b88aa2006c71 100644
--- a/net/rubygem-google-cloud-storage_transfer-v1/distinfo
+++ b/net/rubygem-google-cloud-storage_transfer-v1/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738606701
-SHA256 (rubygem/google-cloud-storage_transfer-v1-1.4.0.gem) = 1720a21d46de05876507f06d5615ae2360ea7cd3a27148d70cc0a437926574ab
-SIZE (rubygem/google-cloud-storage_transfer-v1-1.4.0.gem) = 88064
+TIMESTAMP = 1747716436
+SHA256 (rubygem/google-cloud-storage_transfer-v1-1.5.0.gem) = 1ae9d8ba6fc2f6f64671f090b7b3eb36cea415483306fdee02559ce74ebf1d47
+SIZE (rubygem/google-cloud-storage_transfer-v1-1.5.0.gem) = 88576
diff --git a/net/rubygem-google-cloud-storage_transfer/Makefile b/net/rubygem-google-cloud-storage_transfer/Makefile
index 0dd25750df63..4675b58d309c 100644
--- a/net/rubygem-google-cloud-storage_transfer/Makefile
+++ b/net/rubygem-google-cloud-storage_transfer/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-storage_transfer
-PORTVERSION= 1.5.0
+PORTVERSION= 1.5.1
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-google-cloud-storage_transfer/distinfo b/net/rubygem-google-cloud-storage_transfer/distinfo
index 8e444e59338d..61a18746086f 100644
--- a/net/rubygem-google-cloud-storage_transfer/distinfo
+++ b/net/rubygem-google-cloud-storage_transfer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738606699
-SHA256 (rubygem/google-cloud-storage_transfer-1.5.0.gem) = 2e3284917260b414f5cbcfdbb77bdab3facae3b78181440e8df212a65169903a
-SIZE (rubygem/google-cloud-storage_transfer-1.5.0.gem) = 14336
+TIMESTAMP = 1747547554
+SHA256 (rubygem/google-cloud-storage_transfer-1.5.1.gem) = 1a9d31c552795a9668c03c776d7d36a81db43d62adbb675fb57cc71eb30678a0
+SIZE (rubygem/google-cloud-storage_transfer-1.5.1.gem) = 14336
diff --git a/net/rubygem-google-cloud-trace-v1/Makefile b/net/rubygem-google-cloud-trace-v1/Makefile
index 8eb5aa6bb8db..8b50cc09cd13 100644
--- a/net/rubygem-google-cloud-trace-v1/Makefile
+++ b/net/rubygem-google-cloud-trace-v1/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-trace-v1
-PORTVERSION= 1.3.0
+PORTVERSION= 1.4.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -13,7 +13,7 @@ WWW= https://cloud.google.com/ruby/docs/reference/google-cloud-trace-v1/latest/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-gapic-common>=0.25.0<2.0:devel/rubygem-gapic-common \
+RUN_DEPENDS= rubygem-gapic-common>=1.0<2:devel/rubygem-gapic-common \
rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors
USES= gem
diff --git a/net/rubygem-google-cloud-trace-v1/distinfo b/net/rubygem-google-cloud-trace-v1/distinfo
index 0010950839bd..6a8e3e42d09a 100644
--- a/net/rubygem-google-cloud-trace-v1/distinfo
+++ b/net/rubygem-google-cloud-trace-v1/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738606615
-SHA256 (rubygem/google-cloud-trace-v1-1.3.0.gem) = 2d49dd0093ce937fb524f74c262a769b18f9efb33f2fba0f55214447827a5727
-SIZE (rubygem/google-cloud-trace-v1-1.3.0.gem) = 44544
+TIMESTAMP = 1747716390
+SHA256 (rubygem/google-cloud-trace-v1-1.4.0.gem) = b5b301f44d843d3591e78d0b295d531ea2826fc10c97ffd5199f1d23c7d31ca1
+SIZE (rubygem/google-cloud-trace-v1-1.4.0.gem) = 44544
diff --git a/net/rubygem-google-cloud-trace-v2/Makefile b/net/rubygem-google-cloud-trace-v2/Makefile
index 14a1d98bdf2b..df3e1d8846d5 100644
--- a/net/rubygem-google-cloud-trace-v2/Makefile
+++ b/net/rubygem-google-cloud-trace-v2/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-trace-v2
-PORTVERSION= 1.2.0
+PORTVERSION= 1.3.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -13,7 +13,7 @@ WWW= https://cloud.google.com/ruby/docs/reference/google-cloud-trace-v2/latest/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= rubygem-gapic-common>=0.25.0<2.0:devel/rubygem-gapic-common \
+RUN_DEPENDS= rubygem-gapic-common>=1.0<2:devel/rubygem-gapic-common \
rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors
USES= gem
diff --git a/net/rubygem-google-cloud-trace-v2/distinfo b/net/rubygem-google-cloud-trace-v2/distinfo
index 42ee61a25460..a1f89ed8ff7c 100644
--- a/net/rubygem-google-cloud-trace-v2/distinfo
+++ b/net/rubygem-google-cloud-trace-v2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738606617
-SHA256 (rubygem/google-cloud-trace-v2-1.2.0.gem) = be41ba8d0e4e0a7952f355ab1f980fa5128651596b645c8e291e794a7a8ebc56
-SIZE (rubygem/google-cloud-trace-v2-1.2.0.gem) = 47104
+TIMESTAMP = 1747716392
+SHA256 (rubygem/google-cloud-trace-v2-1.3.0.gem) = b3ef27e6c713300c5a65f1fca4639ae96269a6c3ac31a06189332e83d26e8027
+SIZE (rubygem/google-cloud-trace-v2-1.3.0.gem) = 47616
diff --git a/net/rubygem-oauth2-gitlab/Makefile b/net/rubygem-oauth2-gitlab/Makefile
index 5be782149caa..4e554369a79f 100644
--- a/net/rubygem-oauth2-gitlab/Makefile
+++ b/net/rubygem-oauth2-gitlab/Makefile
@@ -1,5 +1,5 @@
PORTNAME= oauth2
-PORTVERSION= 2.0.9
+PORTVERSION= 2.0.10
CATEGORIES= net rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -gitlab
@@ -9,14 +9,15 @@ COMMENT= Ruby wrapper for the OAuth 2.0 protocol
WWW= https://github.com/oauth-xx/oauth2
LICENSE= MIT
-LICENSE_FILE= ${WRKSRC}/LICENSE
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= rubygem-faraday-gitlab>=0.17.3<3.0:www/rubygem-faraday-gitlab \
- rubygem-jwt>=1.0<3.0:www/rubygem-jwt \
+RUN_DEPENDS= rubygem-faraday-gitlab>=0.17.3<4:www/rubygem-faraday-gitlab \
+ rubygem-jwt>=1.0<4:www/rubygem-jwt \
+ rubygem-logger>=1.2<2:devel/rubygem-logger \
rubygem-multi_xml>=0.5<1:textproc/rubygem-multi_xml \
rubygem-rack>=1.2,3<4,3:www/rubygem-rack \
rubygem-snaky_hash>=2.0<3:devel/rubygem-snaky_hash \
- rubygem-version_gem>=1.1<2:devel/rubygem-version_gem
+ rubygem-version_gem>=1.1.8<3:devel/rubygem-version_gem
USES= gem
diff --git a/net/rubygem-oauth2-gitlab/distinfo b/net/rubygem-oauth2-gitlab/distinfo
index aec0acc8be92..b4207eaf9071 100644
--- a/net/rubygem-oauth2-gitlab/distinfo
+++ b/net/rubygem-oauth2-gitlab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663672998
-SHA256 (rubygem/oauth2-2.0.9.gem) = b21f9defcf52dc1610e0dfab4c868342173dcd707fd15c777d9f4f04e153f7fb
-SIZE (rubygem/oauth2-2.0.9.gem) = 34816
+TIMESTAMP = 1747481298
+SHA256 (rubygem/oauth2-2.0.10.gem) = 8f132679598d21885d4bcc68d7e7e6ef0a29f9a782abca00d67d884280dc3a42
+SIZE (rubygem/oauth2-2.0.10.gem) = 54272
diff --git a/net/rubygem-oauth2/Makefile b/net/rubygem-oauth2/Makefile
index 78c99f65b71c..00668d9363d8 100644
--- a/net/rubygem-oauth2/Makefile
+++ b/net/rubygem-oauth2/Makefile
@@ -1,5 +1,5 @@
PORTNAME= oauth2
-PORTVERSION= 2.0.9
+PORTVERSION= 2.0.10
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -8,14 +8,15 @@ COMMENT= Ruby wrapper for the OAuth 2.0 protocol
WWW= https://github.com/oauth-xx/oauth2
LICENSE= MIT
-LICENSE_FILE= ${WRKSRC}/LICENSE
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= rubygem-faraday>=0.17.3<3.0:www/rubygem-faraday \
- rubygem-jwt>=1.0<3.0:www/rubygem-jwt \
+RUN_DEPENDS= rubygem-faraday>=0.17.3<4.0:www/rubygem-faraday \
+ rubygem-jwt>=1.0<4.0:www/rubygem-jwt \
+ rubygem-logger>=1.2<2:devel/rubygem-logger \
rubygem-multi_xml>=0.5<1:textproc/rubygem-multi_xml \
rubygem-rack>=1.2,3<4,3:www/rubygem-rack \
rubygem-snaky_hash>=2.0<3:devel/rubygem-snaky_hash \
- rubygem-version_gem>=1.1<2:devel/rubygem-version_gem
+ rubygem-version_gem>=1.1.8<3:devel/rubygem-version_gem
USES= gem
diff --git a/net/rubygem-oauth2/distinfo b/net/rubygem-oauth2/distinfo
index aec0acc8be92..b2b70081cfdf 100644
--- a/net/rubygem-oauth2/distinfo
+++ b/net/rubygem-oauth2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663672998
-SHA256 (rubygem/oauth2-2.0.9.gem) = b21f9defcf52dc1610e0dfab4c868342173dcd707fd15c777d9f4f04e153f7fb
-SIZE (rubygem/oauth2-2.0.9.gem) = 34816
+TIMESTAMP = 1747716394
+SHA256 (rubygem/oauth2-2.0.10.gem) = 8f132679598d21885d4bcc68d7e7e6ef0a29f9a782abca00d67d884280dc3a42
+SIZE (rubygem/oauth2-2.0.10.gem) = 54272
diff --git a/net/rubygem-t/Makefile b/net/rubygem-t/Makefile
index 324313ee3c27..2b61d07cb7ac 100644
--- a/net/rubygem-t/Makefile
+++ b/net/rubygem-t/Makefile
@@ -1,5 +1,5 @@
PORTNAME= t
-PORTVERSION= 4.1.1
+PORTVERSION= 4.2.0
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -17,7 +17,7 @@ RUN_DEPENDS= rubygem-geokit>=1.14<2:graphics/rubygem-geokit \
rubygem-oauth>=1.1<2:net/rubygem-oauth \
rubygem-retryable>=3.0<4:devel/rubygem-retryable \
rubygem-thor>=1.3<2:devel/rubygem-thor \
- rubygem-twitter>=8.1<9:net/rubygem-twitter
+ rubygem-twitter>=8.2<9:net/rubygem-twitter
USES= gem
diff --git a/net/rubygem-t/distinfo b/net/rubygem-t/distinfo
index 0865bc6a24fc..7155dfd69daa 100644
--- a/net/rubygem-t/distinfo
+++ b/net/rubygem-t/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715843768
-SHA256 (rubygem/t-4.1.1.gem) = 3017a1eddab05d487fbeffd77fc89d749089170efde00006e62ae400aab9d50e
-SIZE (rubygem/t-4.1.1.gem) = 30208
+TIMESTAMP = 1747547510
+SHA256 (rubygem/t-4.2.0.gem) = cb41e05aebdd8fc5f8391353a3d1220c330372ff2707ea8d73e8db656d609ba2
+SIZE (rubygem/t-4.2.0.gem) = 30208
diff --git a/net/rubygem-train-core/Makefile b/net/rubygem-train-core/Makefile
index 5baecf028644..3c346e7b3d99 100644
--- a/net/rubygem-train-core/Makefile
+++ b/net/rubygem-train-core/Makefile
@@ -1,5 +1,5 @@
PORTNAME= train-core
-PORTVERSION= 3.12.7
+PORTVERSION= 3.12.13
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-train-core/distinfo b/net/rubygem-train-core/distinfo
index 43f719d07353..943e5155f027 100644
--- a/net/rubygem-train-core/distinfo
+++ b/net/rubygem-train-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735228166
-SHA256 (rubygem/train-core-3.12.7.gem) = 731045659aea177c875793e9fd945a58c57b59c5f331ab23d74d2d05c1ccccc3
-SIZE (rubygem/train-core-3.12.7.gem) = 48128
+TIMESTAMP = 1747716398
+SHA256 (rubygem/train-core-3.12.13.gem) = a397299b90624f644c1735b823241842814ac08521d1dba44f71cbfd882b41af
+SIZE (rubygem/train-core-3.12.13.gem) = 49152
diff --git a/net/rubygem-train-winrm/Makefile b/net/rubygem-train-winrm/Makefile
index 4e6d623024f3..626914919b6d 100644
--- a/net/rubygem-train-winrm/Makefile
+++ b/net/rubygem-train-winrm/Makefile
@@ -1,5 +1,5 @@
PORTNAME= train-winrm
-PORTVERSION= 0.2.17
+PORTVERSION= 0.2.19
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -10,7 +10,7 @@ WWW= https://github.com/inspec/train-winrm
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= rubygem-chef-winrm>=2.3.11:sysutils/rubygem-chef-winrm \
+RUN_DEPENDS= rubygem-chef-winrm>=2.3.12:sysutils/rubygem-chef-winrm \
rubygem-chef-winrm-elevated>=1.2.5:sysutils/rubygem-chef-winrm-elevated \
rubygem-chef-winrm-fs>=1.3.7:filesystems/rubygem-chef-winrm-fs
diff --git a/net/rubygem-train-winrm/distinfo b/net/rubygem-train-winrm/distinfo
index 5af00e4b713c..ef9046c23c7b 100644
--- a/net/rubygem-train-winrm/distinfo
+++ b/net/rubygem-train-winrm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740022484
-SHA256 (rubygem/train-winrm-0.2.17.gem) = b30b3713e57e8fd1b32b218e6c89b45e13cbc5e02a7bbee993456885ea39b75b
-SIZE (rubygem/train-winrm-0.2.17.gem) = 13824
+TIMESTAMP = 1747716400
+SHA256 (rubygem/train-winrm-0.2.19.gem) = febcbbd87abc8a2a5cab383d13ce494796d00189fe3c0f15c452710447eabdb3
+SIZE (rubygem/train-winrm-0.2.19.gem) = 13824
diff --git a/net/rubygem-train-winrm/files/patch-gemspec b/net/rubygem-train-winrm/files/patch-gemspec
new file mode 100644
index 000000000000..142892fd3639
--- /dev/null
+++ b/net/rubygem-train-winrm/files/patch-gemspec
@@ -0,0 +1,14 @@
+--- train-winrm.gemspec.orig 2025-05-20 10:04:22 UTC
++++ train-winrm.gemspec
+@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
+
+ s.specification_version = 4
+
+- s.add_runtime_dependency(%q<chef-winrm>.freeze, ["~> 2.3.12".freeze])
+- s.add_runtime_dependency(%q<chef-winrm-elevated>.freeze, ["~> 1.2.5".freeze])
+- s.add_runtime_dependency(%q<chef-winrm-fs>.freeze, ["~> 1.3.7".freeze])
++ s.add_runtime_dependency(%q<chef-winrm>.freeze, [">= 2.3.12".freeze])
++ s.add_runtime_dependency(%q<chef-winrm-elevated>.freeze, [">= 1.2.5".freeze])
++ s.add_runtime_dependency(%q<chef-winrm-fs>.freeze, [">= 1.3.7".freeze])
+ end
+
diff --git a/net/rubygem-train/Makefile b/net/rubygem-train/Makefile
index f91d57252f23..b60a456bbb77 100644
--- a/net/rubygem-train/Makefile
+++ b/net/rubygem-train/Makefile
@@ -1,5 +1,5 @@
PORTNAME= train
-PORTVERSION= 3.12.7
+PORTVERSION= 3.12.13
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -27,7 +27,7 @@ RUN_DEPENDS= rubygem-activesupport71>=6.0.3.1<7.2.0:devel/rubygem-activesupport7
rubygem-googleauth>=0.16.2<2:security/rubygem-googleauth \
rubygem-inifile>=3.0<4:textproc/rubygem-inifile \
rubygem-train-core>=${PORTVERSION}<${PORTVERSION}_99:net/rubygem-train-core \
- rubygem-train-winrm>=0.2<1:net/rubygem-train-winrm
+ rubygem-train-winrm>=0.2.19<0.3:net/rubygem-train-winrm
USES= gem
diff --git a/net/rubygem-train/distinfo b/net/rubygem-train/distinfo
index bce7a5c6a48f..1939a75488eb 100644
--- a/net/rubygem-train/distinfo
+++ b/net/rubygem-train/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735228164
-SHA256 (rubygem/train-3.12.7.gem) = c30c622125f732db70b1580859597b32bf2349f3c93a12fa20bc5409abb9c7cb
-SIZE (rubygem/train-3.12.7.gem) = 16896
+TIMESTAMP = 1747716396
+SHA256 (rubygem/train-3.12.13.gem) = b0a487531f8457ce497ca1688ef3d35e728b27fc6712a6eee976fb25c228c221
+SIZE (rubygem/train-3.12.13.gem) = 16896
diff --git a/net/rubygem-twitter/Makefile b/net/rubygem-twitter/Makefile
index f257dfd46199..1bca4c7a5aa3 100644
--- a/net/rubygem-twitter/Makefile
+++ b/net/rubygem-twitter/Makefile
@@ -1,5 +1,5 @@
PORTNAME= twitter
-PORTVERSION= 8.1.0
+PORTVERSION= 8.2.0
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-twitter/distinfo b/net/rubygem-twitter/distinfo
index 08c23c1de92b..e121f623df52 100644
--- a/net/rubygem-twitter/distinfo
+++ b/net/rubygem-twitter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715843770
-SHA256 (rubygem/twitter-8.1.0.gem) = 674bd09af38a6250cfa15067217f95ba67f35d128db809031f97da9f95ff87d6
-SIZE (rubygem/twitter-8.1.0.gem) = 77824
+TIMESTAMP = 1747547512
+SHA256 (rubygem/twitter-8.2.0.gem) = e6cc09c3a1308c403f8952835158354e4bf05b208991a8043c1d3e900fb241b0
+SIZE (rubygem/twitter-8.2.0.gem) = 76800
diff --git a/net/rubygem-x/Makefile b/net/rubygem-x/Makefile
index a0f9b4225ef9..24037713b011 100644
--- a/net/rubygem-x/Makefile
+++ b/net/rubygem-x/Makefile
@@ -1,5 +1,5 @@
PORTNAME= x
-PORTVERSION= 0.15.3
+PORTVERSION= 0.15.4
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-x/distinfo b/net/rubygem-x/distinfo
index 37389a24076e..73996acee2f7 100644
--- a/net/rubygem-x/distinfo
+++ b/net/rubygem-x/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745936408
-SHA256 (rubygem/x-0.15.3.gem) = da5d625c09d83451473ae29d71ab15687d668311098fede90b00059bf90d700c
-SIZE (rubygem/x-0.15.3.gem) = 18944
+TIMESTAMP = 1747547514
+SHA256 (rubygem/x-0.15.4.gem) = afc049905edebfb686186e550659923f46b0171010c0d02020efcdcd6204f9d9
+SIZE (rubygem/x-0.15.4.gem) = 18944
diff --git a/net/s5cmd/Makefile b/net/s5cmd/Makefile
index fb1ad68b7e07..233cc94a279b 100644
--- a/net/s5cmd/Makefile
+++ b/net/s5cmd/Makefile
@@ -1,7 +1,7 @@
PORTNAME= s5cmd
DISTVERSIONPREFIX= v
DISTVERSION= 2.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/net/slackcat/Makefile b/net/slackcat/Makefile
index eeb5b91b4380..14cecb2c7169 100644
--- a/net/slackcat/Makefile
+++ b/net/slackcat/Makefile
@@ -1,6 +1,6 @@
PORTNAME= slackcat
DISTVERSION= 1.7.3
-PORTREVISION= 23
+PORTREVISION= 24
CATEGORIES= net
MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
DISTFILES= go.mod:gomod
diff --git a/net/speedtest-go/Makefile b/net/speedtest-go/Makefile
index db88d07ef113..8d2a939190d9 100644
--- a/net/speedtest-go/Makefile
+++ b/net/speedtest-go/Makefile
@@ -1,7 +1,7 @@
PORTNAME= speedtest-go
DISTVERSIONPREFIX= v
DISTVERSION= 1.7.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net www
MAINTAINER= driesm@FreeBSD.org
diff --git a/net/spoofdpi/Makefile b/net/spoofdpi/Makefile
index 3c5eb863196d..ba99a859bde4 100644
--- a/net/spoofdpi/Makefile
+++ b/net/spoofdpi/Makefile
@@ -1,7 +1,7 @@
PORTNAME= spoofdpi
DISTVERSIONPREFIX= v
DISTVERSION= 0.12.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MAINTAINER= nxjoseph@protonmail.com
diff --git a/net/stc/Makefile b/net/stc/Makefile
index ba2ea862ad19..7f830f4f857a 100644
--- a/net/stc/Makefile
+++ b/net/stc/Makefile
@@ -1,6 +1,6 @@
PORTNAME= stc
PORTVERSION= 1.5.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MAINTAINER= kbowling@FreeBSD.org
diff --git a/net/storj/Makefile b/net/storj/Makefile
index e37b64e4612b..b7303091f920 100644
--- a/net/storj/Makefile
+++ b/net/storj/Makefile
@@ -1,7 +1,7 @@
PORTNAME= storj
PORTVERSION= 1.117.8
DISTVERSIONPREFIX= v
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MAINTAINER= danfe@FreeBSD.org
diff --git a/net/tcplog_dumper/Makefile b/net/tcplog_dumper/Makefile
index c352b1420019..ca067bb0b8b7 100644
--- a/net/tcplog_dumper/Makefile
+++ b/net/tcplog_dumper/Makefile
@@ -1,7 +1,6 @@
PORTNAME= tcplog_dumper
-PORTVERSION= 0.1.1
+PORTVERSION= 0.1.2
DISTVERSIONPREFIX= v
-PORTREVISION= 2
CATEGORIES= net
MAINTAINER= olivier@FreeBSD.org
diff --git a/net/tcplog_dumper/distinfo b/net/tcplog_dumper/distinfo
index 4be22a7a9ecb..383fdf399ef8 100644
--- a/net/tcplog_dumper/distinfo
+++ b/net/tcplog_dumper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624980089
-SHA256 (Netflix-tcplog_dumper-v0.1.1_GH0.tar.gz) = 2592e8d9a1133bcb151a7f1546c46dfbacf57d4924bc339573ccfbd623b2a1df
-SIZE (Netflix-tcplog_dumper-v0.1.1_GH0.tar.gz) = 22115
+TIMESTAMP = 1748379917
+SHA256 (Netflix-tcplog_dumper-v0.1.2_GH0.tar.gz) = 7950f51a2e1c21db6fcd72ddac5e84a89c3b1c3428d2c4e200af73453736284b
+SIZE (Netflix-tcplog_dumper-v0.1.2_GH0.tar.gz) = 22141
diff --git a/net/termshark/Makefile b/net/termshark/Makefile
index 9eb7a8475d7c..00da8369fb19 100644
--- a/net/termshark/Makefile
+++ b/net/termshark/Makefile
@@ -1,7 +1,7 @@
PORTNAME= termshark
PORTVERSION= 2.4.0
DISTVERSIONPREFIX=v
-PORTREVISION= 22
+PORTREVISION= 23
CATEGORIES= net
MAINTAINER= zi@FreeBSD.org
diff --git a/net/tunneller/Makefile b/net/tunneller/Makefile
index cd0c6bdf5f77..48bb55f859b9 100644
--- a/net/tunneller/Makefile
+++ b/net/tunneller/Makefile
@@ -1,7 +1,7 @@
PORTNAME= tunneller
DISTVERSIONPREFIX= release-
DISTVERSION= 0.6
-PORTREVISION= 24
+PORTREVISION= 25
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
diff --git a/net/v2ray/Makefile b/net/v2ray/Makefile
index 9ebad1792725..af79826804ef 100644
--- a/net/v2ray/Makefile
+++ b/net/v2ray/Makefile
@@ -1,6 +1,7 @@
PORTNAME= v2ray
DISTVERSIONPREFIX= v
DISTVERSION= 5.30.0
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= shen.elf@gmail.com
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index d27e16f9c707..80d5f0d5431f 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= net
MASTER_SITES= SF \
LOCAL/mat/vtun
-MAINTAINER= mat@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Virtual Tunnels over TCP/IP networks with traffic shaping
WWW= https://vtun.sourceforge.net/
diff --git a/net/wangle/Makefile b/net/wangle/Makefile
index 15299000c89f..846ae05bac42 100644
--- a/net/wangle/Makefile
+++ b/net/wangle/Makefile
@@ -1,6 +1,6 @@
PORTNAME= wangle
DISTVERSIONPREFIX= v
-DISTVERSION= 2025.05.12.00
+DISTVERSION= 2025.05.26.00
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
diff --git a/net/wangle/distinfo b/net/wangle/distinfo
index bec90b8a7d3e..e62c28d50eb7 100644
--- a/net/wangle/distinfo
+++ b/net/wangle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747102734
-SHA256 (facebook-wangle-v2025.05.12.00_GH0.tar.gz) = a5f0b6c8aa533ecfd41311bd70cfe3fd968d768c28f1f2643dba4c287ea59045
-SIZE (facebook-wangle-v2025.05.12.00_GH0.tar.gz) = 368610
+TIMESTAMP = 1748334333
+SHA256 (facebook-wangle-v2025.05.26.00_GH0.tar.gz) = 885bbe527fc03ea87b642556468ec6050188b81794f7699ce87ddcb68c9b5d0c
+SIZE (facebook-wangle-v2025.05.26.00_GH0.tar.gz) = 368391
diff --git a/net/wgcf/Makefile b/net/wgcf/Makefile
index 35f606a9541a..e8452a86de1a 100644
--- a/net/wgcf/Makefile
+++ b/net/wgcf/Makefile
@@ -1,6 +1,7 @@
PORTNAME= wgcf
PORTVERSION= 2.2.26
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= sunpoet@FreeBSD.org
diff --git a/net/wireguard-go/Makefile b/net/wireguard-go/Makefile
index 259c74b38a58..75c56b9fe891 100644
--- a/net/wireguard-go/Makefile
+++ b/net/wireguard-go/Makefile
@@ -1,6 +1,6 @@
PORTNAME= wireguard-go
PORTVERSION= 0.0.20230223
-PORTREVISION= 13
+PORTREVISION= 14
PORTEPOCH= 1
CATEGORIES= net net-vpn
MASTER_SITES= https://git.zx2c4.com/wireguard-go/snapshot/
diff --git a/net/wireproxy/Makefile b/net/wireproxy/Makefile
index 9ffadf10e450..03fbc95d9cc3 100644
--- a/net/wireproxy/Makefile
+++ b/net/wireproxy/Makefile
@@ -1,7 +1,7 @@
PORTNAME= wireproxy
DISTVERSIONPREFIX= v
DISTVERSION= 1.0.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net
MAINTAINER= lwhsu@FreeBSD.org
diff --git a/net/wlvncc/Makefile b/net/wlvncc/Makefile
index 8c2d41a2a074..9e5bceef94ba 100644
--- a/net/wlvncc/Makefile
+++ b/net/wlvncc/Makefile
@@ -1,5 +1,5 @@
PORTNAME= wlvncc
-PORTVERSION= s20250307
+PORTVERSION= s20250425
CATEGORIES= net wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -26,7 +26,7 @@ USE_GITHUB= yes
USE_GL= egl gbm glesv2
USE_XORG= pixman
GH_ACCOUNT= any1
-GH_TAGNAME= bec7a54
+GH_TAGNAME= a6a5463
PLIST_FILES= bin/${PORTNAME}
.include <bsd.port.mk>
diff --git a/net/wlvncc/distinfo b/net/wlvncc/distinfo
index 746864294f13..db10a1ed875c 100644
--- a/net/wlvncc/distinfo
+++ b/net/wlvncc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741381399
-SHA256 (any1-wlvncc-s20250307-bec7a54_GH0.tar.gz) = a7c8a1ca41797f99580ae61ad816ff87fc2d3c0b88b9e1b6cb224ba0639fc0d8
-SIZE (any1-wlvncc-s20250307-bec7a54_GH0.tar.gz) = 171195
+TIMESTAMP = 1747860801
+SHA256 (any1-wlvncc-s20250425-a6a5463_GH0.tar.gz) = 9264f2cddb1533c7317790c6ad3890718f2b4fead8ace1f5c07e271582fc5f4e
+SIZE (any1-wlvncc-s20250425-a6a5463_GH0.tar.gz) = 171366
diff --git a/net/xapsd/Makefile b/net/xapsd/Makefile
index 30ac9b4c6809..802f0f4a291a 100644
--- a/net/xapsd/Makefile
+++ b/net/xapsd/Makefile
@@ -1,5 +1,6 @@
PORTNAME= xapsd
DISTVERSION= g20241228
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= PopularMoment@protonmail.com
diff --git a/net/ziina/Makefile b/net/ziina/Makefile
new file mode 100644
index 000000000000..a8818b88cabb
--- /dev/null
+++ b/net/ziina/Makefile
@@ -0,0 +1,21 @@
+PORTNAME= ziina
+DISTVERSIONPREFIX= v
+DISTVERSION= 0.1.3
+CATEGORIES= net
+
+MAINTAINER= fuz@FreeBSD.org
+COMMENT= Instant terminal sharing using Zellij
+WWW= https://github.com/ziinaio/ziina
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE.md
+
+RUN_DEPENDS= zellij:sysutils/zellij
+
+USES= go:1.24,modules
+
+GO_MODULE= github.com/ziinaio/ziina
+
+PLIST_FILES= bin/ziina
+
+.include <bsd.port.mk>
diff --git a/net/ziina/distinfo b/net/ziina/distinfo
new file mode 100644
index 000000000000..bb6ce17ead1d
--- /dev/null
+++ b/net/ziina/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1747744359
+SHA256 (go/net_ziina/ziina-v0.1.3/v0.1.3.mod) = 91760339a9d38affd41925d16bfa8807a7bfb4ce6c3c1ed32e0bc79ad99c1171
+SIZE (go/net_ziina/ziina-v0.1.3/v0.1.3.mod) = 562
+SHA256 (go/net_ziina/ziina-v0.1.3/v0.1.3.zip) = 73ad46eb1c9edebe0bebe04366d8e50e0e4eef16bdf14d5bdc89495a4197fb42
+SIZE (go/net_ziina/ziina-v0.1.3/v0.1.3.zip) = 10025
diff --git a/net/ziina/pkg-descr b/net/ziina/pkg-descr
new file mode 100644
index 000000000000..9c3c230186a1
--- /dev/null
+++ b/net/ziina/pkg-descr
@@ -0,0 +1,7 @@
+Ziina lets you invite peers into a local Zellij session over untrusted
+networks, despite you being behind a NAT gateway. It is heavily
+inspired by tmate.
+
+Ziina is (basically) server-less. You only need a standard OpenSSH
+server with a public IP that serves as an entry-point for your peers.
+Your peers only need a standard OpenSSH client.
diff --git a/net/zsync/Makefile b/net/zsync/Makefile
index c093f1ec8480..6db170d95c6e 100644
--- a/net/zsync/Makefile
+++ b/net/zsync/Makefile
@@ -1,6 +1,5 @@
PORTNAME= zsync
-PORTVERSION= 0.6.2
-PORTREVISION= 2
+DISTVERSION= 0.6.3
CATEGORIES= net
MASTER_SITES= http://zsync.moria.org.uk/download/
diff --git a/net/zsync/distinfo b/net/zsync/distinfo
index 8b9f0aa5c22f..7843c48de5b0 100644
--- a/net/zsync/distinfo
+++ b/net/zsync/distinfo
@@ -1,2 +1,3 @@
-SHA256 (zsync-0.6.2.tar.bz2) = 0b9d53433387aa4f04634a6c63a5efa8203070f2298af72a705f9be3dda65af2
-SIZE (zsync-0.6.2.tar.bz2) = 245592
+TIMESTAMP = 1748408394
+SHA256 (zsync-0.6.3.tar.bz2) = 293b6191821641d3ed6248206f8f9df0bf46e6ee2cf8b4dd97cfd1d5909edb9a
+SIZE (zsync-0.6.3.tar.bz2) = 272821