Date: Sun, 21 Sep 2025 18:30:33 +0200 From: "Herbert J. Skuhra" <herbert@gojira.at> To: Guido Falsi <madpilot@FreeBSD.org> Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 31ec8b6407fd - main - sys/netinet6: Implement RFC 7217 Message-ID: <87ikhbdaza.wl-herbert@gojira.at> In-Reply-To: <31da7dd5-ae67-4fb4-aa47-81e57f460c9d@FreeBSD.org> References: <202509201231.58KCVqBC047480@gitrepo.freebsd.org> <874iswhip4.wl-herbert@gojira.at> <bad8cb94-8243-468a-9919-a713a9426eae@FreeBSD.org> <07503de1-785e-4e4d-b4e4-0524aeb064e1@FreeBSD.org> <87jz1sc9fr.wl-herbert@gojira.at> <31da7dd5-ae67-4fb4-aa47-81e57f460c9d@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 21 Sep 2025 18:02:24 +0200, Guido Falsi wrote:
>
> Yes, I now see recompiling would not have helped in this case.
>
> A C program would have included the system include and noticed the
> change, but this software has hardcoded the struct in go code and
> requires patching.
>
> I'm attaching a simple patch for the ports tree for this port, it
> compiles but I've not tested it at runtime, could you try applying
> this patch to the ports tree and recompile the port, and report back?
>
> Please note this is not a proper patch for the ports tree, it just
> fixes the problem, but would break it for anyone else, I'll produce a
> proper patch for the ports tree once I have confirmed the approach
> woks.
>
> Thanks in advance!
>
> --
> Guido Falsi <madpilot@FreeBSD.org>
> From 5470f8e3f05c21bb0812ee0100ca3372e2f75ede Mon Sep 17 00:00:00 2001
> From: Guido Falsi <madpilot@FreeBSD.org>
> Date: Sun, 21 Sep 2025 17:47:08 +0200
> Subject: [PATCH] security/netbird: Test fix
>
> ---
> ...ndor_golang.zx2c4.com_wireguard_tun_tun__freebsd.go | 10 ++++++++++
> 1 file changed, 10 insertions(+)
> create mode 100644 security/netbird/files/patch-vendor_golang.zx2c4.com_wireguard_tun_tun__freebsd.go
>
> diff --git a/security/netbird/files/patch-vendor_golang.zx2c4.com_wireguard_tun_tun__freebsd.go b/security/netbird/files/patch-vendor_golang.zx2c4.com_wireguard_tun_tun__freebsd.go
> new file mode 100644
> index 000000000000..513b1217fa2c
> --- /dev/null
> +++ b/security/netbird/files/patch-vendor_golang.zx2c4.com_wireguard_tun_tun__freebsd.go
> @@ -0,0 +1,10 @@
> +--- vendor/golang.zx2c4.com/wireguard/tun/tun_freebsd.go.orig 2025-09-21 11:04:17 UTC
> ++++ vendor/golang.zx2c4.com/wireguard/tun/tun_freebsd.go
> +@@ -65,6 +65,7 @@ type nd6Req struct {
> + Randomseed0 [8]byte
> + Randomseed1 [8]byte
> + Randomid [8]byte
> ++ Dad_failures *uint64
> + }
> +
> + type NativeTun struct {
> --
> 2.51.0
Sorry, this patch doesn't resolve the issue. I get the same error.
(Netbird still works with this patch on stable/15.)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?87ikhbdaza.wl-herbert>