From nobody Wed Jan 15 17:14:44 2025 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 4YYCKc42Hzz5kP18; Wed, 15 Jan 2025 17:14:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YYCKc1NzVz43Ky; Wed, 15 Jan 2025 17:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736961284; 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=a5mLzh2eICiYOrksCD4/L2Ygg6vn5P34GGM51gyTYY0=; b=atOr8xm1LNfgp5YLgKeDUv+vZCS3PbXO414y/m8M8xJJrF9sDduo7a9h6zDgnfSXxsT6Lv cUYJQX1SYhvqpinndFMjlnOpZHRYSbSomWrp3OSoFlX71ehf9Dpjm5Y/hiQeheWp+lXRcg 4XOk9QClMKK95u9Y1IB72uKVNCQ+A20YYW4dgNIIwmRImCcUEh+gxcYRKiGWRfoxr03YR0 lHZ7ufcmpxX0MPg/eVttOjPrpU9W0mOCdmK3EY163cUWy1stDpkftWTsZzNoY+w36iktqW 94RhStLpSRglL+fnhWjuJ+FvkngHe71y+1xYTN7qVx7Q+CfBlDBkl+SB29DCCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736961284; 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=a5mLzh2eICiYOrksCD4/L2Ygg6vn5P34GGM51gyTYY0=; b=pPEawuUByDeqCjV5GN57KUtuF9oteQK/wj5heq2mB6oYFA1BXFL7lX+R/O2y/2T0aIle6f 82IwZcacM0LjLlPFAy5vpfh5KYs33Vbd3UDsPtrLEMdXmQb3snR35UmIIVlPWp06cv4ifM Dh1MwnJT721GBs9+hiiCCGhWeLgt6XiAZmzY9GnaglrqJbnHjI0cC/pDQezK4JUJMEWBMq 6P4HT/asYs0jZnDT5eG7SVv2T+UZ+gQ0+6zVVm5C8dhtw1Yh+uVT4nmdE3dtz94z84mUCT TEETxmGRC6rtdyOmMDOVfwtcN/D4pLM0PqhuPuFuFkC7F3beNV/uoSKWKOAMQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736961284; a=rsa-sha256; cv=none; b=CiTcOkZz5w2haOH3n4NiC8brY1jxVdSZ2QnFBoqEdRDIOEtq0i5uBwtFc8kZOyyJLcHCIz IfIed3xg25T+ptaXkZuiV7R7dkzXPPZLk4Ol1mhJ96R5Ac1xF8/IgFMpgeKvIdZivWVdwx LwsR4Ij1hmbSf7IEWPShvZG9wTJc8J/LU2AxGFf0nb3VUW2VtwZB/rfK1pidiBxTd5lJzW O1JChjKO7glHMetfEdWtUWIqggJsICoxHQPpXPPj1NsoT9S4LZO0XB85xgFM2h/chNIRmW xDt0db7kiFYip498c4btP1eVPJYDvHDj/rilgdvxZ1W/sO6Wb6x5jbagJuLJCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YYCKc0zmmzw4C; Wed, 15 Jan 2025 17:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50FHEirW096992; Wed, 15 Jan 2025 17:14:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50FHEi5a096989; Wed, 15 Jan 2025 17:14:44 GMT (envelope-from git) Date: Wed, 15 Jan 2025 17:14:44 GMT Message-Id: <202501151714.50FHEi5a096989@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: cde75d64188c - main - security/tor: Allow to set additional flags from rc.conf 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cde75d64188caadcb2cc7f16217085484f1fca57 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=cde75d64188caadcb2cc7f16217085484f1fca57 commit cde75d64188caadcb2cc7f16217085484f1fca57 Author: Eygene Ryabinkin AuthorDate: 2025-01-15 15:41:04 +0000 Commit: Yuri Victorovich CommitDate: 2025-01-15 15:41:04 +0000 security/tor: Allow to set additional flags from rc.conf tor_flags is added to tor's config. --- security/tor/Makefile | 1 + security/tor/files/tor.in | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/security/tor/Makefile b/security/tor/Makefile index 36ac1a1b85cb..052e6a760d28 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -1,5 +1,6 @@ PORTNAME= tor DISTVERSION= 0.4.8.13 +PORTREVISION= 1 CATEGORIES= security net MASTER_SITES= TOR diff --git a/security/tor/files/tor.in b/security/tor/files/tor.in index 0e1c8f3cae02..9088d42842ae 100644 --- a/security/tor/files/tor.in +++ b/security/tor/files/tor.in @@ -12,6 +12,7 @@ # tor_instances (str): List of instances. Default: "" # tor_conf (str): Points to your torrc file. # Default: %%PREFIX%%/etc/tor/torrc +# tor_flags (str): Additional flags. Common to all instances. # tor_user (str): Tor daemon user. Default: %%USER%% # tor_group (str): Tor group. Default: %%GROUP%% # tor_pidfile (str): Tor pid file. Default: /var/run/tor/tor.pid @@ -36,6 +37,7 @@ load_rc_config ${name} : ${tor_enable="NO"} : ${tor_instances=""} : ${tor_conf="%%PREFIX%%/etc/tor/torrc"} +: ${tor_flags=""} : ${tor_user="%%USER%%"} : ${tor_group="%%GROUP%%"} : ${tor_pidfile="/var/run/tor/tor.pid"} @@ -109,7 +111,7 @@ required_files=${tor_conf} required_dirs=${tor_datadir} pidfile=${tor_pidfile} command="%%PREFIX%%/bin/${name}" -command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir}" +command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir} ${tor_flags}" extra_commands="reload" # clear user setting in conf file: it should be done through the command line