Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Sep 2022 20:08:59 GMT
From:      Bernhard Froehlich <decke@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 513910e35adf - main - net/wireguard-kmod: Fix build on 14-current after e7d02be19d
Message-ID:  <202209082008.288K8xQ4061007@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by decke:

URL: https://cgit.FreeBSD.org/ports/commit/?id=513910e35adf8012d2eacc53d10838298802f145

commit 513910e35adf8012d2eacc53d10838298802f145
Author:     Bernhard Froehlich <decke@FreeBSD.org>
AuthorDate: 2022-09-08 20:08:05 +0000
Commit:     Bernhard Froehlich <decke@FreeBSD.org>
CommitDate: 2022-09-08 20:08:54 +0000

    net/wireguard-kmod: Fix build on 14-current after e7d02be19d
    
    Obtained from:  https://git.zx2c4.com/wireguard-freebsd/commit/?id=20584d1c329ed2a71893375fa11ca4c56ed9f642
---
 net/wireguard-kmod/files/patch-support.h | 34 ++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/net/wireguard-kmod/files/patch-support.h b/net/wireguard-kmod/files/patch-support.h
new file mode 100644
index 000000000000..d7de7b548df6
--- /dev/null
+++ b/net/wireguard-kmod/files/patch-support.h
@@ -0,0 +1,34 @@
+From 20584d1c329ed2a71893375fa11ca4c56ed9f642 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Sun, 4 Sep 2022 19:06:00 +0200
+Subject: support: account for protosw change
+
+e7d02be19 ("protosw: refactor protosw and domain static declaration and
+load") changed the way this function should be invoked.
+
+Link: https://github.com/freebsd/freebsd-src/commit/e7d02be19d40063783d6b8f1ff2bc4c7170fd434
+Reported-by: Michael Pro <michael.adm@gmail.com>
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+---
+ src/support.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/support.h b/src/support.h
+index d1c326c..ee6b03c 100644
+--- support.h
++++ support.h
+@@ -37,7 +37,11 @@ sogetsockaddr(struct socket *so, struct sockaddr **nam)
+ 	int error;
+ 
+ 	CURVNET_SET(so->so_vnet);
++#if __FreeBSD_version < 1400066
+ 	error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, nam);
++#else
++	error = so->so_proto->pr_sockaddr(so, nam);
++#endif
+ 	CURVNET_RESTORE();
+ 	return (error);
+ }
+-- 
+cgit v1.2.3-11-g984f
+



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209082008.288K8xQ4061007>