add alternate gc usage to wrapper

3 files changed, 12 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ecf1c6dceeb..10c366dee277 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Fri Apr 19 07:35:10 UTC 2019
 pkgbase = freenet
 	pkgdesc = An encrypted network without censorship
 	pkgver = 0.7.5.1484
@@ -10,6 +8,7 @@ pkgbase = freenet
 	arch = x86_64
 	license = GPL2
 	makedepends = java-environment>=8
+	makedepends = java-environment<13
 	makedepends = apache-ant
 	makedepends = git
 	makedepends = zip
@@ -40,7 +39,7 @@ pkgbase = freenet
 	sha256sums = a6581d33448c2989ef9f7e888e7e47a8784b0159e76bf8f6bc97eec1d7d55769
 	sha256sums = 434f67e2e86edb555b7dfb572a52d7ff719373989e1f1830f779bfccc678539f
 	sha256sums = c0ce093a098d91dee6be294f8a2fc929aabad95612f994933194d0da5c4cdd25
-	sha256sums = 609705bafc02048f366711f470bebaf2d4e8c5fa1285b1611719826aef755107
+	sha256sums = 560ff07854d5167c83de753c133059c0fcff404c463d31940d8cad3b9ff23845
 
 pkgname = freenet
 
diff --git a/PKGBUILD b/PKGBUILD
index 50e4597e3b55..5e5c0e4cdcd6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,7 +21,7 @@ license=('GPL2')
 arch=('i686' 'x86_64')
 install='freenet.install'
 depends=('java-runtime>=8' 'gmp' 'java-service-wrapper')
-makedepends=('java-environment>=8' 'apache-ant' 'git' 'zip' 'gradle')
+makedepends=('java-environment>=8' 'java-environment<13' 'apache-ant' 'git' 'zip' 'gradle')
 backup=('opt/freenet/wrapper.config'
         'opt/freenet/conf/freenet.ini')
 
@@ -44,7 +44,7 @@ sha256sums=('SKIP'
             'a6581d33448c2989ef9f7e888e7e47a8784b0159e76bf8f6bc97eec1d7d55769'
             '434f67e2e86edb555b7dfb572a52d7ff719373989e1f1830f779bfccc678539f'
             'c0ce093a098d91dee6be294f8a2fc929aabad95612f994933194d0da5c4cdd25'
-            '609705bafc02048f366711f470bebaf2d4e8c5fa1285b1611719826aef755107')
+            '560ff07854d5167c83de753c133059c0fcff404c463d31940d8cad3b9ff23845')
 
 pkgver() {
     cd "fred"
@@ -55,7 +55,7 @@ pkgver() {
 prepare() {
     cd "fred"
 
-    # Gradle 5.3 and Java 11 support
+    # Gradle 5.4 and Java 11 support
     git pull origin pull/658/head
     git apply -v "$srcdir/0001-strip-non-compile-deps.patch"
 
diff --git a/wrapper.config b/wrapper.config
index fa94127513c5..d2c4b2f248c2 100644
--- a/wrapper.config
+++ b/wrapper.config
@@ -30,14 +30,18 @@ wrapper.java.additional.3=-Djava.net.preferIPv4Stack=true
 # You might want to set the following line if you have changed java.maxmemory
 # wrapper.java.additional.5=-XX:MaxPermSize=
 
+# Enable the Shenandoah Gargabe Collector
+#wrapper.java.additional.6=-XX:+UnlockExperimentalVMOptions
+#wrapper.java.additional.7=-XX:+UseShenandoahGC
+
 # Initial Java Heap Size (in MB)
 # If a non-zero value is specified for this property then an appropriate -Xms
 #  parameter will be added. The initial memory must be less than or equal to
 #  the value set for the maxmemory property
-wrapper.java.initmemory=48
+wrapper.java.initmemory=128
 
 # Maximum Java Heap Size (in MB)
-wrapper.java.maxmemory=384
+wrapper.java.maxmemory=512
 
 # Application parameters. Add parameters as needed starting from 1
 wrapper.app.parameter.1=/opt/freenet/conf/freenet.ini
@@ -52,6 +56,7 @@ wrapper.app.parameter.1=/opt/freenet/conf/freenet.ini
 wrapper.console.format=PM
 
 # Log Level for console output.  (See docs for log levels)
+# https://wrapper.tanukisoftware.com/doc/english/prop-console-loglevel.html
 wrapper.console.loglevel=INFO
 
 # Log file to use for wrapper output logging.