Date: Sun, 21 Dec 2025 04:04:21 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Cc: over <over@forkbomb.cc> Subject: git: 4dcbce7fca19 - 2025Q4 - security/xray-core: Fix rc.d script Message-ID: <694771c5.c506.6354343@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2025Q4 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4dcbce7fca19663b8d08b9507ee168fea45b6450 commit 4dcbce7fca19663b8d08b9507ee168fea45b6450 Author: over <over@forkbomb.cc> AuthorDate: 2025-12-21 03:59:40 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-12-21 04:04:05 +0000 security/xray-core: Fix rc.d script It needs to use load_rc_config before knob variables, otherwise customizations such as config and log path won't work. PR: 291704 Approved by: Kirill Lebedev <kirill@drlebedev.com> (maintainer) MFH: 2025Q4 (cherry picked from commit f457dfab6526cd4bd8d137024d2057444b637d9d) --- security/xray-core/Makefile | 2 +- security/xray-core/files/xray.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/security/xray-core/Makefile b/security/xray-core/Makefile index 80dbb318ace7..0257451a9cbb 100644 --- a/security/xray-core/Makefile +++ b/security/xray-core/Makefile @@ -1,7 +1,7 @@ PORTNAME= xray-core DISTVERSIONPREFIX= v DISTVERSION= 25.7.26 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= https://github.com/v2fly/geoip/releases/download/202507050144/:geoip \ https://github.com/v2fly/domain-list-community/releases/download/20250627153051/:geosite diff --git a/security/xray-core/files/xray.in b/security/xray-core/files/xray.in index 87516c9759d0..18c9beeb4f5c 100644 --- a/security/xray-core/files/xray.in +++ b/security/xray-core/files/xray.in @@ -20,6 +20,8 @@ name="xray" rcvar="xray_enable" +load_rc_config "$name" + : ${xray_enable="NO"} : ${xray_config="%%PREFIX%%/etc/${name}-core"} : ${xray_logdir="/var/log/${name}-core"} @@ -43,5 +45,4 @@ xray_startprecmd() { chown -R ${xray_user}:${xray_group} "${xray_logdir}" } -load_rc_config "$name" run_rc_command "$1"home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?694771c5.c506.6354343>