From owner-svn-ports-all@freebsd.org Tue Mar 23 19:59:44 2021 Return-Path: Delivered-To: svn-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 B488B5BA228; Tue, 23 Mar 2021 19:59:44 +0000 (UTC) (envelope-from decke@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 4F4hzN4b5sz3svS; Tue, 23 Mar 2021 19:59:44 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 907A027188; Tue, 23 Mar 2021 19:59:44 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12NJxiwx062955; Tue, 23 Mar 2021 19:59:44 GMT (envelope-from decke@FreeBSD.org) Received: (from decke@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12NJxhGG062952; Tue, 23 Mar 2021 19:59:43 GMT (envelope-from decke@FreeBSD.org) Message-Id: <202103231959.12NJxhGG062952@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: decke set sender to decke@FreeBSD.org using -f From: Bernhard Froehlich Date: Tue, 23 Mar 2021 19:59:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569057 - in head/net/wireguard-tools: . files X-SVN-Group: ports-head X-SVN-Commit-Author: decke X-SVN-Commit-Paths: in head/net/wireguard-tools: . files X-SVN-Commit-Revision: 569057 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2021 19:59:44 -0000 Author: decke Date: Tue Mar 23 19:59:43 2021 New Revision: 569057 URL: https://svnweb.freebsd.org/changeset/ports/569057 Log: net/wireguard-tools: Add patches to fix hang at stop/restart PR: 254328 Submitted by: Jason A. Donenfeld Reported by: Oleg Strizhak Added: head/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 (contents, props changed) head/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 (contents, props changed) Modified: head/net/wireguard-tools/Makefile Modified: head/net/wireguard-tools/Makefile ============================================================================== --- head/net/wireguard-tools/Makefile Tue Mar 23 19:57:31 2021 (r569056) +++ head/net/wireguard-tools/Makefile Tue Mar 23 19:59:43 2021 (r569057) @@ -2,6 +2,7 @@ PORTNAME= wireguard-tools PORTVERSION= 1.0.20210315 +PORTREVISION= 1 CATEGORIES= net net-vpn MASTER_SITES= https://git.zx2c4.com/wireguard-tools/snapshot/ Added: head/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 Tue Mar 23 19:59:43 2021 (r569057) @@ -0,0 +1,17 @@ +From a43f0b634e714cd5cddff373b00c964a57e7b7fc Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Sun, 21 Mar 2021 10:15:32 -0600 +Subject: wg-quick: freebsd: check for socket using -S, not -f + +Signed-off-by: Jason A. Donenfeld +--- wg-quick/freebsd.bash.orig 2021-03-15 14:04:02 UTC ++++ wg-quick/freebsd.bash +@@ -168,7 +168,7 @@ if_exists() { + + del_if() { + [[ $HAVE_SET_DNS -eq 0 ]] || unset_dns +- if [[ -f /var/run/wireguard/$INTERFACE.sock ]]; then ++ if [[ -S /var/run/wireguard/$INTERFACE.sock ]]; then + cmd rm -f "/var/run/wireguard/$INTERFACE.sock" + else + cmd ifconfig "$INTERFACE" destroy Added: head/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 Tue Mar 23 19:59:43 2021 (r569057) @@ -0,0 +1,17 @@ +From 163cef8b9013898bbe0d0b8d4afd25264e999858 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Tue, 23 Mar 2021 12:28:22 -0600 +Subject: wg-quick: freebsd: do not assume point-to-point interface flag + +Signed-off-by: Jason A. Donenfeld +--- wg-quick/freebsd.bash.orig 2021-03-23 19:38:00 UTC ++++ wg-quick/freebsd.bash +@@ -190,7 +190,7 @@ add_addr() { + if [[ $1 == *:* ]]; then + cmd ifconfig "$INTERFACE" inet6 "$1" alias + else +- cmd ifconfig "$INTERFACE" inet "$1" "${1%%/*}" alias ++ cmd ifconfig "$INTERFACE" inet "$1" alias + fi + } +