[gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/files/, net-p2p/freenet/
commit: 07e20f46407339ca15497bad30b4b415b79d1aa8
Author: Thomas Sachau gentoo org>
AuthorDate: Sat Jan 21 13:42:30 2023 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sat Jan 21 13:45:08 2023 +
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 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 ..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 ..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" >>
[gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/files/, net-p2p/freenet/
commit: 051aa227394684af4751a01282fa0e6e2746257f Author: Thomas Sachau gentoo org> AuthorDate: Sat Jun 11 14:41:36 2022 + Commit: Thomas Sachau gentoo org> CommitDate: Sat Jun 11 14:41:36 2022 + 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 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 ..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 ..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 +
[gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/files/, net-p2p/freenet/
commit: c54e5325b0369da14991e21bfe94a8226c257f06
Author: Yuan Liao gmail com>
AuthorDate: Sun Jan 23 18:21:33 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 28 07:53:30 2022 +
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 gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23933
Signed-off-by: Sam James 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 ..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
+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
+---
+ 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 ..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 ..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
[gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/files/, net-p2p/freenet/
commit: 8608b572bcfca67c73d0bf28e4f4899aa7d71814
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Jul 16 08:40:56 2017 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Jul 16 08:40:56 2017 +
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 000..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
+
[gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/files/, net-p2p/freenet/
commit: a6fcfeda31b955139bacc29292931b6383169e43
Author: tharvik users noreply github com>
AuthorDate: Mon Oct 10 16:54:25 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Dec 21 10:46:02 2016 +
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 ..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 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
++
++
+
+
+
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 ..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
[gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/files/, net-p2p/freenet/
commit: d39df900b854f95f556a34c7854002d223cfdc79
Author: Thomas Sachau gentoo org>
AuthorDate: Sat Jul 16 17:11:36 2016 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sat Jul 16 17:12:16 2016 +
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
2c3d976db30cacc88d63fc577e4cb1cd26a16f0d0b65c981b71495fa3b5b 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..000
--- 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.0 +0100
-+++ src/freenet/node/NodeStarter.java.new 2010-11-10 21:50:12.0
+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
