mirror of
https://github.com/openwrt/packages.git
synced 2026-04-15 10:51:55 +00:00
netbird: update to 0.66.2, patch for Go 1.26 build
Changelog: https://github.com/netbirdio/netbird/releases/tag/v0.66.2 NetBird `v0.66.x` adds support for exposing a local HTTP service from the CLI with the `netbird expose`[1] command, but only for self-hosted deployments. Cloud support is coming. [1]: https://docs.netbird.io/manage/reverse-proxy/expose-from-cli --- `0.65.x` highlights Changelog: https://github.com/netbirdio/netbird/releases/tag/v0.65.3 NetBird `v0.65.x` now includes a built-in reverse proxy[1], but only for self-hosted deployments and is currently in beta. Cloud support is coming soon. Important: pre-shared keys or Rosenpass are currently incompatible with the reverse proxy feature. [1]: https://docs.netbird.io/manage/reverse-proxy --- `v0.63.x` highlights Changelog: https://github.com/netbirdio/netbird/releases/tag/v0.63.0 NetBird now supports private DNS zones[1]. [1]: https://docs.netbird.io/manage/dns/custom-zones --- `v0.62.x` highlights Changelog: https://github.com/netbirdio/netbird/releases/tag/v0.62.3 Upstream minimum Go requirement raised from `v1.24.x` to `v1.25.x`, see the go.mod[1]. [1]: https://github.com/netbirdio/netbird/blob/v0.62.3/go.mod#L3-L5 --- Building `netbird` with Go 1.26.x fails with errors: ``` [...] /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 [...] ``` Upstream Issue: https://github.com/netbirdio/netbird/issues/5290 Upstream PR: https://github.com/netbirdio/netbird/pull/5447 Signed-off-by: Wesley Gimenes <wehagy@proton.me>
This commit is contained in:
committed by
Wesley Gimenes
parent
291dacc67c
commit
df6533b96e
@@ -1,12 +1,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=netbird
|
||||
PKG_VERSION:=0.61.2
|
||||
PKG_VERSION:=0.66.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:=6a13cba1a1176faf6932926e04cf09916dbfd1e42a269709416eb0b8a8ee3b2a
|
||||
PKG_HASH:=a6fd51d14c9508ccaa51dee165de552f04ef78d82ac8ee4a86afd35c93790d87
|
||||
|
||||
PKG_MAINTAINER:=Wesley Gimenes <wehagy@proton.me>
|
||||
PKG_LICENSE:=BSD-3-Clause
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
From 9ac6ea431fdc68940785814fc799d7a157bb4323 Mon Sep 17 00:00:00 2001
|
||||
From: Wesley Gimenes <wehagy@proton.me>
|
||||
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 <wehagy@proton.me>
|
||||
---
|
||||
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=
|
||||
Reference in New Issue
Block a user