git mirror is offline

4 files changed, 21 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1fb489cac771..ea71381c5231 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Mon Jul 15 06:34:01 UTC 2019
 pkgbase = i2p-dev
 	pkgdesc = A distributed anonymous network (daily mtn->git sync)
 	pkgver = 0.9.41.2
@@ -11,10 +9,10 @@ pkgbase = i2p-dev
 	arch = armv6h
 	arch = armv7h
 	license = GPL2
-	makedepends = java-environment>=11
+	makedepends = java-environment>=12
 	makedepends = apache-ant
 	makedepends = git
-	depends = java-runtime>=11
+	depends = java-runtime>=12
 	depends = java-service-wrapper
 	depends = gmp
 	provides = i2p
@@ -30,7 +28,7 @@ pkgbase = i2p-dev
 	sha256sums = SKIP
 	sha256sums = ff9942ca43715b5095b0118e306c8aec1af7c68c18e8959dba10d86eac8efbfd
 	sha256sums = ea8f97e66461d591b1819eab39bbc40056b89ae12f7729b3dd9fd2ce088e5e53
-	sha256sums = 72c0944cd2b04c747673a534475f2ec42c64d52fdda76714f1165c4655113de2
+	sha256sums = 3e97ceddc2c4ba766e77893341c83f3f87639d29b0fee346c955bc59ede15d14
 	sha256sums = 41756375ef2e8323147cec31a8675b2bc11109451f9185c036ff32d26d6c9b99
 
 pkgname = i2p-dev
diff --git a/PKGBUILD b/PKGBUILD
index 87c5dafb4158..6520176eadd4 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@ pkgdesc="A distributed anonymous network (daily mtn->git sync)"
 url="https://geti2p.net"
 license=('GPL2')
 arch=('x86_64' 'i686' 'armv6h' 'armv7h')
-depends=('java-runtime>=11' 'java-service-wrapper' 'gmp')
-makedepends=('java-environment>=11' 'apache-ant' 'git')
+depends=('java-runtime>=12' 'java-service-wrapper' 'gmp')
+makedepends=('java-environment>=12' 'apache-ant' 'git')
 [[ "$LG2" != 'en' ]] && makedepends+=('gettext')
 #optdepends=('gtk2: for rrd graphs')
 conflicts=('i2p' 'i2p-bin')
@@ -30,7 +30,7 @@ source=("git+https://github.com/i2p/${_gitname}.git#commit=${_commit}"
 sha256sums=('SKIP'
             'ff9942ca43715b5095b0118e306c8aec1af7c68c18e8959dba10d86eac8efbfd'
             'ea8f97e66461d591b1819eab39bbc40056b89ae12f7729b3dd9fd2ce088e5e53'
-            '72c0944cd2b04c747673a534475f2ec42c64d52fdda76714f1165c4655113de2'
+            '3e97ceddc2c4ba766e77893341c83f3f87639d29b0fee346c955bc59ede15d14'
             '41756375ef2e8323147cec31a8675b2bc11109451f9185c036ff32d26d6c9b99')
 
 pkgver() {
@@ -87,7 +87,7 @@ package() {
     cd "$pkgdir"
 
     install -dm755 "usr/bin"
-    install -dm755 "opt/i2p"
+    install -dm755 "opt/i2p/.tmp"
 
     cp -r "$srcdir/$_gitname"/pkg-temp/* "opt/i2p"
 
@@ -114,9 +114,7 @@ package() {
     sed -i opt/i2p/{eepget,wrapper.config} \
         -e 's:%INSTALL_PATH:/opt/i2p:g'
     sed -i opt/i2p/clients.config \
-        -e "s:clientApp.3.startOnLoad=.*:clientApp.4.startOnLoad=false:" \
+        -e "s:clientApp.3.startOnLoad=.*:clientApp.3.startOnLoad=false:" \
         -e "s:clientApp.4.startOnLoad=.*:clientApp.4.startOnLoad=false:"
-    sed -i opt/i2p/i2ptunnel.config \
-        -e "s:tunnel.6.startOnLoad=.*:tunnel.6.startOnLoad=false:"
     rm -r opt/i2p/{osid,postinstall.sh,runplain.sh,INSTALL-headless.txt,LICENSE.txt,licenses,man,lib/wrapper}
 }
diff --git a/i2p.install b/i2p.install
index caa60bd1a788..68c5726b257f 100755
--- a/i2p.install
+++ b/i2p.install
@@ -18,3 +18,7 @@ post_upgrade() {
     }
     fi
 }
+
+post_remove() {
+    rm -f /opt/i2p/lib*.so*
+}
diff --git a/wrapper.config b/wrapper.config
index 284f7eb6abf7..dbc6927fc49e 100755
--- a/wrapper.config
+++ b/wrapper.config
@@ -47,6 +47,13 @@ wrapper.java.additional.4.stripquotes=TRUE
 wrapper.java.additional.5=-Djava.net.preferIPv4Stack=true
 wrapper.java.additional.6=-Djava.net.preferIPv6Addresses=false
 
+# Location used to hold temporary files.
+wrapper.java.additional.7=-Djava.io.tmpdir=/opt/i2p/.tmp
+
+# https://wiki.openjdk.java.net/display/shenandoah/Main
+wrapper.java.additional.8=-XX:+UnlockExperimentalVMOptions
+wrapper.java.additional.9=-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
@@ -58,7 +65,7 @@ wrapper.java.additional.6=-Djava.net.preferIPv6Addresses=false
 # lots of I2PSnark activity in the same JVM, increasing the default max heap
 # size should help.  Feel free to reduce this if not using I2PSnark in the jvm
 # High-bandwidth routers may need to increase to 256 or more.
-wrapper.java.maxmemory=128
+wrapper.java.maxmemory=512
 
 # Application parameters. Add parameters as needed starting from 1
 wrapper.app.parameter.1=net.i2p.router.Router
@@ -72,7 +79,7 @@ wrapper.app.parameter.1=net.i2p.router.Router
 wrapper.console.format=PM
 
 # Log Level for console output.  (See docs for log levels)
-wrapper.console.loglevel=INFO
+wrapper.console.loglevel=DEBUG
 
 # Log file to use for wrapper output logging.
 # You may wish to change this.