diff options
| author | Bernhard Froehlich <decke@FreeBSD.org> | 2021-06-16 18:28:48 +0000 |
|---|---|---|
| committer | Bernhard Froehlich <decke@FreeBSD.org> | 2021-06-16 18:43:48 +0000 |
| commit | 0e355ccdc9cf44ab92353a08efd3e8b323886937 (patch) | |
| tree | 3cd3f7c3210a8b7a7f8556b395d104cbad4916fc | |
| parent | 7cc516da8f6409f7493f94033a86daaeeb005b39 (diff) | |
| download | ports-0e355ccdc9cf44ab92353a08efd3e8b323886937.tar.gz ports-0e355ccdc9cf44ab92353a08efd3e8b323886937.zip | |
net/wireguard-kmod: Fix build on latest stable/13
PR: 256639
Obtained from: https://git.zx2c4.com/wireguard-freebsd/commit/?id=64a507ad6b3c7e8455c67b452160b9e4211fd872
(cherry picked from commit 57eb088f783473d1a7975d31a669d50b2f724e42)
| -rw-r--r-- | net/wireguard-kmod/Makefile | 1 | ||||
| -rw-r--r-- | net/wireguard-kmod/files/patch-compat.h | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/net/wireguard-kmod/Makefile b/net/wireguard-kmod/Makefile index 3ae33d0fc1fd..04b4241cf112 100644 --- a/net/wireguard-kmod/Makefile +++ b/net/wireguard-kmod/Makefile @@ -1,6 +1,7 @@ PORTNAME= wireguard-kmod PORTVERSION= 0.0.20210606 +PORTREVISION= 1 CATEGORIES= net net-vpn MASTER_SITES= https://git.zx2c4.com/wireguard-freebsd/snapshot/ DISTNAME= wireguard-freebsd-${PORTVERSION} diff --git a/net/wireguard-kmod/files/patch-compat.h b/net/wireguard-kmod/files/patch-compat.h new file mode 100644 index 000000000000..b1dd32249515 --- /dev/null +++ b/net/wireguard-kmod/files/patch-compat.h @@ -0,0 +1,22 @@ +From 64a507ad6b3c7e8455c67b452160b9e4211fd872 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" <Jason@zx2c4.com> +Date: Mon, 7 Jun 2021 11:50:20 +0200 +Subject: compat: taskqueue draining was backported to stable/13 + +Since 407b687dfef ("Make sure all tasklets are drained before unloading +the LinuxKPI. Else use-after-free may happen."), stable/13 now has the +taskqueue API that we need. + +Reported-by: Herbert J. Skuhra <herbert@gojira.at> +Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> +--- compat.h.orig 2021-06-06 13:35:25 UTC ++++ compat.h +@@ -8,7 +8,7 @@ + + #include <sys/param.h> + +-#if __FreeBSD_version < 1400000 ++#if __FreeBSD_version < 1300507 + #include <sys/smp.h> + #include <sys/gtaskqueue.h> + |