public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/files/, net-p2p/freenet/
@ 2016-07-16 17:12 Thomas Sachau
  0 siblings, 0 replies; 7+ messages in thread
From: Thomas Sachau @ 2016-07-16 17:12 UTC (permalink / raw
  To: gentoo-commits

commit:     d39df900b854f95f556a34c7854002d223cfdc79
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 17:11:36 2016 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 17:12:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d39df900

net-p2p/freenet: Version bump to 1475

Package-Manager: portage-2.2.27

 net-p2p/freenet/Manifest                           |   4 +-
 net-p2p/freenet/files/0.7.5_p1302-ext.patch        |  22 ----
 ....7.5_p1384-libraryloader-just-try-loading.patch |  17 ---
 ...384-nativebiginteger-no-nativedoublevalue.patch |  28 ----
 .../freenet/files/freenet-0.7.5_p1389-wrapper.conf |  49 -------
 ...apper.conf => freenet-0.7.5_p1474-wrapper.conf} |   4 +-
 ...braryloader-revert-using-of-absolute-path.patch |  19 ---
 net-p2p/freenet/freenet-0.7.5_p1470.ebuild         | 144 ---------------------
 ...7.5_p1472.ebuild => freenet-0.7.5_p1475.ebuild} |  12 +-
 9 files changed, 7 insertions(+), 292 deletions(-)

diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 3be33aa..cdedea5 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,5 +1,3 @@
-DIST freenet-0.7.5_p1470.zip 4900868 SHA256 2c3d976db30cacc88d63fc577e4cb1cd26a111116f0d0b65c981b71495fa3b5b SHA512 90f1693c9a5395b99f2bdf7517c29811726aef3175d6c7faded9e57a4b72addcf9ba8516c82dfe198c07b8dbed441de63d0321265049c14673cf5f48d2adf116 WHIRLPOOL 983e2abdecbf229edd28badee0a66072f5cf7e71731c4bfa0fb01ea60d508f94bcdb04eae8bc70bef4c8b846b9f28fded308a1920de690cbfdb21e98529a631d
-DIST freenet-0.7.5_p1472.zip 4958808 SHA256 8033c3f3726fed6cd1493582b0d1665b65fedc8b6807f61f25a7d8ca276b4f83 SHA512 ac551986bcbf402833bfa6947bd315ffb36d13ddf219152ea9aa57f93ed8e85b599ccc900b3f6ead3143c39f3f22277442af531c62deb2ba17bd2f9dd80ba1ec WHIRLPOOL 7dfb986996fcc9832371b498274c3397ddcf614c02c44d72526b981269942ca72a1d35d36e66446cba5ae2d2b6bcd0b93f7df4984b8dfb0d657c8a9de601994b
+DIST freenet-0.7.5_p1475.zip 5009537 SHA256 21b3c3e95ea094cd137ae081e9b5dff098b9e5c20b37576dc0b1c091b6ee3108 SHA512 96376600fb3ff6d2bd6ede426fd05c684b51a0f2ace1f83696b0f63b2e2acd9359d41558a11d954e54031e88a62afe854f6cab7d852756dff76851f075249369 WHIRLPOOL 59e5b6240f3e34e6032feb1702e03f55fdd0bfa12977e70281cdf626e56863eff66b93c35afa54f9c398a87b4d8ac5254238b33742904ac9ec10f6bdb759228d
 DIST freenet-ant-1.7.1.jar 1327167 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408 WHIRLPOOL 667be2b1581c5fd847907b63522a0f83c595a6b8f1805d714e978a5cb0f05de4804153c89605618adf5c3b097a7019e7d7e9de0bf0987c7b1adb0dbc54e0f055
-DIST seednodes-20150812.fref.bz2 11631 SHA256 bf8a83a2c5cb7c160119d69c657f1db5324794c3603f13acb41416c09728fdc7 SHA512 3aa2ef00ca058b313032243f03f0f82a4e70f455bbe3dee48f9ce438415711f4415172946a3f958e14a699df69d9d0fa88173ce482c0b3d503da0829418b1d3d WHIRLPOOL 724b610d6ebd839a304262645cbf81fb7ea6c5da7b6121e76016d1752dc474fb331e74abe445987f5af94181eacfba832ec23077aa84ba08026bbf831d542a44
 DIST seednodes-20160521.fref.bz2 13751 SHA256 c122851dee2da471d3e286c9fad4d3c94e3d235fd8dc9f27bc99eeff5811f7a8 SHA512 3530ac6bf9de886930bb403c2d2ec27102d5dc6904582ee69987e369dbfaf7170aadbc02b95836ff43fef2531fb06087a494b426662cd5529c87316590fd2686 WHIRLPOOL 3b8bd751983f3cd97677129a6205d1365a3bc95dc4a4a7e7ba539d75c0faf9159b6f03bf2c89e9290a07a2b58641af0e59d227a8b4cfc31e91c9a3ba1c85547d

diff --git a/net-p2p/freenet/files/0.7.5_p1302-ext.patch b/net-p2p/freenet/files/0.7.5_p1302-ext.patch
deleted file mode 100644
index 035b4e6..0000000
--- a/net-p2p/freenet/files/0.7.5_p1302-ext.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/freenet/node/NodeStarter.java	2010-11-10 21:46:10.000000000 +0100
-+++ src/freenet/node/NodeStarter.java.new	2010-11-10 21:50:12.000000000 +0100
-@@ -49,8 +49,8 @@
- 	public static final String extRevisionNumber;
- 	
- 	static {
--		extBuildNumber = ExtVersion.extBuildNumber();
--		extRevisionNumber = ExtVersion.extRevisionNumber();
-+		extBuildNumber = RECOMMENDED_EXT_BUILD_NUMBER;
-+		extRevisionNumber = "";
- 	}
- 
- 	private FreenetFilePersistentConfig cfg;
-@@ -86,7 +86,7 @@
- 			return Integer.valueOf(-1);
- 		}
- 
--		String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + ExtVersion.buildNumber + " r" + ExtVersion.cvsRevision+" running with ext build "+extBuildNumber+" r" + extRevisionNumber;
-+		String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + extBuildNumber + " running with ext build "+extBuildNumber;
- 		Logger.normal(this, builtWithMessage);
- 		System.out.println(builtWithMessage);
- 

diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch b/net-p2p/freenet/files/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch
deleted file mode 100644
index ffe9354..0000000
--- a/net-p2p/freenet/files/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- freenet-0.7.5_p1384/src/freenet/support/LibraryLoader.java.orig	2011-07-29 17:32:37.000000000 +0200
-+++ freenet-0.7.5_p1384/src/freenet/support/LibraryLoader.java	2011-07-29 17:35:02.000000000 +0200
-@@ -48,12 +48,11 @@
- 		final String libraryNameWithPrefixAndArchAndSuffix = libraryNameWithPrefixAndArch + prefix;
- 		String resourceName = path + libraryNameWithPrefixAndArchAndSuffix;
- 
--		File nativeLib = new File((System.getProperty("java.library.path")) + "/lib" + libraryName + prefix);
--		if (nativeLib.exists()) {
-+		try {
- 			System.out.println("Attempting to load the NativeThread library ["+libraryName+']');
- 			System.loadLibrary(libraryName);
- 			success = true;
--		} else {
-+		} catch(UnsatisfiedLinkError ule) {
- 			try {
- 				// Get the resource
- 				URL resource = LibraryLoader.class.getResource(resourceName);

diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch b/net-p2p/freenet/files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
deleted file mode 100644
index 5300fb1..0000000
--- a/net-p2p/freenet/files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- freenet-0.7.5_p1384/src/net/i2p/util/NativeBigInteger.java.orig	2011-07-29 16:48:36.000000000 +0200
-+++ freenet-0.7.5_p1384/src/net/i2p/util/NativeBigInteger.java	2011-07-29 16:50:20.000000000 +0200
-@@ -193,12 +193,6 @@
- 	 */
- 	public native static byte[] nativeModPow(byte base[], byte exponent[], byte modulus[]);
- 
--	/**
--	 * Converts a BigInteger byte-array to a 'double'
--	 * @param ba Big endian twos complement representation of the BigInteger to convert to a double
--	 * @return The plain double-value represented by 'ba'
--	 */
--	public native static double nativeDoubleValue(byte ba[]);
- 	private byte[] cachedBa = null;
- 
-         /**
-@@ -286,11 +280,7 @@
- 
- 	@Override
- 	public double doubleValue() {
--		// TODO Recent tests show that Java version is quicker. Maybe drop?
--		if(_nativeOk)
--			return nativeDoubleValue(toByteArray());
--		else
--			return super.doubleValue();
-+		return super.doubleValue();
- 	}
- 
- 	/**

diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1389-wrapper.conf b/net-p2p/freenet/files/freenet-0.7.5_p1389-wrapper.conf
deleted file mode 100644
index 066f624..0000000
--- a/net-p2p/freenet/files/freenet-0.7.5_p1389-wrapper.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-wrapper.java.command=java
-wrapper.working.dir=/var/freenet/
-wrapper.java.mainclass=freenet.node.NodeStarter
-wrapper.java.library.path.1=/usr/lib
-wrapper.java.initmemory=60
-wrapper.java.maxmemory=128
-wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=0
-wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=0
-wrapper.java.additional.3=-enableassertions:freenet
-# You might want to set the following line if you have changed java.maxmemory
-wrapper.java.additional.4=-XX:MaxPermSize=256M
-
-wrapper.app.parameter.1=freenet.ini
-wrapper.console.format=PM
-wrapper.console.loglevel=INFO
-wrapper.logfile=wrapper.log
-wrapper.logfile.format=LPTM
-wrapper.logfile.loglevel=INFO
-wrapper.logfile.maxsize=2M
-wrapper.logfile.maxfiles=3
-wrapper.syslog.loglevel=NONE
-wrapper.console.title=Freenet 0.7
-wrapper.jvm_exit.timeout=120
-wrapper.restart.reload_configuration=TRUE
-wrapper.filter.trigger.1=java.lang.OutOfMemoryError
-wrapper.filter.action.1=RESTART
-
-# Name of the service
-wrapper.ntservice.name=freenet-darknet
-
-# Display name of the service
-wrapper.ntservice.displayname=Freenet 0.7 darknet
-
-# Description of the service
-wrapper.ntservice.description=The Free Network Project daemon
-
-# Service dependencies.  Add dependencies as needed starting from 1
-wrapper.ntservice.dependency.1=
-
-# Mode in which the service is installed.  AUTO_START or DEMAND_START
-wrapper.ntservice.starttype=AUTO_START
-
-# Allow the service to interact with the desktop.
-wrapper.ntservice.interactive=false
-
-wrapper.ntservice.process_priority=BELOW_NORMAL
-
-# Start services with a different user than SYSTEM
-# SEE http://wrapper.tanukisoftware.org/doc/english/prop-ntservice-account.html BEFORE PROCEEDING !

diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1422-wrapper.conf b/net-p2p/freenet/files/freenet-0.7.5_p1474-wrapper.conf
similarity index 91%
rename from net-p2p/freenet/files/freenet-0.7.5_p1422-wrapper.conf
rename to net-p2p/freenet/files/freenet-0.7.5_p1474-wrapper.conf
index a8176aa..7ec6cd0 100644
--- a/net-p2p/freenet/files/freenet-0.7.5_p1422-wrapper.conf
+++ b/net-p2p/freenet/files/freenet-0.7.5_p1474-wrapper.conf
@@ -3,12 +3,12 @@ wrapper.working.dir=/var/freenet/
 wrapper.java.mainclass=freenet.node.NodeStarter
 wrapper.java.library.path.1=/usr/lib
 wrapper.java.initmemory=60
-wrapper.java.maxmemory=256
+wrapper.java.maxmemory=1024
 wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=0
 wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=0
 wrapper.java.additional.3=-enableassertions:freenet
 # You might want to set the following line if you have changed java.maxmemory
-wrapper.java.additional.4=-XX:MaxPermSize=256M
+wrapper.java.additional.4=-XX:MaxPermSize=1024M
 
 wrapper.app.parameter.1=freenet.ini
 wrapper.console.format=PM

diff --git a/net-p2p/freenet/files/libraryloader-revert-using-of-absolute-path.patch b/net-p2p/freenet/files/libraryloader-revert-using-of-absolute-path.patch
deleted file mode 100644
index e252aed..0000000
--- a/net-p2p/freenet/files/libraryloader-revert-using-of-absolute-path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit bad37bf86798d30292769581aca7e71471c34485
-Author: Matthew Toseland <toad@amphibian.dyndns.org>
-Date:   Fri Nov 5 23:30:43 2010 +0000
-
-    Use the specific, absolute path, rather than loading from path, for NativeBigInteger library.
-
-diff --git a/src/freenet/support/LibraryLoader.java b/src/freenet/support/LibraryLoader.java
-index d4a22a0..2470d40 100644
---- a/src/freenet/support/LibraryLoader.java
-+++ b/src/freenet/support/LibraryLoader.java
-@@ -45,7 +45,7 @@ public class LibraryLoader {
- 		File nativeLib = new File((System.getProperty("java.library.path")) + "/lib" + libraryName + prefix);
- 		if (nativeLib.exists()) {
- 			System.out.println("Attempting to load the NativeThread library ["+libraryName+']');
--			System.loadLibrary(libraryName);
-+			System.loadLibrary(nativeLib.getAbsolutePath());
- 			success = true;
- 		} else {
- 			try {

diff --git a/net-p2p/freenet/freenet-0.7.5_p1470.ebuild b/net-p2p/freenet/freenet-0.7.5_p1470.ebuild
deleted file mode 100644
index 0746f5c..0000000
--- a/net-p2p/freenet/freenet-0.7.5_p1470.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-DATE=20150812
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 multilib systemd user
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-SRC_URI="https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	mirror://gentoo/seednodes-${DATE}.fref.bz2
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND="dev-java/bcprov:1.52
-	dev-java/commons-compress:0
-	dev-db/db-je:3.3
-	dev-java/fec:0
-	dev-java/java-service-wrapper:0
-	dev-java/db4o-jdk11:0
-	dev-java/db4o-jdk12:0
-	dev-java/db4o-jdk5:0
-	dev-java/jbitcollider-core:0
-	dev-java/lzma:0
-	dev-java/lzmajio:0
-	dev-java/mersennetwister:0"
-DEPEND="app-arch/unzip
-	>=virtual/jdk-1.6
-	${CDEPEND}
-	test? ( dev-java/junit:0
-		dev-java/ant-junit:0 )
-	dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.6
-	net-libs/nativebiginteger:0
-	${CDEPEND}"
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov-1.52,commons-compress,db4o-jdk5,db4o-jdk12,db4o-jdk11,db-je-3.3,fec,java-service-wrapper,jbitcollider-core,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S=${WORKDIR}/fred-build0${PV#*p}
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_unpack() {
-	unpack ${P}.zip seednodes-${DATE}.fref.bz2
-	mv "${WORKDIR}"/freenet-fred-* "${S}"
-}
-
-java_prepare() {
-	cp "${FILESDIR}"/freenet-0.7.5_p1422-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/0.7.5_p1321-ext.patch
-
-	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
-
-	local i=2 pkg jars jar
-	local ifs_original=${IFS}
-	IFS=","
-	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
-		jars="$(java-pkg_getjars ${pkg})"
-		for jar in ${jars} ; do
-			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
-		done
-	done
-	IFS=${ifs_original}
-	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-	systemd_dounit "${FILESDIR}"/freenet.service
-	dodoc AUTHORS || die
-	newdoc README.md README || die
-	insinto /etc
-	doins freenet-wrapper.conf || die
-	insinto /var/freenet
-	doins run.sh || die
-	newins "${WORKDIR}"/seednodes-${DATE}.fref seednodes.fref || die
-	fperms +x /var/freenet/run.sh
-	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-pkg_postinst() {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/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
-}

diff --git a/net-p2p/freenet/freenet-0.7.5_p1472.ebuild b/net-p2p/freenet/freenet-0.7.5_p1475.ebuild
similarity index 91%
rename from net-p2p/freenet/freenet-0.7.5_p1472.ebuild
rename to net-p2p/freenet/freenet-0.7.5_p1475.ebuild
index 448e41d..506a648 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1472.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1475.ebuild
@@ -21,23 +21,19 @@ IUSE="test"
 
 CDEPEND="dev-java/bcprov:1.54
 	dev-java/commons-compress:0
-	dev-db/db-je:3.3
 	dev-java/fec:0
 	dev-java/java-service-wrapper:0
-	dev-java/db4o-jdk11:0
-	dev-java/db4o-jdk12:0
-	dev-java/db4o-jdk5:0
 	dev-java/jbitcollider-core:0
 	dev-java/lzma:0
 	dev-java/lzmajio:0
 	dev-java/mersennetwister:0"
 DEPEND="app-arch/unzip
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.7
 	${CDEPEND}
 	test? ( dev-java/junit:0
 		dev-java/ant-junit:0 )
 	dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.7
 	net-libs/nativebiginteger:0
 	${CDEPEND}"
 PDEPEND="net-libs/NativeThread:0"
@@ -50,7 +46,7 @@ JAVA_ANT_ENCODING="utf8"
 EANT_BUILD_TARGET="package"
 EANT_TEST_TARGET="unit"
 EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov-1.54,commons-compress,db4o-jdk5,db4o-jdk12,db4o-jdk11,db-je-3.3,fec,java-service-wrapper,jbitcollider-core,lzma,lzmajio,mersennetwister"
+EANT_GENTOO_CLASSPATH="bcprov-1.54,commons-compress,fec,java-service-wrapper,jbitcollider-core,lzma,lzmajio,mersennetwister"
 EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
 
 S=${WORKDIR}/fred-build0${PV#*p}
@@ -73,7 +69,7 @@ src_unpack() {
 }
 
 java_prepare() {
-	cp "${FILESDIR}"/freenet-0.7.5_p1422-wrapper.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/freenet-0.7.5_p1474-wrapper.conf freenet-wrapper.conf || die
 	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
 	epatch "${FILESDIR}"/0.7.5_p1321-ext.patch
 


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/files/, net-p2p/freenet/
@ 2016-12-21 10:46 Patrice Clement
  0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-12-21 10:46 UTC (permalink / raw
  To: gentoo-commits

commit:     a6fcfeda31b955139bacc29292931b6383169e43
Author:     tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Mon Oct 10 16:54:25 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 10:46:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6fcfeda

net-p2p/freenet: remove git polling.

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2526

 net-p2p/freenet/files/0.7.5_p1475-remove-git.patch |  24 ++++
 net-p2p/freenet/freenet-0.7.5_p1475-r1.ebuild      | 142 +++++++++++++++++++++
 2 files changed, 166 insertions(+)

diff --git a/net-p2p/freenet/files/0.7.5_p1475-remove-git.patch b/net-p2p/freenet/files/0.7.5_p1475-remove-git.patch
new file mode 100644
index 00000000..5cebf6e
--- /dev/null
+++ b/net-p2p/freenet/files/0.7.5_p1475-remove-git.patch
@@ -0,0 +1,24 @@
+diff -Naur a/build-clean.xml b/build-clean.xml
+--- a/build-clean.xml	2016-10-10 18:26:04.056935377 +0200
++++ b/build-clean.xml	2016-10-10 18:47:11.662036536 +0200
+@@ -59,18 +59,8 @@
+ 	<assertions><enable/></assertions>
+ 
+ 	<!-- set version string based on git-describe -->
+-	<exec executable="git" failifexecutionfails="false"
+-		errorProperty="git.errror" outputproperty="git.describe" resultproperty="git.result">
+-		<arg value="describe" />
+-		<arg value="--always" />
+-		<arg value="--abbrev=4" />
+-		<arg value="--dirty" />
+-	</exec>
+-	<condition property="git.revision" value="${git.describe}" else="@unknown@">
+-		<and>
+-			<equals arg1="${git.result}" arg2="0" />
+-			<isset property="git.describe" />
+-		</and>
++	<condition property="git.revision" value="@unknown@" else="@unknown@">
++		<isset property="git.describe" />
+ 	</condition>
+ 
+ 	<!-- =================================================================== -->

diff --git a/net-p2p/freenet/freenet-0.7.5_p1475-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1475-r1.ebuild
new file mode 100644
index 00000000..3a5d199
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1475-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+#DATE=20160521
+DATE=20150812
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 multilib systemd user
+
+DESCRIPTION="An encrypted network without censorship"
+HOMEPAGE="https://freenetproject.org/"
+SRC_URI="https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
+	mirror://gentoo/seednodes-${DATE}.fref.bz2
+	mirror://gentoo/freenet-ant-1.7.1.jar"
+
+LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-java/bcprov:1.54
+	dev-java/commons-compress:0
+	dev-java/fec:0
+	dev-java/java-service-wrapper:0
+	dev-java/jbitcollider-core:0
+	dev-java/lzma:0
+	dev-java/lzmajio:0
+	dev-java/mersennetwister:0"
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.7
+	${CDEPEND}
+	test? ( dev-java/junit:0
+		dev-java/ant-junit:0 )
+	dev-java/ant-core:0"
+RDEPEND=">=virtual/jre-1.7
+	net-libs/nativebiginteger:0
+	${CDEPEND}"
+PDEPEND="net-libs/NativeThread:0"
+
+JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+JAVA_ANT_ENCODING="utf8"
+
+EANT_BUILD_TARGET="package"
+EANT_TEST_TARGET="unit"
+EANT_BUILD_XML="build-clean.xml"
+EANT_GENTOO_CLASSPATH="bcprov-1.54,commons-compress,fec,java-service-wrapper,jbitcollider-core,lzma,lzmajio,mersennetwister"
+EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
+
+S=${WORKDIR}/fred-build0${PV#*p}
+
+pkg_setup() {
+	has_version dev-java/icedtea[cacao] && {
+		ewarn "dev-java/icedtea was built with cacao USE flag."
+		ewarn "freenet may compile with it, but it will refuse to run."
+		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
+		ewarn "if you plan to use it for running freenet."
+	}
+	java-pkg-2_pkg_setup
+	enewgroup freenet
+	enewuser freenet -1 -1 /var/freenet freenet
+}
+
+src_unpack() {
+	unpack ${P}.zip seednodes-${DATE}.fref.bz2
+	mv "${WORKDIR}"/freenet-fred-* "${S}"
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/freenet-0.7.5_p1474-wrapper.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
+	epatch "${FILESDIR}"/0.7.5_p1321-ext.patch
+	epatch "${FILESDIR}/${PV}-remove-git.patch"
+
+	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
+
+	local i=2 pkg jars jar
+	local ifs_original=${IFS}
+	IFS=","
+	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
+		jars="$(java-pkg_getjars ${pkg})"
+		for jar in ${jars} ; do
+			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
+		done
+	done
+	IFS=${ifs_original}
+	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf
+
+	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
+}
+
+EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar dist/freenet.jar
+	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
+	if has_version =sys-apps/baselayout-2*; then
+		doinitd "${FILESDIR}"/freenet
+	else
+		newinitd "${FILESDIR}"/freenet.old freenet
+	fi
+	systemd_dounit "${FILESDIR}"/freenet.service
+	dodoc AUTHORS || die
+	newdoc README.md README || die
+	insinto /etc
+	doins freenet-wrapper.conf || die
+	insinto /var/freenet
+	doins run.sh || die
+	newins "${WORKDIR}"/seednodes-${DATE}.fref seednodes.fref || die
+	fperms +x /var/freenet/run.sh
+	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src
+}
+
+pkg_postinst() {
+	elog " "
+	elog "1. Start freenet with /etc/init.d/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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/files/, net-p2p/freenet/
@ 2017-07-16  8:42 Thomas Sachau
  0 siblings, 0 replies; 7+ messages in thread
From: Thomas Sachau @ 2017-07-16  8:42 UTC (permalink / raw
  To: gentoo-commits

commit:     8608b572bcfca67c73d0bf28e4f4899aa7d71814
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 16 08:40:56 2017 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jul 16 08:40:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8608b572

net-p2p/freenet: Update /etc/init.d/freenet to use --user instead of --chuid

 net-p2p/freenet/files/freenet                 |   6 +-
 net-p2p/freenet/freenet-0.7.5_p1478-r1.ebuild | 158 ++++++++++++++++++++++++++
 2 files changed, 161 insertions(+), 3 deletions(-)

diff --git a/net-p2p/freenet/files/freenet b/net-p2p/freenet/files/freenet
index ef90f226bfb..cfbfa767732 100644
--- a/net-p2p/freenet/files/freenet
+++ b/net-p2p/freenet/files/freenet
@@ -3,16 +3,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 start() {
-	start-stop-daemon --start --chuid freenet --exec /bin/sh /var/freenet/run.sh start 2>/dev/null
+	start-stop-daemon --start --user freenet --exec /bin/sh /var/freenet/run.sh start 2>/dev/null
 	eend 0
 }
 
 status() {
-	start-stop-daemon --start --chuid freenet --exec /bin/sh /var/freenet/run.sh status 2>/dev/null
+	start-stop-daemon --start --user freenet --exec /bin/sh /var/freenet/run.sh status 2>/dev/null
 	eend 0
 }
 
 stop() {
-	start-stop-daemon --start --chuid freenet --exec /bin/sh /var/freenet/run.sh stop 2>/dev/null
+	start-stop-daemon --start --user freenet --exec /bin/sh /var/freenet/run.sh stop 2>/dev/null
 	eend 0
 }

diff --git a/net-p2p/freenet/freenet-0.7.5_p1478-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1478-r1.ebuild
new file mode 100644
index 00000000000..d37f8db162e
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1478-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DATE=20160521
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 multilib systemd user
+
+DESCRIPTION="An encrypted network without censorship"
+HOMEPAGE="https://freenetproject.org/"
+SRC_URI="
+	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
+	mirror://gentoo/seednodes-${DATE}.fref.bz2
+	mirror://gentoo/freenet-ant-1.7.1.jar"
+
+LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-java/bcprov:1.54
+	dev-java/commons-compress:0
+	dev-java/fec:0
+	dev-java/java-service-wrapper:0
+	dev-java/jbitcollider-core:0
+	dev-java/lzma:0
+	dev-java/lzmajio:0
+	dev-java/mersennetwister:0"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.7
+	${CDEPEND}
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	dev-java/ant-core:0"
+
+RDEPEND="
+	>=virtual/jre-1.7
+	net-libs/nativebiginteger:0
+	${CDEPEND}"
+
+PDEPEND="net-libs/NativeThread:0"
+
+JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+JAVA_ANT_ENCODING="utf8"
+
+EANT_BUILD_TARGET="package"
+EANT_TEST_TARGET="unit"
+EANT_BUILD_XML="build-clean.xml"
+EANT_GENTOO_CLASSPATH="bcprov-1.54,commons-compress,fec,java-service-wrapper,jbitcollider-core,lzma,lzmajio,mersennetwister"
+EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
+
+S="${WORKDIR}/fred-build0${PV#*p}"
+
+RESTRICT="test" # they're broken in the last release.
+
+MY_PATCHES=(
+	"${FILESDIR}"/0.7.5_p1321-ext.patch
+	"${FILESDIR}/"0.7.5_p1475-remove-git.patch
+)
+
+pkg_setup() {
+	has_version dev-java/icedtea[cacao] && {
+		ewarn "dev-java/icedtea was built with cacao USE flag."
+		ewarn "freenet may compile with it, but it will refuse to run."
+		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
+		ewarn "if you plan to use it for running freenet."
+	}
+	java-pkg-2_pkg_setup
+	enewgroup freenet
+	enewuser freenet -1 -1 /var/freenet freenet
+}
+
+src_unpack() {
+	unpack ${P}.zip seednodes-${DATE}.fref.bz2
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/freenet-0.7.5_p1474-wrapper.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
+
+	epatch "${MY_PATCHES[@]}"
+
+	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
+
+	local i=2 pkg jars jar
+	local ifs_original=${IFS}
+	IFS=","
+	for pkg in ${EANT_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.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
+
+	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
+}
+
+EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar dist/freenet.jar
+	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
+
+	if has_version =sys-apps/baselayout-2*; then
+		doinitd "${FILESDIR}"/freenet
+	else
+		newinitd "${FILESDIR}"/freenet.old freenet
+	fi
+
+	systemd_dounit "${FILESDIR}"/freenet.service
+
+	dodoc AUTHORS
+	newdoc README.md README
+	insinto /etc
+	doins freenet-wrapper.conf
+	insinto /var/freenet
+	doins run.sh
+	newins "${WORKDIR}"/seednodes-${DATE}.fref seednodes.fref
+	fperms +x /var/freenet/run.sh
+	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src
+}
+
+pkg_postinst() {
+	elog " "
+	elog "1. Start freenet with /etc/init.d/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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/files/, net-p2p/freenet/
@ 2022-01-28  7:53 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-01-28  7:53 UTC (permalink / raw
  To: gentoo-commits

commit:     c54e5325b0369da14991e21bfe94a8226c257f06
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Sun Jan 23 18:21:33 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 07:53:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c54e5325

net-p2p/freenet: Fix build and runtime errors with JNA 5.x

This package uses JNA's Pointer.SIZE API, which has been removed since
JNA 5.0.0.  A replacement of the API is Native.POINTER_SIZE, which is
present in both JNA 4.x and 5.x.

Since JNA 5.0.0, the default JNI library loading mechanism has been
changed, which would cause this package to crash upon launch, unless
system property 'jna.nosys' is set to 'false', which restores the 4.x
library loading behavior compatible with this package.

Closes: https://bugs.gentoo.org/830847
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23933
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/0.7.5_p1491-update-for-jna-5.x.patch     |  31 ++++
 .../freenet/files/freenet-0.7.5_p1491-wrapper.conf |  30 ++++
 net-p2p/freenet/freenet-0.7.5_p1488-r2.ebuild      | 169 +++++++++++++++++++++
 net-p2p/freenet/freenet-0.7.5_p1491-r1.ebuild      | 165 ++++++++++++++++++++
 4 files changed, 395 insertions(+)

diff --git a/net-p2p/freenet/files/0.7.5_p1491-update-for-jna-5.x.patch b/net-p2p/freenet/files/0.7.5_p1491-update-for-jna-5.x.patch
new file mode 100644
index 000000000000..788a48040b17
--- /dev/null
+++ b/net-p2p/freenet/files/0.7.5_p1491-update-for-jna-5.x.patch
@@ -0,0 +1,31 @@
+From 830b4bb3948bd69fbd9b10001940f1775051114a Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sun, 23 Jan 2022 10:09:17 -0800
+Subject: [PATCH] Replace Pointer.SIZE with Native.POINTER_SIZE for JNA 5.x
+
+This patch is backward compatible with JNA 4.x because
+Native.POINTER_SIZE is present in both 4.x and 5.x.
+
+Bug: https://github.com/kaitoy/pcap4j/issues/191
+Bug: https://bugs.gentoo.org/830847
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ src/freenet/io/comm/UdpSocketHandler.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/freenet/io/comm/UdpSocketHandler.java b/src/freenet/io/comm/UdpSocketHandler.java
+index 0cd975f16..c004613a9 100644
+--- a/src/freenet/io/comm/UdpSocketHandler.java
++++ b/src/freenet/io/comm/UdpSocketHandler.java
+@@ -120,7 +120,7 @@ public class UdpSocketHandler implements PrioRunnable, PacketSocketHandler, Port
+ 			    return false;
+ 			int ret = -1;
+ 			try {
+-			    ret = socketOptionsHolder.setsockopt(fd, SOCKET_level.IPPROTO_IPV6.linux, p.option_name.linux, new IntByReference(p.linux).getPointer(), Pointer.SIZE);
++			    ret = socketOptionsHolder.setsockopt(fd, SOCKET_level.IPPROTO_IPV6.linux, p.option_name.linux, new IntByReference(p.linux).getPointer(), Native.POINTER_SIZE);
+ 			} catch(Exception e) { Logger.normal(UdpSocketHandler.class, e.getMessage(),e); } //if it fails that's fine
+ 			return (ret == 0 ? true : false);
+ 		}
+-- 
+2.34.1
+

diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1491-wrapper.conf b/net-p2p/freenet/files/freenet-0.7.5_p1491-wrapper.conf
new file mode 100644
index 000000000000..61bbf6f40bfb
--- /dev/null
+++ b/net-p2p/freenet/files/freenet-0.7.5_p1491-wrapper.conf
@@ -0,0 +1,30 @@
+wrapper.java.command=java
+wrapper.working.dir=/var/freenet/
+wrapper.java.mainclass=freenet.node.NodeStarter
+wrapper.java.library.path.1=/usr/lib
+wrapper.java.initmemory=60
+wrapper.java.maxmemory=1024
+wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=0
+wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=0
+wrapper.java.additional.3=-enableassertions:freenet
+# You might want to set the following line if you have changed java.maxmemory
+wrapper.java.additional.4=-XX:MaxPermSize=1024M
+# Required since JNA 5.0.0, which changed the default JNI library search path
+# https://github.com/java-native-access/jna/issues/384
+wrapper.java.additional.5=-Djna.nosys=false
+
+wrapper.app.parameter.1=freenet.ini
+wrapper.console.format=PM
+wrapper.console.loglevel=INFO
+wrapper.logfile=wrapper.log
+wrapper.logfile.format=LPTM
+wrapper.logfile.loglevel=INFO
+wrapper.logfile.maxsize=2M
+wrapper.logfile.maxfiles=3
+wrapper.syslog.loglevel=NONE
+wrapper.console.title=Freenet 0.7
+wrapper.jvm_exit.timeout=120
+wrapper.restart.reload_configuration=TRUE
+wrapper.filter.trigger.1=java.lang.OutOfMemoryError
+wrapper.filter.action.1=RESTART
+

diff --git a/net-p2p/freenet/freenet-0.7.5_p1488-r2.ebuild b/net-p2p/freenet/freenet-0.7.5_p1488-r2.ebuild
new file mode 100644
index 000000000000..8b2cb5f7eea2
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1488-r2.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit epatch java-pkg-2 java-ant-2 systemd
+
+DESCRIPTION="An encrypted network without censorship"
+HOMEPAGE="https://freenetproject.org/"
+#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
+SRC_URI="
+	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
+	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
+	mirror://gentoo/freenet-ant-1.7.1.jar"
+
+LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+nss test"
+
+CDEPEND="dev-java/bcprov:0
+	dev-java/commons-compress:0
+	dev-java/fec:0
+	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
+	nss? ( dev-libs/nss )"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.8
+	${CDEPEND}
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	dev-java/ant-core:0"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	net-libs/nativebiginteger:0
+	${CDEPEND}
+	acct-user/freenet
+	acct-group/freenet"
+
+PDEPEND="net-libs/NativeThread:0"
+
+JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+JAVA_ANT_ENCODING="utf8"
+
+EANT_BUILD_TARGET="package"
+EANT_TEST_TARGET="unit"
+EANT_BUILD_XML="build-clean.xml"
+EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
+EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
+
+S="${WORKDIR}/fred-build0${PV#*p}"
+
+RESTRICT="test" # they're broken in the last release.
+
+MY_PATCHES=(
+	"${FILESDIR}"/0.7.5_p1491-update-for-jna-5.x.patch
+	"${FILESDIR}"/0.7.5_p1483-ext.patch
+	"${FILESDIR}/"0.7.5_p1475-remove-git.patch
+)
+
+pkg_setup() {
+	has_version dev-java/icedtea[cacao] && {
+		ewarn "dev-java/icedtea was built with cacao USE flag."
+		ewarn "freenet may compile with it, but it will refuse to run."
+		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
+		ewarn "if you plan to use it for running freenet."
+	}
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+#	unpack ${P}.zip seednodes-${PV}.zip
+	unpack ${P}.zip seednodes-0.7.5_p1480.zip
+}
+
+src_prepare() {
+#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
+	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
+	cp "${FILESDIR}"/freenet-0.7.5_p1491-wrapper.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
+	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
+	cp "${FILESDIR}"/build.properties build.properties || die
+
+	epatch "${MY_PATCHES[@]}"
+
+	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.6=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
+	fi
+	local i=2 pkg jars jar
+	local ifs_original=${IFS}
+	IFS=","
+	for pkg in ${EANT_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.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
+	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
+
+	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
+	eapply_user
+}
+
+EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar dist/freenet.jar
+	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
+
+	if has_version =sys-apps/baselayout-2*; then
+		doinitd "${FILESDIR}"/freenet
+	else
+		newinitd "${FILESDIR}"/freenet.old freenet
+	fi
+
+	systemd_dounit "${FILESDIR}"/freenet.service
+
+	dodoc AUTHORS
+	newdoc README.md README
+	insinto /etc
+	doins freenet-wrapper.conf
+	insinto /var/freenet
+	doins run.sh seednodes.fref
+	fperms +x /var/freenet/run.sh
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src
+}
+
+pkg_postinst() {
+	elog " "
+	elog "1. Start freenet with /etc/init.d/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
+}

diff --git a/net-p2p/freenet/freenet-0.7.5_p1491-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1491-r1.ebuild
new file mode 100644
index 000000000000..a7d25aeca420
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1491-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 systemd
+
+DESCRIPTION="An encrypted network without censorship"
+HOMEPAGE="https://freenetproject.org/"
+#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
+SRC_URI="
+	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
+	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
+	mirror://gentoo/freenet-ant-1.7.1.jar"
+
+LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+nss test"
+
+CDEPEND="dev-java/bcprov:0
+	dev-java/commons-compress:0
+	dev-java/fec:0
+	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
+	nss? ( dev-libs/nss )"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.8
+	${CDEPEND}
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	dev-java/ant-core:0"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	net-libs/nativebiginteger:0
+	${CDEPEND}
+	acct-user/freenet
+	acct-group/freenet"
+
+PDEPEND="net-libs/NativeThread:0"
+
+JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+JAVA_ANT_ENCODING="utf8"
+
+EANT_BUILD_TARGET="package"
+EANT_TEST_TARGET="unit"
+EANT_BUILD_XML="build-clean.xml"
+EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
+EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
+
+S="${WORKDIR}/fred-build0${PV#*p}"
+
+RESTRICT="test" # they're broken in the last release.
+
+pkg_setup() {
+	has_version dev-java/icedtea[cacao] && {
+		ewarn "dev-java/icedtea was built with cacao USE flag."
+		ewarn "freenet may compile with it, but it will refuse to run."
+		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
+		ewarn "if you plan to use it for running freenet."
+	}
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+#	unpack ${P}.zip seednodes-${PV}.zip
+	unpack ${P}.zip seednodes-0.7.5_p1480.zip
+}
+
+src_prepare() {
+#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
+	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
+	cp "${FILESDIR}"/freenet-0.7.5_p1491-wrapper.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
+	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
+	cp "${FILESDIR}"/build.properties build.properties || die
+
+	eapply -p1 "${FILESDIR}/"0.7.5_p1491-update-for-jna-5.x.patch
+	eapply -p0 "${FILESDIR}"/0.7.5_p1483-ext.patch
+	eapply -p1 "${FILESDIR}/"0.7.5_p1475-remove-git.patch
+
+	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.6=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
+	fi
+	local i=2 pkg jars jar
+	local ifs_original=${IFS}
+	IFS=","
+	for pkg in ${EANT_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.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
+	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
+
+	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
+	eapply_user
+}
+
+EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar dist/freenet.jar
+	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
+
+	if has_version =sys-apps/baselayout-2*; then
+		doinitd "${FILESDIR}"/freenet
+	else
+		newinitd "${FILESDIR}"/freenet.old freenet
+	fi
+
+	systemd_dounit "${FILESDIR}"/freenet.service
+
+	dodoc AUTHORS
+	newdoc README.md README
+	insinto /etc
+	doins freenet-wrapper.conf
+	insinto /var/freenet
+	doins run.sh seednodes.fref
+	fperms +x /var/freenet/run.sh
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src
+}
+
+pkg_postinst() {
+	elog " "
+	elog "1. Start freenet with /etc/init.d/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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/files/, net-p2p/freenet/
@ 2022-06-11 14:42 Thomas Sachau
  0 siblings, 0 replies; 7+ messages in thread
From: Thomas Sachau @ 2022-06-11 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     051aa227394684af4751a01282fa0e6e2746257f
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 14:41:36 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 14:41:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051aa227

net-p2p/freenet: Version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 net-p2p/freenet/Manifest                           |   1 +
 .../freenet/files/freenet-0.7.5_p1493-wrapper.conf |  37 +++++
 net-p2p/freenet/freenet-0.7.5_p1493.ebuild         | 164 +++++++++++++++++++++
 3 files changed, 202 insertions(+)

diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 75e8a8e02fb0..1a649d7425a8 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,5 +1,6 @@
 DIST freenet-0.7.5_p1488.zip 7815529 BLAKE2B a63de0b365abe7fd3a7bdde735127c56d0bf220036932db93392893c21e8714cffa27b76357b9e429e5a915975030470035549c8010e3828bb503eaab5911c62 SHA512 5232d4d18bcf8775832aabee7392d0434cecb07114190ed9cd9bbab08fd693a1ac07f3ffad0835e4c5e3696961a234906cbee79c425e50cd29021b8bb77ef733
 DIST freenet-0.7.5_p1491.zip 7827005 BLAKE2B 422f3050dbfdc829d1614b2f65262a063710028255582f7952c7ee4195f62af34d2b52ae74e5f7af2d92fd7e0db2800b6b2c24b8259e55485e1ce89929fccb40 SHA512 6b09816f9fb77003462c06e090d9ca572db9360990f2c9ba43908f30cef47dca8f89044f13ab503ea406cb7a42c07b0cba87e114c80d971ce990e0869e7dd1c3
 DIST freenet-0.7.5_p1492.zip 7844187 BLAKE2B 59dc274d1904448d9be608f34beb3fd942fe5f45a34c4be8e5c02939f5681796f8b3afe2fa70bb9a62d25bc45eb0f699c9949689fad79c11acef40b1b57e9849 SHA512 e5d40954e84ccd327b2935d222b1174c4720f1ee2c35ec41554f4d90b4cac6ab21d5655612dde2a844fbcaf13c5edfe405c0effe5c8200b77657aeecc09d1976
+DIST freenet-0.7.5_p1493.zip 8507217 BLAKE2B af8eb65ada0c5bf698314d721e615c75b57ec0136b1a593ec0960398ae952ae4115cbcec3d1da22a1c624c5f434b032bb68103f2a2ad68e8d1a7f5fb17fc3167 SHA512 3a34648e59e4201a2e66a8d87fa45b2a311d5dbfea3de96d44f797c8a6bc74c35e9d495ea6f93e04003f8bae79026d1f929f28f56b4abaa2c581cc18a0d06104
 DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
 DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497

diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1493-wrapper.conf b/net-p2p/freenet/files/freenet-0.7.5_p1493-wrapper.conf
new file mode 100644
index 000000000000..d3471affad62
--- /dev/null
+++ b/net-p2p/freenet/files/freenet-0.7.5_p1493-wrapper.conf
@@ -0,0 +1,37 @@
+wrapper.java.command=java
+wrapper.working.dir=/var/freenet/
+wrapper.java.mainclass=freenet.node.NodeStarter
+wrapper.java.library.path.1=/usr/lib
+wrapper.java.initmemory=60
+wrapper.java.maxmemory=768
+wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=0
+wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=0
+wrapper.java.additional.3=-enableassertions:freenet
+# You might want to set the following line if you have changed java.maxmemory
+wrapper.java.additional.4=-XX:MaxPermSize=1024M
+# open the modules required for Java 16 and Java 17
+wrapper.java.additional.5=--illegal-access=permit
+wrapper.java.additional.6=--add-opens=java.base/java.lang=ALL-UNNAMED
+wrapper.java.additional.7=--add-opens=java.base/java.util=ALL-UNNAMED
+wrapper.java.additional.8=--add-opens=java.base/java.io=ALL-UNNAMED
+# reduce the stacksize per thread from 1MiB to conserve memory since we easily use 500 threads.
+# Old form for compatibility with Java 11.
+wrapper.java.additional.9=-Xss512k
+# Required since JNA 5.0.0, which changed the default JNI library search path
+# https://github.com/java-native-access/jna/issues/384
+wrapper.java.additional.10=-Djna.nosys=false
+
+wrapper.app.parameter.1=freenet.ini
+wrapper.console.format=PM
+wrapper.console.loglevel=INFO
+wrapper.logfile=wrapper.log
+wrapper.logfile.format=LPTM
+wrapper.logfile.loglevel=INFO
+wrapper.logfile.maxsize=2M
+wrapper.logfile.maxfiles=3
+wrapper.syslog.loglevel=NONE
+wrapper.console.title=Freenet 0.7
+wrapper.jvm_exit.timeout=120
+wrapper.restart.reload_configuration=TRUE
+wrapper.filter.trigger.1=java.lang.OutOfMemoryError
+wrapper.filter.action.1=RESTART

diff --git a/net-p2p/freenet/freenet-0.7.5_p1493.ebuild b/net-p2p/freenet/freenet-0.7.5_p1493.ebuild
new file mode 100644
index 000000000000..722e185f0213
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1493.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 systemd
+
+DESCRIPTION="An encrypted network without censorship"
+HOMEPAGE="https://freenetproject.org/"
+#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
+SRC_URI="
+	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
+	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
+	mirror://gentoo/freenet-ant-1.7.1.jar"
+
+LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+nss test"
+
+CDEPEND="dev-java/bcprov:0
+	dev-java/commons-compress:0
+	dev-java/fec:0
+	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
+	nss? ( dev-libs/nss )"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.8
+	${CDEPEND}
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	dev-java/ant-core:0"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	net-libs/nativebiginteger:0
+	${CDEPEND}
+	acct-user/freenet
+	acct-group/freenet"
+
+PDEPEND="net-libs/NativeThread:0"
+
+JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+JAVA_ANT_ENCODING="utf8"
+
+EANT_BUILD_TARGET="package"
+EANT_TEST_TARGET="unit"
+EANT_BUILD_XML="build-clean.xml"
+EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
+EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
+
+S="${WORKDIR}/fred-build0${PV#*p}"
+
+RESTRICT="test" # they're broken in the last release.
+
+pkg_setup() {
+	has_version dev-java/icedtea[cacao] && {
+		ewarn "dev-java/icedtea was built with cacao USE flag."
+		ewarn "freenet may compile with it, but it will refuse to run."
+		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
+		ewarn "if you plan to use it for running freenet."
+	}
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+#	unpack ${P}.zip seednodes-${PV}.zip
+	unpack ${P}.zip seednodes-0.7.5_p1480.zip
+}
+
+src_prepare() {
+#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
+	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
+	cp "${FILESDIR}"/freenet-0.7.5_p1491-wrapper.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
+	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
+	cp "${FILESDIR}"/build.properties build.properties || die
+
+	eapply -p0 "${FILESDIR}"/0.7.5_p1483-ext.patch
+	eapply -p1 "${FILESDIR}/"0.7.5_p1475-remove-git.patch
+
+	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
+	local i=2 pkg jars jar
+	local ifs_original=${IFS}
+	IFS=","
+	for pkg in ${EANT_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.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
+	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
+
+	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
+	eapply_user
+}
+
+EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar dist/freenet.jar
+	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
+
+	if has_version =sys-apps/baselayout-2*; then
+		doinitd "${FILESDIR}"/freenet
+	else
+		newinitd "${FILESDIR}"/freenet.old freenet
+	fi
+
+	systemd_dounit "${FILESDIR}"/freenet.service
+
+	dodoc AUTHORS
+	newdoc README.md README
+	insinto /etc
+	doins freenet-wrapper.conf
+	insinto /var/freenet
+	doins run.sh seednodes.fref
+	fperms +x /var/freenet/run.sh
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src
+}
+
+pkg_postinst() {
+	elog " "
+	elog "1. Start freenet with /etc/init.d/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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/files/, net-p2p/freenet/
@ 2023-01-21 13:45 Thomas Sachau
  0 siblings, 0 replies; 7+ messages in thread
From: Thomas Sachau @ 2023-01-21 13:45 UTC (permalink / raw
  To: gentoo-commits

commit:     07e20f46407339ca15497bad30b4b415b79d1aa8
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 13:42:30 2023 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 13:45:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e20f46

net-p2p/freenet: Revision bump to workaround bug #878869

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 net-p2p/freenet/files/freenet.initd           |  11 ++
 net-p2p/freenet/freenet-0.7.5_p1493-r1.ebuild | 178 ++++++++++++++++++++++++++
 2 files changed, 189 insertions(+)

diff --git a/net-p2p/freenet/files/freenet.initd b/net-p2p/freenet/files/freenet.initd
new file mode 100755
index 000000000000..75e957e579cc
--- /dev/null
+++ b/net-p2p/freenet/files/freenet.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+start() {
+	start-stop-daemon --start --user freenet --chdir /var/freenet/ --background --stdout=/var/freenet/freenet.log --stderr=/var/freenet/freenet.log --make-pidfile --pidfile=/var/run/freenet.pid --name freenet --exec java -- -cp $classpath $additional_options $configurable_options $target
+}
+
+stop() {
+	start-stop-daemon --stop --user freenet --pidfile=/var/run/freenet.pid
+}

diff --git a/net-p2p/freenet/freenet-0.7.5_p1493-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1493-r1.ebuild
new file mode 100644
index 000000000000..dc8909dae308
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1493-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 systemd
+
+DESCRIPTION="An encrypted network without censorship"
+HOMEPAGE="https://freenetproject.org/"
+#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
+SRC_URI="
+	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
+	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
+	mirror://gentoo/freenet-ant-1.7.1.jar"
+
+LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+nss test"
+
+CDEPEND="dev-java/bcprov:0
+	dev-java/commons-compress:0
+	dev-java/fec:0
+	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
+	nss? ( dev-libs/nss )"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.8
+	${CDEPEND}
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	dev-java/ant-core:0"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	net-libs/nativebiginteger:0
+	${CDEPEND}
+	acct-user/freenet
+	acct-group/freenet"
+
+PDEPEND="net-libs/NativeThread:0"
+
+JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+JAVA_ANT_ENCODING="utf8"
+
+EANT_BUILD_TARGET="package"
+EANT_TEST_TARGET="unit"
+EANT_BUILD_XML="build-clean.xml"
+EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
+EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
+
+S="${WORKDIR}/fred-build0${PV#*p}"
+
+RESTRICT="test" # they're broken in the last release.
+
+pkg_setup() {
+	has_version dev-java/icedtea[cacao] && {
+		ewarn "dev-java/icedtea was built with cacao USE flag."
+		ewarn "freenet may compile with it, but it will refuse to run."
+		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
+		ewarn "if you plan to use it for running freenet."
+	}
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+#	unpack ${P}.zip seednodes-${PV}.zip
+	unpack ${P}.zip seednodes-0.7.5_p1480.zip
+}
+
+src_prepare() {
+#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
+	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
+	cp "${FILESDIR}"/freenet-0.7.5_p1491-wrapper.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
+	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
+	cp "${FILESDIR}"/build.properties build.properties || die
+
+	eapply -p0 "${FILESDIR}"/0.7.5_p1483-ext.patch
+	eapply -p1 "${FILESDIR}/"0.7.5_p1475-remove-git.patch
+
+	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
+	else
+		sed -i -e "s:Dfreenet.jce.use.NSS=tru:Dfreenet.jce.use.NSS=false:g" freenet.confd || die
+	fi
+	local i=2 pkg jars jar classpath
+	classpath="/usr/share/freenet/lib/freenet.jar"
+	local ifs_original=${IFS}
+	IFS=","
+	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
+		jars="$(java-pkg_getjars ${pkg})"
+		for jar in ${jars} ; do
+			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf || die
+			classpath="${classpath}":"${jar}"
+
+		done
+	done
+	IFS=${ifs_original}
+	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
+	classpath="${classpath}":/usr/share/freenet/lib/ant.jar
+	echo "classpath=\"""${classpath}""\"" > freenet.confd || die
+	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
+	echo "additional_options=\"-Dfreenet.jce.use.NSS=true -Djna.nosys=false -Dnetworkaddress.cache.ttl=0 -Dnetworkaddress.cache.negative.ttl=0 -enableassertions:freenet -Djava.library.path=/usr/$(get_libdir)/jna-4\"" >> freenet.confd || die
+	echo "target=\"freenet.node.NodeStarter\"" >> freenet.confd || die
+	echo "configurable_options=\"-Djava.initmemory=60 -Djava.maxmemory=1024 -XX:MaxPermSize=1024M\"" >> freenet.confd || die
+
+	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
+	eapply_user
+}
+
+EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar dist/freenet.jar
+	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
+
+	if has_version =sys-apps/baselayout-2*; then
+#this uses java-service-wrapper, which is currently broken, bug 878869
+#		doinitd "${FILESDIR}"/freenet
+#this does directly start freenet without the wrapper
+		newinitd "${FILESDIR}"/freenet.initd freenet
+		newconfd freenet.confd freenet
+	else
+		newinitd "${FILESDIR}"/freenet.old freenet
+	fi
+
+	systemd_dounit "${FILESDIR}"/freenet.service
+
+	dodoc AUTHORS
+	newdoc README.md README
+	insinto /etc
+	doins freenet-wrapper.conf
+	insinto /var/freenet
+	doins run.sh seednodes.fref
+	fperms +x /var/freenet/run.sh
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src
+}
+
+pkg_postinst() {
+	elog " "
+	elog "1. Start freenet with /etc/init.d/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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/files/, net-p2p/freenet/
@ 2023-05-30  3:41 John Helmert III
  0 siblings, 0 replies; 7+ messages in thread
From: John Helmert III @ 2023-05-30  3:41 UTC (permalink / raw
  To: gentoo-commits

commit:     6062a50abf0264d32916f1337aab70d5318bf7ee
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri May 26 15:06:20 2023 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue May 30 03:40:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6062a50a

net-p2p/freenet: drop versions

Bug: https://bugs.gentoo.org/904441
Closes: https://bugs.gentoo.org/899216
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/31223
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 net-p2p/freenet/Manifest                           |   4 -
 net-p2p/freenet/files/0.7.5_p1475-remove-git.patch |  24 --
 net-p2p/freenet/files/0.7.5_p1483-ext.patch        |  22 --
 .../files/0.7.5_p1491-update-for-jna-5.x.patch     |  31 --
 net-p2p/freenet/files/build-clean.xml              | 421 ---------------------
 net-p2p/freenet/files/build.properties             |  95 -----
 .../freenet/files/freenet-0.7.5_p1474-wrapper.conf |  27 --
 net-p2p/freenet/files/freenet.initd                |  11 -
 net-p2p/freenet/files/freenet.old                  |  18 -
 net-p2p/freenet/freenet-0.7.5_p1491-r1.ebuild      | 165 --------
 net-p2p/freenet/freenet-0.7.5_p1491.ebuild         | 164 --------
 net-p2p/freenet/freenet-0.7.5_p1492.ebuild         | 165 --------
 net-p2p/freenet/freenet-0.7.5_p1493-r1.ebuild      | 178 ---------
 net-p2p/freenet/freenet-0.7.5_p1493.ebuild         | 164 --------
 14 files changed, 1489 deletions(-)

diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index c759eab58a0f..7d1d4c5043c5 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,9 +1,5 @@
-DIST freenet-0.7.5_p1491.zip 7827005 BLAKE2B 422f3050dbfdc829d1614b2f65262a063710028255582f7952c7ee4195f62af34d2b52ae74e5f7af2d92fd7e0db2800b6b2c24b8259e55485e1ce89929fccb40 SHA512 6b09816f9fb77003462c06e090d9ca572db9360990f2c9ba43908f30cef47dca8f89044f13ab503ea406cb7a42c07b0cba87e114c80d971ce990e0869e7dd1c3
-DIST freenet-0.7.5_p1492.zip 7844187 BLAKE2B 59dc274d1904448d9be608f34beb3fd942fe5f45a34c4be8e5c02939f5681796f8b3afe2fa70bb9a62d25bc45eb0f699c9949689fad79c11acef40b1b57e9849 SHA512 e5d40954e84ccd327b2935d222b1174c4720f1ee2c35ec41554f4d90b4cac6ab21d5655612dde2a844fbcaf13c5edfe405c0effe5c8200b77657aeecc09d1976
-DIST freenet-0.7.5_p1493.zip 8507217 BLAKE2B af8eb65ada0c5bf698314d721e615c75b57ec0136b1a593ec0960398ae952ae4115cbcec3d1da22a1c624c5f434b032bb68103f2a2ad68e8d1a7f5fb17fc3167 SHA512 3a34648e59e4201a2e66a8d87fa45b2a311d5dbfea3de96d44f797c8a6bc74c35e9d495ea6f93e04003f8bae79026d1f929f28f56b4abaa2c581cc18a0d06104
 DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
 DIST freenet-build01497-source.tar.bz2 6387097 BLAKE2B 1476793b1084bef4c596648f0d83b808da80e5d0ccddaede5c2b41264f70919dc73e7b2a020437da88bc5b6266a3866398d9a1204cf8ebef9d17b5d9a0a697c4 SHA512 f9c15ebbd7e04b241de767851254169b4d1f94b66afa910784eb9bf6a22db43d0786bd7323f92fde48b59b0c4f73a75ec64646dcc47e5aa908108fb7fb0712fa
 DIST freenet-build01497-source.tar.bz2.sig 566 BLAKE2B fb1d3169942d4a1fd50aadd03011cc8907c5f5784ddfa1a20ecf0956bb8b1e0e2fbd58d93d904edb93c1781bca39a8043e56f6e73a9da927dece905ce4c570e7 SHA512 0453a6bb146531bbcdd7c1e249d3d82731400985fad5d38277cb8687fa01fd8b43e7d3164c7c22d2e8605f6e03e125bc767ffcde51b880acedbcdd45f1009ffb
 DIST pebble-3.1.6.jar 318370 BLAKE2B c3ea059ebc960764cf32a2390773926f1c4e8b0be3aaee7739adfc9529a30dfd0dab3cec0c7519be991d43eed87025db9b64f230cca0622eba16e0e64371243d SHA512 abbf9f8d5c7e23cb658970f670e4e78e62d12433a6683506f14c9c0334257d0d93089d83348691b033704e661f7c1954859e9630e1d94a461a5acf7f336f88dd
 DIST seednodes-0.7.5_p1480.tar.gz 12364 BLAKE2B edb4e2a5c7424b51f0afb8234c7e486d56fe92e9201ab7ed7658366f070225f8def1b5412a31367e434ab4afae393caa16e7bdd7307f1d870607105fd5076638 SHA512 a2662a29f5721cd1523eb68b8787b074baec990327207b9ff444c91e644738a610e5216064aef00c62d6aca8ba66b2035a3175f63d45c1e0e8efc816b2a38660
-DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497

diff --git a/net-p2p/freenet/files/0.7.5_p1475-remove-git.patch b/net-p2p/freenet/files/0.7.5_p1475-remove-git.patch
deleted file mode 100644
index 5cebf6e948ef..000000000000
--- a/net-p2p/freenet/files/0.7.5_p1475-remove-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur a/build-clean.xml b/build-clean.xml
---- a/build-clean.xml	2016-10-10 18:26:04.056935377 +0200
-+++ b/build-clean.xml	2016-10-10 18:47:11.662036536 +0200
-@@ -59,18 +59,8 @@
- 	<assertions><enable/></assertions>
- 
- 	<!-- set version string based on git-describe -->
--	<exec executable="git" failifexecutionfails="false"
--		errorProperty="git.errror" outputproperty="git.describe" resultproperty="git.result">
--		<arg value="describe" />
--		<arg value="--always" />
--		<arg value="--abbrev=4" />
--		<arg value="--dirty" />
--	</exec>
--	<condition property="git.revision" value="${git.describe}" else="@unknown@">
--		<and>
--			<equals arg1="${git.result}" arg2="0" />
--			<isset property="git.describe" />
--		</and>
-+	<condition property="git.revision" value="@unknown@" else="@unknown@">
-+		<isset property="git.describe" />
- 	</condition>
- 
- 	<!-- =================================================================== -->

diff --git a/net-p2p/freenet/files/0.7.5_p1483-ext.patch b/net-p2p/freenet/files/0.7.5_p1483-ext.patch
deleted file mode 100644
index 5b778dd619f4..000000000000
--- a/net-p2p/freenet/files/0.7.5_p1483-ext.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/freenet/node/NodeStarter.java	2019-03-17 12:44:12.000000000 +0100
-+++ src/freenet/node/NodeStarter.java.new	2019-03-17 12:58:51.000000000 +0100
-@@ -51,8 +51,8 @@
- 	public static final String extRevisionNumber;
- 
- 	static {
--		extBuildNumber = ExtVersion.extBuildNumber();
--		extRevisionNumber = ExtVersion.extRevisionNumber();
-+		extBuildNumber = 29;
-+		extRevisionNumber = "";
- 	}
- 
- 	private FreenetFilePersistentConfig cfg;
-@@ -109,7 +109,7 @@
- 			System.out.println("Usage: $ java freenet.node.Node <configFile>");
- 			return Integer.valueOf(-1);
- 		}
--		String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + ExtVersion.buildNumber + " r" + ExtVersion.cvsRevision+" running with ext build "+extBuildNumber+" r" + extRevisionNumber;
-+		String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + extBuildNumber +" running with ext build "+extBuildNumber;
- 		Logger.normal(this, builtWithMessage);
- 		System.out.println(builtWithMessage);
- 

diff --git a/net-p2p/freenet/files/0.7.5_p1491-update-for-jna-5.x.patch b/net-p2p/freenet/files/0.7.5_p1491-update-for-jna-5.x.patch
deleted file mode 100644
index 788a48040b17..000000000000
--- a/net-p2p/freenet/files/0.7.5_p1491-update-for-jna-5.x.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 830b4bb3948bd69fbd9b10001940f1775051114a Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sun, 23 Jan 2022 10:09:17 -0800
-Subject: [PATCH] Replace Pointer.SIZE with Native.POINTER_SIZE for JNA 5.x
-
-This patch is backward compatible with JNA 4.x because
-Native.POINTER_SIZE is present in both 4.x and 5.x.
-
-Bug: https://github.com/kaitoy/pcap4j/issues/191
-Bug: https://bugs.gentoo.org/830847
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- src/freenet/io/comm/UdpSocketHandler.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/freenet/io/comm/UdpSocketHandler.java b/src/freenet/io/comm/UdpSocketHandler.java
-index 0cd975f16..c004613a9 100644
---- a/src/freenet/io/comm/UdpSocketHandler.java
-+++ b/src/freenet/io/comm/UdpSocketHandler.java
-@@ -120,7 +120,7 @@ public class UdpSocketHandler implements PrioRunnable, PacketSocketHandler, Port
- 			    return false;
- 			int ret = -1;
- 			try {
--			    ret = socketOptionsHolder.setsockopt(fd, SOCKET_level.IPPROTO_IPV6.linux, p.option_name.linux, new IntByReference(p.linux).getPointer(), Pointer.SIZE);
-+			    ret = socketOptionsHolder.setsockopt(fd, SOCKET_level.IPPROTO_IPV6.linux, p.option_name.linux, new IntByReference(p.linux).getPointer(), Native.POINTER_SIZE);
- 			} catch(Exception e) { Logger.normal(UdpSocketHandler.class, e.getMessage(),e); } //if it fails that's fine
- 			return (ret == 0 ? true : false);
- 		}
--- 
-2.34.1
-

diff --git a/net-p2p/freenet/files/build-clean.xml b/net-p2p/freenet/files/build-clean.xml
deleted file mode 100644
index 89698df2675f..000000000000
--- a/net-p2p/freenet/files/build-clean.xml
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="freenet" default="package" basedir=".">
-	<description>
-Freenet is free software that lets you publish and retrieve information without
-fear of censorship. To achieve this, the network is entirely decentralized, and
-all actions are anonymous. Without anonymity, there can never be true freedom
-of speech, and without decentralization the network would be vulnerable to attack.
-
-This file is to build Freenet entirely from source. The builder is responsible
-for satisfying all library dependencies, e.g. via override.properties. Package
-maintainers may prefer to use this instead of build.xml.
-	</description>
-
-	<!-- =================================================================== -->
-	<!-- Global properties                                                   -->
-	<!-- =================================================================== -->
-
-	<!-- user overrides (properties are immutable, so set overrides first) -->
-	<property file="override.properties"/>
-	<property file="build.properties"/>
-	<property file="dependencies.properties"/>
-
-	<property name="version.src" value="freenet/node/Version.java" />
-	<property name="version.make" value="freenet/node/Version.class" />
-
-	<path id="lib.path">
-		<fileset dir="${lib.contrib.dir}" includes="${lib.contrib.jars}"/>
-		<fileset dir="${lib.dir}" includes="${lib.jars}"/>
-		<fileset dir="/usr/share/java" includes="${lib.jars}" erroronmissingdir="false"/>
-	</path>
-	<path id="libtest.path">
-		<path refid="lib.path"/>
-		<fileset dir="${lib.dir}" includes="${libtest.jars}"/>
-		<fileset dir="/usr/share/java" includes="${libtest.jars}" erroronmissingdir="false"/>
-		<pathelement path="${main.make}"/>
-		<pathelement path="${test.make}"/>
-	</path>
-
-	<property name="gjs.dst" value="${main.src}/freenet/clients/http/staticfiles/freenetjs"/>
-	<property name="gjs.dir" value="generator/js"/>
-	<path id="gjs.lib.path">
-		<fileset dir="${gjs.dir}" includes="lib/*.jar"/>
-		<pathelement location="${gjs.dir}/war/WEB-INF/classes"/>
-		<fileset dir="${lib.dir}" includes="${gjs.lib.jars}"/>
-	</path>
-
-	<path id="pmd.classpath">
-		<fileset dir="${pmd.dir}" erroronmissingdir="false" includes="lib/*.jar"/>
-	</path>
-
-	<property environment="env"/>
-	<property name="keystore" value="${env.jarsignerStoreLocation}"/>
-	<property name="keystore_alias" value="${env.jarsignerAlias}"/>
-	<property name="keystore_pass" value="${env.jarsignerStorePassword}"/>
-	<property name="key_pass" value="${env.jarsignerCodeSigningKeyPassword}"/>
-
-	<property name="jar.dst" value="${main.dst}/freenet.jar"/>
-
-	<assertions><enable/></assertions>
-
-	<!-- set version string based on git-describe -->
-	<exec executable="git" failifexecutionfails="false"
-		errorProperty="git.errror" outputproperty="git.describe" resultproperty="git.result">
-		<arg value="describe" />
-		<arg value="--always" />
-		<arg value="--abbrev=4" />
-		<arg value="--dirty" />
-	</exec>
-	<condition property="git.revision" value="${git.describe}" else="@unknown@">
-		<and>
-			<equals arg1="${git.result}" arg2="0" />
-			<isset property="git.describe" />
-		</and>
-	</condition>
-
-	<!-- =================================================================== -->
-	<!-- Miscellaneous                                                       -->
-	<!-- =================================================================== -->
-
-	<target name="dist" depends="clean-all, all" description="clean-build everything"/>
-
-	<target name="sign" description="Sign the distribution" depends="package">
-		<echo message="Signing the distribution"/>
-		<signjar jar="${jar.dst}" strict="false" tsaurl="http://timestamp.comodoca.com/rfc3161" alias="${keystore_alias}" keystore="${keystore}" storepass="${keystore_pass}" keypass="${key_pass}" sigalg="SHA256withRSA" digestalg="SHA-256"/>
-		<!-- TODO: Should have strict="true", but it was introduced in Java 7, which we cannot yet require. -->
-		<verifyjar jar="${jar.dst}" alias="${keystore_alias}" keystore="${keystore}" storepass="${keystore_pass}" keypass="${key_pass}"/>
-	</target>
-
-	<target name="all" depends="package, doc, findbugs, pmd, cpd" description="build everything, incl. docs, GWT js"/>
-
-	<target name="clean-all" depends="clean, clean-doc, clean-gjs" description="clean all build products, incl. docs, GWT js"/>
-
-	<target name="help" description="display help on parameters">
-		<echo message="For main build targets, see `ant -p`"/>
-		<echo message=""/>
-		<echo message="Test parameters (-Dtest.PARAM=true)"/>
-		<echo message="  skip        Skip all tests"/>
-		<echo message="  verbose     Report additional information"/>
-		<echo message="  benchmark   Run benchmark tests"/>
-		<echo message="  extensive   Run extensive tests"/>
-		<echo message=""/>
-		<echo message="Misc parameters (-DPARAM=VALUE)"/>
-		<echo message="  javac.args  Command line arguments to pass to javac"/>
-		<echo message=""/>
-	</target>
-
-	<target name="findbugs" depends="package" unless="${findbugs.skip}">
-		<antcall target="libdep-findbugs"/>
-		<echo message="Running Findbugs"/>
-		<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.path}"/>
-
-		<findbugs home="${findbugs.dir}"
-		output="xml"
-		outputFile="${test.dst}/findbugs.xml"
-		warningsProperty="findbugs.module.warnings"
-		failOnError="true"
-		jvmargs="-Xmx1536m -XX:MaxPermSize=384m -XX:ReservedCodeCacheSize=128m" >
-		<auxClasspath refid="lib.path" />
-		<sourcePath path="${main.src}" />
-		<class location="${jar.dst}" />
-		</findbugs>
-	</target>
-
-	<target name="pmd" depends="package" unless="${pmd.skip}">
-		<antcall target="libdep-pmd"/>
-		<echo message="Running PMD"/>
-		<taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
-		<pmd rulesetfiles="rulesets/java/design.xml" encoding="utf-8">
-			<formatter type="xml" toFile="${test.dst}/pmd.xml"/>
-			<fileset dir="${main.src}">
-				<include name="**/*.java"/>
-			</fileset>
-		</pmd>
-	</target>
-
-	<target name="cpd" depends="package" unless="${cpd.skip}">
-		<antcall target="libdep-cpd"/>
-		<echo message="Running CPD"/>
-		<taskdef name="cpd" classname="net.sourceforge.pmd.cpd.CPDTask" classpathref="pmd.classpath"/>
-		<cpd minimumTokenCount="100" format="xml" outputFile="${test.dst}/cpd.xml">
-			<fileset dir="${main.src}">
-				<include name="**/*.java"/>
-			</fileset>
-		</cpd>	
-	</target>
-
-	<target name="debug">
-		<echoproperties/>
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Library dependencies                                                -->
-	<!-- =================================================================== -->
-
-	<!--
-	currently we only check for the most common cases of missing libraries.
-	this does result in less clear error messages for more obscure setups, e.g.
-	if you have debian's gwt-dev.jar but not commons-collections3.jar. however,
-	to cover all scenarios would be a pain.
-	-->
-
-	<target name="env">
-		<available property="lib.contrib.present" classname="freenet.node.ExtVersion" classpathref="lib.path"/>
-		<available property="lib.bouncycastle.present" classname="org.bouncycastle.crypto.signers.HMacDSAKCalculator" classpathref="lib.path"/>
-		<available property="lib.junit.present" classname="org.junit.runners.JUnit4" classpathref="libtest.path"/>
-		<available property="lib.hamcrest.present" classname="org.hamcrest.SelfDescribing" classpathref="libtest.path"/>
-		<available property="lib.findbugs.present" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.path}"/>
-		<available property="lib.pmd.present" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
-		<available property="lib.cpd.present" classname="net.sourceforge.pmd.cpd.CPDTask" classpathref="pmd.classpath"/>
-		<available property="gjs.lib.gwt-user.present" classname="com.google.gwt.user.client.Window" classpathref="gjs.lib.path"/>
-		<available property="gjs.lib.gwt-dev.present" classname="com.google.gwt.dev.About" classpathref="gjs.lib.path"/>
-		<condition property="gjs.lib.gwt.present">
-			<and>
-				<isset property="gjs.lib.gwt-user.present"/>
-				<isset property="gjs.lib.gwt-dev.present"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="libdep-ext" depends="env" unless="lib.contrib.present">
-		<fail message="freenet-ext not available"/>
-	</target>
-
-	<target name="libdep-bc" depends="env" unless="lib.bouncycastle.present">
-		<fail message="Bouncycastle not available (or not recent enough); try https://www.bouncycastle.org/download/${bc.jar}"/>
-	</target>
-
-	<target name="libdep-junit" depends="env" unless="lib.junit.present">
-		<fail message="JUnit4 not available"/>
-	</target>
-
-	<target name="libdep-hamcrest" depends="env" unless="lib.hamcrest.present">
-		<fail message="Hamcrest-core not available"/>
-	</target>
-
-	<target name="libdep-findbugs" depends="env" unless="lib.findbugs.present">
-		<fail message="findbugs not available"/>
-	</target>
-
-	<target name="libdep-pmd" depends="env" unless="lib.pmd.present">
-		<fail message="PMD not available"/>
-	</target>
-
-	<target name="libdep-cpd" depends="env" unless="lib.cpd.present">
-		<fail message="CPD not available"/>
-	</target>
-
-	<target name="libdep-gwt-user" depends="env" unless="gjs.lib.gwt-user.present">
-		<fail message="GWT-user not present"/>
-	</target>
-
-	<target name="libdep-gwt-dev" depends="env" unless="gjs.lib.gwt-dev.present">
-		<fail message="GWT-dev not present"/>
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Standard build                                                      -->
-	<!-- =================================================================== -->
-
-	<target name="init">
-		<mkdir dir="${main.make}"/>
-		<mkdir dir="${main.dst}"/>
-		<mkdir dir="${test.make}"/>
-		<mkdir dir="${test.dst}"/>
-	</target>
-
-	<target name="dep" depends="ensure-ext, ensure-bc, ensure-gjs"/>
-
-	<target name="check-version-file">
-		<uptodate property="version.uptodate"
-		  targetfile="${main.make}/${version.src}"
-		  srcfile="${main.src}/${version.src}"/>
-	</target>
-
-	<target name="build-version-file" depends="check-version-file" unless="version.uptodate">
-		<!-- Create the Version file with patched revision number in ${main.make} -->
-		<copy file="${main.src}/${version.src}" tofile="${main.make}/${version.src}" overwrite="true" />
-		<delete file="${main.make}/${version.make}" quiet="true" />
-		<replace file="${main.make}/${version.src}">
-			<replacefilter token="@custom@" value="${git.revision}"/>
-		</replace>
-		<echo message="Updated build version to ${git.revision} in ${main.make}/${version.src}"/>
-	</target>
-
-	<target name="build" depends="init, dep, build-version-file">
-		<!-- Create the time stamp -->
-		<tstamp/>
-		<!-- Create the build directory structure used by compile -->
-		<javac srcdir="${main.src}" destdir="${main.make}" debug="on" source="1.7" target="1.7" includeAntRuntime="false" encoding="UTF-8">
-			<compilerarg line="${javac.args}"/>
-			<classpath refid="lib.path"/>
-			<!-- tell javac to find Version.java in ${main.make}, not ${main.src} -->
-			<sourcepath><pathelement path="${main.make}"/></sourcepath>
-			<!-- following a very temporary list of files to be build -->
-			<include name="**/*.java"/>
-			<exclude name="**/package-info.java"/>
-			<exclude name="${version.src}"/>
-		</javac>
-
-		<!-- Force compile of Version.java in case compile of ${main.src} didn't trigger it -->
-		<javac srcdir="${main.make}" destdir="${main.make}" debug="on" source="1.7" target="1.7" includeAntRuntime="false" encoding="UTF-8">
-			<compilerarg line="${javac.args}"/>
-			<classpath refid="lib.path"/>
-			<include name="${version.src}"/>
-		</javac>
-
-		<!-- Copy web interface static files to the build dir -->
-		<copy todir="${main.make}/freenet/clients/http/staticfiles">
-			<fileset dir="${main.src}/freenet/clients/http/staticfiles"/>
-		</copy>
-		<!-- Copy translation files to the build dir -->
-		<copy todir="${main.make}/freenet/l10n">
-			<fileset dir="${main.src}/freenet/l10n">
-				<include name="freenet.l10n.*.properties"/>
-				<include name="iso-*.tab"/>
-			</fileset>
-		</copy>
-		<!-- Copy the dependencies.properties file -->
-		<copy todir="${main.make}" file="dependencies.properties"/>
-	</target>
-
-	<target name="package-only" depends="build">
-		<property name="lib.contrib.loc" location="${lib.contrib.dir}" />
-		<property name="lib.loc" location="${lib.dir}" />
-		<pathconvert property="lib.jars.package" refid="lib.path" pathsep=" ">
-			<map from="${lib.contrib.loc}/" to=""/>
-			<map from="${lib.loc}/" to=""/>
-		</pathconvert>
-		<jar jarfile="${jar.dst}" basedir="${main.make}">
-			<manifest>
-				<attribute name="Permissions" value="all-permissions"/>
-				<attribute name="Application-Name" value="Freenet REference Daemon"/>
-
-				<attribute name="Required-Ext-Version" value="29"/>
-				<attribute name="Recommended-Ext-Version" value="29"/>
-				<section name="common">
-					<attribute name="Specification-Title" value="Freenet"/>
-					<attribute name="Specification-Version" value="0.7.5"/>
-					<attribute name="Specification-Vendor" value="freenetproject.org"/>
-					<attribute name="Implementation-Title" value="Freenet"/>
-					<attribute name="Implementation-Version" value="0.7.5 ${git.revision}"/>
-					<attribute name="Implementation-Vendor" value="freenetproject.org"/>
-				</section>
-			</manifest>
-			<exclude name="${version.src}"/>
-		</jar>
-	</target>
-
-	<target name="package" depends="unit, package-only" description="build standard binary packages (Freenet daemon)"/>
-
-	<target name="unit-build" depends="build" unless="${test.skip}">
-		<antcall target="libdep-junit"/>
-		<antcall target="libdep-hamcrest"/>
-		<javac srcdir="${test.src}" destdir="${test.make}" debug="on" source="1.7" target="1.7" includeAntRuntime="false" encoding="UTF-8">
-			<compilerarg line="${javac.args}"/>
-			<classpath refid="libtest.path"/>
-			<include name="**/*.java"/>
-			<exclude name="*.java"/>
-		</javac>
-		<copy todir="${test.make}/freenet/client/filter/png" overwrite="true">
-			<fileset dir="${test.src}/freenet/client/filter/png"/>
-		</copy>
-		<copy todir="${test.make}/freenet/client/filter/bmp" overwrite="true">
-			<fileset dir="${test.src}/freenet/client/filter/bmp"/>
-		</copy>
-		<copy todir="${test.make}/freenet/client/filter/mp3" overwrite="true">
-			<fileset dir="${test.src}/freenet/client/filter/mp3"/>
-		</copy>
-		<copy todir="${test.make}/freenet/client/filter/gif" overwrite="true">
-			<fileset dir="${test.src}/freenet/client/filter/gif"/>
-		</copy>
-		<copy todir="${test.make}/freenet/crypt/ciphers/rijndael-gladman-test-data" overwrite="true">
-			<fileset dir="${test.src}/freenet/crypt/ciphers/rijndael-gladman-test-data"/>
-		</copy>
-		<copy todir="${test.make}/freenet/l10n" overwrite="true">
-			<fileset dir="${test.src}/freenet/l10n" includes="*.properties"/>
-		</copy>
-	</target>
-
-	<target name="unit" depends="unit-build" unless="${test.skip}">
-		<junit printsummary="yes" haltonfailure="${test.haltonfailure}" logfailedtests="yes" showoutput="yes" filtertrace="no" fork="on" forkmode="perTest" maxmemory="256m" dir="${test.dst}">
-			<classpath refid="libtest.path"/>
-			<formatter type="plain" usefile="false"/>
-			<formatter type="xml" if="${test.xml_output}"/>
-			<formatter classname="org.apache.tools.ant.taskdefs.optional.junit.TearDownOnVmCrash" usefile="false"/>
-			<test if="test.class" name="${test.class}" todir="${test.dst}"/>
-			<batchtest unless="test.class" fork="yes" todir="${test.dst}">
-				<fileset dir="${test.make}" includes="**/*Test.class"/>
-			</batchtest>
-			<sysproperty key="test.verbose" value="${test.verbose}"/>
-			<sysproperty key="test.benchmark" value="${test.benchmark}"/>
-			<sysproperty key="test.extensive" value="${test.extensive}"/>
-			<!-- TODO source needs to be edited too; the old variables were "benchmark" and "extensiveTesting" -->
-			<assertions><enable/></assertions>
-		</junit>
-	</target>
-
-	<target name="clean" description="clean standard build products">
-		<delete dir="${main.make}"/>
-		<delete dir="${main.dst}"/>
-		<delete dir="${test.make}"/>
-		<delete dir="${test.dst}"/>
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Dependencies (contrib, ie. freenet-ext.jar)                         -->
-	<!-- =================================================================== -->
-
-	<target name="ensure-ext" depends="libdep-ext">
-		<!-- clean build does nothing, since this is external library. -->
-	</target>
-
-	<target name="ensure-bc" depends="libdep-bc">
-		<!-- clean build does nothing, since this is external library. -->
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Generate GWT code                                                   -->
-	<!-- =================================================================== -->
-
-	<target name="env-gjs">
-		<available property="gjs.present" file="${gjs.dst}" type="dir"/>
-	</target>
-
-	<target name="ensure-gjs" depends="env-gjs" unless="gjs.present">
-		<antcall target="build-gjs"/>
-	</target>
-
-	<target name="build-gjs" depends="libdep-gwt-user, libdep-gwt-dev">
-		<ant antfile="build.xml" dir="${gjs.dir}">
-			<reference refid="gjs.lib.path" torefid="project.class.path"/>
-		</ant>
-	</target>
-
-	<target name="clean-gjs">
-		<ant antfile="build.xml" dir="${gjs.dir}" target="deleteGenerated"/>
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Documentation                                                       -->
-	<!-- =================================================================== -->
-
-	<target name="init-doc" unless="${doc.skip}">
-		<mkdir dir="${doc.api}"/>
-	</target>
-
-	<target name="javadoc" depends="init-doc, dep" unless="${doc.skip}">
-		<javadoc classpathref="lib.path" sourcepath="${main.src}" destdir="${doc.api}" use="true">
-			<link href="http://docs.oracle.com/javase/6/docs/api/"/>
-		</javadoc>
-	</target>
-
-	<target name="doc" depends="javadoc" description="build documentation">
-		<!-- currently freenet has no other documentation apart from javadocs -->
-	</target>
-
-	<target name="clean-doc" unless="${doc.skip}">
-		<delete dir="${doc.api}"/>
-	</target>
-
-</project>

diff --git a/net-p2p/freenet/files/build.properties b/net-p2p/freenet/files/build.properties
deleted file mode 100644
index 21fecf30c803..000000000000
--- a/net-p2p/freenet/files/build.properties
+++ /dev/null
@@ -1,95 +0,0 @@
-##
-# Properties you can set to affect the build process.
-#
-# This file contains default values that are checked-in to version control.
-#
-# End users should not edit this file to set machine-specific properties;
-# instead, create a new file called override.properties and set them there.
-#
-
-################################################################################
-## build files/directories
-
-main.src=src
-main.make=build/main
-main.dst=dist
-
-test.src=test
-test.make=build/test
-test.dst=run
-
-doc.src=doc
-doc.dst=javadoc
-doc.api=javadoc
-
-################################################################################
-## external dependencies
-
-# dir for common library jars
-lib.dir = lib
-
-# dir for freenet library jars (aka freenet-ext or "contrib" jars)
-lib.contrib.dir = lib/freenet
-## if you use the git submodule in ./contrib (legacy-27 branch)
-## by running `git submodule init && git submodule update`
-## contrib.ant is needed for the old legacy layout
-#lib.contrib.dir = contrib/freenet_ext
-#contrib.ant = ${lib.contrib.dir}/build.xml
-## if you clone the contrib package separately (master branch)
-#lib.contrib.dir = ../contrib/freenet-ext/dist
-
-# dir that freenet library jars will be installed to, relative to freenet.jar
-lib.contrib.dir.rel = freenet
-
-# jars from ${lib.dir} to use
-bc.jar = bcprov-jdk15on-154.jar
-lib.jars = ${bc.jar}
-#lib.jars = wrapper.jar db-je.jar bdb-je.jar commons-compress.jar
-
-# jars from ${lib.dir} to use, for tests
-libtest.jars = junit4.jar hamcrest-core.jar
-
-# jars from ${lib.contrib.dir} to use
-lib.contrib.jars = freenet-ext.jar bitcollider-core.jar db4o.jar lzmajio.jar mantissa.jar \
- wrapper.jar db-je.jar bdb-je.jar commons-compress.jar
-
-# jars from ${lib.dir} to use, for compiling GWT javascript
-gjs.lib.jars = null
-#gjs.lib.jars = gwt-dev-linux.jar gwt-dev-windows.jar gwt-dev.jar gwt-user.jar \
-# commons-collections3.jar ant.jar eclipse-ecj.jar
-
-findbugs.dir = findbugs
-findbugs.path = ${findbugs.dir}/lib/findbugs-ant.jar
-
-pmd.dir =
-################################################################################
-## build tool options
-
-# Javac
-javac.args=-Xlint -Xlint:-deprecation
-
-# Test properties
-test.skip=false
-test.verbose=false
-test.benchmark=false
-test.extensive=false
-test.xml_output=true
-test.haltonfailure=yes
-
-# select a single test to run
-#test.class=
-
-# Build javadoc
-doc.skip=false
-
-# Run findbugs
-findbugs.skip=false
-pmd.skip=false
-cpd.skip=false
-
-################################################################################
-## misc options
-
-# Hack around property expansion not featured in ant <= 1.7.1
-# see http://ant.apache.org/manual/properties.html#if+unless
-true=true

diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1474-wrapper.conf b/net-p2p/freenet/files/freenet-0.7.5_p1474-wrapper.conf
deleted file mode 100644
index 7ec6cd01bcad..000000000000
--- a/net-p2p/freenet/files/freenet-0.7.5_p1474-wrapper.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-wrapper.java.command=java
-wrapper.working.dir=/var/freenet/
-wrapper.java.mainclass=freenet.node.NodeStarter
-wrapper.java.library.path.1=/usr/lib
-wrapper.java.initmemory=60
-wrapper.java.maxmemory=1024
-wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=0
-wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=0
-wrapper.java.additional.3=-enableassertions:freenet
-# You might want to set the following line if you have changed java.maxmemory
-wrapper.java.additional.4=-XX:MaxPermSize=1024M
-
-wrapper.app.parameter.1=freenet.ini
-wrapper.console.format=PM
-wrapper.console.loglevel=INFO
-wrapper.logfile=wrapper.log
-wrapper.logfile.format=LPTM
-wrapper.logfile.loglevel=INFO
-wrapper.logfile.maxsize=2M
-wrapper.logfile.maxfiles=3
-wrapper.syslog.loglevel=NONE
-wrapper.console.title=Freenet 0.7
-wrapper.jvm_exit.timeout=120
-wrapper.restart.reload_configuration=TRUE
-wrapper.filter.trigger.1=java.lang.OutOfMemoryError
-wrapper.filter.action.1=RESTART
-

diff --git a/net-p2p/freenet/files/freenet.initd b/net-p2p/freenet/files/freenet.initd
deleted file mode 100755
index 75e957e579cc..000000000000
--- a/net-p2p/freenet/files/freenet.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-start() {
-	start-stop-daemon --start --user freenet --chdir /var/freenet/ --background --stdout=/var/freenet/freenet.log --stderr=/var/freenet/freenet.log --make-pidfile --pidfile=/var/run/freenet.pid --name freenet --exec java -- -cp $classpath $additional_options $configurable_options $target
-}
-
-stop() {
-	start-stop-daemon --stop --user freenet --pidfile=/var/run/freenet.pid
-}

diff --git a/net-p2p/freenet/files/freenet.old b/net-p2p/freenet/files/freenet.old
deleted file mode 100644
index ce98ea99cb22..000000000000
--- a/net-p2p/freenet/files/freenet.old
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-start() {
-	start-stop-daemon --start --chuid freenet --exec /var/freenet/run.sh start 2>/dev/null
-	eend 0
-}
-
-status() {
-	start-stop-daemon --start --chuid freenet --exec /var/freenet/run.sh status 2>/dev/null
-	eend 0
-}
-
-stop() {
-	start-stop-daemon --start --chuid freenet --exec /var/freenet/run.sh stop 2>/dev/null
-	eend 0
-}

diff --git a/net-p2p/freenet/freenet-0.7.5_p1491-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1491-r1.ebuild
deleted file mode 100644
index 5205069d8205..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1491-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 systemd
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
-SRC_URI="
-	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+nss test"
-
-CDEPEND="dev-java/bcprov:0
-	dev-java/commons-compress:0
-	dev-java/fec:0
-	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
-	nss? ( dev-libs/nss )"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.8
-	${CDEPEND}
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	dev-java/ant-core:0"
-
-RDEPEND="
-	>=virtual/jre-1.8
-	net-libs/nativebiginteger:0
-	${CDEPEND}
-	acct-user/freenet
-	acct-group/freenet"
-
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S="${WORKDIR}/fred-build0${PV#*p}"
-
-RESTRICT="test" # they're broken in the last release.
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-#	unpack ${P}.zip seednodes-${PV}.zip
-	unpack ${P}.zip seednodes-0.7.5_p1480.zip
-}
-
-src_prepare() {
-#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
-	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
-	cp "${FILESDIR}"/freenet-0.7.5_p1491-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
-	cp "${FILESDIR}"/build.properties build.properties || die
-
-	eapply -p1 "${FILESDIR}/"0.7.5_p1491-update-for-jna-5.x.patch
-	eapply -p0 "${FILESDIR}"/0.7.5_p1483-ext.patch
-	eapply -p1 "${FILESDIR}/"0.7.5_p1475-remove-git.patch
-
-	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.6=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
-	fi
-	local i=2 pkg jars jar
-	local ifs_original=${IFS}
-	IFS=","
-	for pkg in ${EANT_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.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
-	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
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-	eapply_user
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-
-	systemd_dounit "${FILESDIR}"/freenet.service
-
-	dodoc AUTHORS
-	newdoc README.md README
-	insinto /etc
-	doins freenet-wrapper.conf
-	insinto /var/freenet
-	doins run.sh seednodes.fref
-	fperms +x /var/freenet/run.sh
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-pkg_postinst() {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/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
-}

diff --git a/net-p2p/freenet/freenet-0.7.5_p1491.ebuild b/net-p2p/freenet/freenet-0.7.5_p1491.ebuild
deleted file mode 100644
index 9c2352f70072..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1491.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 systemd
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
-SRC_URI="
-	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+nss test"
-
-CDEPEND="dev-java/bcprov:0
-	dev-java/commons-compress:0
-	dev-java/fec:0
-	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
-	nss? ( dev-libs/nss )"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.8
-	${CDEPEND}
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	dev-java/ant-core:0"
-
-RDEPEND="
-	>=virtual/jre-1.8
-	net-libs/nativebiginteger:0
-	${CDEPEND}
-	acct-user/freenet
-	acct-group/freenet"
-
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S="${WORKDIR}/fred-build0${PV#*p}"
-
-RESTRICT="test" # they're broken in the last release.
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-#	unpack ${P}.zip seednodes-${PV}.zip
-	unpack ${P}.zip seednodes-0.7.5_p1480.zip
-}
-
-src_prepare() {
-#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
-	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
-	cp "${FILESDIR}"/freenet-0.7.5_p1474-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
-	cp "${FILESDIR}"/build.properties build.properties || die
-
-	eapply -p0 "${FILESDIR}"/0.7.5_p1483-ext.patch
-	eapply -p1 "${FILESDIR}/"0.7.5_p1475-remove-git.patch
-
-	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.5=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
-	fi
-	local i=2 pkg jars jar
-	local ifs_original=${IFS}
-	IFS=","
-	for pkg in ${EANT_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.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
-	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
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-	eapply_user
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-
-	systemd_dounit "${FILESDIR}"/freenet.service
-
-	dodoc AUTHORS
-	newdoc README.md README
-	insinto /etc
-	doins freenet-wrapper.conf
-	insinto /var/freenet
-	doins run.sh seednodes.fref
-	fperms +x /var/freenet/run.sh
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-pkg_postinst() {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/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
-}

diff --git a/net-p2p/freenet/freenet-0.7.5_p1492.ebuild b/net-p2p/freenet/freenet-0.7.5_p1492.ebuild
deleted file mode 100644
index e501d6fa4dbf..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1492.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 systemd
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
-SRC_URI="
-	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+nss test"
-
-CDEPEND="dev-java/bcprov:0
-	dev-java/commons-compress:0
-	dev-java/fec:0
-	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
-	nss? ( dev-libs/nss )"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.8
-	${CDEPEND}
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	dev-java/ant-core:0"
-
-RDEPEND="
-	>=virtual/jre-1.8
-	net-libs/nativebiginteger:0
-	${CDEPEND}
-	acct-user/freenet
-	acct-group/freenet"
-
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S="${WORKDIR}/fred-build0${PV#*p}"
-
-RESTRICT="test" # they're broken in the last release.
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-#	unpack ${P}.zip seednodes-${PV}.zip
-	unpack ${P}.zip seednodes-0.7.5_p1480.zip
-}
-
-src_prepare() {
-#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
-	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
-	cp "${FILESDIR}"/freenet-0.7.5_p1491-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
-	cp "${FILESDIR}"/build.properties build.properties || die
-
-	eapply -p1 "${FILESDIR}/"0.7.5_p1491-update-for-jna-5.x.patch
-	eapply -p0 "${FILESDIR}"/0.7.5_p1483-ext.patch
-	eapply -p1 "${FILESDIR}/"0.7.5_p1475-remove-git.patch
-
-	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.6=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
-	fi
-	local i=2 pkg jars jar
-	local ifs_original=${IFS}
-	IFS=","
-	for pkg in ${EANT_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.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
-	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
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-	eapply_user
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-
-	systemd_dounit "${FILESDIR}"/freenet.service
-
-	dodoc AUTHORS
-	newdoc README.md README
-	insinto /etc
-	doins freenet-wrapper.conf
-	insinto /var/freenet
-	doins run.sh seednodes.fref
-	fperms +x /var/freenet/run.sh
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-pkg_postinst() {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/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
-}

diff --git a/net-p2p/freenet/freenet-0.7.5_p1493-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1493-r1.ebuild
deleted file mode 100644
index dc8909dae308..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1493-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 systemd
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
-SRC_URI="
-	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+nss test"
-
-CDEPEND="dev-java/bcprov:0
-	dev-java/commons-compress:0
-	dev-java/fec:0
-	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
-	nss? ( dev-libs/nss )"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.8
-	${CDEPEND}
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	dev-java/ant-core:0"
-
-RDEPEND="
-	>=virtual/jre-1.8
-	net-libs/nativebiginteger:0
-	${CDEPEND}
-	acct-user/freenet
-	acct-group/freenet"
-
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S="${WORKDIR}/fred-build0${PV#*p}"
-
-RESTRICT="test" # they're broken in the last release.
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-#	unpack ${P}.zip seednodes-${PV}.zip
-	unpack ${P}.zip seednodes-0.7.5_p1480.zip
-}
-
-src_prepare() {
-#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
-	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
-	cp "${FILESDIR}"/freenet-0.7.5_p1491-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
-	cp "${FILESDIR}"/build.properties build.properties || die
-
-	eapply -p0 "${FILESDIR}"/0.7.5_p1483-ext.patch
-	eapply -p1 "${FILESDIR}/"0.7.5_p1475-remove-git.patch
-
-	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
-	else
-		sed -i -e "s:Dfreenet.jce.use.NSS=tru:Dfreenet.jce.use.NSS=false:g" freenet.confd || die
-	fi
-	local i=2 pkg jars jar classpath
-	classpath="/usr/share/freenet/lib/freenet.jar"
-	local ifs_original=${IFS}
-	IFS=","
-	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
-		jars="$(java-pkg_getjars ${pkg})"
-		for jar in ${jars} ; do
-			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf || die
-			classpath="${classpath}":"${jar}"
-
-		done
-	done
-	IFS=${ifs_original}
-	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
-	classpath="${classpath}":/usr/share/freenet/lib/ant.jar
-	echo "classpath=\"""${classpath}""\"" > freenet.confd || die
-	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
-	echo "additional_options=\"-Dfreenet.jce.use.NSS=true -Djna.nosys=false -Dnetworkaddress.cache.ttl=0 -Dnetworkaddress.cache.negative.ttl=0 -enableassertions:freenet -Djava.library.path=/usr/$(get_libdir)/jna-4\"" >> freenet.confd || die
-	echo "target=\"freenet.node.NodeStarter\"" >> freenet.confd || die
-	echo "configurable_options=\"-Djava.initmemory=60 -Djava.maxmemory=1024 -XX:MaxPermSize=1024M\"" >> freenet.confd || die
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-	eapply_user
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
-	if has_version =sys-apps/baselayout-2*; then
-#this uses java-service-wrapper, which is currently broken, bug 878869
-#		doinitd "${FILESDIR}"/freenet
-#this does directly start freenet without the wrapper
-		newinitd "${FILESDIR}"/freenet.initd freenet
-		newconfd freenet.confd freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-
-	systemd_dounit "${FILESDIR}"/freenet.service
-
-	dodoc AUTHORS
-	newdoc README.md README
-	insinto /etc
-	doins freenet-wrapper.conf
-	insinto /var/freenet
-	doins run.sh seednodes.fref
-	fperms +x /var/freenet/run.sh
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-pkg_postinst() {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/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
-}

diff --git a/net-p2p/freenet/freenet-0.7.5_p1493.ebuild b/net-p2p/freenet/freenet-0.7.5_p1493.ebuild
deleted file mode 100644
index 494391e226e5..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1493.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 systemd
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
-SRC_URI="
-	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+nss test"
-
-CDEPEND="dev-java/bcprov:0
-	dev-java/commons-compress:0
-	dev-java/fec:0
-	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
-	nss? ( dev-libs/nss )"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.8
-	${CDEPEND}
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	dev-java/ant-core:0"
-
-RDEPEND="
-	>=virtual/jre-1.8
-	net-libs/nativebiginteger:0
-	${CDEPEND}
-	acct-user/freenet
-	acct-group/freenet"
-
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S="${WORKDIR}/fred-build0${PV#*p}"
-
-RESTRICT="test" # they're broken in the last release.
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-#	unpack ${P}.zip seednodes-${PV}.zip
-	unpack ${P}.zip seednodes-0.7.5_p1480.zip
-}
-
-src_prepare() {
-#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
-	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
-	cp "${FILESDIR}"/freenet-0.7.5_p1491-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
-	cp "${FILESDIR}"/build.properties build.properties || die
-
-	eapply -p0 "${FILESDIR}"/0.7.5_p1483-ext.patch
-	eapply -p1 "${FILESDIR}/"0.7.5_p1475-remove-git.patch
-
-	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
-	local i=2 pkg jars jar
-	local ifs_original=${IFS}
-	IFS=","
-	for pkg in ${EANT_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.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
-	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
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-	eapply_user
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-
-	systemd_dounit "${FILESDIR}"/freenet.service
-
-	dodoc AUTHORS
-	newdoc README.md README
-	insinto /etc
-	doins freenet-wrapper.conf
-	insinto /var/freenet
-	doins run.sh seednodes.fref
-	fperms +x /var/freenet/run.sh
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-pkg_postinst() {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-05-30  3:41 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-21 10:46 [gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/files/, net-p2p/freenet/ Patrice Clement
  -- strict thread matches above, loose matches on Subject: below --
2023-05-30  3:41 John Helmert III
2023-01-21 13:45 Thomas Sachau
2022-06-11 14:42 Thomas Sachau
2022-01-28  7:53 Sam James
2017-07-16  8:42 Thomas Sachau
2016-07-16 17:12 Thomas Sachau

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox