From 5569d64c12eeaba5c6752595b1defef623ccc300 Mon Sep 17 00:00:00 2001 From: Valérian Rousset Date: Sat, 3 Aug 2024 14:16:15 +0200 Subject: net-vpn/i2p: add 2.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Valérian Rousset Closes: https://github.com/gentoo/gentoo/pull/37939 Signed-off-by: Joonas Niilola --- net-vpn/i2p/Manifest | 1 + .../i2p/files/2.6.0-force-gentoo-classpath.patch | 291 +++++++++++++++++++++ net-vpn/i2p/i2p-2.6.0.ebuild | 262 +++++++++++++++++++ 3 files changed, 554 insertions(+) create mode 100644 net-vpn/i2p/files/2.6.0-force-gentoo-classpath.patch create mode 100644 net-vpn/i2p/i2p-2.6.0.ebuild (limited to 'net-vpn') diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest index 64b2a9814809..b9560b8355df 100644 --- a/net-vpn/i2p/Manifest +++ b/net-vpn/i2p/Manifest @@ -1 +1,2 @@ DIST i2psource_2.5.2.tar.bz2 33791390 BLAKE2B ceb74d4dd1c694aa174d9861615f5765f5620a803a5bd8b30eb8f986b2855a70e38c90899ed655f5cb65af5dde1a9572d4bb4ad5d244e5a62805a81325bf8419 SHA512 92ee39fb75b8b3bc4a06ea04831d2267d0fcd52a250eaa5b162f3c1e2c29207a51dcbafe4eab4fcfa87b21317201911d5bdafc118f5493c98bb86d0513fc9c88 +DIST i2psource_2.6.0.tar.bz2 33486530 BLAKE2B c9a39f4700c590a4e9e6ba621f24d1b6b181e6e69433493259bd59113231c2023c506419298ae6ed158808c0a45bed91038ab92c96147973ec947a787f91f56c SHA512 fdabd15084d0f66474d70e4786951be31e7a0fb4bf8094cd1a442beebd3c81d5f00d88ddc4b79b79d1494e2ad469c2b8028279e1259cd80a6ba68b6265d1be2e diff --git a/net-vpn/i2p/files/2.6.0-force-gentoo-classpath.patch b/net-vpn/i2p/files/2.6.0-force-gentoo-classpath.patch new file mode 100644 index 000000000000..e0be1a1926f6 --- /dev/null +++ b/net-vpn/i2p/files/2.6.0-force-gentoo-classpath.patch @@ -0,0 +1,291 @@ +commit 0d7543a63f99fb1713274fd8619d0d7285f68727 +Author: tharvik +Date: Sat Aug 17 13:56:51 2024 +0200 + + add gentoo.classpath + +diff --git a/apps/i2pcontrol/build.xml b/apps/i2pcontrol/build.xml +index c350b0b73..db73702f4 100644 +--- a/apps/i2pcontrol/build.xml ++++ b/apps/i2pcontrol/build.xml +@@ -24,6 +24,7 @@ + + + ++ + + + +@@ -33,6 +34,7 @@ + + + ++ + + + +diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml +index 7033fccff..6701a4f47 100644 +--- a/apps/i2psnark/java/build.xml ++++ b/apps/i2psnark/java/build.xml +@@ -63,6 +63,7 @@ + + + ++ + + + +diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml +index fc40aa32b..91725ab16 100644 +--- a/apps/i2ptunnel/java/build.xml ++++ b/apps/i2ptunnel/java/build.xml +@@ -45,7 +45,7 @@ + destdir="./build/obj" + includeAntRuntime="false" + encoding="UTF-8" +- classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" > ++ classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar:${gentoo.classpath}" > + + + +@@ -373,6 +373,7 @@ + + + ++ + + + +@@ -410,6 +411,7 @@ + + + ++ + + + +@@ -477,6 +479,7 @@ + + + ++ + + + +diff --git a/apps/imagegen/imagegen/build.xml b/apps/imagegen/imagegen/build.xml +index ea55c2c7e..83d17e36c 100644 +--- a/apps/imagegen/imagegen/build.xml ++++ b/apps/imagegen/imagegen/build.xml +@@ -8,6 +8,7 @@ + + + ++ + + + +diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml +index 3eed66acf..79d664ca9 100644 +--- a/apps/jetty/build.xml ++++ b/apps/jetty/build.xml +@@ -418,6 +418,7 @@ + + + ++ + + + +diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml +index 7e589cb81..387c09eae 100644 +--- a/apps/ministreaming/java/build.xml ++++ b/apps/ministreaming/java/build.xml +@@ -262,6 +262,7 @@ + + + ++ + + + +@@ -326,6 +327,7 @@ + + + ++ + + + +diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml +index 3f9c7ba4b..abcac8aec 100644 +--- a/apps/routerconsole/java/build.xml ++++ b/apps/routerconsole/java/build.xml +@@ -88,6 +88,7 @@ + + + ++ + + + +@@ -499,6 +500,7 @@ + + + ++ + + + +@@ -539,6 +541,7 @@ + + + ++ + + + +diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml +index bd5782b73..d0c12b334 100644 +--- a/apps/sam/java/build.xml ++++ b/apps/sam/java/build.xml +@@ -18,6 +18,7 @@ + + + ++ + + + +@@ -39,7 +40,7 @@ + includeAntRuntime="false" + encoding="UTF-8" + destdir="./build/obj" +- classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" > ++ classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar:${gentoo.classpath}" > + + + +diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml +index ecfa0ebfd..690b456de 100644 +--- a/apps/streaming/java/build.xml ++++ b/apps/streaming/java/build.xml +@@ -76,6 +76,7 @@ + + + ++ + + + +@@ -143,6 +144,7 @@ + + + ++ + + + +diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml +index 801881118..2d34278e9 100644 +--- a/apps/susidns/src/build.xml ++++ b/apps/susidns/src/build.xml +@@ -35,6 +35,7 @@ + + + ++ + + + +diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml +index a8c8cfffa..098b911db 100644 +--- a/apps/susimail/build.xml ++++ b/apps/susimail/build.xml +@@ -53,6 +53,7 @@ + + + ++ + + + +diff --git a/core/java/build.xml b/core/java/build.xml +index be590b093..4dc18c711 100644 +--- a/core/java/build.xml ++++ b/core/java/build.xml +@@ -72,7 +72,7 @@ + debuglevel="lines,vars,source" + includeAntRuntime="false" + encoding="UTF-8" +- destdir="./build/obj" classpath="${javac.classpath.mod}" > ++ destdir="./build/obj" classpath="${javac.classpath.mod}:${gentoo.classpath}" > + + + +@@ -284,6 +284,7 @@ + + + ++ + + + +@@ -319,6 +320,7 @@ + + + ++ + + + +@@ -485,6 +487,7 @@ + + + ++ + + + +diff --git a/installer/tools/java/build.xml b/installer/tools/java/build.xml +index 51c45cebf..81b0f6f26 100644 +--- a/installer/tools/java/build.xml ++++ b/installer/tools/java/build.xml +@@ -29,7 +29,7 @@ + release="${javac.release}" + includeAntRuntime="false" + encoding="UTF-8" +- destdir="./build/obj" classpath="${javac.classpath}:../../../build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../../build/router.jar" > ++ destdir="./build/obj" classpath="${javac.classpath}:../../../build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../../build/router.jar:${gentoo.classpath}" > + + + +diff --git a/router/java/build.xml b/router/java/build.xml +index 34cf4c1f7..0b0833e38 100644 +--- a/router/java/build.xml ++++ b/router/java/build.xml +@@ -48,7 +48,7 @@ + debuglevel="lines,vars,source" + includeAntRuntime="false" + encoding="UTF-8" +- destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar:../../core/java/build/httpclient.jar:../../core/java/build/httpcore.jar" > ++ destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar:../../core/java/build/httpclient.jar:../../core/java/build/httpcore.jar:${gentoo.classpath}" > + + + +@@ -285,6 +285,7 @@ + + + ++ + + + +@@ -431,6 +432,7 @@ + + + ++ + + + diff --git a/net-vpn/i2p/i2p-2.6.0.ebuild b/net-vpn/i2p/i2p-2.6.0.ebuild new file mode 100644 index 000000000000..a77f1880f29d --- /dev/null +++ b/net-vpn/i2p/i2p-2.6.0.ebuild @@ -0,0 +1,262 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="test" + +inherit java-pkg-2 systemd toolchain-funcs + +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" + +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +LANGS=( + ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq + sr sv tk tr uk vi zh zh-TW +) +IUSE="${LANGS[@]/#/l10n_}" + +CP_DEPEND=" + dev-java/bcprov:0 + dev-java/hashcash:1 + dev-java/httpcomponents-client:4 + dev-java/identicon:1 + dev-java/java-getopt:1 + dev-java/java-service-wrapper:0 + dev-java/jbcrypt:0 + dev-java/json-simple:2.3 + dev-java/jsonrpc2-server:1 + dev-java/jstl:0 + dev-java/jstl-api:0 + dev-java/minidns-core:1 + dev-java/zxing-core:3 + dev-java/zxing-javase:3 + sys-devel/gettext:0[java] + www-servers/tomcat:9 +" +# jdk-11 for bug #932030 +DEPEND=" + dev-libs/gmp:0= + ${CP_DEPEND} + >=virtual/jdk-11:* + test? ( + dev-java/hamcrest:0 + dev-java/junit:4 + dev-java/mockito:4 + ) +" +BDEPEND=" + >=dev-java/ant-1.10.14-r3:0 + test? ( + >=dev-java/ant-1.10.14-r3:0[junit4] + ) +" +RDEPEND=" + ${CP_DEPEND} + acct-user/i2p + acct-group/i2p + >=virtual/jre-11:* +" + +PATCHES=( "${FILESDIR}/${PV}-force-gentoo-classpath.patch" ) + +DOCS=( README.md history.txt ) + +src_prepare() { + default # apply PATCHES + + # remove hardcoded javac's source & target + find -name build.xml \ + -exec sed -Ei 's,(source|target)="\$\{javac\.version\}",,g' {} + || + die "remove javac's source & target in build files" + + java-pkg-2_src_prepare + + # remove most bundled, excepted the next ones. + # apps/addressbook/java/src/net/metanotion too much code drift + # apps/i2psnark/java/src/org/klomp/snark too much code drift + # apps/jrobin need rrd4j ebuild + # apps/routerconsole/java/src/{com,edu} too much code drift + # {core,router}/java/src/com/southernstorm/noise use internal symbols + # core/java/src/freenet too much code drift + # core/java/src/gnu/crypto too much code drift + # router/java/src/com/maxmind changed interface + # router/java/src/org/cybergarage unable to find version 3 + # router/java/src/org/freenetproject too big to pull + # router/java/src/org/xlattice changed interface + java-pkg_clean ! \ + -path "./apps/jetty/jetty-distribution-*" # need to package jetty + ( cat >> override.properties || die 'set unbundled properties' ) <<- EOF + require.gettext=true + with-libgetopt-java=true + with-libjakarta-taglibs-standard-java=true + with-libjson-simple-java=true + with-libtomcat9-java=true + with-gettext-base=true + # with-geoip-database=true need std geoip use + # with-libjetty9-java=true needs a jetty ebuild + EOF + + # bcprov + rm -r core/java/src/net/i2p/crypto/elgamal || die 'unbundle bcprov' + sed -e 's,net\.i2p\.crypto\.elgamal\.spec,org.bouncycastle.jce.spec,' \ + -i core/java/src/net/i2p/crypto/CryptoConstants.java || + die 'redirect imports of bcprov' + # getopt, gettext + rm -r core/java/src/gnu/{getopt,gettext} || die 'unbundle GNU code' + # httpcomponents-client + rm -r core/java/src/net/i2p/apache || die 'unbundle httpcomponents-client' + sed -e 's,net\.i2p\.apache,org.apache,' \ + -i core/java/src/net/i2p/util/{Addresses,I2PSSLSocketFactory}.java \ + apps/i2pcontrol/java/net/i2p/i2pcontrol/HostCheckHandler.java || + die 'redirect imports of httpcomponents-client' + # identicon, zxing + rm -r apps/imagegen/{identicon,zxing} || die 'unbundle identicon & zxing' + sed -e '/LICENSE-Identicon.txt/d' -i build.xml && + sed -E '/dir="[^"]*(identicon|zxing)/d' -i apps/imagegen{/imagegen,}/build.xml && + sed -E '/(todir="build\/WEB-INF\/classes"|<\/copy>)/d' -i apps/imagegen/imagegen/build.xml || + die 'do not depend on unbundled' + mkdir -p apps/imagegen/identicon/build || die 'create built identicon dependencies' + java-pkg_jar-from --into apps/imagegen/identicon/build identicon-1 + # hashcash + rm core/java/src/com/nettgryppa/security/HashCash.java || + die 'unbundle hashcash' + # jbcrypt, jsonrpc2-* + rm -r apps/i2pcontrol/java/{com,org} || die 'unbundle jbcrypt & jsonrpc2-*' + # jstl* + sed -E '/"apps\/susidns\/src\/lib\/(jstl|standard).jar"/d' -i build.xml || + die 'unbundle jstl*' + java-pkg_jar-from --into apps/susidns/src/lib jstl jstl-impl.jar standard.jar + java-pkg_jar-from --into apps/susidns/src/lib jstl-api jstl-api.jar jstl.jar + # minidns-core, json-simple + rm -r core/java/src/org || die 'unbundle minidns-core & json-simple' + mkdir core/java/build || die 'create built core dependencies' + java-pkg_jar-from --into core/java/build json-simple-2.3 + + # keep only enabled locales + local lang + for lang in ${LANGS[@]} + do + if ! use "l10n_${lang}" + then + find -regextype egrep \ + -regex ".*[_\\./]${lang/-/_}.(html|po|1)" \ + -delete || die "unbundling ${lang} translations" + fi + done + + # fix some locale names + find -name '*_in.*' -exec rename --no-overwrite _in. _id. {} \; && + find -name '*_iw.*' -exec rename --no-overwrite _iw. _he. {} \; || + die 'fix some locale names' +} + +src_configure() { + # build for our JDK + cat >> override.properties <<-EOF || die 'set JDK infos' + ant.build.javac.source=$(java-pkg_get-source) + ant.build.javac.target=$(java-pkg_get-target) + EOF + + # deamon shouldn't start GUI + sed -i 's|\(clientApp.4.startOnLoad\)=true|\1=false|' \ + installer/resources/clients.config || + die 'avoid auto starting browser' + + # yep, that's us + echo 'build.built-by=Gentoo' >> override.properties || + die 'bragging failed' + + # support no-UTF-8 build systems + echo 'file.encoding=UTF-8' >> override.properties || + die 'set files encoding' +} + +src_compile() { + local libs='bcprov,gettext,hashcash-1,httpcomponents-client-4' + libs+=',java-getopt-1,java-service-wrapper,jbcrypt,jsonrpc2-server-1' + libs+=',tomcat-9,minidns-core-1,zxing-javase-3' + eant \ + -Dgentoo.classpath=`java-pkg_getjars --with-dependencies "${libs}"` \ + preppkg-base + + local compile_lib + compile_lib() { + local name="${1}" + shift 1 + + "$(tc-getCC)" "${@}" -Iinclude ${CFLAGS} $(java-pkg_get-jni-cflags) \ + ${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \ + "src/${name}.c" -o "lib${name}.so" + } + + cd "${S}/core/c/jbigi/jbigi" || die "unable to cd to jbigi" + compile_lib jbigi -lgmp || die "unable to build jbigi" + + if use amd64 || use x86; then + cd "${S}/core/c/jcpuid" || die "unable to cd to jcpuid" + compile_lib jcpuid || die "unable to build jcpuid" + fi +} + +src_test() { + # avoid rebuilding + sed -e '//d' -i core/java/build.xml || + die 'avoid building twice' + + # halt on error + find -name build.xml \ + -execdir sed -e 's/