net-vpn/frp: add 0.53.2-r1, 0.56.0, drop 0.53.2

* Update service files
* Fix file names of configuration files in '/etc/frp'

Signed-off-by: Puqns67 <me@puqns67.icu>
Closes: https://github.com/gentoo/gentoo/pull/36025
Signed-off-by: Zac Medico <zmedico@gentoo.org>

8 files changed, 139 insertions, 75 deletions

diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest
index 67de7b6e5d5a..d3746f023af7 100644
--- a/net-vpn/frp/Manifest
+++ b/net-vpn/frp/Manifest
@@ -1,2 +1,4 @@
 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.56.0-deps.tar.xz 47560372 BLAKE2B b40fb99c8ed769c287db2f866198b1d9e6f41f25ae1caa1ba8aa1270e14b2ddc6e3771664407bde12aecb29e3a93d76865db3c18bcda7df78f6a557bb7d77727 SHA512 110717775f40f27665c656a37d157455bb81487959fa8826464ff0f5da03d7dcb64a2f1ab190fa3dcb6331be178515ca48ce3d18a6fb81f7ac1c3f93652de7b8
+DIST frp-0.56.0.tar.gz 1080201 BLAKE2B 493e8b21aab6d5fae2d762eafba7d94de59394e9c4cb3c3dfce2bd8b5a0d0fcca6ef471917e8257022e079bececf34e910fe3b6bc845753862da59a1d00ca20c SHA512 883dce220aa78296f2b7eb9d64b3d1598bc2df436c52a48bc813d725a6f8fa43028359b0507bf4a586a29f4739310474047abfefd46249c0c9942990ceac0e2d
diff --git a/net-vpn/frp/files/frpc.service b/net-vpn/frp/files/frpc.service
index 37a6a9bccbac..5679ae7d1229 100644
--- a/net-vpn/frp/files/frpc.service
+++ b/net-vpn/frp/files/frpc.service
@@ -4,11 +4,10 @@ After=network.target
 
 [Service]
 Type=simple
-User=nobody
+DynamicUser=yes
 Restart=on-failure
 RestartSec=5s
-ExecStart=/usr/bin/frpc -c /etc/frp/frpc.ini
-ExecReload=/usr/bin/frpc reload -c /etc/frp/frpc.ini
+ExecStart=/usr/bin/frpc -c /etc/frp/frpc.toml
 LimitNOFILE=1048576
 
 [Install]
diff --git a/net-vpn/frp/files/frpc_at_.service b/net-vpn/frp/files/frpc_at_.service
index 5914ff6ae97e..79331b417003 100644
--- a/net-vpn/frp/files/frpc_at_.service
+++ b/net-vpn/frp/files/frpc_at_.service
@@ -4,11 +4,10 @@ After=network.target
 
 [Service]
 Type=simple
-User=nobody
+DynamicUser=yes
 Restart=on-failure
 RestartSec=5s
-ExecStart=/usr/bin/frpc -c /etc/frp/%i.ini
-ExecReload=/usr/bin/frpc reload -c /etc/frp/%i.ini
+ExecStart=/usr/bin/frpc -c /etc/frp/%i.toml
 LimitNOFILE=1048576
 
 [Install]
diff --git a/net-vpn/frp/files/frps.service b/net-vpn/frp/files/frps.service
index c00f2dc53c64..69b1cd887029 100644
--- a/net-vpn/frp/files/frps.service
+++ b/net-vpn/frp/files/frps.service
@@ -4,10 +4,10 @@ After=network.target
 
 [Service]
 Type=simple
-User=nobody
+DynamicUser=yes
 Restart=on-failure
 RestartSec=5s
-ExecStart=/usr/bin/frps -c /etc/frp/frps.ini
+ExecStart=/usr/bin/frps -c /etc/frp/frps.toml
 LimitNOFILE=1048576
 
 [Install]
diff --git a/net-vpn/frp/files/frps_at_.service b/net-vpn/frp/files/frps_at_.service
index 2942e0ba7a69..3f337590fcd0 100644
--- a/net-vpn/frp/files/frps_at_.service
+++ b/net-vpn/frp/files/frps_at_.service
@@ -4,10 +4,10 @@ After=network.target
 
 [Service]
 Type=simple
-User=nobody
+DynamicUser=yes
 Restart=on-failure
 RestartSec=5s
-ExecStart=/usr/bin/frps -c /etc/frp/%i.ini
+ExecStart=/usr/bin/frps -c /etc/frp/%i.toml
 LimitNOFILE=1048576
 
 [Install]
diff --git a/net-vpn/frp/frp-0.53.2-r1.ebuild b/net-vpn/frp/frp-0.53.2-r1.ebuild
new file mode 100644
index 000000000000..d8e7afbf47de
--- /dev/null
+++ b/net-vpn/frp/frp-0.53.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd shell-completion
+
+DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to the internet"
+HOMEPAGE="https://github.com/fatedier/frp"
+SRC_URI="https://github.com/fatedier/frp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~riscv"
+IUSE="+client +server"
+REQUIRED_USE="|| ( client server )"
+
+src_compile() {
+	mkdir -pv comp || die
+
+	if use client; then
+		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 "-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
+	fi
+}
+
+src_install() {
+	_install() {
+		# Install binary file
+		dobin "${1}"
+
+		# Install completion files
+		dobashcomp "${S}/comp/${1}"
+		dofishcomp "${S}/comp/${1}.fish"
+		dozshcomp "${S}/comp/_${1}"
+
+		# Install systemd services
+		systemd_dounit "${FILESDIR}/${1}.service"
+		systemd_newunit "${FILESDIR}/${1}_at_.service" "${1}@.service"
+
+		# Install config files
+		insinto "/etc/${PN}"
+		newins "${S}/conf/${1}.toml" "${1}.toml.example"
+		newins "${S}/conf/${1}_full_example.toml" "${1}_full.toml.example"
+	}
+
+	if use client; then
+		_install frpc
+	fi
+
+	if use server; then
+		_install frps
+	fi
+}
diff --git a/net-vpn/frp/frp-0.53.2.ebuild b/net-vpn/frp/frp-0.53.2.ebuild
deleted file mode 100644
index e391ce1b9d6a..000000000000
--- a/net-vpn/frp/frp-0.53.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd shell-completion
-
-DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to the internet"
-HOMEPAGE="https://github.com/fatedier/frp"
-SRC_URI="https://github.com/fatedier/frp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~riscv"
-IUSE="+client +server"
-REQUIRED_USE="|| ( client server )"
-
-DEPEND="${RDEPEND}"
-RDEPEND=""
-BDEPEND="dev-lang/go"
-
-src_compile() {
-	mkdir -pv completions || die
-
-	if use client; then
-		ego build -trimpath -ldflags "-w" -o frpc ./cmd/frpc
-		./frpc completion bash > completions/frpc || die
-		./frpc completion fish > completions/frpc.fish || die
-		./frpc completion zsh > completions/_frpc || die
-	fi
-
-	if use server; then
-		ego build -trimpath -ldflags "-w" -o frps ./cmd/frps
-		./frps completion bash > completions/frps || die
-		./frps completion fish > completions/frps.fish || die
-		./frps completion zsh > completions/_frps || die
-	fi
-}
-
-src_install() {
-	if use client; then
-		dobin frpc
-		dobashcomp completions/frpc
-		systemd_dounit "${FILESDIR}/frpc.service"
-		systemd_newunit "${FILESDIR}/frpc_at_.service" frpc@.service
-
-		for x in conf/frpc*.toml; do mv "${x}"{,.example}; done
-	fi
-
-	if use server; then
-		dobin frps
-		dobashcomp completions/frps
-		systemd_dounit "${FILESDIR}/frps.service"
-		systemd_newunit "${FILESDIR}/frps_at_.service" frps@.service
-
-		for x in conf/frps*.toml; do mv "${x}"{,.example}; done
-	fi
-
-	insinto /etc/frp
-	doins conf/*.example
-
-	dofishcomp completions/*.fish
-	dozshcomp completions/_*
-}
diff --git a/net-vpn/frp/frp-0.56.0.ebuild b/net-vpn/frp/frp-0.56.0.ebuild
new file mode 100644
index 000000000000..b7ac11f4e26f
--- /dev/null
+++ b/net-vpn/frp/frp-0.56.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd shell-completion
+
+DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to the internet"
+HOMEPAGE="https://github.com/fatedier/frp"
+SRC_URI="https://github.com/fatedier/frp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/Puqns67/gentoo-deps/releases/download/${P}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~riscv"
+IUSE="+client +server"
+REQUIRED_USE="|| ( client server )"
+BDEPEND=">=dev-lang/go-1.22"
+
+src_compile() {
+	mkdir -pv comp || die
+
+	if use client; then
+		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 "-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
+	fi
+}
+
+src_install() {
+	_install() {
+		# Install binary file
+		dobin "${1}"
+
+		# Install completion files
+		dobashcomp "${S}/comp/${1}"
+		dofishcomp "${S}/comp/${1}.fish"
+		dozshcomp "${S}/comp/_${1}"
+
+		# Install systemd services
+		systemd_dounit "${FILESDIR}/${1}.service"
+		systemd_newunit "${FILESDIR}/${1}_at_.service" "${1}@.service"
+
+		# Install config files
+		insinto "/etc/${PN}"
+		newins "${S}/conf/${1}.toml" "${1}.toml.example"
+		newins "${S}/conf/${1}_full_example.toml" "${1}_full.toml.example"
+	}
+
+	if use client; then
+		_install frpc
+	fi
+
+	if use server; then
+		_install frps
+	fi
+}