0.9.43

3 files changed, 43 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bdd7d81f98f1..f6f9c31026b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,30 @@
 pkgbase = i2p
 	pkgdesc = A distributed anonymous network
-	pkgver = 0.9.42
-	pkgrel = 2
+	pkgver = 0.9.43
+	pkgrel = 1
 	url = https://geti2p.net
 	install = i2p.install
 	arch = any
 	license = GPL2
 	makedepends = java-environment>=8
 	makedepends = apache-ant
-	makedepends = gettext
 	depends = java-runtime>=8
 	depends = java-service-wrapper
 	conflicts = i2p-bin
 	conflicts = i2p-dev
 	options = !strip
 	backup = opt/i2p/wrapper.config
-	source = https://download.i2p2.de/releases/0.9.42/i2psource_0.9.42.tar.bz2
-	source = https://download.i2p2.de/releases/0.9.42/i2psource_0.9.42.tar.bz2.sig
+	source = https://launchpad.net/i2p/trunk/0.9.43/+download/i2psource_0.9.43.tar.bz2
+	source = https://launchpad.net/i2p/trunk/0.9.43/+download/i2psource_0.9.43.tar.bz2.sig
 	source = i2prouter.service
 	source = i2prouter.sh
 	source = wrapper.config
 	source = router.config
-	validpgpkeys = 2D3D2D03910C6504C1210C65EE60C0C8EE7256A8
-	sha256sums = 30482b56becb6135ed4b74bd4715906774f7c3f3302753985a5fde363f0cc713
+	sha256sums = beb2a3c62efce826cd5aa3e296b483143ad2c581ddb038677f960f7d110df81c
 	sha256sums = SKIP
 	sha256sums = 9bb899ece87099716da29bac8b7da02916fc325699b68989e73c1fe333a6342f
 	sha256sums = ea8f97e66461d591b1819eab39bbc40056b89ae12f7729b3dd9fd2ce088e5e53
-	sha256sums = d32da73b85be527ef0cc3791a2cedab089fed8272c7a70d23bc8edfe49d80b28
+	sha256sums = fc8833e081a842af0d9ff88af021a086370b2e55140bb08d932459f86f2c0bd2
 	sha256sums = 7a4688db826c3dddb762976cd8c9a5d465255c3577069243d8e5af941a4126e2
 
 pkgname = i2p
diff --git a/PKGBUILD b/PKGBUILD
index 4f63608049af..1f787766f5a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 # Maintainer:  skydrome <skydrome@protonmail.com>
 
 # Uncomment if you do not want to build all language translations
-#export LG2=en
+export LG2=en
 
 pkgname=i2p
-pkgver=0.9.42
-pkgrel=2
+pkgver=0.9.43
+pkgrel=1
 pkgdesc="A distributed anonymous network"
 url="https://geti2p.net"
 license=('GPL2')
@@ -20,28 +20,31 @@ backup=('opt/i2p/wrapper.config')
 install='i2p.install'
 options=(!strip)
 
-_url="https://download.i2p2.de/releases/${pkgver}"
-#_url="https://launchpad.net/i2p/trunk/${pkgver}/+download"
+# https://geti2p.net/en/get-involved/develop/release-signing-key
+# https://geti2p.net/_static/zzz.key.asc
+validpgpkeys=('2D3D2D03910C6504C1210C65EE60C0C8EE7256A8')
+
+#_url="https://download.i2p2.de/releases/${pkgver}"
+_url="https://launchpad.net/i2p/trunk/${pkgver}/+download"
 
 source=("${_url}/i2psource_${pkgver}.tar.bz2"{,.sig}
         'i2prouter.service' 'i2prouter.sh' 'wrapper.config' 'router.config')
 
-sha256sums=('30482b56becb6135ed4b74bd4715906774f7c3f3302753985a5fde363f0cc713'
+sha256sums=('beb2a3c62efce826cd5aa3e296b483143ad2c581ddb038677f960f7d110df81c'
             'SKIP'
             '9bb899ece87099716da29bac8b7da02916fc325699b68989e73c1fe333a6342f'
             'ea8f97e66461d591b1819eab39bbc40056b89ae12f7729b3dd9fd2ce088e5e53'
-            'd32da73b85be527ef0cc3791a2cedab089fed8272c7a70d23bc8edfe49d80b28'
+            'fc8833e081a842af0d9ff88af021a086370b2e55140bb08d932459f86f2c0bd2'
             '7a4688db826c3dddb762976cd8c9a5d465255c3577069243d8e5af941a4126e2')
 
-# https://geti2p.net/en/get-involved/develop/release-signing-key
-validpgpkeys=('2D3D2D03910C6504C1210C65EE60C0C8EE7256A8')
-
 build() {
     cd "$pkgname-$pkgver"
 
-    source /etc/ant.conf
-    export ANT_OPTS="-Dfile.encoding=UTF-8"
-    ant preppkg-linux-only
+    ant -Dfile.encoding=UTF-8 \
+        -Djavac.compilerargs=-Xlint:-options \
+        -Dbuild.reproducible=true \
+        -Djavac.version=8 \
+        preppkg-linux-only
 }
 
 package() {
diff --git a/wrapper.config b/wrapper.config
index 30271d5372c2..d8ca3b4a801b 100644
--- a/wrapper.config
+++ b/wrapper.config
@@ -4,17 +4,15 @@
 #
 # WARNING - for any changes to take effect, you must completely
 # stop the router and the wrapper. Clicking 'Restart' on your
-# router console will NOT reread this file! You must
-# click "Shutdown", wait 11 minutes, then start i2p.
+# router console will NOT reload this file! You must
+# click "Shutdown", wait 10 minutes, then start i2p.
 #
 #********************************************************************
 # Java Application
 wrapper.java.command=/usr/lib/jvm/default/bin/java
 
 # Java Main class.  This class must implement the WrapperListener interface
-#  or guarantee that the WrapperManager class is initialized.  Helper
-#  classes are provided to do this for you.  See the Integration section
-#  of the documentation for details.
+#  or guarantee that the WrapperManager class is initialized.
 wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
 
 # Java Classpath (include wrapper.jar)  Add class path elements as
@@ -129,16 +127,12 @@ wrapper.jvm_exit.timeout=60
 # give the OS 60s to clear all the old sockets / etc before restarting
 # Let's change the default from 60 to 10 seconds and see if anyone moans..
 wrapper.restart.delay=5
+wrapper.restart.reload_configuration=TRUE
 
-wrapper.ping.interval=300
 # The ping timeout must be at least 5 seconds longer than the value of wrapper.ping.interval.
 # Extend this if you are getting 'JVM appears hung' shutdowns.
 wrapper.ping.timeout=320
-
-# use the wrapper's internal timer thread.  otherwise this would
-# force a restart of the router during daylight savings time as well
-# as any time that the OS clock changes
-wrapper.use_system_time=false
+wrapper.ping.interval=300
 
 # pid file for the JVM
 # If you plan to have multiple wrappers running on the same machine,
@@ -155,7 +149,7 @@ wrapper.java.pidfile=/run/i2p/i2p.pid
 wrapper.ignore_sequence_gaps=TRUE
 
 # Title to use when running as a console
-wrapper.console.title=I2P Service
+wrapper.console.title=I2P Router Service
 
 # Set permissions used when creating files
 # See http://wrapper.tanukisoftware.com/doc/english/prop-umask.html
@@ -163,3 +157,18 @@ wrapper.console.title=I2P Service
 wrapper.umask=0022
 wrapper.java.umask=0022
 wrapper.logfile.umask=077
+
+#********************************************************************
+# Wrapper JVM Checks
+#********************************************************************
+# Out Of Memory detection.
+wrapper.filter.trigger.1=java.lang.OutOfMemoryError
+wrapper.filter.action.1=RESTART
+wrapper.filter.message.1=The JVM has run out of memory.
+
+#********************************************************************
+# Advanced Options
+#********************************************************************
+# Enable the Shenandoah Gargabe Collector
+#wrapper.java.additional.100=-XX:+UnlockExperimentalVMOptions
+#wrapper.java.additional.101=-XX:+UseShenandoahGC