From e12b43d4cacedb2172c767071d4a9c4d1db861d8 Mon Sep 17 00:00:00 2001
From: Puqns67 <me@puqns67.icu>
Date: Mon, 5 Feb 2024 02:28:21 +0800
Subject: [PATCH] net-vpn/frp: add 0.54.0, drop 0.53.2-r1

---
 net-vpn/frp/Manifest                                   |  4 ++--
 net-vpn/frp/files/frpc.service                         |  3 +--
 net-vpn/frp/files/frpc_at.service                      |  3 +--
 net-vpn/frp/files/frps.service                         |  2 +-
 net-vpn/frp/files/frps_at.service                      |  2 +-
 .../frp/{frp-0.53.2-r1.ebuild => frp-0.54.0.ebuild}    | 10 +++-------
 6 files changed, 9 insertions(+), 15 deletions(-)
 rename net-vpn/frp/{frp-0.53.2-r1.ebuild => frp-0.54.0.ebuild} (88%)

diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest
index 67de7b6..41f8b9c 100644
--- a/net-vpn/frp/Manifest
+++ b/net-vpn/frp/Manifest
@@ -1,2 +1,2 @@
-DIST frp-0.53.2-deps.tar.xz 55621188 BLAKE2B 35e14b82bbc3a3386f2901a274969e7650cf6ce529ae17dd7ab0a7f759f355da7b7d64d0945e22d3a741d75ff3e21bd17ccf708d2184605c9303b35dc63f1b88 SHA512 c173d1d1918afc5549d99ac575eadd2b408220625c773ec5f5cce4e00a648c19d9a3cfbfce51a86e0e8425edb7a1a72a9d798a37f4bf37b38c0d4d031bc27dae
-DIST frp-0.53.2.tar.gz 1023383 BLAKE2B bad6aee65d5386ba14a0c4679514e17e1643b703292a4bb0811ff1f9a76b95833358993fdfb13b1e4224d7cf8c0035c2aabfdcd74a14003dff90c3e569fa5d12 SHA512 c1f0acff002dbdef001d04c3dcd5ca138c33a36b8e5ad119a555f0dd05f4e6200c915e1481eab58c02e650a058f0b3f75310b9a50ad4756087f69f9fe74377b4
+DIST frp-0.54.0-deps.tar.xz 55772980 BLAKE2B 26b00d8c4e19365ed1691e1ba9c07f2e17fd09c6bc6f419aacf9a8621deb51ad6ed265dde31fbd3eff5c90297ee37d7b430d27fa136e6748e7f0b0969c57aa3b SHA512 891c93e98a25e1ec24e2b88ce04063cd593cb705b7ce69a29ff3c38ab0143184c8d0f73a2df5e75e181bbd80ac93287d7fb63de645ae8793ff5f0e62d45a0e9c
+DIST frp-0.54.0.tar.gz 1021523 BLAKE2B 65f99692ddc7f629bd8bdac5e31752a3fef1bf31ca285a4339a4de3c03550334a69fc7943b32b7e1bf5423dc38effb1b174b8bf7b38622c67391cd778355f9b1 SHA512 081e8f96384d6711511362f9decd779286ee7a2dd2244b64597a06704a2be7bb0e58686dea8650613931d04b346a8326f86c63e2a0132653e46d38c1f7154b70
diff --git a/net-vpn/frp/files/frpc.service b/net-vpn/frp/files/frpc.service
index 17f2b01..c08442b 100644
--- a/net-vpn/frp/files/frpc.service
+++ b/net-vpn/frp/files/frpc.service
@@ -5,11 +5,10 @@ Wants=network-online.target
 
 [Service]
 Type=simple
-User=nobody
+DynamicUser=yes
 Restart=on-failure
 RestartSec=5s
 ExecStart=/usr/bin/frpc -c /etc/frp/frpc.toml
-ExecReload=/usr/bin/frpc reload -c /etc/frp/frpc.toml
 
 [Install]
 WantedBy=multi-user.target
diff --git a/net-vpn/frp/files/frpc_at.service b/net-vpn/frp/files/frpc_at.service
index a546b85..8bed5c8 100644
--- a/net-vpn/frp/files/frpc_at.service
+++ b/net-vpn/frp/files/frpc_at.service
@@ -5,11 +5,10 @@ Wants=network-online.target
 
 [Service]
 Type=simple
-User=nobody
+DynamicUser=yes
 Restart=on-failure
 RestartSec=5s
 ExecStart=/usr/bin/frpc -c /etc/frp/%i.toml
-ExecReload=/usr/bin/frpc reload -c /etc/frp/%i.toml
 
 [Install]
 WantedBy=multi-user.target
diff --git a/net-vpn/frp/files/frps.service b/net-vpn/frp/files/frps.service
index 200e02e..e61c366 100644
--- a/net-vpn/frp/files/frps.service
+++ b/net-vpn/frp/files/frps.service
@@ -5,7 +5,7 @@ Wants=network.target
 
 [Service]
 Type=simple
-User=nobody
+DynamicUser=yes
 Restart=on-failure
 RestartSec=5s
 ExecStart=/usr/bin/frps -c /etc/frp/frps.toml
diff --git a/net-vpn/frp/files/frps_at.service b/net-vpn/frp/files/frps_at.service
index e0e405d..3860aac 100644
--- a/net-vpn/frp/files/frps_at.service
+++ b/net-vpn/frp/files/frps_at.service
@@ -5,7 +5,7 @@ Wants=network-online.target
 
 [Service]
 Type=simple
-User=nobody
+DynamicUser=yes
 Restart=on-failure
 RestartSec=5s
 ExecStart=/usr/bin/frps -c /etc/frp/%i.toml
diff --git a/net-vpn/frp/frp-0.53.2-r1.ebuild b/net-vpn/frp/frp-0.54.0.ebuild
similarity index 88%
rename from net-vpn/frp/frp-0.53.2-r1.ebuild
rename to net-vpn/frp/frp-0.54.0.ebuild
index 97bcf1a..06260c2 100644
--- a/net-vpn/frp/frp-0.53.2-r1.ebuild
+++ b/net-vpn/frp/frp-0.54.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,22 +16,18 @@ KEYWORDS="~amd64 ~loong ~riscv"
 IUSE="+client server"
 REQUIRED_USE="|| ( client server )"
 
-DEPEND="${RDEPEND}"
-RDEPEND=""
-BDEPEND="dev-lang/go"
-
 src_compile() {
 	mkdir -pv comp || die
 
 	if use client; then
-		ego build -trimpath -ldflags "-w" -o frpc ./cmd/frpc
+		ego build -trimpath -ldflags "-s -w" -tags frpc -o frpc ./cmd/frpc
 		./frpc completion bash > comp/frpc || die
 		./frpc completion fish > comp/frpc.fish || die
 		./frpc completion zsh > comp/_frpc || die
 	fi
 
 	if use server; then
-		ego build -trimpath -ldflags "-w" -o frps ./cmd/frps
+		ego build -trimpath -ldflags "-s -w" -tags frps -o frps ./cmd/frps
 		./frps completion bash > comp/frps || die
 		./frps completion fish > comp/frps.fish || die
 		./frps completion zsh > comp/_frps || die