[gentoo-commits] repo/gentoo:master commit in: net-vpn/frp/files/, net-vpn/frp/
commit: 96027ab3666197c477280b21d80bb095869b7cd7 Author: Puqns67 puqns67 icu> AuthorDate: Sun Mar 31 18:43:32 2024 + Commit: Zac Medico gentoo org> CommitDate: Mon Apr 1 00:16:02 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96027ab3 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 puqns67.icu> Closes: https://github.com/gentoo/gentoo/pull/36025 Signed-off-by: Zac Medico gentoo.org> net-vpn/frp/Manifest | 2 ++ net-vpn/frp/files/frpc.service | 5 ++- net-vpn/frp/files/frpc_at_.service | 5 ++- net-vpn/frp/files/frps.service | 4 +-- net-vpn/frp/files/frps_at_.service | 4 +-- net-vpn/frp/frp-0.53.2-r1.ebuild | 64 + net-vpn/frp/frp-0.53.2.ebuild | 65 -- net-vpn/frp/frp-0.56.0.ebuild | 65 ++ 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 ..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 +
[gentoo-commits] repo/gentoo:master commit in: net-vpn/frp/files/, net-vpn/frp/
commit: 8c4754a73a49bb489d6de3bf207acdab5918a6bd Author: Zac Medico gentoo org> AuthorDate: Sat May 28 17:58:56 2022 + Commit: Zac Medico gentoo org> CommitDate: Sat May 28 18:16:48 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c4754a7 net-vpn/frp: add 0.43.0 Signed-off-by: Zac Medico gentoo.org> net-vpn/frp/Manifest | 1 + net-vpn/frp/files/frpc.service | 15 +++ net-vpn/frp/files/frpc_at_.service | 15 +++ net-vpn/frp/files/frps.service | 14 ++ net-vpn/frp/files/frps_at_.service | 14 ++ net-vpn/frp/frp-0.43.0.ebuild | 37 + 6 files changed, 96 insertions(+) diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest index 0acde273bf3b..e5361847af86 100644 --- a/net-vpn/frp/Manifest +++ b/net-vpn/frp/Manifest @@ -1,2 +1,3 @@ DIST frp-0.42.0-deps.tar.xz 40716624 BLAKE2B 60f8f1486c0c83627954f45d55fff6e42564549950557ffdf0bed6f4ee752670547a6968ec19bd7ce04ebd259480d9f665d6b93fc3550e0830fbc9e5bee55f80 SHA512 ddab5192b9399dab54b521fa35c38c6e6cf293737b8677d384f3d991255aa49ed6c6ccb3e4ff686f4946b30e7d84499c4d5564e327ef19aa3fdf465d85b15a49 DIST frp-0.42.0.tar.gz 1280863 BLAKE2B 5377aeb7ef83ace3a36772bf56ab671a91688da6d6b54ce23833221cc7cadee1107a3a5d1ad8a615bb7b4e6cc6eca214888449481ad18584ca03f1b0bc484be2 SHA512 b61786a1023a09d9f854e09c406ac241c4a8684fb903511b70adc7527c44d80df92b2d3493fe49e9e04d19dbd994b8fe866285862c88ff89f090860c3bda1987 +DIST frp-0.43.0.tar.gz 1282855 BLAKE2B d2e60e89de8823ae129f91aa2cf50fe5101bcc3c42d63fde48febf89cb2511e5ecabaf799803cf6ba0042b523ef1a3de19fb7d027a34074df0ccb40ba8393b86 SHA512 e6ccbf98d9d8fb714f37784ca582684b9f27994cf3f74b7081043285394243a8e9114b65f0918b64207a99064422312d700d01adaed085175314ad0ae238eb8f diff --git a/net-vpn/frp/files/frpc.service b/net-vpn/frp/files/frpc.service new file mode 100644 index ..37a6a9bccbac --- /dev/null +++ b/net-vpn/frp/files/frpc.service @@ -0,0 +1,15 @@ +[Unit] +Description=Frp Client Service +After=network.target + +[Service] +Type=simple +User=nobody +Restart=on-failure +RestartSec=5s +ExecStart=/usr/bin/frpc -c /etc/frp/frpc.ini +ExecReload=/usr/bin/frpc reload -c /etc/frp/frpc.ini +LimitNOFILE=1048576 + +[Install] +WantedBy=multi-user.target diff --git a/net-vpn/frp/files/frpc_at_.service b/net-vpn/frp/files/frpc_at_.service new file mode 100644 index ..5914ff6ae97e --- /dev/null +++ b/net-vpn/frp/files/frpc_at_.service @@ -0,0 +1,15 @@ +[Unit] +Description=Frp Client Service +After=network.target + +[Service] +Type=simple +User=nobody +Restart=on-failure +RestartSec=5s +ExecStart=/usr/bin/frpc -c /etc/frp/%i.ini +ExecReload=/usr/bin/frpc reload -c /etc/frp/%i.ini +LimitNOFILE=1048576 + +[Install] +WantedBy=multi-user.target diff --git a/net-vpn/frp/files/frps.service b/net-vpn/frp/files/frps.service new file mode 100644 index ..c00f2dc53c64 --- /dev/null +++ b/net-vpn/frp/files/frps.service @@ -0,0 +1,14 @@ +[Unit] +Description=Frp Server Service +After=network.target + +[Service] +Type=simple +User=nobody +Restart=on-failure +RestartSec=5s +ExecStart=/usr/bin/frps -c /etc/frp/frps.ini +LimitNOFILE=1048576 + +[Install] +WantedBy=multi-user.target diff --git a/net-vpn/frp/files/frps_at_.service b/net-vpn/frp/files/frps_at_.service new file mode 100644 index ..2942e0ba7a69 --- /dev/null +++ b/net-vpn/frp/files/frps_at_.service @@ -0,0 +1,14 @@ +[Unit] +Description=Frp Server Service +After=network.target + +[Service] +Type=simple +User=nobody +Restart=on-failure +RestartSec=5s +ExecStart=/usr/bin/frps -c /etc/frp/%i.ini +LimitNOFILE=1048576 + +[Install] +WantedBy=multi-user.target diff --git a/net-vpn/frp/frp-0.43.0.ebuild b/net-vpn/frp/frp-0.43.0.ebuild new file mode 100644 index ..a9d8f761c7f8 --- /dev/null +++ b/net-vpn/frp/frp-0.43.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module systemd + +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/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~zmedico/dist/frp-0.42.0-deps.tar.xz"; + +LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~riscv" +IUSE="" + +src_prepare() { + # patch LDFLAGS to preserve symbol table #792408 + sed -e "s|^\\(LDFLAGS :=\\) -s \\(.*\\)|\1 \2|" -i Makefile || die + default +} + +src_compile() { + emake all +} + +src_install() { + local x + dobin bin/{frpc,frps} + dodoc README*.md + systemd_dounit "${FILESDIR}"/frp{c,s}.service + systemd_newunit "${FILESDIR}"/frpc_at_.service frpc@.service + systemd_newunit "${FILESDIR}"/frps_at_.service frps@.service + insinto /etc/frp + for x in c