From nobody Thu Sep 08 20:08:59 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MNqvb6gfXz4bdSc; Thu, 8 Sep 2022 20:08:59 +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 4MNqvb5qw2z3lQc; Thu, 8 Sep 2022 20:08:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662667739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wJJs8HMsPDbwq4cMfWaqdqc+7m+SB3by2I8nI++CP6M=; b=Hu6spTnYWggnRnWh5Rx822J4XxqBQWbAiSZ9Ul/CYWHNe0Ygks+830xQqjxOBeIKVR1jkb OBm0jzffZmZVwcPdqFRDoPEsOUx/KT+R8NGbb+aEKo9VKaUcVFRr6UKz3fzPu6UjL5VTeT j1lyx8FUgJgysRWF9ldP/BrFG0oAp7RAy5lvY+5PDB7jVHuhdxkKmI2Ex3v0T7ahQ8Rkke GHcJ/syp8T85MJmL7N/PnFQm8e30wfgQzlAoHasaZ/tcpzLzsMIGGHtp2iAiYCCT/qVvfk EOGxZz12NgIBW8Volio94TMacdNoWUGX4vFNMlvCLLQ6PvYOtedZxX15z0JHBg== 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 4MNqvb4sSZzyth; Thu, 8 Sep 2022 20:08:59 +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 288K8xU2061008; Thu, 8 Sep 2022 20:08:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 288K8xQ4061007; Thu, 8 Sep 2022 20:08:59 GMT (envelope-from git) Date: Thu, 8 Sep 2022 20:08:59 GMT Message-Id: <202209082008.288K8xQ4061007@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: 513910e35adf - main - net/wireguard-kmod: Fix build on 14-current after e7d02be19d List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: 513910e35adf8012d2eacc53d10838298802f145 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662667739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wJJs8HMsPDbwq4cMfWaqdqc+7m+SB3by2I8nI++CP6M=; b=vLTQMEOFRkysGJpv25z6+P6V29h0XfTNuuH3IF4N8wTnnl/VzuShW/TkhOW/zw1KSX7d5s sH6cXHZyvorb47FUp9doj1pQrVMH7NBBEpiB/bTe7KrXRCxNbRMMxvALa/s6V2itwfTqrX Ug230oVlvCI0/PmFpbIqxYjE/BfcXDWNFGw011S8eIP/fPbp2VvPp5lvgtdSz7RqCaQwYl ze9bUwhzMjvZF6R9FVqQcdztNXpFRNoGZXWK9XTjR/losWtFxskR7gPiFlG2KhJUtQMEzp RrUIKD44mSw5Y86zfd++3WxxlP7oO1bmlfct/Xh1kplJtSig8wDNCV8ZG4IEuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662667739; a=rsa-sha256; cv=none; b=DfvMKiYFOEtzCe6jxwJKWYWdYM8QhSWCWAkB1Vdtl9ZNlS8LYzydZJNzOYYSuYt29eMVao qZLpeS62Z/e3xrFLriCo1J2kyziuGBODmcmVdbwOPog1e4qCe55qxpgf4bNMlJGRNwIVKX E2ViMJTW6RT9SJjCpQUl1As5gTvP0McAKJ33K+0tSz1vJKE17B/YDFGNl90/Q/FmzkLnfj dwusTl1wr9KD/i9eUJtwo6X6IjIdVBMrSgjoSMC+cxWvAAca3lZgcbjqkdfM0ebZpv6kBc LVt7FvjMSYBO+LKcn746IPbfZRqsoeC46g0lmUfC63bHMo18nwmVCS3UgsA8EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=513910e35adf8012d2eacc53d10838298802f145 commit 513910e35adf8012d2eacc53d10838298802f145 Author: Bernhard Froehlich AuthorDate: 2022-09-08 20:08:05 +0000 Commit: Bernhard Froehlich 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" +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 +Signed-off-by: Jason A. Donenfeld +--- + 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 +