increase wrapper timeout value

increase wrapper mem limit to what gentoo has set

3 files changed, 14 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e751baf6172b..0ace50cf6152 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,19 +2,17 @@ pkgbase = freenet
 	pkgdesc = An encrypted network without censorship
 	pkgver = 0.7.5.1470
 	pkgrel = 3
-	epoch = 1
 	url = https://downloads.freenetproject.org
 	install = freenet.install
 	arch = any
 	license = GPL2
 	checkdepends = junit
 	makedepends = java-environment>=7
-	makedepends = unzip
 	makedepends = apache-ant
 	makedepends = apache-ant-contrib
 	makedepends = git
 	depends = java-runtime>=7
-	depends = bcprov151>=1.52
+	depends = bcprov151
 	depends = gmp
 	depends = java-service-wrapper
 	noextract = lzma465.tar.bz2
@@ -31,6 +29,7 @@ pkgbase = freenet
 	source = git+https://github.com/freenet/plugin-KeyUtils.git
 	source = git+https://github.com/freenet/plugin-WebOfTrust.git#tag=build0018
 	source = https://downloads.freenetproject.org/alpha/opennet/seednodes.fref
+	source = IpToCountry.dat::http://software77.net/geo-ip/?DL=4
 	source = https://downloads.freenetproject.org/contrib/jar/latest/commons-compress.jar
 	source = https://raw.githubusercontent.com/i2p/i2p.i2p/master/core/c/jcpuid/src/jcpuid.c
 	source = https://raw.githubusercontent.com/i2p/i2p.i2p/master/core/c/jcpuid/include/jcpuid.h
@@ -51,15 +50,16 @@ pkgbase = freenet
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = 16924be3c8f1322b659f3ff08060a43f45f2e8de6f95af28d86fe9876e79008d
 	sha256sums = f1ecddb5395892e0b2e6282bc3a1437d06afa52758057850ecccfa0a79c45c5d
 	sha256sums = 9ec758801a9864ae10caf851ee60ed22c3ef44428e77689c203d9b890921a6d2
 	sha256sums = 187dd4479fcda313d64415e02687acde66e018fe0be55b9f9e9d117f701d303d
 	sha256sums = 865c1f259d9c544861cc12b4ea64ad35ec6388c1392b3e5247eaed0f316e42b7
-	sha256sums = 4a1597e4748012d684622f4491108eb8fae022f00dbca9a2f6a31a589ec022d2
+	sha256sums = 9912dcfc8f30143b68e6f9c51505ae921100eb6b24690a8680582bb23559d95a
 	sha256sums = 434f67e2e86edb555b7dfb572a52d7ff719373989e1f1830f779bfccc678539f
-	sha256sums = bab61a82b5e0e0aa92a51b7d6111f37fc5416faa14b7805077a7e89b5653e297
-	sha256sums = ac83d727d6301e75cf1d441a1a1e72ba06ea119fa53a3bae65b3373108abf213
+	sha256sums = 6ae810e40ac177b4238e95b31329d099f6a7cc95154ec1b1844538580e692f64
+	sha256sums = f7bceda39b36d1d79e70c8ba8e0e68d4cfe060b16e67d8341078af5fda13b405
 	sha256sums = c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e
 	sha256sums = 265f7ed2dd4fecb058884d3f8974674b06e0be46131c3b2bc6a310373937d2ef
 	sha256sums = b36482ee9e919c669bb1797ff7e50f57edf505af67664e280fe1dff361861044
diff --git a/PKGBUILD b/PKGBUILD
index 0d046c92b8e8..1687ea16476f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,7 @@
 # Contributors:
 
 _fred=#tag=build01470
-#_fred=#branch=next
-
 _wot=#tag=build0018
-#_wot=#branch=next
 
 pkgname=freenet
 pkgver=0.7.5.1470
@@ -17,8 +14,8 @@ license=('GPL2')
 arch=('any')
 install='freenet.install'
 
-depends=('java-runtime>=7' 'bcprov151>=1.52' 'gmp' 'java-service-wrapper')
-makedepends=('java-environment>=7' 'unzip' 'apache-ant' 'apache-ant-contrib' 'git')
+depends=('java-runtime>=7' 'bcprov151' 'gmp' 'java-service-wrapper')
+makedepends=('java-environment>=7' 'apache-ant' 'apache-ant-contrib' 'git')
 checkdepends=('junit')
 # comment out to run unit tests
 BUILDENV+=('!check')
@@ -76,7 +73,7 @@ sha256sums=('SKIP'
             '9912dcfc8f30143b68e6f9c51505ae921100eb6b24690a8680582bb23559d95a'
             '434f67e2e86edb555b7dfb572a52d7ff719373989e1f1830f779bfccc678539f'
             '6ae810e40ac177b4238e95b31329d099f6a7cc95154ec1b1844538580e692f64'
-            'f91a860868f0ad0dee4164110f49cf3529c2c051fd067e3318406bb9105b800d'
+            'f7bceda39b36d1d79e70c8ba8e0e68d4cfe060b16e67d8341078af5fda13b405'
             'c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e'
             '265f7ed2dd4fecb058884d3f8974674b06e0be46131c3b2bc6a310373937d2ef'
             'b36482ee9e919c669bb1797ff7e50f57edf505af67664e280fe1dff361861044'
@@ -143,7 +140,7 @@ build() {
     cd dist
     for dep in bitcollider-core commons-compress db4o lzmajio mantissa wrapper
     do
-        unzip -nq "${dep}.jar"
+        jar xf "${dep}.jar"
     done
     jar uf freenet-ext.jar com net org SevenZip
 
diff --git a/wrapper.config b/wrapper.config
index ed49077b6403..3960c613fab8 100644
--- a/wrapper.config
+++ b/wrapper.config
@@ -38,7 +38,7 @@ wrapper.java.additional.3=-Djava.net.preferIPv4Stack=true
 wrapper.java.initmemory=32
 
 # Maximum Java Heap Size (in MB)
-wrapper.java.maxmemory=192
+wrapper.java.maxmemory=256
 
 # Application parameters. Add parameters as needed starting from 1
 wrapper.app.parameter.1=/opt/freenet/conf/freenet.ini
@@ -73,11 +73,11 @@ wrapper.logfile.loglevel=INFO
 #  the log is rolled. Size is specified in bytes.  The default value
 #  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
 #  'm' (mb) suffix.  For example: 10m = 10 megabytes.
-wrapper.logfile.maxsize=1m
+wrapper.logfile.maxsize=2M
 
 # Maximum number of rolled log files which will be allowed before old
 #  files are deleted.  The default value of 0 implies no limit.
-wrapper.logfile.maxfiles=5
+wrapper.logfile.maxfiles=3
 
 # Log Level for sys/event log output.  (See docs for log levels)
 wrapper.syslog.loglevel=NONE
@@ -102,7 +102,7 @@ wrapper.on_exit.4=RESTART
 wrapper.on_exit.5=RESTART
 
 # the router may take a few seconds to save state, etc
-wrapper.jvm_exit.timeout=60
+wrapper.jvm_exit.timeout=120
 
 wrapper.restart.reload_configuration=TRUE
 wrapper.filter.trigger.1=java.lang.OutOfMemoryError