gradle 7.6: allow building with jdk19

3 files changed, 13 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45473b4afacc..29d91f530a41 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,8 +4,7 @@ pkgbase = freenet
 	pkgrel = 1
 	url = https://freenetproject.org
 	install = freenet.install
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = GPL2
 	makedepends = java-environment>=11
 	makedepends = ant
@@ -28,7 +27,7 @@ pkgbase = freenet
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = 043589015aced4a9828518db5a7207382c782ff7f0f5bc2c5ad19ff559fc7f695bcd503e717bfb19bee8338abdf0b30f418a155e9c86f5016162ccad4870d82a
-	b2sums = 134a273c654c87b7c34d40416944e3e5f80254d68cf30d9a096ca8821cbb42dac0b66bf9ce316515ba6e47876f1221eb3eae4ebf90e2bd2ed8cf77c317d2d4bc
+	b2sums = d8c628a79c912855a34b30cd3f1dfee40a6a629591c2a7e08221850bfd314f34fe60c9dadf23ff486949e587a7396bf1cc728b32a89571ce5825f86d782c884e
 	b2sums = 83a374354b4ade822e6ecdc0b08013ac6c1c7dd3071478d4017e998ec031a1f3d0731f76eb8470e36bf8e77f7bbe1310d8d0cf5726929fcc6db81a90cc802d04
 	b2sums = 540c911bbccea18ed2b5ad22864040b83674833746536e869ec8491974f0265239c7b4c12fb1e43f27126320adc9206d81249c5e0c9e7ce6ef2aeb46b8f9cf5b
 	b2sums = 54828750ac0283e4328635bb61d0edd695391d433d85a6612b2288520a58b40b312d5759b38487e093e150aedee3659e6bed3827d936171d2d252aea2cbced1d
diff --git a/PKGBUILD b/PKGBUILD
index 69953c842342..ee6723d1e54e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: skydrome <skydrome at@at proton mail dot com>
-# Contributors: Thynix
+# Contributor: Thynix
 
 # detect java version
 # javac -version 2>&1 |awk '{split($2,v,"."); print v[1]}'
@@ -15,7 +15,7 @@ pkgrel=1
 pkgdesc="A peer-to-peer platform for censorship-resistant communication and publishing"
 url="https://freenetproject.org"
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('any')
 install='freenet.install'
 depends=('java-runtime>=11' 'nss' 'java-service-wrapper')
 makedepends=('java-environment>=11' 'ant' 'git' 'zip')
@@ -33,7 +33,7 @@ b2sums=('SKIP'
         'SKIP'
         'SKIP'
         '043589015aced4a9828518db5a7207382c782ff7f0f5bc2c5ad19ff559fc7f695bcd503e717bfb19bee8338abdf0b30f418a155e9c86f5016162ccad4870d82a'
-        '134a273c654c87b7c34d40416944e3e5f80254d68cf30d9a096ca8821cbb42dac0b66bf9ce316515ba6e47876f1221eb3eae4ebf90e2bd2ed8cf77c317d2d4bc'
+        'd8c628a79c912855a34b30cd3f1dfee40a6a629591c2a7e08221850bfd314f34fe60c9dadf23ff486949e587a7396bf1cc728b32a89571ce5825f86d782c884e'
         '83a374354b4ade822e6ecdc0b08013ac6c1c7dd3071478d4017e998ec031a1f3d0731f76eb8470e36bf8e77f7bbe1310d8d0cf5726929fcc6db81a90cc802d04'
         '540c911bbccea18ed2b5ad22864040b83674833746536e869ec8491974f0265239c7b4c12fb1e43f27126320adc9206d81249c5e0c9e7ce6ef2aeb46b8f9cf5b'
         '54828750ac0283e4328635bb61d0edd695391d433d85a6612b2288520a58b40b312d5759b38487e093e150aedee3659e6bed3827d936171d2d252aea2cbced1d')
@@ -48,7 +48,7 @@ prepare() {
     cd fred
 
     # java 17 support
-    git pull -r -v https://github.com/skydrome/fred.git gradle-7.4-aur -q
+    git pull -r -v https://github.com/skydrome/fred.git gradle-7.6-aur -q
 
     # create seednodes file for bootstrapping
     rm -f seednodes.fref
@@ -61,7 +61,7 @@ build() {
     cd fred
 
     export ANT_HOME=/usr/share/ant
-    export GRADLE_USER_HOME="$startdir/.gradle"
+    export GRADLE_USER_HOME="$SRCDEST/.gradle"
     export GRADLE_OPTS="-Dorg.gradle.internal.launcher.welcomeMessageEnabled=false"
 
     msg "Building Freenet..."
@@ -84,7 +84,6 @@ package() {
 
     # create folder structure
     install -dm755 "$pkgdir"/usr/bin
-    install -dm750 "$pkgdir"/run/freenet
     install -dm750 "$pkgdir"/opt/freenet
     install -dm700 "$pkgdir"/opt/freenet/tmp
     install -dm750 "$pkgdir"/opt/freenet/{downloads,lib,conf,noderef,persistent-temp,plugins,user}
diff --git a/wrapper.config b/wrapper.config
index b109d5b30ead..d9cbe0b8c4d7 100644
--- a/wrapper.config
+++ b/wrapper.config
@@ -22,11 +22,11 @@ wrapper.java.library.path.1=/usr/lib/java-service-wrapper
 # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
 wrapper.java.additional.auto_bits=TRUE
 
-#wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=0
-#wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=0
+wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=360
+wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=10
 
-# Needed for some linux distros? Shouldn't prevent using IPv6, just make it prefer IPv4?
-#wrapper.java.additional.3=-Djava.net.preferIPv4Stack=true
+# Required for JNA 5
+wrapper.java.additional.3=-Djna.nosys=false
 
 # Use nss for crypto operations
 wrapper.java.additional.4=-Dfreenet.jce.use.NSS=true
@@ -37,14 +37,13 @@ wrapper.java.additional.5=-Djava.io.tmpdir=/opt/freenet/tmp
 # Open internal modules (required for Java 17)
 wrapper.java.additional.6=--add-opens=java.base/java.io=ALL-UNNAMED
 wrapper.java.additional.7=--add-opens=java.base/java.lang=ALL-UNNAMED
-wrapper.java.additional.8=--add-opens=java.base/java.net=ALL-UNNAMED
 wrapper.java.additional.9=--add-opens=java.base/java.util=ALL-UNNAMED
 
-# Thread Stack Size
+# Maximum Thread Stack Size
 wrapper.java.additional.10=-Xss256k
 
 # Maximum Heap Size (in MB)
-wrapper.java.maxmemory=512
+wrapper.java.maxmemory=768
 
 # Application parameters. Add parameters as needed starting from 1
 wrapper.app.parameter.1=/opt/freenet/conf/freenet.ini