From nobody Thu Apr 27 08:26:47 2023 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 4Q6TNm0Hftz46Yw6; Thu, 27 Apr 2023 08:26:48 +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 4Q6TNl6mrWz4bFX; Thu, 27 Apr 2023 08:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682584008; 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=ZpNbSendDlQxTAvDzf0N/J6gxGrWEJpIH/wI4SoOpUE=; b=Nfz8bI5U1j90Xk90ntGDS2UccA0N4CVbXL4lXo3CFkboP08GKH/rRZ92EAamqzwn+7jo3D tR1XmWyCnkF2H+j1vuXjznc20U9Dau1BpuILIzZWQ0fkK6fUW+ETKwA46YfXSiUCTgUCIr YlkT1CfKkhzVRZk+bQGcsJa2/f0w8Qut0VH4hG9k44qXdaPWu6DukAQyAZ2Hv/X1Jd2u61 JTm8buJu7tlsHa0SflX23qLw1EBH1kACMsv9b4bAfiHPlEgdYevIOw1tdkGpYhCDbmIlEf igrskLmRpRpKAQZVEV7WEe6GHnwWqY5G1J2kVATWEfG0LqpKyS2gPxsmr2eAvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682584007; 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=ZpNbSendDlQxTAvDzf0N/J6gxGrWEJpIH/wI4SoOpUE=; b=HG/R//sga+GBK6MPXFAmCq7cXdM8n6mYJKjVPX6jVzwqttiaYRyFnAFdiBFNGT4ENZwn0u FJlBd3CaASj0k7EzFS/dKb5X23ZTEK5HDyga2Fn3IapaRIJK6rNpvI0FwxsZX6xW+xnlau 5DdONxG3HF8mgAeQvk+m1HM3S07wEfmvKVMcEuC6dhrbUmycH89a2smTCL0CImHuzHzZRG BgafUYfqRjG2cCTR4zAhedFPVSgaPUcTes1z7aqW0yMZxMuTuoypJ44KvqAAndsVB3Ky4R +Oy+kwuVzjYl/a07zpRxnc9jyaWz6elyxAntGT/jzM/JfbTbUHI4SFnyRsjGbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682584007; a=rsa-sha256; cv=none; b=KxTLfBl3+B6uxaTgMkuxmmMaWvPP2+/vvHaw6jybCbC5Lt+o55BV9EQJRQaIXhagssEfxj x0Jq8L5/tjy5vyl+pQzS2HujJvxuPEg1X5GH3Qk8Y2zkngG5/73f/byJviLEiQVx/PjQv5 oAzYBR4QAPfoXac4LUtP4tbyjxEOBlOPN8w2RDnu7hEaQMuzPuLF2IqNfXeRr5Wn5pfzVQ dtb5NYyqn9lfcshCGEgs8kItIdprPRi2es929splrF4sC/2DNw4Ny0DhATwAH/8Dcz24vs vVDzLjfdwqjs9+VzKk+qs2362xEILlOOP7WsLzGi67MEb4RNj+v+UIDJdAp+Pg== 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 4Q6TNl5l9cz199s; Thu, 27 Apr 2023 08:26:47 +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 33R8Qlv4083894; Thu, 27 Apr 2023 08:26:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33R8QlMl083893; Thu, 27 Apr 2023 08:26:47 GMT (envelope-from git) Date: Thu, 27 Apr 2023 08:26:47 GMT Message-Id: <202304270826.33R8QlMl083893@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: 467256a89512 - 2023Q2 - security/tailscale: introduce tailscaled_state_dir rc knob 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/2023Q2 X-Git-Reftype: branch X-Git-Commit: 467256a89512b0682b8b9367de61c08419adab84 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=467256a89512b0682b8b9367de61c08419adab84 commit 467256a89512b0682b8b9367de61c08419adab84 Author: Christian McDonald AuthorDate: 2023-04-18 20:51:41 +0000 Commit: Ashish SHUKLA CommitDate: 2023-04-27 08:26:09 +0000 security/tailscale: introduce tailscaled_state_dir rc knob PR: 270921 MFH: 2023Q2 (cherry picked from commit 8c4c48ecd652d631f7521ea797292cb2b26709d5) --- security/tailscale/Makefile | 2 +- security/tailscale/files/tailscaled.in | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/security/tailscale/Makefile b/security/tailscale/Makefile index c4c5236ea699..074f6ed62ab5 100644 --- a/security/tailscale/Makefile +++ b/security/tailscale/Makefile @@ -1,6 +1,6 @@ PORTNAME= tailscale PORTVERSION= 1.38.4 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= security net-vpn diff --git a/security/tailscale/files/tailscaled.in b/security/tailscale/files/tailscaled.in index cfa72604f5e3..ef6218876a10 100644 --- a/security/tailscale/files/tailscaled.in +++ b/security/tailscale/files/tailscaled.in @@ -9,6 +9,8 @@ # # tailscaled_enable (bool): Set it to YES to enable tailscaled. # Default is "NO". +# tailscaled_state_dir (str): Set the path to use for the state directory. +# Default is "/var/db/tailscale" # tailscaled_port (number): Set the port to listen on for incoming VPN packets. # Default is "41641". # tailscaled_syslog_output_enable (bool): Set to enable syslog output. @@ -32,6 +34,7 @@ rcvar=tailscaled_enable load_rc_config $name : ${tailscaled_enable:="NO"} +: ${tailscaled_state_dir:="/var/db/tailscale"} : ${tailscaled_port:="41641"} : ${tailscaled_exitnode_enable:="NO"} : ${tailscaled_up_args:=""} @@ -74,7 +77,8 @@ tailscaled_start() /sbin/ifconfig ${tailscaled_tun_dev} | fgrep -qw PID || /sbin/ifconfig ${tailscaled_tun_dev} destroy ) - env CACHE_DIRECTORY=/var/db/tailscale /usr/sbin/daemon -f ${tailscaled_syslog_output_flags} -p ${pidfile} ${procname} -port ${tailscaled_port} -tun ${tailscaled_tun_dev} + + /usr/sbin/daemon -f ${tailscaled_syslog_output_flags} -p ${pidfile} ${procname} -port ${tailscaled_port} -tun ${tailscaled_tun_dev} -statedir ${tailscaled_state_dir} } tailscaled_poststart()