From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CC9AD15813A for ; Fri, 17 Jan 2025 13:36:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0BFACE08DB; Fri, 17 Jan 2025 13:36:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E39B8E08DB for ; Fri, 17 Jan 2025 13:36:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 705013431F1 for ; Fri, 17 Jan 2025 13:36:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 034AD231C for ; Fri, 17 Jan 2025 13:36:07 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1737120959.14e265614411d6665594c800b29e41bdd70025da.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/freenet/Manifest net-p2p/freenet/freenet-0.7.5_p1500.ebuild X-VCS-Directories: net-p2p/freenet/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 14e265614411d6665594c800b29e41bdd70025da X-VCS-Branch: master Date: Fri, 17 Jan 2025 13:36:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 76977a07-db10-43ef-8b5d-66d8e3b8f748 X-Archives-Hash: f3713325d422094973969182b68c2166 commit: 14e265614411d6665594c800b29e41bdd70025da Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Dec 25 09:25:19 2024 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Jan 17 13:35:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14e26561 net-p2p/freenet: add 0.7.5_p1500 Closes: https://bugs.gentoo.org/947151 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/39889 Signed-off-by: Joonas Niilola gentoo.org> net-p2p/freenet/Manifest | 2 + net-p2p/freenet/freenet-0.7.5_p1500.ebuild | 219 +++++++++++++++++++++++++++++ 2 files changed, 221 insertions(+) diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest index 1e47162dde9c..6abee10c5f99 100644 --- a/net-p2p/freenet/Manifest +++ b/net-p2p/freenet/Manifest @@ -1,3 +1,5 @@ DIST freenet-build01498-source.tar.bz2 6349168 BLAKE2B e42b3b7a89a5b4051ac38512d6beb06ce21d661e9cdb7ae1e2e0f800cea4cac0885281efb589e29800e4fd15578b223dd42c2bfbfe3b0deabd774073eef0a4e8 SHA512 6202e6f066c85ae704cb1f5db8b971cfec39dc902b166d5204be87848f9ff338bf964cd694702c6a3bfd08c23533a3658914998cf384ddec367b77c09c6eb808 DIST freenet-build01498-source.tar.bz2.sig 566 BLAKE2B 5c7fef3e5272be6ba4d75d5ca62cebe6bf2ebbc3086ad840e26c52b908bc9b7a2d0e3a77e20fbc3774d7a73bc63c710e3e44e681cf675931aa1bd1373c198c7c SHA512 008a13bde022d4db0b8daf2318c91255fc46bb374c884767b29370e4f0e595c7a9ca787a81197bcb2191c9b4f217f8f7ab7a1a9f5f91d51ac06a2a6505aa367e +DIST freenet-build01500-source.tar.bz2 6314667 BLAKE2B dc4a7333f030f6d53a5d734bd2b8dfd6712d555addadb2201a899118ad69414779db7d499884daf69ce687e57d510ebef76fdc6d9cb2cb3ae5fd649e5529ac10 SHA512 a7e67f91805b04d9e7cf56af12afd07d8cccedbed3a9977e4d5af938711ab4d9aee7ed85acad8f3e03c8ce4f35e4324fd6a607fc00f135ac1bfecd6ed3cbcb04 +DIST freenet-build01500-source.tar.bz2.sig 566 BLAKE2B 69f05acb65b093c5d62160ef5933446a0383c2aaf9d42fa216df21106ac86b6e49d56c1223746c7d602717cdd2340bbf3834fdde9026b4765d4454decf7f5a31 SHA512 2028ba06cbf6cbf123b011365f32ef4fdeb1f61cf8bbfc0e92e7666a8a2f3eacadd5deff9d12e1952146cd3830f95bf5515ea71e20a2321a7e204286c77423bf DIST seednodes-0.7.5_p1480.tar.gz 12364 BLAKE2B edb4e2a5c7424b51f0afb8234c7e486d56fe92e9201ab7ed7658366f070225f8def1b5412a31367e434ab4afae393caa16e7bdd7307f1d870607105fd5076638 SHA512 a2662a29f5721cd1523eb68b8787b074baec990327207b9ff444c91e644738a610e5216064aef00c62d6aca8ba66b2035a3175f63d45c1e0e8efc816b2a38660 diff --git a/net-p2p/freenet/freenet-0.7.5_p1500.ebuild b/net-p2p/freenet/freenet-0.7.5_p1500.ebuild new file mode 100644 index 000000000000..29085cb5336b --- /dev/null +++ b/net-p2p/freenet/freenet-0.7.5_p1500.ebuild @@ -0,0 +1,219 @@ +# 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:0 + 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 + 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 +}