diff options
| author | Bernhard Froehlich <decke@FreeBSD.org> | 2019-03-18 21:18:02 +0000 |
|---|---|---|
| committer | Bernhard Froehlich <decke@FreeBSD.org> | 2019-03-18 21:18:02 +0000 |
| commit | 134f0b0da7b830168bde5883d32e51daff229644 (patch) | |
| tree | 3fba96eefcaf091305c90218a33ac427e30e0b9f /net | |
| parent | 120dcb7b29174973a020fea6237a75e21373c4c1 (diff) | |
| download | ports-134f0b0da7b830168bde5883d32e51daff229644.tar.gz ports-134f0b0da7b830168bde5883d32e51daff229644.zip | |
net/wireguard:
- Cherry pick patch that fixes TMPDIR handling and tmp file leaks on /
- Fix rc.d script to initialize variable
- Bump PORTREVISION
Notes
Notes:
svn path=/head/; revision=496212
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireguard/Makefile | 2 | ||||
| -rw-r--r-- | net/wireguard/files/patch-5d60f6beb5ddcda0aee99261d0bb7fa7db934001 | 28 | ||||
| -rw-r--r-- | net/wireguard/files/patch-cba99f16a4ec9a229358ce1ed96080bd5ae04a7e (renamed from net/wireguard/files/patch-wg-quick_freebsd.bash) | 0 | ||||
| -rw-r--r-- | net/wireguard/files/wireguard.in | 1 |
4 files changed, 30 insertions, 1 deletions
diff --git a/net/wireguard/Makefile b/net/wireguard/Makefile index 7eb96aefa859..11227e558dc8 100644 --- a/net/wireguard/Makefile +++ b/net/wireguard/Makefile @@ -2,7 +2,7 @@ PORTNAME= wireguard PORTVERSION= 0.0.20190227 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= https://git.zx2c4.com/WireGuard/snapshot/ DISTNAME= WireGuard-${PORTVERSION} diff --git a/net/wireguard/files/patch-5d60f6beb5ddcda0aee99261d0bb7fa7db934001 b/net/wireguard/files/patch-5d60f6beb5ddcda0aee99261d0bb7fa7db934001 new file mode 100644 index 000000000000..dc16bcd9a9be --- /dev/null +++ b/net/wireguard/files/patch-5d60f6beb5ddcda0aee99261d0bb7fa7db934001 @@ -0,0 +1,28 @@ +From 5d60f6beb5ddcda0aee99261d0bb7fa7db934001 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" <Jason@zx2c4.com> +Date: Mon, 18 Mar 2019 14:41:10 -0600 +Subject: wg-quick: freebsd: export TMPDIR when restoring and don't make empty + +Otherwise mktemp doesn't see it, and if it's empty we wind up in /. +--- + src/tools/wg-quick/freebsd.bash | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/tools/wg-quick/freebsd.bash b/src/tools/wg-quick/freebsd.bash +index e83dbef0..c3fa47a5 100755 +--- wg-quick/freebsd.bash ++++ wg-quick/freebsd.bash +@@ -42,8 +42,9 @@ unset ORIGINAL_TMPDIR + make_temp() { + local old_umask + +- [[ -v ORIGINAL_TMPDIR ]] && TMPDIR="$ORIGINAL_TMPDIR" ++ [[ -v ORIGINAL_TMPDIR ]] && export TMPDIR="$ORIGINAL_TMPDIR" + ORIGINAL_TMPDIR="$TMPDIR" ++ [[ -z $TMPDIR ]] && unset TMPDIR + + old_umask="$(umask)" + umask 077 +-- +cgit v1.2.1-20-gc37e + diff --git a/net/wireguard/files/patch-wg-quick_freebsd.bash b/net/wireguard/files/patch-cba99f16a4ec9a229358ce1ed96080bd5ae04a7e index 1a3da59f7343..1a3da59f7343 100644 --- a/net/wireguard/files/patch-wg-quick_freebsd.bash +++ b/net/wireguard/files/patch-cba99f16a4ec9a229358ce1ed96080bd5ae04a7e diff --git a/net/wireguard/files/wireguard.in b/net/wireguard/files/wireguard.in index 7caaa8597ab6..d0544fdad32d 100644 --- a/net/wireguard/files/wireguard.in +++ b/net/wireguard/files/wireguard.in @@ -37,6 +37,7 @@ wireguard_stop() load_rc_config $name +: ${wireguard_enable="NO"} : ${wireguard_interfaces=""} run_rc_command "$1" |