From nobody Wed Apr 19 21:55:15 2023 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 4Q1vjJ1gRJz45Gw6; Wed, 19 Apr 2023 21:55:16 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q1vjJ0rhZz3KqB; Wed, 19 Apr 2023 21:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681941316; 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=lAc52yQMJkycandcjf2ZNKBj/+r8NAWhOeu9Cb4hJqw=; b=gx0QAb4kbkV2LQwvT9eH/mzUXGap5AraU30xEPcYX2FXc50XIqNoK5Z1oQ36FYj5Woq0IN zDXwFL8C2iKgq6/jpuzWGDorQaE6xXxarpm29yFpuTQAjDnjNVJpc11tAGzE84IfioeCf9 ueBFphrKjLr8hHvejuLjQP3fDrzZLPW/6IdQAKO+wLpKbUx6MWsv42wyrqTLr+CQqmuli8 8+WWfyf8VGIIbBC8X0WvNLhnkJOFl0wJXzkM9K0dIWZxO+Io2Lfdot5uv5gKMicRAy8zMB aUPC7ZI9w580WnA2cdnWKLd7oJyNldZ82HH1S3VmazJzQfpumO3wYXVl9+SuQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681941316; 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=lAc52yQMJkycandcjf2ZNKBj/+r8NAWhOeu9Cb4hJqw=; b=J0Lvc8meks/ecqeMKPI6o6/qh0LYlQJRQFJV3mAk93XlMPI7XFCJjFjngooz9lSNgYmzrF W1rsEJGPVHPnNIPr3l10zX95FK42wGfM4yoS0V7gFlzGkXePQqQjOzCo4WcbV6gBdOAKYC jDuN5GXsxnniW1MiKafxB4WQgEQ+7RW1H7OMZ9HCah366wURmsPnkz9OfT31wNTqKZPxls Fjpq7EG+b4R3IQplG5bCCdfBJ9YRUpkthuW8bLxqWZIvPLWm349zC3MF5AJ4i2ly8ohG7s NJxHeGB0KRiCdzkUAoEVaexF7idYZbeMB2Vd+OlLnVttUMCZfxDjQZsIExwL8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681941316; a=rsa-sha256; cv=none; b=mu1DDt9fEOw6AOIhXAyhopUbvY4+VgMj3sZRLYLed0qaJjQrmq0PKvEOvRgfGibo41eNC2 4whBTdA0nVawC0l6cjCyXT2S81AW3AkWsClQOzjUMeHlUjw6ot06unSwqxdjwdxXDrkThp r3/s60vRDqEUOh1SxCsb+2kslCDdnQCfOm/85Ljg5fHVrbdLaOiJBAAcZVRYL3T2EkuTza etvv6XKoPpVN5wwWMQd8rSYdYEQ6HueGNpa9csAac2vHsXHACw25HIwsLJxmF0wtYGLaKt kNgGOtly6a4T9IkwZb78SkdweONBQXHbPg/AjiKYvA00BcWWXh81XUVgkHcFug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q1vjH747Qz19vx; Wed, 19 Apr 2023 21:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33JLtF4u034767; Wed, 19 Apr 2023 21:55:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33JLtFI2034766; Wed, 19 Apr 2023 21:55:15 GMT (envelope-from git) Date: Wed, 19 Apr 2023 21:55:15 GMT Message-Id: <202304192155.33JLtFI2034766@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 80807f4a0af0 - main - =?utf-8?Q?net/frp:=20Update=200.45.0=20=E2=86=92=200.48.0;=20Add=20options=20for=20daemon=20user?= 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80807f4a0af09d12893685a4d79881525ddc64aa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=80807f4a0af09d12893685a4d79881525ddc64aa commit 80807f4a0af09d12893685a4d79881525ddc64aa Author: Yuri Victorovich AuthorDate: 2023-04-19 21:54:34 +0000 Commit: Yuri Victorovich CommitDate: 2023-04-19 21:55:13 +0000 net/frp: Update 0.45.0 → 0.48.0; Add options for daemon user --- net/frp/Makefile | 18 ++++++++++++++---- net/frp/distinfo | 22 +++++++++++----------- net/frp/files/frps.in | 2 +- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/net/frp/Makefile b/net/frp/Makefile index 5a13e25a6f55..99dbce92e993 100644 --- 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 index e4ae5a0a614d..fcc6962b38f7 100644 --- 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 index 66897e56f5ef..6ddd03ba853c 100644 --- 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"