From owner-dev-commits-ports-all@freebsd.org Wed Jun 16 18:40:40 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EBB7A666F65; Wed, 16 Jun 2021 18:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G4vBw5cRHz3CMy; Wed, 16 Jun 2021 18:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A844620AB7; Wed, 16 Jun 2021 18:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15GIeeat090875; Wed, 16 Jun 2021 18:40:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15GIeetq090874; Wed, 16 Jun 2021 18:40:40 GMT (envelope-from git) Date: Wed, 16 Jun 2021 18:40:40 GMT Message-Id: <202106161840.15GIeetq090874@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernhard Froehlich Subject: git: 57eb088f7834 - main - net/wireguard-kmod: Fix build on latest stable/13 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57eb088f783473d1a7975d31a669d50b2f724e42 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2021 18:40:41 -0000 The branch main has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=57eb088f783473d1a7975d31a669d50b2f724e42 commit 57eb088f783473d1a7975d31a669d50b2f724e42 Author: Bernhard Froehlich AuthorDate: 2021-06-16 18:28:48 +0000 Commit: Bernhard Froehlich 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" +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 +Signed-off-by: Jason A. Donenfeld +--- compat.h.orig 2021-06-06 13:35:25 UTC ++++ compat.h +@@ -8,7 +8,7 @@ + + #include + +-#if __FreeBSD_version < 1400000 ++#if __FreeBSD_version < 1300507 + #include + #include +