1.7.0

3 files changed, 32 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf4d27b7e5bf..4b1e04165977 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = i2p
 	pkgdesc = A distributed anonymous network
-	pkgver = 1.6.1
+	pkgver = 1.7.0
 	pkgrel = 1
 	url = https://geti2p.net
 	install = i2p.install
 	arch = any
 	license = GPL2
-	makedepends = java-environment>=11
+	makedepends = java-environment>=13
 	makedepends = ant
-	depends = java-runtime>=11
+	depends = java-runtime>=13
 	depends = java-service-wrapper
 	conflicts = i2p-bin
 	conflicts = i2p-dev
 	options = !strip
 	backup = opt/i2p/wrapper.config
-	source = https://files.i2p-projekt.de/1.6.1/i2psource_1.6.1.tar.bz2
-	source = https://files.i2p-projekt.de/1.6.1/i2psource_1.6.1.tar.bz2.sig
+	source = https://files.i2p-projekt.de/1.7.0/i2psource_1.7.0.tar.bz2
+	source = https://files.i2p-projekt.de/1.7.0/i2psource_1.7.0.tar.bz2.sig
 	source = i2prouter.service
 	source = i2p.tmpfiles
 	source = wrapper.config
@@ -23,15 +23,19 @@ pkgbase = i2p
 	source = i2prouter.bash
 	source = i2prouter.sh
 	source = chromium-i2p.sh
+	source = speed_up_prng.patch::https://github.com/i2p/i2p.i2p/commit/63f3d88f785172f747e7f049dfc8badecd963e96.patch
+	source = update_firefox_useragent::https://github.com/i2p/i2p.i2p/commit/265f5ee5dfb0fe977ca8114554b7156e2aa0e40a.patch
 	validpgpkeys = 2D3D2D03910C6504C1210C65EE60C0C8EE7256A8
-	sha256sums = 719606c4cb510de4fe74f24bbfa53911a70531821fc1ee79a29e3d96eaa16733
+	sha256sums = aa53591e89eacc3491ab472dc4df998780fb6747eea3b97ecb7a9f81ff2c9a5e
 	sha256sums = SKIP
 	sha256sums = 644b771ec7f5db3efab3206bf1f896566cdb00d410a54608fda85bdb4c2ad876
 	sha256sums = fc30dd32f48fe1c93bf36c8297ca48203a1479e4e221ebe62c57cf3c3c0347d3
-	sha256sums = ba4bcb8d9aef307045d1d24385a456d096ea45f69d95a474467728ea140188ec
+	sha256sums = e3a85d8992a09e8f57498b1eba0aef758ceffdb944d296528e8c5cec970becd9
 	sha256sums = 90f202e5b66d5a5b425522b409e71fb892d34c534e32ce2d6fe5284015cacf94
 	sha256sums = 7a19b9f90c8792460fd58e8b8aa435a065e34d29a942479850472510e9d3078a
 	sha256sums = 8d39f080c7a2e49226db3a785f3e18583159ef2f95e1ab467fd9984c4e38c9f5
 	sha256sums = a7076156703e2b949331e450455813432caeb4e5712f1c7b668974eb06a69fb9
+	sha256sums = 55b05dec917d5a55f2a7c3b76c5111d2cdbb3694968049fca5cdb089cb18e390
+	sha256sums = 70f2ada05fa56e06c7cfc107a87b327aa37683bd0c47f0cb5454c60105a71be8
 
 pkgname = i2p
diff --git a/PKGBUILD b/PKGBUILD
index aa2d2e3c9847..1f5257fdf8c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,14 +5,14 @@
 #export LG2=en
 
 pkgname=i2p
-pkgver=1.6.1
+pkgver=1.7.0
 pkgrel=1
 pkgdesc="A distributed anonymous network"
 url="https://geti2p.net"
 license=('GPL2')
 arch=('any')
-depends=('java-runtime>=11' 'java-service-wrapper')
-makedepends=('java-environment>=11' 'ant')
+depends=('java-runtime>=13' 'java-service-wrapper')
+makedepends=('java-environment>=13' 'ant')
 #optdepends=('gtk2: for rrd graphs')
 conflicts=('i2p-bin' 'i2p-dev')
 backup=('opt/i2p/wrapper.config')
@@ -30,22 +30,28 @@ source=("${_url}/i2psource_${pkgver}.tar.bz2"{,.sig}
         #"https://download.db-ip.com/free/dbip-country-lite-$(date +%Y-%m).mmdb.gz"
         'i2prouter.service' 'i2p.tmpfiles' 'wrapper.config' 'router.config'
         'i2prouter.bash' 'i2prouter.sh' 'chromium-i2p.sh'
+        speed_up_prng.patch::'https://github.com/i2p/i2p.i2p/commit/63f3d88f785172f747e7f049dfc8badecd963e96.patch'
+        update_firefox_useragent::'https://github.com/i2p/i2p.i2p/commit/265f5ee5dfb0fe977ca8114554b7156e2aa0e40a.patch'
         #upstream.patch::'https://github.com/i2p/i2p.i2p/commit/6c0e18d3.patch'
 )
 
-sha256sums=('719606c4cb510de4fe74f24bbfa53911a70531821fc1ee79a29e3d96eaa16733'
+sha256sums=('aa53591e89eacc3491ab472dc4df998780fb6747eea3b97ecb7a9f81ff2c9a5e'
             'SKIP'
             '644b771ec7f5db3efab3206bf1f896566cdb00d410a54608fda85bdb4c2ad876'
             'fc30dd32f48fe1c93bf36c8297ca48203a1479e4e221ebe62c57cf3c3c0347d3'
-            'ba4bcb8d9aef307045d1d24385a456d096ea45f69d95a474467728ea140188ec'
+            'e3a85d8992a09e8f57498b1eba0aef758ceffdb944d296528e8c5cec970becd9'
             '90f202e5b66d5a5b425522b409e71fb892d34c534e32ce2d6fe5284015cacf94'
             '7a19b9f90c8792460fd58e8b8aa435a065e34d29a942479850472510e9d3078a'
             '8d39f080c7a2e49226db3a785f3e18583159ef2f95e1ab467fd9984c4e38c9f5'
             'a7076156703e2b949331e450455813432caeb4e5712f1c7b668974eb06a69fb9'
+            '55b05dec917d5a55f2a7c3b76c5111d2cdbb3694968049fca5cdb089cb18e390'
+            '70f2ada05fa56e06c7cfc107a87b327aa37683bd0c47f0cb5454c60105a71be8'
 )
 
 prepare() {
     cd "$pkgname-$pkgver"
+    patch -Np1 -i ../speed_up_prng.patch
+    patch -Np1 -i ../update_firefox_useragent
     #patch -Np1 -i ../upstream.patch ||true
     #cp -f ../dbip-country-lite-$(date +%Y-%m).mmdb.gz installer/resources/GeoLite2-Country.mmdb.gz
 }
diff --git a/wrapper.config b/wrapper.config
index 1474aa02ca9a..2bc2b8e9eb34 100644
--- a/wrapper.config
+++ b/wrapper.config
@@ -169,8 +169,15 @@ wrapper.filter.action.1=RESTART
 wrapper.filter.message.1=The JVM has run out of memory.
 
 #********************************************************************
-# Advanced Options
+# Advanced Options - https://docs.oracle.com/en/java/javase/17/docs/specs/man/java.html
 #********************************************************************
-# Enable the Shenandoah Gargabe Collector
-#wrapper.java.additional.100=-XX:+UnlockExperimentalVMOptions
+# Enable the Shenandoah Garbage Collector
 #wrapper.java.additional.101=-XX:+UseShenandoahGC
+#wrapper.java.additional.102=-XX:+DisableExplicitGC
+
+# Committing heap pages into memory helps to reduce latency hiccups
+#wrapper.java.additional.103=-XX:+AlwaysPreTouch
+
+# Using large pages greatly improves performance on large heaps
+# Recommended to set /sys/kernel/mm/transparent_hugepage/enabled and /sys/kernel/mm/transparent_hugepage/defrag to "madvise"
+#wrapper.java.additional.104=XX:+UseTransparentHugePages