From nobody Sat Mar 14 07:06:02 2026 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 4fXsp256SSz6VMhT for ; Sat, 14 Mar 2026 07:06:02 +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 4fXsp24Mh3z3XB1 for ; Sat, 14 Mar 2026 07:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773471962; 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=yaGl6SgoZ3DyHemwtpByefk8XajAuexErtud5WzAKRM=; b=XmIvwnoTWef2LeCFBiks8qSTBFXy8uFCTiDxTZavZgKKrVsQqaDEuALtF19NOu7pG7tLK8 U5hCrqJ0xoWjPrJNER6TURtME70sCACxosMbjDfyRtBY1Fd+2Re4V/cv/pquIrl+fJrO9j Z5AXkC3r2ykNjTQch1Ibo1eWOVNWjmdIoBk0iuptkQpUEoc4qySK/mXo0wg33T+tCT5vet k7t4x+S6LUcfrZ1mT+hbpf1MxVV+0A51LW8M7gRo6dCZ6DxWeV8Pjklup7YP7EOw8fp++1 75Q4BSkG1XJGOKJojy4mIufYxMwNuoZoKwEJLjbZx5DXyAdk4l0FBOczsXOG8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773471962; a=rsa-sha256; cv=none; b=u2WCcNT6JcSi4njAll9iFhAWn/KB3yZzsmY6PqqeCFXIyWB8GqvHtBG0iItpjGXl0u6crS klBLoTJ6BPB3Jqs6K65jq0YklEU/+ULwsuecHDr+vbyIuoruY2Af7/IYtAezYUHmaoRKur fDWtxRO6wBGMHFR5xYF7fxFZWxGbPxM4ZdVrkABTLmIM2GbBmdHaPue1MK7hoynN7RO/Q8 BZcECq0ApkFxVYUuvpJbC5ZoKVeXcHHvAeabvjE8Da3ZSlkVGSYAeFUqYxBQL7g2Rvckbc grAj+BvnKtDthaw+HVuqArO5PBMWeT3SwvlVRECoiI3SCPoua9ZM9XfbmLC4VQ== 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=1773471962; 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=yaGl6SgoZ3DyHemwtpByefk8XajAuexErtud5WzAKRM=; b=vqja0GyybiVFkdvVPHSL2ir1XOqFDwWL3jujQnfVpsGoNDizW3ZJZZBDv8AS73WX64lsEL PDkYCnb4as0EUUMm2lZmD8BZnQKWtdrapw2fcx0BVGJJ/VnRgb5VPbp21M3ki4eN0bx49A dJ0aNEHkVo0eywSutivh9XdKNKaVxzWUgF2hLlwTcmshDyXTCBiDDVC9zRYllpMmOavwpL u7kFhdvTcuT2CNFi0ZYrUFKkLP6BUqekW1zuCcBwCNP5rTlW6bcDcHUu+4gxjpHSOpxnDp 2gZ7N4gsH7AvEtpaeUaS2qQEkkVarhgyQXhMlpDnlGbyFjfzTks8mRqn/CL9FQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXsp23yRDz17Ff for ; Sat, 14 Mar 2026 07:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 308ab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 07:06:02 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?=C3=84lven?= Subject: git: 6771b1d14157 - main - net/v2ray: Lint and improve rc file 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 6771b1d14157a659a8e235f692526c97f83f435a Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 07:06:02 +0000 Message-Id: <69b508da.308ab.7cdc462a@gitrepo.freebsd.org> The branch main has been updated by alven: URL: https://cgit.FreeBSD.org/ports/commit/?id=6771b1d14157a659a8e235f692526c97f83f435a commit 6771b1d14157a659a8e235f692526c97f83f435a Author: Älven AuthorDate: 2026-03-14 06:48:56 +0000 Commit: Älven CommitDate: 2026-03-14 07:05:19 +0000 net/v2ray: Lint and improve rc file * Sort stances * Expand variables Approved by: db@, yuri@ (Mentors, implicit) --- net/v2ray/Makefile | 2 +- net/v2ray/files/v2ray.in | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/net/v2ray/Makefile b/net/v2ray/Makefile index 9d65cb147ee3..6e3fe7cb4033 100644 --- a/net/v2ray/Makefile +++ b/net/v2ray/Makefile @@ -1,7 +1,7 @@ PORTNAME= v2ray DISTVERSIONPREFIX= v DISTVERSION= 5.46.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= alven@FreeBSD.org 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"