From de6c40224da664deb650b25efd11f41044602c76 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 Apr 2024 02:13:31 +0100 Subject: gentoo auto-resync : 01:04:2024 - 02:13:31 --- net-vpn/frp/Manifest | 15 +++++---- 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.45.0.ebuild | 37 ---------------------- 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 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 145 insertions(+), 119 deletions(-) delete mode 100644 net-vpn/frp/frp-0.45.0.ebuild create mode 100644 net-vpn/frp/frp-0.53.2-r1.ebuild delete mode 100644 net-vpn/frp/frp-0.53.2.ebuild create mode 100644 net-vpn/frp/frp-0.56.0.ebuild (limited to 'net-vpn/frp') diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest index fa976d8bbdbb..24ad7047b341 100644 --- a/net-vpn/frp/Manifest +++ b/net-vpn/frp/Manifest @@ -1,10 +1,11 @@ -AUX frpc.service 283 BLAKE2B 9ed07bc1296c8bc2b24df3787e0bc5f6d955ba4ceebc84b4e10a89c0ba9779e42cb76318c6a05401f009dde883ed8a8a8b81df40a94ad9f56f0e896ba3826a36 SHA512 28ba0fb299b48109340ef0adc2107285c41f69426311128fb14d2074d04ea9dd0d44a3927d0928ed371d4b3d45150690351891a2783c62ca9d3d993413a3a9d4 -AUX frpc_at_.service 279 BLAKE2B 6285f0ff4c91696cc662426d47d61b52bf3e9374a48463de411b4eb89106b3b614c88426a1f4cdc6d0a5c4dec3e33baf80d1b3c08881a9d410874330e5efb997 SHA512 97602e6d0e1390cf3e6a23e74500f93661251de3525c620085e82fba5d765e3a782bf01b46924080ab052e29557dae1e0edd3b426cd990f0ed9501f9da8c8831 -AUX frps.service 230 BLAKE2B 7bc291cf644898a0fe4ffd8761e9474a598dd9e9a39f5afc52d8319917b62ac7e75c962c1038c3d132bb19d78f77bb40abf515e5de6ce13563ac36f41dab2a0b SHA512 58f97b93cf5b15976ed6600cdd0d32fd4c0203c4ad718d010c205d81f25a00608a0082721330629beb251e157733b388b09d3dc5d1e104e5bc6fa95972130794 -AUX frps_at_.service 228 BLAKE2B e6464ef7fd71bf87f82101dd80b6633708d5d4b336515e0aace4f8a5107c2ce1b1930ffa3586da622163d1477246828eb7ec76b3f631da9f608e57dc414b880a SHA512 8a1d94cc14e133290b0ac20b0c1cb532fbf41136f1f1cba3b4dafb971bdaa63cbec8fadf51e94adf7730b8952072457a8567996eca3d904911652535e29586f4 -DIST frp-0.45.0-vendor.tar.gz 5301832 BLAKE2B 23198a326678f3ec5357ce1bd6c7abff26a27dce6810653ef0262fb3f5c68165481ec75218ded64c90a357fafefba11b0a9c0afc4dc7e3a229ad8cc245a76fc3 SHA512 b94dd5adec82ae940044d448ec4551ca24ec3c8f1a9d870327a76a9a7d3b39e7dc567199a999b85879637dca3d46df65f8f46d11c3dbe10653a20f2eb7521f9a +AUX frpc.service 235 BLAKE2B 54fa905336108e7208450e76382e248a61c9871b5a6d48b97df392845b8f62f273f156827469c4e3802eac56421a7cbba69b6e354eeb226884ae52eb9af7de03 SHA512 c70daa5dc0eaa93b528654696b3bfc6ce18cf5d56410be851f25bbc16486f7a84df9bcac75fab9ec525b52f2933493c84b9d0daad0480f3cc901254706abde0f +AUX frpc_at_.service 233 BLAKE2B 1082dcb1672cc32166c9b5352cafdf43e3d2748f59ecd274c286a49d846d37237599b677dcb0dcb587db645be04f97c186f2b98294ffd249c3618309df3eec9c SHA512 c1422333e57f66997324f87a1fd7d33eda03bc9ee6aae701707f865a5dfd928d279d87b5ee2f55150cb5a76bdc7ae7b15cbb2ff09a7be4f97003b49ee84b23ae +AUX frps.service 235 BLAKE2B 432462e62b2ee8acf03d18804ba0aec732f1f1d3077b2429a3d6ae6132d7823748f9b23d90150511ecea202f0a1c576d8ccb9336483007da9dc3159d998708d3 SHA512 4965354f07b72ac0a912cee4d3198bfd7df39f8dab7742140ccd71f35c32e9f6c25b1a914be7c36829b9b9df6f6c1321c54e9a2666d2048679aea6fdb646e524 +AUX frps_at_.service 233 BLAKE2B 8a3867d396c95b7cc2259b61c9f1a8bbafef26be2766bf0c00740b8b1a2f6b94dcb524ac6417cfa90c45c779efe5c0b64e6edac39d146669497ea17752704005 SHA512 acc5fc39762a6411eda0c652cb6ccda95f02d13df2d34631e115882469acda6a4e85264c88ce97c2091dc4b008c840c0b042f0358441e43988654396016d78b1 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 -EBUILD frp-0.45.0.ebuild 997 BLAKE2B 519a565bf6394a54913452b47851abc2f76576fb86c1ba47ecce0e2f4f9da72d455800149f94c8f9f0c96f269c8117a6e4cfc22a0d8347b8e4309c8d6bd95437 SHA512 9fec0eaefe68478aae96303c42be94159fca5f6df56e114d49a7f238a3701481524e467975d84934f0e504743fe74416c8d4ab2c59fa453ba4310787b2276a41 -EBUILD frp-0.53.2.ebuild 1753 BLAKE2B b0c4c1d5d0aca891f636d7474e96344b26578571325338ee53a16db201a06b6b26cedabcc7e6bbc38bcc8a11a3d97f80eac01b8e7e240f5e4388b6031066916f SHA512 d69026d92e7706d98fa67889ead520de6b853b78f12d73f1e9a5335dca0c8ceb638dae550432025baf97d49584375a1039c7a628033e8bbf82a414df995c991e +DIST frp-0.56.0-deps.tar.xz 2890568 BLAKE2B cabeeba66d4fa94ff95637020178310c984b7e3254c756e75f0facc5bee0803c6ba485fa83e7c0f7c92474ce9d60621cd6a1608c3b631f2a9c27f6b6c9638ebe SHA512 0687db5001542780ac6e5c57d0da356f4c36bd31c96c2657a9e15988950436abedcd490d85cc272ff80f4868989d173a71dcf2cf28ed26f93b877d1650f04206 +DIST frp-0.56.0.tar.gz 1080201 BLAKE2B 493e8b21aab6d5fae2d762eafba7d94de59394e9c4cb3c3dfce2bd8b5a0d0fcca6ef471917e8257022e079bececf34e910fe3b6bc845753862da59a1d00ca20c SHA512 883dce220aa78296f2b7eb9d64b3d1598bc2df436c52a48bc813d725a6f8fa43028359b0507bf4a586a29f4739310474047abfefd46249c0c9942990ceac0e2d +EBUILD frp-0.53.2-r1.ebuild 1683 BLAKE2B 7e736aefb90863aff090c2e33d5ba291d021ad13215489eab76fb9925901b53b24672baf3c06ce1149095d6761061b6509e32a181eab14dc150591ac66d03b72 SHA512 00a524aa77bd39c60eea263cebdefdf44fe2ad45c879bed2c8f65ee39c7568e7588d73a5d765d703cc57bea756a9fae4726d9b1fe207ea0cc29569395236c752 +EBUILD frp-0.56.0.ebuild 1712 BLAKE2B 17f2f9b4eb24c30b05a62e8c6f84b93068459a49a90206c2558ce2892cde532bc4242c76ead1a5620fc1a0bbee3859bcbdd837d5cfe8c98ce2f3c4bc3200a578 SHA512 c6c3f8da587de37336467c39dce292e9acc4851a918cb422b641e231966262baae7541349ecd6b7dca1fdd8d1b336f15636629b1b8dbb102f324e6af439f2e01 MISC metadata.xml 467 BLAKE2B a4b1a8611d1ab87bed87c5b40ac24a2dd64d4f2f2482351fd159f5826f77988c7c5e625614dc7c1c040b623a2b0b4452fc798af96115318a46f9d00a83766e9f SHA512 44e7c4e144789e64b2e373fae969e840928e2d618db695c008c07156037841175f51c19ed7f42b63f115319c24aa26701c94bb83f581c06143689bb5237bb965 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.45.0.ebuild b/net-vpn/frp/frp-0.45.0.ebuild deleted file mode 100644 index fa2801c4d23b..000000000000 --- a/net-vpn/frp/frp-0.45.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2023 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/zmedico/frp/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz" - -LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~loong ~riscv" -IUSE="" -S=${WORKDIR}/${P}-vendor - -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 conf/*.ini; do mv "${x}"{,.example}; done - doins conf/*.example -} 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..83d79cd6446d --- /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://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 )" +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 +} -- cgit v1.2.3