Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Jun 2021 18:40:40 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: 57eb088f7834 - main - net/wireguard-kmod: Fix build on latest stable/13
Message-ID:  <202106161840.15GIeetq090874@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=57eb088f783473d1a7975d31a669d50b2f724e42

commit 57eb088f783473d1a7975d31a669d50b2f724e42
Author:     Bernhard Froehlich <decke@FreeBSD.org>
AuthorDate: 2021-06-16 18:28:48 +0000
Commit:     Bernhard Froehlich <decke@FreeBSD.org>
CommitDate: 2021-06-16 18:40:01 +0000

    net/wireguard-kmod: Fix build on latest stable/13
    
    PR:             256639
    Obtained from:  https://git.zx2c4.com/wireguard-freebsd/commit/?id=64a507ad6b3c7e8455c67b452160b9e4211fd872
---
 net/wireguard-kmod/Makefile             |  1 +
 net/wireguard-kmod/files/patch-compat.h | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/net/wireguard-kmod/Makefile b/net/wireguard-kmod/Makefile
index c88b72f4729b..4ae494f3dbf6 100644
--- a/net/wireguard-kmod/Makefile
+++ b/net/wireguard-kmod/Makefile
@@ -1,5 +1,6 @@
 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>
+ 



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