From nobody Thu Apr 27 08:22:15 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 4Q6THX10wtz46YK5; Thu, 27 Apr 2023 08:22:16 +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 4Q6THX0FB1z4ZsB; Thu, 27 Apr 2023 08:22:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682583736; 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=vgnYrYjtlTq6CLMNX/HDCPj9kO2s6aLOXt/seK7dhLA=; b=aWM7vJcSNawwNnz18jWwVfSxwks25/ApJFKBZRl6SXu6i7FQv/WJOQlD31TWUNFmLE7Ead GSJkhj9e+6m3DDTnmwHRcHjnY3dM+CBNWMR11yPBKOW/ZKrMguB7kUB3YjuWm6AWiPzRIk Y3aEBmVsZVEr3rt6Swi9RyQNkbD1t6zu9yEy6/MECEaOwS9lcskuf89Y2ZHAJfd4ZSXByM E7NS38TkbKOTL9mnES+dV+VzFtYeMAocHX6DOcWvIWxWDyYAlcf6dVE20UbJ3eIrn/K6+I TLhk4DDOHNc2ByHcN9ShawDX04tljnMu6lIXTFmjmPo9PnT2dP7sHJk97QX3wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682583736; 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=vgnYrYjtlTq6CLMNX/HDCPj9kO2s6aLOXt/seK7dhLA=; b=YvvDFiEi/Xk82HN4s1broq2rfYtVW6WW2vXal5mQ7F5jJS5g3SffpMsSz/EcBUrx3C+hfM mGmPWdwpMue5Xr1K41ua1WI8hFg4yyiEpuQZzfoym0Wz8hv+Hz3mtx+oif8aOtybpkZbko z+Puu0PXl2eXffrRpWT+oTaTX+iBuik/du4ORi31vibmenYFdErX1C+FQRUVcC598xZgjn XywS+lLaLgam5guHdUHI503rd/Q7E3VxuEg7ecWDwhhMyksMOvHcsIHWUcAgWvqNyMRWt1 2eLTAZ5b1D+7tDXCpX/fwLZ1B/OodxluNhGmc5vIcofgPqXvVopYQ6y5fdMZyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682583736; a=rsa-sha256; cv=none; b=icH6Ue3FA5ne08yGudibnUXCrg98BKQ13c9kc41s1btfOl/AmgDGoNXDym/NjOHz0wPshi u5vrIUD8wHiZhVPJU133+uRqh5a7IeH9oifpYH3GMovhwvUwBitlpBrEZPBaY3oWpCAIpI xaIL8t4OZpy3gdoaejLoCemuPnNfCHO6bq2a8S8MV+TqZL9bQkG8Z6C2zAebawzRLcgqu4 yr8TsvqWeNhAsWa6g4Wfbw1NjgJ9SDnvOP1RI76nWS5Bv428x8fkTYRIM4NGe7I3ff9TQ7 9q20hymNk84o+7YkxtuVbqSEkoTW8a01EVOwqqjVThWauaFuu8eiy+h2skuL1Q== 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 4Q6THW6Rx7z18pD; Thu, 27 Apr 2023 08:22:15 +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 33R8MFQN083194; Thu, 27 Apr 2023 08:22:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33R8MFAF083193; Thu, 27 Apr 2023 08:22:15 GMT (envelope-from git) Date: Thu, 27 Apr 2023 08:22:15 GMT Message-Id: <202304270822.33R8MFAF083193@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 8c4c48ecd652 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8c4c48ecd652d631f7521ea797292cb2b26709d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=8c4c48ecd652d631f7521ea797292cb2b26709d5 commit 8c4c48ecd652d631f7521ea797292cb2b26709d5 Author: Christian McDonald AuthorDate: 2023-04-18 20:51:41 +0000 Commit: Ashish SHUKLA CommitDate: 2023-04-27 08:20:33 +0000 security/tailscale: introduce tailscaled_state_dir rc knob PR: 270921 MFH: 2023Q2 --- 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()