diff options
| author | Bernhard Froehlich <decke@FreeBSD.org> | 2021-03-23 19:59:43 +0000 |
|---|---|---|
| committer | Bernhard Froehlich <decke@FreeBSD.org> | 2021-03-23 19:59:43 +0000 |
| commit | f487c5c7b8a9790002691b7ad6088107b85f34c2 (patch) | |
| tree | de4a9a576a84857ff4b7b62bcd732feb4e73c27c /net/wireguard-tools | |
| parent | 7a710fbd3adfd8aac400cc87738f2bf88d6eda27 (diff) | |
| download | ports-f487c5c7b8a9790002691b7ad6088107b85f34c2.tar.gz ports-f487c5c7b8a9790002691b7ad6088107b85f34c2.zip | |
net/wireguard-tools: Add patches to fix hang at stop/restart
PR: 254328
Submitted by: Jason A. Donenfeld <Jason@zx2c4.com>
Reported by: Oleg Strizhak <oleg@pcbtech.ru>
Notes
Notes:
svn path=/head/; revision=569057
Diffstat (limited to 'net/wireguard-tools')
| -rw-r--r-- | net/wireguard-tools/Makefile | 1 | ||||
| -rw-r--r-- | net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 | 17 | ||||
| -rw-r--r-- | net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 | 17 |
3 files changed, 35 insertions, 0 deletions
diff --git a/net/wireguard-tools/Makefile b/net/wireguard-tools/Makefile index 6870caea0a8a..5191e24f469a 100644 --- a/net/wireguard-tools/Makefile +++ b/net/wireguard-tools/Makefile @@ -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/ diff --git a/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 b/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 new file mode 100644 index 000000000000..b73bd664e441 --- /dev/null +++ b/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 @@ -0,0 +1,17 @@ +From a43f0b634e714cd5cddff373b00c964a57e7b7fc Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" <Jason@zx2c4.com> +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 <Jason@zx2c4.com> +--- 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 diff --git a/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 b/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 new file mode 100644 index 000000000000..96cb6def8649 --- /dev/null +++ b/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 @@ -0,0 +1,17 @@ +From 163cef8b9013898bbe0d0b8d4afd25264e999858 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" <Jason@zx2c4.com> +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 <Jason@zx2c4.com> +--- 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 + } + |