From: Erik Conijn Date: Sat, 20 Jun 2026 06:54:39 +0000 (+0200) Subject: netbird: update to 0.73.2 X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=784e09efb3486d7ff28934a71d7a0b24c6dab918;p=openwrt-packages.git netbird: update to 0.73.2 Maintainer: Wesley Gimenes Changelog: https://github.com/netbirdio/netbird/compare/v0.66.2...v0.73.2 Compile tested: x86_64 Run tested: X86_64 The patch for GoLang is no longer necessary Signed-off-by: Erik Conijn --- diff --git a/net/netbird/Makefile b/net/netbird/Makefile index d016759c4..2893c4c17 100644 --- a/net/netbird/Makefile +++ b/net/netbird/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netbird -PKG_VERSION:=0.66.2 +PKG_VERSION:=0.73.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/netbirdio/netbird/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=a6fd51d14c9508ccaa51dee165de552f04ef78d82ac8ee4a86afd35c93790d87 +PKG_HASH:=ba8d1615a6676e6d17f5d4a3c8027cd2e7437c862da3f963d3b337c09efff423 PKG_MAINTAINER:=Wesley Gimenes PKG_LICENSE:=BSD-3-Clause diff --git a/net/netbird/patches/0100-client_update_gvisor_to_build_with_Go_1.26.x.patch b/net/netbird/patches/0100-client_update_gvisor_to_build_with_Go_1.26.x.patch deleted file mode 100644 index af97ed2ad..000000000 --- a/net/netbird/patches/0100-client_update_gvisor_to_build_with_Go_1.26.x.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 9ac6ea431fdc68940785814fc799d7a157bb4323 Mon Sep 17 00:00:00 2001 -From: Wesley Gimenes -Date: Wed, 25 Feb 2026 06:36:10 -0300 -Subject: [PATCH] [client] update gvisor to fix build with Go 1.26.x -Upstream-Status: Submitted [https://github.com/netbirdio/netbird/pull/5447] - -Building the client with the Go 1.26.x you see the error: - -``` -[...] -/builder/dl/go-mod-cache/gvisor.dev/gvisor@v0.0.0-20251031020517-ecfcdd2f171c/pkg/sync/runtime_constants_go126.go:22:2: WaitReasonSelect redeclared in this block - /builder/dl/go-mod-cache/gvisor.dev/gvisor@v0.0.0-20251031020517-ecfcdd2f171c/pkg/sync/runtime_constants_go125.go:22:2: other declaration of WaitReasonSelect -/builder/dl/go-mod-cache/gvisor.dev/gvisor@v0.0.0-20251031020517-ecfcdd2f171c/pkg/sync/runtime_constants_go126.go:23:2: WaitReasonChanReceive redeclared in this block - /builder/dl/go-mod-cache/gvisor.dev/gvisor@v0.0.0-20251031020517-ecfcdd2f171c/pkg/sync/runtime_constants_go125.go:23:2: other declaration of WaitReasonChanReceive -/builder/dl/go-mod-cache/gvisor.dev/gvisor@v0.0.0-20251031020517-ecfcdd2f171c/pkg/sync/runtime_constants_go126.go:24:2: WaitReasonSemacquire redeclared in this block - /builder/dl/go-mod-cache/gvisor.dev/gvisor@v0.0.0-20251031020517-ecfcdd2f171c/pkg/sync/runtime_constants_go125.go:24:2: other declaration of WaitReasonSemacquire -[...] -``` - -Fixes: https://github.com/netbirdio/netbird/issues/5290 ("Does not build with Go 1.26rc3") - -Signed-off-by: Wesley Gimenes ---- - go.mod | 6 ++---- - go.sum | 4 ++-- - 2 files changed, 4 insertions(+), 6 deletions(-) - ---- a/go.mod -+++ b/go.mod -@@ -1,8 +1,6 @@ - module github.com/netbirdio/netbird - --go 1.25 -- --toolchain go1.25.5 -+go 1.25.5 - - require ( - cunicu.li/go-rosenpass v0.4.0 -@@ -125,7 +123,7 @@ require ( - gorm.io/driver/postgres v1.5.7 - gorm.io/driver/sqlite v1.5.7 - gorm.io/gorm v1.25.12 -- gvisor.dev/gvisor v0.0.0-20251031020517-ecfcdd2f171c -+ gvisor.dev/gvisor v0.0.0-20260219192049-0f2374377e89 - ) - - require ( ---- a/go.sum -+++ b/go.sum -@@ -852,5 +852,5 @@ gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1W - gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= - gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= - gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= --gvisor.dev/gvisor v0.0.0-20251031020517-ecfcdd2f171c h1:pfzmXIkkDgydR4ZRP+e1hXywZfYR21FA0Fbk6ptMkiA= --gvisor.dev/gvisor v0.0.0-20251031020517-ecfcdd2f171c/go.mod h1:/mc6CfwbOm5KKmqoV7Qx20Q+Ja8+vO4g7FuCdlVoAfQ= -+gvisor.dev/gvisor v0.0.0-20260219192049-0f2374377e89 h1:mGJaeA61P8dEHTqdvAgc70ZIV3QoUoJcXCRyyjO26OA= -+gvisor.dev/gvisor v0.0.0-20260219192049-0f2374377e89/go.mod h1:QkHjoMIBaYtpVufgwv3keYAbln78mBoCuShZrPrer1Q=