commit: 59ad5ebfde582e0643fe7c95ae794e50b4c0b4d5 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Oct 8 07:40:37 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Oct 9 07:00:44 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ad5ebf
net-p2p/freenet: drop 0.7.5_p1501-r1 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/43678 Signed-off-by: Sam James <sam <AT> gentoo.org> net-p2p/freenet/Manifest | 2 - .../freenet-0.7.5_p1498-ignore-failing-tests.patch | 42 ---- net-p2p/freenet/freenet-0.7.5_p1501-r1.ebuild | 219 --------------------- 3 files changed, 263 deletions(-) diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest index a639735d1bed..9e65bc331d25 100644 --- a/net-p2p/freenet/Manifest +++ b/net-p2p/freenet/Manifest @@ -1,5 +1,3 @@ -DIST freenet-build01501-source.tar.bz2 6314508 BLAKE2B 9c666481c10322cb95284b8e2e10c5a995c5f0e2d9054e774c30df737bda1c5ee75c918f1e4b6e901e04724e4c5a3b3118ba3f50f8929d5b9bfe6eea023317b4 SHA512 5ea5558d9b2698da29afe909180bec09739bfc8ca9888be9b97eaa0e7ae9bb055d81c9a957956a492fc1dd1774876f1be2c5835e2f65ac204af5a1adfd113c48 -DIST freenet-build01501-source.tar.bz2.sig 566 BLAKE2B 888365c8424a05222f644baab37abb90802f6443c3fe07a94d149ea4baebc3613865fc5a4f8d5691f755b56647cad0f47c358b3b549ff88fabd1d4643e210fa0 SHA512 fe121c84067d170b79faa643f625eaa8ef0a1b063eb08b972f1c5d6a3f4a6d3c55b372c0b2892abd72c4266b1c2dd3419068ccb8d413e6076e0c6913b0b36401 DIST freenet-build01503-source.tar.bz2 6766859 BLAKE2B f23091d3c0d03eb6cc85e6417465516274e9083dc427fac1b6baad8f7c018c3a4a4f57a7d74058763c32f8c45b93830d48cedee0279f8fb2b3d95caa9714ef25 SHA512 0b8d584ea5591fce1b45290d920ca233803b2c4ea5ed4c8f83b34652d2b10ecb1a812277ffd6d5ddfde71a00cb6475023f53c7024ad0a85da4e83488ba3bc69a DIST freenet-build01503-source.tar.bz2.sig 566 BLAKE2B 525c749eaa0f499ffdd1ebeac1b4473c22259b9370143706576fba44a618e569cf986b7ad8e4a91730eb2c7809e413a5f433e3b9641dda1be3d7a6ed7856fb58 SHA512 52f2fa65d6cef59ea2b85a510c361470e5cf042d591ef0f3275eed4eb82a55529a52cf3452b5e507554cd822adbaff56121ac134b43a3adac62fbed350d5e881 DIST freenet-ext-29.tar.gz 4328779 BLAKE2B a9dc6dc34d6dbccc9f89c955f35b35024a7067aa8e89cf195492e77a8ebc92b73cc98e779c7f75ba6a430e994e856937be018a6505e1cda07eeea275925ee0e7 SHA512 11cf0942042483403cf526684a18c2b1766d3f6fb15c2ca4bdb59d95382ed86fcdb71a66d9f43a504abf3ca5c53f9da749086e462bbb56826beb95a2a7f1cbfa diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1498-ignore-failing-tests.patch b/net-p2p/freenet/files/freenet-0.7.5_p1498-ignore-failing-tests.patch deleted file mode 100644 index 5212cebc19ee..000000000000 --- a/net-p2p/freenet/files/freenet-0.7.5_p1498-ignore-failing-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -There were 2 failures: -1) testGetStringOverridden(freenet.l10n.BaseL10nTest) -org.junit.ComparisonFailure: expected:<[O]verridden> but was:<[Not o]verridden> - at org.junit.Assert.assertEquals(Assert.java:117) - at org.junit.Assert.assertEquals(Assert.java:146) - at freenet.l10n.BaseL10nTest.testGetStringOverridden(BaseL10nTest.java:188) -2) testStrings(freenet.l10n.BaseL10nTest) -java.lang.AssertionError: Error in test.unmatchedCloseSubstitution for ENGLISH: Starts with / - at org.junit.Assert.fail(Assert.java:89) - at freenet.l10n.BaseL10nTest.testStrings(BaseL10nTest.java:245) - -FAILURES!!! -Tests run: 1053, Failures: 2 - ---- a/test/freenet/l10n/BaseL10nTest.java -+++ b/test/freenet/l10n/BaseL10nTest.java -@@ -6,6 +6,7 @@ import java.io.File; - import java.util.Iterator; - - import org.junit.Test; -+import org.junit.Ignore; - - import freenet.l10n.BaseL10n.LANGUAGE; - import freenet.support.HTMLNode; -@@ -181,7 +182,7 @@ public class BaseL10nTest { - assertEquals("Sane", value); - } - -- @Test -+ @Test @Ignore - public void testGetStringOverridden() { - BaseL10n l10n = createTestL10n(LANGUAGE.ENGLISH); - String value = l10n.getString("test.override"); -@@ -230,7 +231,7 @@ public class BaseL10nTest { - assertEquals("test.nonexistent", value); - } - -- @Test -+ @Test @Ignore - public void testStrings() throws Exception { - for (LANGUAGE lang : LANGUAGE.values()) { - BaseL10n l10n = createL10n(lang); diff --git a/net-p2p/freenet/freenet-0.7.5_p1501-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1501-r1.ebuild deleted file mode 100644 index 84416a59a737..000000000000 --- a/net-p2p/freenet/freenet-0.7.5_p1501-r1.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple systemd verify-sig - -DESCRIPTION="An encrypted network without censorship" -HOMEPAGE="https://www.hyphanet.org"; -PEV="3.1.6" -SRC_URI="https://github.com/hyphanet/fred/releases/download/build0${PV#*p}/freenet-build0${PV#*p}-source.tar.bz2 - https://github.com/hyphanet/seedrefs/archive/build01480.tar.gz -> seednodes-0.7.5_p1480.tar.gz - verify-sig? ( - https://github.com/hyphanet/fred/releases/download/build0${PV#*p}/freenet-build0${PV#*p}-source.tar.bz2.sig - )" -S="${WORKDIR}/freenet-build0${PV#*p}" - -LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64" -IUSE="+nss" - -CP_DEPEND=" - dev-java/bcprov:0 - dev-java/commons-compress:0 - dev-java/commons-io:1 - dev-java/fec:0 - dev-java/freenet-ext:29 - dev-java/java-service-wrapper:0 - dev-java/jbitcollider-core:0 - dev-java/jna:4 - dev-java/lzma:0 - dev-java/lzmajio:0 - dev-java/mersennetwister:0 - dev-java/pebble:0 -" - -DEPEND=" - dev-java/unbescape:0 - >=virtual/jdk-1.8:* - ${CP_DEPEND} - test? ( - dev-java/hamcrest:0 - dev-java/mockito:1 - dev-java/objenesis:0 - net-libs/NativeThread:0 - ) -" -RDEPEND=" - acct-user/freenet - acct-group/freenet - >=virtual/jre-1.8:* - ${CP_DEPEND} - nss? ( dev-libs/nss ) -" -BDEPEND=" - app-arch/unzip - verify-sig? ( sec-keys/openpgp-keys-freenet ) -" -PDEPEND="net-libs/NativeThread:0" - -DOCS=( - AUTHORS - CONTRIBUTING.md - NEWS.md - README.md - SECURITY.md -) - -PATCHES=( - "${FILESDIR}/freenet-0.7.5_p1498-ignore-failing-tests.patch" -) - -JAVA_CLASSPATH_EXTRA=" - java-service-wrapper - unbescape -" -JAVA_RESOURCE_DIRS="res" -JAVA_SRC_DIR="src" -JAVA_TEST_GENTOO_CLASSPATH=" - hamcrest - junit-4 - mockito-1 - objenesis -" -# Yes, both variables point to the same directory -# https://github.com/hyphanet/fred/blob/build01497/build.gradle#L169-L173 -JAVA_TEST_RESOURCE_DIRS="test" -JAVA_TEST_SRC_DIR="test" - -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/freenetproject.org.asc" -src_unpack() { - if use verify-sig; then - verify-sig_verify_detached \ - "${DISTDIR}"/freenet-build0${PV#*p}-source.tar.bz2 \ - "${DISTDIR}"/freenet-build0${PV#*p}-source.tar.bz2.sig - fi - unpack freenet-build0${PV#*p}-source.tar.bz2 - unpack seednodes-0.7.5_p1480.tar.gz -} - -src_prepare() { - default - java-pkg-2_src_prepare - - # Could not get resource : freenet/l10n/freenet.l10n.pt-PT.properties - # https://github.com/hyphanet/fred/pull/500 - mv src/freenet/l10n/freenet.l10n.pt{_,-}PT.properties || die - - # java-pkg-simple wants resources in JAVA_RESOURCE_DIRS - mkdir res || die - pushd src > /dev/null || die - find -type f \ - ! -name '*.java' \ - ! -name 'package.html' \ - ! -path '*/simulator/readme.txt' \ - | xargs cp --parent -t ../res || die - popd > /dev/null || die - - mkdir "${JAVA_RESOURCE_DIRS}/META-INF" || die - cat > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" <<- EOF || die - Add-opens: java.base/java.lang java.base/java.util java.base/java.io - EOF - - cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref - cp "${FILESDIR}"/freenet-0.7.5_p1497-wrapper.conf freenet-wrapper.conf || die - cp "${FILESDIR}"/run.sh-20090501 run.sh || die - - sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \ - freenet-wrapper.conf || die "sed failed" - - echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf || die - if use nss; then - echo "wrapper.java.additional.11=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die - fi -} - -src_compile() { - java-pkg-simple_src_compile - - # Moved here because of using JAVA_GENTOO_CLASSPATH which is populated by java-pkg_gen-cp. - local i=2 pkg jars jar - local ifs_original=${IFS} - IFS="," - for pkg in ${JAVA_GENTOO_CLASSPATH} ; do - jars="$(java-pkg_getjars ${pkg})" - for jar in ${jars} ; do - echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf || die - done - done - IFS=${ifs_original} - echo "wrapper.java.library.path.2=/usr/$(get_libdir)/java-service-wrapper" >> freenet-wrapper.conf || die - echo "wrapper.java.library.path.3=/usr/$(get_libdir)/jna-4" >> freenet-wrapper.conf || die -} - -src_test() { - JAVA_TEST_EXTRA_ARGS=( - -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/jna-4/" - -Djna.nosys=false - -Dnetworkaddress.cache.negative.ttl=0 - -Dnetworkaddress.cache.ttl=0 - # https://github.com/hyphanet/fred/blob/build01497/build.gradle#L194-L196 - # "test.l10npath_main" reads from the JAR file. - -Dtest.l10npath_test="freenet/l10n/" - -Dtest.l10npath_main="freenet/l10n/" - ) - local vm_version="$(java-config -g PROVIDES_VERSION)" - if ver_test "${vm_version}" -ge 17; then - JAVA_TEST_EXTRA_ARGS+=( - --add-opens=java.base/java.io=ALL-UNNAMED - --add-opens=java.base/java.lang=ALL-UNNAMED - --add-opens=java.base/java.util=ALL-UNNAMED - ) - fi - - pushd test > /dev/null || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -type f -name "*Test.java" \ - ) - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - popd > /dev/null || die - java-pkg-simple_src_test -} - -src_install() { - java-pkg-simple_src_install - - doinitd "${FILESDIR}"/freenet - - systemd_dounit "${FILESDIR}"/freenet.service - - insinto /etc - doins freenet-wrapper.conf - insinto /var/freenet - doins run.sh seednodes.fref - fperms +x /var/freenet/run.sh -} - -pkg_postinst() { - elog " " - elog "1. Start freenet with rc-service freenet start." - elog "2. Open localhost:8888 in your browser for the web interface." - #workaround for previously existing freenet user - [[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \ - freenet:freenet /var/freenet -} - -pkg_postrm() { - if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then - elog " " - elog "If you dont want to use freenet any more" - elog "and dont want to keep your identity/other stuff" - elog "remember to do 'rm -rf /var/freenet' to remove everything" - fi -}
