gentoo auto-resync : 11:07:2022 - 01:28:44

5 files changed, 39 insertions, 149 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 14700cf9df34..983d5a7b036f 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest
index 6f0d0a17d803..870318ac5c56 100644
--- a/net-vpn/frp/Manifest
+++ b/net-vpn/frp/Manifest
@@ -5,6 +5,8 @@ AUX frps_at_.service 228 BLAKE2B e6464ef7fd71bf87f82101dd80b6633708d5d4b336515e0
 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
+DIST frp-0.44.0.tar.gz 1284095 BLAKE2B 35464acd0dcdf3eeeb326c612eeef457baad5a8a7eb36a28183fd3dd1f1eb585914ed290a0897928244ac1319f45358c0b19ae3606cb149501c7ead79ba2e26e SHA512 6a5d0f4985075e260bc7970031391b457a3c7b8ea05628f17b551ea9afc0f2454db76caaad49250a2aecdd7ca26abc8ff74ee705a4c44319d33a92e5c055fd56
 EBUILD frp-0.42.0.ebuild 867 BLAKE2B 5cf05d20c378625fdba349796b2a84ade9c58fc180b7cf94f9710f00843471b7a9486db0fb48063e46fce7f661985a0a1f4176a76fd4c63a4a8dde512b1d621b SHA512 e61f2e1721b0afbcb1777f26559ba426b6d7330d359a20db09c68e3d393ea808bdc689132cd8b71e9b9e31aa6885a10388cf906deae433e7423ca00da2eda7d2
 EBUILD frp-0.43.0.ebuild 1013 BLAKE2B e44c3ec402f582c4a17132e45379ec5be8e87b6574e16575be82e26e452078472985d1e0f4a4b34b7cd7f685c3d469cb6db68e6f4ce70e204a3c4d197cff27a0 SHA512 50182b1948739fe3fe16f0fd9e6573340d1e6d51bbbcb5d98998f8fa584d2498b2d8628453c529e025a4e4497714be4906b13c58cc04b848741893d0e8e96ca9
+EBUILD frp-0.44.0.ebuild 1013 BLAKE2B e44c3ec402f582c4a17132e45379ec5be8e87b6574e16575be82e26e452078472985d1e0f4a4b34b7cd7f685c3d469cb6db68e6f4ce70e204a3c4d197cff27a0 SHA512 50182b1948739fe3fe16f0fd9e6573340d1e6d51bbbcb5d98998f8fa584d2498b2d8628453c529e025a4e4497714be4906b13c58cc04b848741893d0e8e96ca9
 MISC metadata.xml 322 BLAKE2B 8438877d202ce024eb32c6ba8196e1d6bf14b2e29179be7a0c92fb521f110b2501f29f8961752b5bfe07e2c5ddbaae6f1ea087713259c26c3255e985003d56a5 SHA512 3204b6e7ff9565b4677ffa681e88c440e12fea53936d31cd6617f6e86180f92729e5f28f7b81419b131150a89fec364a073249047cf1a36066199b76e5c174ab
diff --git a/net-vpn/frp/frp-0.44.0.ebuild b/net-vpn/frp/frp-0.44.0.ebuild
new file mode 100644
index 000000000000..a9d8f761c7f8
--- /dev/null
+++ b/net-vpn/frp/frp-0.44.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 conf/*.ini; do mv "${x}"{,.example}; done
+	doins conf/*.example
+}
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 6951cae5c512..4710cbda8c88 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,7 +1,5 @@
 AUX i2p.init 391 BLAKE2B e62a23021db61ba93adaf1ff9c2f0bb9372cee3921544c9ca498f3472dc64c700a0fb78d2fed9dafc0fa98c97670f67266a2e0f8c594c7c1352d15e1b23d7586 SHA512 12c69b2c5918a23219d84f2c1ded286ced6f78564241372bead318ddcb77876e90c800735f7ed6e92c03f69dfeb990ec43e40efd1e9ee32888b404d1e2e9643a
 AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a
 DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f
-EBUILD i2p-1.6.1.ebuild 4460 BLAKE2B 787d90534c98d4fb6b399151a71bff687d623080f4b102112c1a86471c2e682f8f182b924237207b5cadc92633bc65ddba9bd261ebff02239d46469606002657 SHA512 18463baab09b5b06bf6077df16c70efd1b67731cb6f7a6e11b9d6be3ff574a3190405528476e23709d7cdc7f372025e1d2109a7be242ce527efffb71ad61feda
 EBUILD i2p-1.7.0.ebuild 4309 BLAKE2B 7a17e63badb7ddf0acbbfbd28e5edffd602b872797ae96be16ab50aedac9d4eb88244e156798c853ccea567c9bcb23cce0669b4f5913208e365880160e1f0f0e SHA512 93b5cbc1a7bf69ea9efdcda9f2daaee55a66ba84ab6448e01b40dd72e1c0f4621e62669d9674937ad841e3f2c1ff71756f30536c52b722b48f4f6a8f54e06fb8
 MISC metadata.xml 740 BLAKE2B 06a3a1b273cd25dacdedfb1e9dbb1a1ef5c32cf44bb76101ba521ac3b387533c10e111b76182a04e55d50a9bdf7e03f15101db768a63d03c02190c5aebe1f4ac SHA512 b598a77193edf843a205f4fdf22e779b978e26d1b3fcec9adc19e78783bbda15d53c66a55ef0b14fe3c25601f167e5f5f299fa0472ef3620dc46fd47c97ff909
diff --git a/net-vpn/i2p/i2p-1.6.1.ebuild b/net-vpn/i2p/i2p-1.6.1.ebuild
deleted file mode 100644
index 4dc99a0cf9e6..000000000000
--- a/net-vpn/i2p/i2p-1.6.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2 systemd
-
-DESCRIPTION="A privacy-centric, anonymous network"
-HOMEPAGE="https://geti2p.net"
-SRC_URI="https://files.i2p-projekt.de/${PV}/i2psource_${PV}.tar.bz2"
-
-LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
-SLOT="0"
-
-# Until the deps reach other arches
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="nls test"
-RESTRICT="!test? ( test )"
-
-# dev-java/ant-core is automatically added due to java-ant-2.eclass
-CP_DEPEND="dev-java/java-service-wrapper:0"
-
-#dev-java/eclipse-ecj:*
-DEPEND="${CP_DEPEND}
-	virtual/jdk:1.8
-	nls? ( >=sys-devel/gettext-0.19 )
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/junit:4
-		dev-java/mockito:0
-	)
-"
-
-RDEPEND="${CP_DEPEND}
-	acct-user/i2p
-	acct-group/i2p
-	net-libs/nativebiginteger:0
-	virtual/jre:1.8
-"
-
-EANT_BUILD_TARGET="pkg"
-# no scala as depending on antlib.xml not installed by dev-lang/scala
-EANT_TEST_TARGET="junit.test"
-JAVA_ANT_ENCODING="UTF-8"
-
-src_prepare() {
-	if use test; then
-		# no *streaming as requiring >dev-java/mockito-1.9.5
-		sed -e "/streaming.*junit\.test/d" \
-			-i build.xml ||
-			die "unable to remove ministreaming tests"
-	fi
-
-	# as early as possible to allow generic patches to be applied
-	default
-
-	java-ant_rewrite-classpath
-
-	java-pkg-2_src_prepare
-
-	# We're on GNU/Linux, we don't need .exe files
-	echo "noExe=true" > override.properties || die
-	if ! use nls; then
-		echo "require.gettext=false" >> override.properties || die
-	fi
-
-	# avoid auto starting browser
-	sed -i "s|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|" \
-		installer/resources/clients.config || die
-
-	# generate wrapper classpath, keeping the default to be replaced later
-	i2p_cp="" # global forced by java-pkg_gen-cp
-	java-pkg_gen-cp i2p_cp
-	local lib i=2
-	local classpath="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n"
-	for lib in ${i2p_cp//,/ }
-	do
-		classpath+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
-	done
-
-	# add generated classpath, hardcode system VM, setting system's conf
-	sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${classpath}|" \
-		-e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
-		-e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/$(get_libdir)/java-service-wrapper|" \
-		-e "s|\(wrapper\.java\.library\.path\)\.2=.*|\1.2=${EPREFIX}/usr/share/i2p/lib\n\1.3=/usr/$(get_libdir)|" \
-		-e "s|\(wrapper\.java\.additional\.1=-DloggerFilenameOverride\)=.*|\1=${EPREFIX}/var/log/i2p/router-@|" \
-		-e "s|\(wrapper\.logfile\)=.*|\1=${EPREFIX}/var/log/i2p/wrapper|" \
-		-e "/wrapper\.java\.additional\.2\(\.stripquote\|\)/d" \
-		-i installer/resources/wrapper.config ||
-		die "unable to apply gentoo config"
-	local prop i=2
-	for prop in \
-		"i2p.dir.base=${EPREFIX}/usr/share/i2p" \
-		"i2p.dir.app=${EPREFIX}/var/lib/i2p/app" \
-		"i2p.dir.config=${EPREFIX}/var/lib/i2p/config" \
-		"i2p.dir.router=${EPREFIX}/var/lib/i2p/router" \
-		"i2p.dir.log=${EPREFIX}/var/log/i2p" \
-		"i2p.dir.pid=${EPREFIX}/tmp" \
-		"i2p.dir.temp=${EPREFIX}/tmp"
-	do
-		echo "wrapper.java.additional.$((i++))=-D$prop" >> installer/resources/wrapper.config ||
-			die "unable to apply gentoo config"
-	done
-}
-
-src_test() {
-	# generate test classpath
-	local classpath="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3,mockito)"
-	EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${classpath}" java-pkg-2_src_test
-}
-
-src_install() {
-	# cd into pkg-temp.
-	cd "${S}/pkg-temp" || die
-
-	# we remove system installed jar and install the others
-	rm lib/wrapper.jar || \
-		die "unable to remove locally built jar already found in system"
-	java-pkg_dojar lib/*.jar
-
-	# create own launcher
-	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-
-	# Install main files and basic documentation
-	insinto "/usr/share/i2p"
-	doins blocklist.txt hosts.txt *.config
-	dodoc history.txt INSTALL-headless.txt LICENSE.txt
-	doman man/*
-
-	# Install other directories
-	doins -r certificates docs eepsite geoip scripts
-	java-pkg_dowar webapps/*.war
-
-	# Install daemon files
-	newinitd "${FILESDIR}/i2p.init" i2p
-	systemd_dounit "${FILESDIR}/i2p.service"
-
-	# setup log
-	keepdir /var/log/i2p
-	fowners i2p:i2p /var/log/i2p
-
-	# setup user
-	keepdir /var/lib/i2p
-	fowners i2p:i2p /var/lib/i2p
-}