diff --git a/net/frp/Makefile b/net/frp/Makefile index e573aa2056c5..17eac72f84f0 100644 --- a/net/frp/Makefile +++ b/net/frp/Makefile @@ -1,47 +1,48 @@ PORTNAME= frp DISTVERSIONPREFIX= v -DISTVERSION= 0.51.3 -PORTREVISION= 1 +DISTVERSION= 0.52.0 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org COMMENT= Reverse proxy to expose local server behind NAT/firewall to Internet WWW= https://github.com/fatedier/frp LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules USE_GITHUB= nodefault GH_TUPLE= golang:net:v0.8.0:net \ golang:sys:v0.6.0:sys \ golang:text:v0.8.0:text GO_MODULE= github.com/fatedier/frp GO_TARGET= ./cmd/frpc ./cmd/frps 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 ${LN} -s ${WRKDIR}/$m-* ${WRKSRC}/vendor/golang.org/x/$m .endfor post-install: - ${INSTALL_DATA} ${WRKSRC}/conf/frps.ini ${STAGEDIR}${PREFIX}/etc/frps.ini.sample +.for f in frpc.toml frps.toml + ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${STAGEDIR}${PREFIX}/etc/${f}.sample +.endfor .include diff --git a/net/frp/distinfo b/net/frp/distinfo index c9dbe2d4b5bd..3fd0e24b4022 100644 --- a/net/frp/distinfo +++ b/net/frp/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1692078043 -SHA256 (go/net_frp/frp-v0.51.3/v0.51.3.mod) = 242fc8020ecf6fa4f8d41215edb12230aa24de19537dee3e102340b70d154eb2 -SIZE (go/net_frp/frp-v0.51.3/v0.51.3.mod) = 3624 -SHA256 (go/net_frp/frp-v0.51.3/v0.51.3.zip) = 3b1dc5c756540c1e399f5ff6b23b11da96a05536a66d3423fc46fb4f71908ce6 -SIZE (go/net_frp/frp-v0.51.3/v0.51.3.zip) = 1195020 -SHA256 (go/net_frp/frp-v0.51.3/golang-net-v0.8.0_GH0.tar.gz) = f9e2128a2d6861db0595428c7cce62fe5a131348a6c7651b6efa8b03d0b10831 -SIZE (go/net_frp/frp-v0.51.3/golang-net-v0.8.0_GH0.tar.gz) = 1244302 -SHA256 (go/net_frp/frp-v0.51.3/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 -SIZE (go/net_frp/frp-v0.51.3/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 -SHA256 (go/net_frp/frp-v0.51.3/golang-text-v0.8.0_GH0.tar.gz) = aeaec799a8e0b02523c80fed03383da04bf1b9c9ef431ed4d34b70488fbeaa64 -SIZE (go/net_frp/frp-v0.51.3/golang-text-v0.8.0_GH0.tar.gz) = 8359526 +TIMESTAMP = 1697007555 +SHA256 (go/net_frp/frp-v0.52.0/v0.52.0.mod) = 6b9f6f8b05afda43270dba6d4d036d002fbf2f2cf72177f32e662d36f8706990 +SIZE (go/net_frp/frp-v0.52.0/v0.52.0.mod) = 3532 +SHA256 (go/net_frp/frp-v0.52.0/v0.52.0.zip) = 5e393c7dd1943e7ee559ce986619ddc0be2344d8d1dcc3b77810d97a8d69171a +SIZE (go/net_frp/frp-v0.52.0/v0.52.0.zip) = 1236224 +SHA256 (go/net_frp/frp-v0.52.0/golang-net-v0.8.0_GH0.tar.gz) = f9e2128a2d6861db0595428c7cce62fe5a131348a6c7651b6efa8b03d0b10831 +SIZE (go/net_frp/frp-v0.52.0/golang-net-v0.8.0_GH0.tar.gz) = 1244302 +SHA256 (go/net_frp/frp-v0.52.0/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (go/net_frp/frp-v0.52.0/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 +SHA256 (go/net_frp/frp-v0.52.0/golang-text-v0.8.0_GH0.tar.gz) = aeaec799a8e0b02523c80fed03383da04bf1b9c9ef431ed4d34b70488fbeaa64 +SIZE (go/net_frp/frp-v0.52.0/golang-text-v0.8.0_GH0.tar.gz) = 8359526 diff --git a/net/frp/pkg-plist b/net/frp/pkg-plist index 10dc09875382..86377d9904e4 100644 --- a/net/frp/pkg-plist +++ b/net/frp/pkg-plist @@ -1,3 +1,4 @@ bin/frpc bin/frps -@sample etc/frps.ini.sample +@sample etc/frpc.toml.sample +@sample etc/frps.toml.sample