gentoo auto-resync : 26:08:2024 - 12:00:09

7 files changed, 75 insertions, 24 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index e2e2dc323aba..f80543a28c98 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest
index 810c1be558c9..45d3c3336e3f 100644
--- a/net-vpn/frp/Manifest
+++ b/net-vpn/frp/Manifest
@@ -6,6 +6,9 @@ DIST frp-0.56.0-deps.tar.xz 2890568 BLAKE2B cabeeba66d4fa94ff95637020178310c984b
 DIST frp-0.56.0.tar.gz 1080201 BLAKE2B 493e8b21aab6d5fae2d762eafba7d94de59394e9c4cb3c3dfce2bd8b5a0d0fcca6ef471917e8257022e079bececf34e910fe3b6bc845753862da59a1d00ca20c SHA512 883dce220aa78296f2b7eb9d64b3d1598bc2df436c52a48bc813d725a6f8fa43028359b0507bf4a586a29f4739310474047abfefd46249c0c9942990ceac0e2d
 DIST frp-0.58.1-deps.tar.xz 2916740 BLAKE2B 49256c40ca359a5b76a92e2999e3a5a3ca4899f71e4804544296ee71fa6c079f563b1892195243e9e8792c72c445f779fb5a32b1cc5c4ebca9265d88808072e3 SHA512 3295e0e6b5a7ace8c5af1dd9e15ffb893930c0f03755e8de46dfbca2272747b95d8e58f4034f4fa2c44896c5036654b3c805a6d3dd0d39299996335330d28d07
 DIST frp-0.58.1.tar.gz 1081317 BLAKE2B e5d897a9d866df1075c9fb397f1cbcf23efb738fd89e58bce4fba5abce23d9cb6c826b50d4cda52b3fa40a6194003a51c6209f2d4aef43d9dc62f08b51a776a7 SHA512 809e86e9cd2cb67ae338b2584c0c8f5d4f01104cc7725826743f48eb5c893bce9cd678bcd90e04953bb6bfc6523fcf400c6bc1bdf03ff335666b05af5e0c4b55
+DIST frp-0.60.0-vendor.tar.xz 2816520 BLAKE2B 3f58f108c1dc563d73d119293d9cbcb181059c24bb58731f5d6d870a320982c976c8a0938ff0442bd21ffd0bb86218aaa20f1b382fb7a045422aaea411ad3557 SHA512 9825d39cd4bce25ad796b3ac817e690ca41daf9f028ac4e88aa43b4e295d20f9ede57a1be8933efca00a512ff238f8e34a85f24a4b56f9c52cf40aa1f26118f9
+DIST frp-0.60.0.tar.gz 1073862 BLAKE2B c6169818bbca656d44bc945c70b73474a4f427bd123fa7a546285fb63d3a156dc90d7fa1d46f2ba4ae971281e546fb43a217ad2527b7bd20a402810cb356d7ac SHA512 4c86b91a28b58ce5b681e5f8c886efd57a41fb6ac92606facce0b6f6f6cbd6cf6f789209252455bc6bc6a3ad043f2470040ac84b893926653cc036b40907e60c
 EBUILD frp-0.56.0.ebuild 1712 BLAKE2B 17f2f9b4eb24c30b05a62e8c6f84b93068459a49a90206c2558ce2892cde532bc4242c76ead1a5620fc1a0bbee3859bcbdd837d5cfe8c98ce2f3c4bc3200a578 SHA512 c6c3f8da587de37336467c39dce292e9acc4851a918cb422b641e231966262baae7541349ecd6b7dca1fdd8d1b336f15636629b1b8dbb102f324e6af439f2e01
 EBUILD frp-0.58.1.ebuild 1723 BLAKE2B 7f2f0a91deba073ce0a84f0da7745213c83c32977808f6ef3b2913b8b34987396003afd992e8d47254ee00e8f50427a5366a7660c4fcaedb3f85cdcc9bf0ed68 SHA512 517e6b4380241162df1dc7b5790482335c4fee73683e45ce6c735e4dbac4f54a803bde9f960a96c929deb0439a87bd5ef9a3c495d721f4f58ded630243723d51
+EBUILD frp-0.60.0.ebuild 1750 BLAKE2B 822be8f8fcdc4fd2b7ea7d754cdfbbb534f467350a016d4d61c33611a6e097a56633d432418db3c8d2fa99fb8fd16f07f5379f55e4c60dddb138a7921e0073dd SHA512 4ce127cb1c1b3895cbe6ce1488e307a2500fa78bb47b4bef63aad3c6f0c80bfcf116ee538e3d7be5cc4c3381c8e280ac641071eaa186270f4a7cc49726fea32e
 MISC metadata.xml 467 BLAKE2B a4b1a8611d1ab87bed87c5b40ac24a2dd64d4f2f2482351fd159f5826f77988c7c5e625614dc7c1c040b623a2b0b4452fc798af96115318a46f9d00a83766e9f SHA512 44e7c4e144789e64b2e373fae969e840928e2d618db695c008c07156037841175f51c19ed7f42b63f115319c24aa26701c94bb83f581c06143689bb5237bb965
diff --git a/net-vpn/frp/frp-0.60.0.ebuild b/net-vpn/frp/frp-0.60.0.ebuild
new file mode 100644
index 000000000000..994a8b5d4b28
--- /dev/null
+++ b/net-vpn/frp/frp-0.60.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"
+SRC_URI+=" https://github.com/Puqns67/gentoo-deps/releases/download/${P}/${P}-vendor.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
+}
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index d5db9d99f98a..8e2b2e94733b 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -6,6 +6,6 @@ AUX i2pd-2.52.0-miniupnp.patch 1198 BLAKE2B 3448fb24ca2c41cf37b15a4c45e8245d0c5d
 AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d21ef4d83620c064838d0e27f89f287a97404276490b848bd1372a40b915d4830b7755d801c4bda551099 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9
 DIST i2pd-2.52.0.tar.gz 677023 BLAKE2B 785eeb074df3e8a046ae3c6aa1204b52275ced56560addb3d4829d098b22d37582a41de29042bb3b2d48b6616f606c200b16ae10b26608d4bb6b74f237a4c9da SHA512 54272b23dcb62b8b7523038a9c1fc71b87bb9042f22bd12d6ebc62cfa47da07e2df47d88d706f285e9d88f9cace0564546632c10161f83f5c57b9ea17f5bde5f
 DIST i2pd-2.53.1.tar.gz 677029 BLAKE2B 5b84a3833b3a71c88dc7bf319f802c7c326f045eeee1c5062d51f3b9aa9fb76627c075baf6c6aa8ed9bac3b2fd35ea16d33396332c7b7b21ea15117564f037e0 SHA512 9226fbab7f260e6d84738db4fe9d729eedc8104ed09b191331760b1d77debb6bc05e6558861c1cd304ffdc8661e893f9ac5950e47a38facad51038769b478c64
-EBUILD i2pd-2.52.0.ebuild 1997 BLAKE2B fc2b2d9deb7c80d78a53c79801319c962887caf04e1d8b1b8087c243fe060f8dab06cae4339b8c2b467a3918a772c7a80543727f64e97ca5e71a9c6624d1400b SHA512 03a313d13f7bec68c088740fc828e8bc9c33d20d135c87eec103b0c6100a66e219e1d0a8ad52a65b00b8c0236e709e27e76f4353707a93cd5e640f402f730df0
-EBUILD i2pd-2.53.1.ebuild 1954 BLAKE2B 47fc79773f9c76eb391bb3f040a18a9beb66712ae72636ef8c54db836c2a31567579065abbd5aff186a407549c9137b8bc575b61c6e366138ad05f2fba589c4b SHA512 9197177fd3202dad5a9f3f86fd33cf362c10d28c47703d8d22e5e4964d72ffd7da86c309086517bf914dd3ca93b118ed2d4694cb7840a11dbb9a29bd20fef80d
-MISC metadata.xml 588 BLAKE2B a7a342599b07b88c0fc192386a7722eeb864b8f1debc4f30d6825e829b9c684d085edc6ef0b4e7d8e5bf3e04e93629df2925341784b2221d591084098a8a2d3e SHA512 86ca6c50c7eb8f06269a3e0b84f1189f4be57f40ea92b9cae3b9299b02c63d5a89fbb9ca6f16588a682ea1bb193c6395b55f67799c07e4bbf60f046185fb5d0e
+EBUILD i2pd-2.52.0.ebuild 1904 BLAKE2B 756e35bde3ff2b01f1b350bbf765b7641fc742e5f285f7775c506a861996dfb0b4c80178ce731ccf55d421017ed32e3475befc0fce8799cfe596066cbaeb1666 SHA512 8d861b1c73d12ea59fafbffd65a429ae438aea85c2f2ade00b0b5b632db55c09af085ae0141343bf78935b70dcdda990980ef8e1c506027442d31a0ce0d67d52
+EBUILD i2pd-2.53.1.ebuild 1861 BLAKE2B 4a60f9314bc41909870a074515dedab2cd12570c22b1f9d8847e48bb02fbe7517ed4cbc5ee3704f078b974a24fedd8d9ad6e462f0ba78a87e5bff616d77761d1 SHA512 39cc1cccd1ddc73c66c08e3c9a031b7abf45e22604e93404973c9ecdb399a9facebf853206bbd579dc7fa409e0cd5862350efd5a54a24d71d1b0a03b700731a4
+MISC metadata.xml 478 BLAKE2B f0b9e6552cdd050bfbdd86ee4d664e0b293e2dfb614c4abffec8482cc0b06e331964db758f466136fff085485de50fd2c4f5c212126c93953423a3965676ac13 SHA512 9deb1abd5a97c2eab9191c9907c17add5c62a8a81d7f4e4c7b02a23f41b6f4e4526f049838cb92f50a14734d51ddd80a8cccc5b4ea2a424c5897bf3e2e4cf32f
diff --git a/net-vpn/i2pd/i2pd-2.52.0.ebuild b/net-vpn/i2pd/i2pd-2.52.0.ebuild
index 14ed8c998b07..02167b17f796 100644
--- a/net-vpn/i2pd/i2pd-2.52.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.52.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening +upnp"
+IUSE="cpu_flags_x86_aes +upnp"
 
 RDEPEND="
 	acct-user/i2pd
@@ -29,16 +29,10 @@ DOCS=( ../README.md ../contrib/i2pd.conf ../contrib/tunnels.conf )
 
 PATCHES=( "${FILESDIR}/${P}-miniupnp.patch" )
 
-pkg_pretend() {
-	if use i2p-hardening && ! tc-is-gcc; then
-		die "i2p-hardening requires gcc"
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+		-DWITH_HARDENING=OFF # worsens or matches the non-hardened profiles
 		-DWITH_STATIC=OFF
 		-DWITH_UPNP=$(usex upnp ON OFF)
 		-DWITH_LIBRARY=ON
diff --git a/net-vpn/i2pd/i2pd-2.53.1.ebuild b/net-vpn/i2pd/i2pd-2.53.1.ebuild
index cb442b9d45f9..b9b3a931569f 100644
--- a/net-vpn/i2pd/i2pd-2.53.1.ebuild
+++ b/net-vpn/i2pd/i2pd-2.53.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening +upnp"
+IUSE="cpu_flags_x86_aes +upnp"
 
 DEPEND="
 	dev-libs/boost:=
@@ -30,16 +30,10 @@ CMAKE_USE_DIR="${WORKDIR}/${P}/build"
 
 DOCS=( ../README.md ../contrib/i2pd.conf ../contrib/tunnels.conf )
 
-pkg_pretend() {
-	if use i2p-hardening && ! tc-is-gcc; then
-		die "i2p-hardening requires gcc"
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+		-DWITH_HARDENING=OFF # worsens or matches the non-hardened profiles
 		-DWITH_STATIC=OFF
 		-DWITH_UPNP=$(usex upnp ON OFF)
 		-DWITH_LIBRARY=ON
diff --git a/net-vpn/i2pd/metadata.xml b/net-vpn/i2pd/metadata.xml
index 9427ac50fa12..86d072b8ee21 100644
--- a/net-vpn/i2pd/metadata.xml
+++ b/net-vpn/i2pd/metadata.xml
@@ -9,11 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="i2p-hardening">
-			Compile with hardening on vanilla compilers/linkers
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">PurpleI2P/i2pd</remote-id>
 	</upstream>