From owner-dev-commits-ports-main@freebsd.org Wed Apr 7 19:48:34 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 D7FA85C283F; Wed, 7 Apr 2021 19:48:34 +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 4FFw1Z5pqqz4g5H; Wed, 7 Apr 2021 19:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B5D3824B79; Wed, 7 Apr 2021 19:48:34 +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 137JmYOJ056099; Wed, 7 Apr 2021 19:48:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 137JmYB3056098; Wed, 7 Apr 2021 19:48:34 GMT (envelope-from git) Date: Wed, 7 Apr 2021 19:48:34 GMT Message-Id: <202104071948.137JmYB3056098@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: 9986bb780c47 - main - net/wireguard-tools: Various fixes for the rc.d scripts 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: 9986bb780c473fe5a1a2821d14aead6b3bcaadbe Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Apr 2021 19:48:34 -0000 The branch main has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=9986bb780c473fe5a1a2821d14aead6b3bcaadbe commit 9986bb780c473fe5a1a2821d14aead6b3bcaadbe Author: Bernhard Froehlich AuthorDate: 2021-04-07 19:46:38 +0000 Commit: Bernhard Froehlich CommitDate: 2021-04-07 19:46:38 +0000 net/wireguard-tools: Various fixes for the rc.d scripts - Introduce wireguard_confdir to rc.d script - Fix variables and load_rc_config order in rc.d script - Change rc.d scripts to run earlier after NETWORKING is available Submitted by: niels@netbox.org --- net/wireguard-tools/Makefile | 2 +- net/wireguard-tools/files/wireguard_lite.in | 19 +++++++++++-------- net/wireguard-tools/files/wireguard_wgquick.in | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/net/wireguard-tools/Makefile b/net/wireguard-tools/Makefile index 0f06481f8279..47131508ab73 100644 --- a/net/wireguard-tools/Makefile +++ b/net/wireguard-tools/Makefile @@ -1,6 +1,6 @@ PORTNAME= wireguard-tools PORTVERSION= 1.0.20210315 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net net-vpn MASTER_SITES= https://git.zx2c4.com/wireguard-tools/snapshot/ diff --git a/net/wireguard-tools/files/wireguard_lite.in b/net/wireguard-tools/files/wireguard_lite.in index 0784c13a7497..791a83c3ce55 100644 --- a/net/wireguard-tools/files/wireguard_lite.in +++ b/net/wireguard-tools/files/wireguard_lite.in @@ -1,7 +1,7 @@ #!/bin/sh # PROVIDE: wireguard -# REQUIRE: DAEMON +# REQUIRE: NETWORKING # KEYWORD: shutdown # # wireguard_enable (bool): Set to "YES" to enable wireguard. @@ -10,17 +10,14 @@ # wireguard_interfaces (str): List of interfaces to bring up/down # on start/stop. (eg: "wg0 wg1") # (default: "") +# wireguard_confdir (str): Config directory that contains wg0.conf +# (default: "%%PREFIX%%/etc/wireguard") # wireguard__ips (str): List of IP Addresses for iface # wireguard__routes (str): List of Routes for this iface # wireguard__mtu (str): MTU for iface (default: "1500") . /etc/rc.subr -load_rc_config $name - -: ${wireguard_enable="NO"} -: ${wireguard_interfaces=""} - name=wireguard rcvar=wireguard_enable extra_commands="reload" @@ -39,7 +36,7 @@ wireguard_start() eval wireguard_mtu="\${wireguard_${interface}_mtu}" ifconfig ${interface} create - %%PREFIX%%/bin/wg setconf ${interface} %%PREFIX%%/etc/wireguard/${interface}.conf + %%PREFIX%%/bin/wg setconf ${interface} ${wireguard_confdir}/${interface}.conf for ip in ${wireguard_ips}; do if [ "${ip#*:}" != "${ip}" ]; then @@ -96,8 +93,14 @@ wireguard_stop() wireguard_reload() { for interface in ${wireguard_interfaces}; do - %%PREFIX%%/bin/wg syncconf ${interface} %%PREFIX%%/etc/wireguard/${interface}.conf + %%PREFIX%%/bin/wg syncconf ${interface} ${wireguard_confdir}/${interface}.conf done } +load_rc_config $name + +: ${wireguard_enable="NO"} +: ${wireguard_interfaces=""} +: ${wireguard_confdir="%%PREFIX%%/etc/wireguard"} + run_rc_command "$1" diff --git a/net/wireguard-tools/files/wireguard_wgquick.in b/net/wireguard-tools/files/wireguard_wgquick.in index df39926c232e..34da254ceed6 100644 --- a/net/wireguard-tools/files/wireguard_wgquick.in +++ b/net/wireguard-tools/files/wireguard_wgquick.in @@ -1,7 +1,7 @@ #!/bin/sh # PROVIDE: wireguard -# REQUIRE: DAEMON +# REQUIRE: NETWORKING # KEYWORD: shutdown # # wireguard_enable (bool): Set to "YES" to enable wireguard.