From nobody Sat Oct 22 04:54:29 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MvTX560g1z4fZQt; Sat, 22 Oct 2022 04:54:29 +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 4MvTX54fwdz457K; Sat, 22 Oct 2022 04:54:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666414469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SUTi3rdqzeFd+9AfHIAy7JwfWd0UDnhCQ6q3LpRb7n0=; b=F4gFh2TM0yDLSwF6n3Ymhe642u/dj19B0uZeg0ybNStxhwyA8xEo3cR9PoSR2HNyCxnqb/ kb3JYJbQT6j291rFSgfn4RdObKUN5bZHdTi4pTTOI4utLDiPu8USwlCA5lHGDFLeLDvck7 5aX2qq1hpacDzU2r/DmC6pn1zRQm4oPP+sFTpvmpCwZqvUjl4gHrLabcjEuF+fmozssRka /k0hiRQzdZV6pkX+ZVF1pTHMvjRv9ySsAEJWLo2/+Qk8faBI+gYfnAM4es9OJcHFFu/ge5 nORhPEg0mm2of4EX+xHqlfF969yzGZTAwFIMOfvCvmpnom3a0THbObhuz+HW7A== 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 4MvTX53QxDzRry; Sat, 22 Oct 2022 04:54:29 +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 29M4sTMq014783; Sat, 22 Oct 2022 04:54:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29M4sThV014782; Sat, 22 Oct 2022 04:54:29 GMT (envelope-from git) Date: Sat, 22 Oct 2022 04:54:29 GMT Message-Id: <202210220454.29M4sThV014782@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Ashish SHUKLA Subject: git: 89e60f94eef7 - 2022Q4 - security/tailscale: Add suupport for extra arguments List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 89e60f94eef76387ad6f36ba8bb2788dd4450f7f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666414469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SUTi3rdqzeFd+9AfHIAy7JwfWd0UDnhCQ6q3LpRb7n0=; b=n5CmUBGKP3Z5bHzIUo3pIcKm+Libv1cbEww5VzLIVjbkWPofb7/gmIVnN5m77bhT749Hd0 CAGV/F10kbnP3wm2YHUBRoXHQbvR9TDNA+ghwXmpKgMPAwJMUJlLb2IcdL4HG6vmuv3o18 /fbUoFdR+NoFChZyY+FtHl4AtIsDREPFgpDx/QNWFWsiB8Ptrl9ptPyuSH0EpIeN7JTo3G WA1zFuI0X3grNlt4kv3XRgq/4YALcj4R7N8XgGeWKKXxIawGveg6BV33R4dQwDZ4apOkg+ mDPA3k+FW79L+D3AMoMG8H/o9mRRKu+iltB8kmUYLuCbhdH23DuoK5ODxWq56w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666414469; a=rsa-sha256; cv=none; b=ZZ7nYmO2uVN1lsZHGXe9gogKbuTZNQyBHk5fCxmlPSxyY7gTzBHaTy3eU3BSzxmUbOLsQ0 SRdIfFktDiHDoiK6lEPpB3aT5c/4nUkvz7HzFEFgxcbGFKPuRAdFrkMLm2E717h88Y4qI4 OJeUGTxpzYRft6aadSc2y/HZrxq6LW+ow4jAKQn+U4W4kAMVBKmReHf3FCd8B3/e17aDkF u8ZD8PKsVCL58zsujSI9ToHnFSvZltD72wbNqpd7jpmQPZWT63m7+n1gDDQMYJu8DrvUgA EXCE2VVuxThxQDrTLzGNWb+tZ8a4OTjYIGK5ILA27oYuQquyzBhFGK8Is1QhRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=89e60f94eef76387ad6f36ba8bb2788dd4450f7f commit 89e60f94eef76387ad6f36ba8bb2788dd4450f7f Author: Ashish SHUKLA AuthorDate: 2022-10-21 16:12:08 +0000 Commit: Ashish SHUKLA CommitDate: 2022-10-22 04:53:14 +0000 security/tailscale: Add suupport for extra arguments Add a rc.conf variable to support passing extra arguments to tailscale up. Thanks to Gregory for advicing on the implementation. Reported by: Gregory Shapiro (cherry picked from commit 1e38c92fd199d83be41d4a15b894a45e552cf1be) --- security/tailscale/Makefile | 1 + security/tailscale/files/tailscaled.in | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/security/tailscale/Makefile b/security/tailscale/Makefile index 390cb5f50d63..e041a8b7991a 100644 --- a/security/tailscale/Makefile +++ b/security/tailscale/Makefile @@ -1,5 +1,6 @@ PORTNAME= tailscale PORTVERSION= 1.32.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= security net-vpn diff --git a/security/tailscale/files/tailscaled.in b/security/tailscale/files/tailscaled.in index f70c8cd71873..cfa72604f5e3 100644 --- a/security/tailscale/files/tailscaled.in +++ b/security/tailscale/files/tailscaled.in @@ -19,6 +19,8 @@ # Default is "daemon". See daemon(8). # tailscaled_exitnode_enable (bool): Set it to YES to announce tailscaled as # an exit node. Default is "NO". +# tailscaled_up_args (str): Additional arguments to pass to tailscale up +# Default is "" (empty string). # tailscaled_tun_dev (str): Set the name of the tun interface tailscaled creates. # Default is "tailscale0" @@ -32,6 +34,7 @@ load_rc_config $name : ${tailscaled_enable:="NO"} : ${tailscaled_port:="41641"} : ${tailscaled_exitnode_enable:="NO"} +: ${tailscaled_up_args:=""} : ${tailscaled_tun_dev:="tailscale0"} DAEMON=$(/usr/sbin/daemon 2>&1 | grep -q syslog ; echo $?) @@ -78,7 +81,10 @@ tailscaled_poststart() { if checkyesno tailscaled_exitnode_enable; then logger -s -t tailscale "Enabling Exit node mode" - ${ctlname} up --advertise-exit-node + tailscaled_up_args=" --advertise-exit-node ${tailscaled_up_args}" + fi + if [ -n "${tailscaled_up_args}" ]; then + ${ctlname} up ${tailscaled_up_args} fi }