From nobody Sat Mar 14 08:26:25 2026 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 4fXvZp2t9wz6VT3J for ; Sat, 14 Mar 2026 08:26:26 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXvZp0RqKz3fW0 for ; Sat, 14 Mar 2026 08:26:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773476786; 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=w0pM4DZe5E0maPUGACaHvt1vSXF7OCDjGDHLsyXb3uA=; b=bHdbM5s6pCYfqwpEiGGDSiRr1vzN0blovHMn4o2Ijqn2GPUW6SrpKudyhIcoRmBppZ2073 9sC9g4to88akGcT7yX3xtkCEVRMZdgP+EKNh2fslk6XGhc0I2QTjTjpvK5Lani7fwkn4s+ lNBRVKfRarzrP23eYzaSIMmG0RzyLRB+KUfCTETxapDIl3IK/Q9xFbxud7KWVUk56affn3 sdm0U0wfB08RIl/hzNY4mRCLyowhV1YyIeI26Rn+GSNlTSYPYDDdtZkTr/A9iTUnq8wPyD HZVZummww4Bw3ke38aGs+bbGdCDxJyjxfTvMnRdZ/KNG7dWxSUlK6E5snbCqkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773476786; a=rsa-sha256; cv=none; b=BE1ltXVwvGJiPx0A7jgVb2m0bsrLAwTqzgFgBvQ8xOOgK3yPR2H6EvaWQXW6ZnO5fpJq9x hMVVY6W1HnSdCIg5J18VVckiGM2jbRCZWvHX5LsVDIVZcAVjCik1aoSgvKXcSpFjQlT031 00aaOQyISkAxWAHMegXRNpoigdo2n8JFrEIjXSJ5Wzk/xigDV7BOXj/Ns1XKo65A8Fqbmd Sj7T0idhOsac9+imfwoOCNPMquGmcGfQWuuzMI22YnUZGApDWCJPML11HqdWmwbF2aEwbX mx1TQrhXMXKTM8dLiYpWTG7n4SiNp0EA9t0GYkQX9zAHARdD1UR0OoQFZ9w6VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773476786; 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=w0pM4DZe5E0maPUGACaHvt1vSXF7OCDjGDHLsyXb3uA=; b=PqOEHPiWDUZpv/MPfWX5K1XS+s+vTMckVfGwWSXK6z/9HgGnBVOAo4gHx+EluzLAk9zzFp UDSQQOh+ZbeTLulM3K25uzZROE0OQ7Q1gd2yp2r32m24r/UAr3f0rm+UXVJM0Pwcv0uh34 8YkRBw0q2ezAR+XJQ09sVAUiQVnLHouC5uyv1AQrDMgIlLoSSTqgw/yyX2rdn7fxSMuecL FqLv+j6R6Ixo6Os8sFVNW2okOZOgWMoqo8qu35p4fgO6vZjdrTcTbWc3L39hqJ9W2J2Lnp A27AhFahI0GbRROreuiJe5PZeMICnRJVyJeKCK0524SFlOyfPDqKcTWbDKGCfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXvZn6gcNz19Jt for ; Sat, 14 Mar 2026 08:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a795 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 08:26:25 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: =?utf-8?Q?=C3=84lven?= Subject: git: d08f0d751204 - 2026Q1 - net/v2ray: Lint and improve rc file 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: alven X-Git-Repository: ports X-Git-Refname: refs/heads/2026Q1 X-Git-Reftype: branch X-Git-Commit: d08f0d751204386b3a1fb196de281f5039d975d9 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 08:26:25 +0000 Message-Id: <69b51bb1.3a795.20bace49@gitrepo.freebsd.org> The branch 2026Q1 has been updated by alven: URL: https://cgit.FreeBSD.org/ports/commit/?id=d08f0d751204386b3a1fb196de281f5039d975d9 commit d08f0d751204386b3a1fb196de281f5039d975d9 Author: Älven AuthorDate: 2026-03-14 06:48:56 +0000 Commit: Älven CommitDate: 2026-03-14 08:25:29 +0000 net/v2ray: Lint and improve rc file * Sort stances * Expand variables Approved by: db@, yuri@ (Mentors, implicit) MFH: 2026Q1 (cherry picked from commit 6771b1d14157a659a8e235f692526c97f83f435a) --- net/v2ray/files/v2ray.in | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/net/v2ray/files/v2ray.in b/net/v2ray/files/v2ray.in index 3778a4846d06..82d470d57d6d 100644 --- a/net/v2ray/files/v2ray.in +++ b/net/v2ray/files/v2ray.in @@ -1,7 +1,8 @@ #!/bin/sh # PROVIDE: v2ray -# REQUIRE: LOGIN +# REQUIRE: DAEMON NETWORKING FILESYSTEMS +# BEFORE: LOGIN # KEYWORD: shutdown # Add these lines to /etc/rc.conf.local or /etc/rc.conf to enable `v2ray': @@ -17,20 +18,22 @@ . /etc/rc.subr +desc="v2ray startup script" name="v2ray" -rcvar="${name}_enable" +rcvar="v2ray_enable" + load_rc_config ${name} : ${v2ray_enable="NO"} -: ${v2ray_config="%%PREFIX%%/etc/$name/config.json"} -: ${v2ray_logdir="/var/log/${name}"} : ${v2ray_env=""} -: ${v2ray_user="%%USER%%"} +: ${v2ray_config="%%PREFIX%%/etc/v2ray/config.json"} : ${v2ray_group="%%GROUP%%"} +: ${v2ray_user="%%USER%%"} +: ${v2ray_logdir="/var/log/v2ray"} -asset_env="V2RAY_LOCATION_ASSET=%%PREFIX%%/share/$name" -pidfile="/var/run/$name.pid" -procname="%%PREFIX%%/bin/$name" +asset_env="V2RAY_LOCATION_ASSET=%%DATADIR%%" +pidfile="/var/run/v2ray.pid" +procname="%%PREFIX%%/bin/v2ray" command="/usr/sbin/daemon" command_args="-c -p ${pidfile} /usr/bin/env ${asset_env} ${v2ray_env} ${procname} run -config ${v2ray_config}" required_files="${v2ray_config}" @@ -39,9 +42,8 @@ start_precmd="v2ray_startprecmd" v2ray_startprecmd() { touch "${pidfile}" - chown ${v2ray_user}:${v2ray_group} "${pidfile}" mkdir -p "${v2ray_logdir}" - chown -R ${v2ray_user}:${v2ray_group} "${v2ray_logdir}" + chown -R ${v2ray_user}:${v2ray_group} "${pidfile}" "${v2ray_logdir}" } run_rc_command "$1"