Index: head/net/wireguard-tools/Makefile =================================================================== --- head/net/wireguard-tools/Makefile (revision 569056) +++ head/net/wireguard-tools/Makefile (revision 569057) @@ -1,51 +1,52 @@ # $FreeBSD$ PORTNAME= wireguard-tools PORTVERSION= 1.0.20210315 +PORTREVISION= 1 CATEGORIES= net net-vpn MASTER_SITES= https://git.zx2c4.com/wireguard-tools/snapshot/ MAINTAINER= decke@FreeBSD.org COMMENT= Fast, modern and secure VPN Tunnel LICENSE= GPLv2 LICENSE_FILE= ${WRKDIR}/${DISTNAME}/COPYING FLAVORS= default lite lite_PKGNAMESUFFIX= -lite USES= gmake tar:xz WRKSRC= ${WRKDIR}/${DISTNAME}/src MAKE_ARGS+= DEBUG=no WITH_BASHCOMPLETION=yes WITH_SYSTEMDUNITS=no MAKE_ENV+= MANDIR="${MANPREFIX}/man" \ SYSCONFDIR="${PREFIX}/etc" OPTIONS_DEFINE= WGQUICK OPTIONS_DEFAULT=WGQUICK OPTIONS_SUB= yes WGQUICK_DESC= wg-quick(8) userland utility WGQUICK_RUN_DEPENDS= bash:shells/bash WGQUICK_MAKE_ARGS= WITH_WGQUICK=yes WGQUICK_MAKE_ARGS_OFF= WITH_WGQUICK=no .if ${FLAVOR:U} == lite USE_RC_SUBR= wireguard_lite OPTIONS_EXCLUDE=WGQUICK COMMENT+= (lite flavor) .endif .include .if ${PORT_OPTIONS:MWGQUICK} USE_RC_SUBR= wireguard_wgquick .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/completion/wg-quick.bash-completion \ ${WRKSRC}/wg-quick/freebsd.bash .include Index: head/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 =================================================================== --- head/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 (nonexistent) +++ head/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 (revision 569057) @@ -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 Property changes on: head/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 =================================================================== --- head/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 (nonexistent) +++ head/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 (revision 569057) @@ -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 + } + Property changes on: head/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property