net/frp: Update 0.45.0 → 0.48.0; Add options for daemon user

freebsd · Apr 19, 2023 · 80807f4 · 80807f4
1 parent ed310eb
commit 80807f4
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/net/frp/Makefile b/net/frp/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	frp
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.45.0
-PORTREVISION=	7
+DISTVERSION=	0.48.0
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -20,10 +19,21 @@ GH_TUPLE=	golang:net:v0.8.0:net \
 GO_MODULE=	github.com/fatedier/frp
 GO_TARGET=	./cmd/frpc ./cmd/frps
 
-USER=		nobody
-SUB_LIST=	USER=${USER}
+SUB_LIST=	DAEMON_USER=${DAEMON_USER}
 USE_RC_SUBR=	${PORTNAME}s
 
+OPTIONS_RADIO=			DAEMON_USER # also see https://github.com/fatedier/frp/issues/3417
+OPTIONS_RADIO_DAEMON_USER=	ROOT NOBODY
+OPTIONS_DEFAULT=		ROOT # to allow frp to read certificates
+
+ROOT_VARS=	DAEMON_USER=root
+NOBODY_VARS=	DAEMON_USER=nobody
+
+DAEMON_USER_DESC=	Daemon user
+
+ROOT_DESC=	Run as root
+NOBODY_DESC=	Run as nobody
+
 pre-patch:
 .for m in net sys test
 	${RM} -r ${WRKSRC}/vendor/golang.org/x/$m

diff --git a/net/frp/distinfo b/net/frp/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1679742375
-SHA256 (go/net_frp/frp-v0.45.0/v0.45.0.mod) = 2e0af530bd1fd1479667cf35feae544d645f3eb475db42fa3c36cab8fe05d0c2
-SIZE (go/net_frp/frp-v0.45.0/v0.45.0.mod) = 2933
-SHA256 (go/net_frp/frp-v0.45.0/v0.45.0.zip) = 8c353832727a71bc5fd0f5ef4b9a2d92fe081ffc7e3f5ceac2ec2cf43761c6d0
-SIZE (go/net_frp/frp-v0.45.0/v0.45.0.zip) = 1411497
-SHA256 (go/net_frp/frp-v0.45.0/golang-net-v0.8.0_GH0.tar.gz) = f9e2128a2d6861db0595428c7cce62fe5a131348a6c7651b6efa8b03d0b10831
-SIZE (go/net_frp/frp-v0.45.0/golang-net-v0.8.0_GH0.tar.gz) = 1244302
-SHA256 (go/net_frp/frp-v0.45.0/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
-SIZE (go/net_frp/frp-v0.45.0/golang-sys-v0.6.0_GH0.tar.gz) = 1434234
-SHA256 (go/net_frp/frp-v0.45.0/golang-text-v0.8.0_GH0.tar.gz) = aeaec799a8e0b02523c80fed03383da04bf1b9c9ef431ed4d34b70488fbeaa64
-SIZE (go/net_frp/frp-v0.45.0/golang-text-v0.8.0_GH0.tar.gz) = 8359526
+TIMESTAMP = 1681940886
+SHA256 (go/net_frp/frp-v0.48.0/v0.48.0.mod) = 44263246c0053d8f56f0750ab9b8e840ee1901609699e25d3ac31ed9e5b6f47b
+SIZE (go/net_frp/frp-v0.48.0/v0.48.0.mod) = 3144
+SHA256 (go/net_frp/frp-v0.48.0/v0.48.0.zip) = a165f2410811626f88611612ec54d8489ee5a3e6eed0c8267e2b68e53a3f630a
+SIZE (go/net_frp/frp-v0.48.0/v0.48.0.zip) = 1174064
+SHA256 (go/net_frp/frp-v0.48.0/golang-net-v0.8.0_GH0.tar.gz) = f9e2128a2d6861db0595428c7cce62fe5a131348a6c7651b6efa8b03d0b10831
+SIZE (go/net_frp/frp-v0.48.0/golang-net-v0.8.0_GH0.tar.gz) = 1244302
+SHA256 (go/net_frp/frp-v0.48.0/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (go/net_frp/frp-v0.48.0/golang-sys-v0.6.0_GH0.tar.gz) = 1434234
+SHA256 (go/net_frp/frp-v0.48.0/golang-text-v0.8.0_GH0.tar.gz) = aeaec799a8e0b02523c80fed03383da04bf1b9c9ef431ed4d34b70488fbeaa64
+SIZE (go/net_frp/frp-v0.48.0/golang-text-v0.8.0_GH0.tar.gz) = 8359526
diff --git a/net/frp/files/frps.in b/net/frp/files/frps.in
@@ -20,6 +20,6 @@ logfile="/var/log/${name}.log"
 
 procname=%%PREFIX%%/bin/frps
 command="/usr/sbin/daemon"
-command_args="-u %%USER%% -o ${logfile} -t ${name} %%PREFIX%%/bin/frps -c %%PREFIX%%/etc/frps.ini"
+command_args="-u %%DAEMON_USER%% -o ${logfile} -t ${name} %%PREFIX%%/bin/frps -c %%PREFIX%%/etc/frps.ini"
 
 run_rc_command "$1"