From owner-svn-ports-all@freebsd.org Mon Mar 30 19:15:41 2020 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 2BB3B2647DC; Mon, 30 Mar 2020 19:15:41 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48rhxm1jB4z4Q5Y; Mon, 30 Mar 2020 19:15:40 +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 8B09821C1F; Mon, 30 Mar 2020 19:15:33 +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 02UJFXt6038058; Mon, 30 Mar 2020 19:15:33 GMT (envelope-from decke@FreeBSD.org) Received: (from decke@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02UJFXXK038057; Mon, 30 Mar 2020 19:15:33 GMT (envelope-from decke@FreeBSD.org) Message-Id: <202003301915.02UJFXXK038057@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: decke set sender to decke@FreeBSD.org using -f From: Bernhard Froehlich Date: Mon, 30 Mar 2020 19:15:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529908 - in head/net/wireguard: . files X-SVN-Group: ports-head X-SVN-Commit-Author: decke X-SVN-Commit-Paths: in head/net/wireguard: . files X-SVN-Commit-Revision: 529908 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.29 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: Mon, 30 Mar 2020 19:15:41 -0000 Author: decke Date: Mon Mar 30 19:15:32 2020 New Revision: 529908 URL: https://svnweb.freebsd.org/changeset/ports/529908 Log: net/wireguard: Introduce general wireguard_env parameter for environment variables which affect wg-quick or the userspace implementation (eg. wireguard-go). The syntax in rc.conf is: wireguard_env="VAR=val VAR2=val2" As a reference wg-quick uses these environment variables WG_QUICK_USERSPACE_IMPLEMENTATION and wireguard-go LOG_LEVEL WG_TUN_FD WG_UAPI_FD WG_PROCESS_FOREGROUND Submitted by: J.R. Oldroyd Modified: head/net/wireguard/Makefile head/net/wireguard/files/wireguard.in Modified: head/net/wireguard/Makefile ============================================================================== --- head/net/wireguard/Makefile Mon Mar 30 19:15:20 2020 (r529907) +++ head/net/wireguard/Makefile Mon Mar 30 19:15:32 2020 (r529908) @@ -2,6 +2,7 @@ PORTNAME= wireguard PORTVERSION= 1.0.20200319 +PORTREVISION= 1 CATEGORIES= net net-vpn MASTER_SITES= https://git.zx2c4.com/wireguard-tools/snapshot/ DISTNAME= wireguard-tools-${PORTVERSION} Modified: head/net/wireguard/files/wireguard.in ============================================================================== --- head/net/wireguard/files/wireguard.in Mon Mar 30 19:15:20 2020 (r529907) +++ head/net/wireguard/files/wireguard.in Mon Mar 30 19:15:32 2020 (r529908) @@ -12,10 +12,8 @@ # wireguard_interfaces (str): List of interfaces to bring up/down # on start/stop. (eg: "wg0 wg1") # (default: "") -# wireguard_impl (str): Wireguard userspace implementation -# (default: "wireguard-go") -# Possible choices: -# wireguard-go, boringtun +# wireguard_env (str): Environment variables for the userspace +# implementation. (eg: "LOG_LEVEL=debug") . /etc/rc.subr @@ -27,7 +25,7 @@ stop_cmd="${name}_stop" wireguard_start() { - export WG_QUICK_USERSPACE_IMPLEMENTATION=${wireguard_impl} + ${wireguard_env:+eval export $wireguard_env} for interface in ${wireguard_interfaces}; do %%PREFIX%%/bin/wg-quick up ${interface} @@ -45,6 +43,6 @@ load_rc_config $name : ${wireguard_enable="NO"} : ${wireguard_interfaces=""} -: ${wireguard_impl="wireguard-go"} +: ${wireguard_env=""} run_rc_command "$1"