From nobody Sun Aug 07 22:35:38 2022 X-Original-To: dev-commits-ports-main@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 4M1Dgb2jp9z4Y0xK; Sun, 7 Aug 2022 22:35:39 +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 4M1Dgb28TKz3cX6; Sun, 7 Aug 2022 22:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659911739; 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=6XG+/BlVCfkHcey07eLg5/wgSArNBVpyjT4thS001es=; b=fidF5XyppoLccm1XFd/xU2xCccjwa5Ybm+8TFchQDso0vyb2SRIlzj2JazHJjr5IKJNnVL jOyc+Bia/mLsL1lvUEmrZ6mB+VvJ9bNBwfklwhX8gDdWnFiRzsrNTay0V08w9bB1En1z+B 1yYCiBVKhlE3hkPyDi5RnzMqXxgz5G2PpLIKsCQ8VN6ZcfopCA0KoBSwpDCEWqNU7ZG89P DNgOWVUZaU7sZbNi3Oq/3zQdafr2miwHcR+71UyCdp+3M6d6iZzjrpGWTvsNiyVV08GTgT ZFpY2FZ/wX6BQzdzkWWmOqP0nIgTHbgFcBHC/K9695xQwvFV5B6PW1ZPMASREA== 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 4M1Dgb0zNMzTf5; Sun, 7 Aug 2022 22:35:39 +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 277MZcaX026625; Sun, 7 Aug 2022 22:35:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 277MZc8s026624; Sun, 7 Aug 2022 22:35:38 GMT (envelope-from git) Date: Sun, 7 Aug 2022 22:35:38 GMT Message-Id: <202208072235.277MZc8s026624@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: 36c71cf9a831 - main - security/tailscale: Enhance rc.d script List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 36c71cf9a8313fe2388f301fac73cd13a3fec05d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659911739; 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=6XG+/BlVCfkHcey07eLg5/wgSArNBVpyjT4thS001es=; b=OgZJrU/bnBQ/QQHIP4VOEIAbbIhLKjBYFR0JjGLUuP8LgIHsugpn0S95F3jNFvZsTxnqPb LAdCEmxIpPbSV8T9S2Xef5hGc3LJzVFqccP3kAONAZedG+UtbgALlY4NPIZmkP7vRhqGUa 5/iFZFqGe9i549CujFWNxHrACwONc83M2+POLxKd5XUjpLezxXT92WTv56Alihac0eIQ87 wTReZu1vZLDkadsxCPq+t1zr1Cg1ki026/kYlvb/WlQ0bvlEfS0Y40tu27LDhTpxcFYr2s 4MZkiOxS5odej5ny/P9u02TsdxpBHTnL7qQGQrE669RrycM8v3pgwGK0LrEZsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659911739; a=rsa-sha256; cv=none; b=n8NKYMkySoSMuALfW11bYuJ4QwWqEC4NoC+NdwUI2WCsBGaBCctWybvFPFarasjCE1XWdT IXK613yEsq+81fxX8lhF+gnHAFZttbr+JJy1gomB51MupEEFp7/SP6U7zoFDOtvm1UlWR6 mtzyI+/8iFqqUmdczGNZAsnWDIlmjgvH8+ML2HWjIhE3wSJcyfD2fiagbPu5jMar+vA6c8 hkUCd5uo/NkwfCZ7Aew/uN6XEusFXWRJXB+vYhsp6Mo9Zf68KAIALp8N6ihXwFb19oM6As 9xn5He63xScWAnETg4VlwkT9p+0RMrCX2xjlXIEPk/wVGuPrC01TdPypFXY2dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=36c71cf9a8313fe2388f301fac73cd13a3fec05d commit 36c71cf9a8313fe2388f301fac73cd13a3fec05d Author: Jeff Schmidt AuthorDate: 2022-08-07 06:49:25 +0000 Commit: Ashish SHUKLA CommitDate: 2022-08-07 22:35:00 +0000 security/tailscale: Enhance rc.d script - Fix a typo in a command-line argument to specify port - Add another option tailscaled_tun_dev to let user specify the name of the interface Co-authored-by: Ashish SHUKLA --- security/tailscale/Makefile | 2 +- security/tailscale/files/tailscaled.in | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/security/tailscale/Makefile b/security/tailscale/Makefile index f9fd25b1ac27..06342013ce5a 100644 --- a/security/tailscale/Makefile +++ b/security/tailscale/Makefile @@ -1,6 +1,6 @@ PORTNAME= tailscale PORTVERSION= 1.28.0 -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 9300e901357c..f70c8cd71873 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_tun_dev (str): Set the name of the tun interface tailscaled creates. +# Default is "tailscale0" . /etc/rc.subr @@ -30,6 +32,7 @@ load_rc_config $name : ${tailscaled_enable:="NO"} : ${tailscaled_port:="41641"} : ${tailscaled_exitnode_enable:="NO"} +: ${tailscaled_tun_dev:="tailscale0"} DAEMON=$(/usr/sbin/daemon 2>&1 | grep -q syslog ; echo $?) if [ ${DAEMON} -eq 0 ]; then @@ -56,9 +59,6 @@ pidfile=/var/run/${name}.pid procname="%%PREFIX%%/bin/${name}" ctlname="%%PREFIX%%/bin/tailscale" -# XXX: Can we have multiple interfaces? -tailscale_tap_dev="tailscale0" - start_cmd="${name}_start" start_postcmd="${name}_poststart" stop_postcmd="${name}_poststop" @@ -67,11 +67,11 @@ tailscaled_start() { # Check for orphaned tailscale network interface # And if it exists, then destroy it - /sbin/ifconfig ${tailscale_tap_dev} >/dev/null 2>&1 && ( - /sbin/ifconfig ${tailscale_tap_dev} | fgrep -qw PID || - /sbin/ifconfig ${tailscale_tap_dev} destroy + /sbin/ifconfig ${tailscaled_tun_dev} >/dev/null 2>&1 && ( + /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} + env CACHE_DIRECTORY=/var/db/tailscale /usr/sbin/daemon -f ${tailscaled_syslog_output_flags} -p ${pidfile} ${procname} -port ${tailscaled_port} -tun ${tailscaled_tun_dev} } tailscaled_poststart() @@ -84,9 +84,9 @@ tailscaled_poststart() tailscaled_poststop() { - /sbin/ifconfig ${tailscale_tap_dev} >/dev/null 2>&1 && ( - logger -s -t tailscaled "Destroying tailscale0 adapter" - /sbin/ifconfig ${tailscale_tap_dev} destroy || logger -s -t tailscaled "Failed to destroy ${tailscale_tap_dev} adapter" + /sbin/ifconfig ${tailscaled_tun_dev} >/dev/null 2>&1 && ( + logger -s -t tailscaled "Destroying ${tailscaled_tun_dev} adapter" + /sbin/ifconfig ${tailscaled_tun_dev} destroy || logger -s -t tailscaled "Failed to destroy ${tailscaled_tun_dev} adapter" ) }