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 <t...@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
