0.9.42

4 files changed, 27 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 696186089910..122e2d95f4da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,31 @@
-# Generated by mksrcinfo v8
-# Mon Jul 15 06:27:59 UTC 2019
 pkgbase = i2p-bin
 	pkgdesc = A distributed anonymous network (pre-compiled binary)
-	pkgver = 0.9.41
+	pkgver = 0.9.42
 	pkgrel = 1
 	url = https://geti2p.net
 	install = i2p.install
 	arch = any
 	license = GPL2
-	depends = java-runtime>=7
+	depends = java-runtime>=8
 	depends = java-service-wrapper
 	provides = i2p
 	conflicts = i2p
 	conflicts = i2p-dev
-	noextract = i2pinstall_0.9.41.jar
+	noextract = i2pinstall_0.9.42.jar
 	options = !strip
 	backup = opt/i2p/wrapper.config
-	source = https://launchpad.net/i2p/trunk/0.9.41/+download/i2pinstall_0.9.41.jar
-	source = https://launchpad.net/i2p/trunk/0.9.41/+download/i2pinstall_0.9.41.jar.sig
+	source = https://launchpad.net/i2p/trunk/0.9.42/+download/i2pinstall_0.9.42.jar
+	source = https://launchpad.net/i2p/trunk/0.9.42/+download/i2pinstall_0.9.42.jar.sig
 	source = i2prouter.service
 	source = i2prouter.sh
 	source = wrapper.config
 	source = router.config
-	sha256sums = 3faf1c24c776375694d5f70c53c795ef73e00b21cd4b931ee62b1299b7073fc4
+	validpgpkeys = 2D3D2D03910C6504C1210C65EE60C0C8EE7256A8
+	sha256sums = cb192e48c5f06839c99b71861364f3a9117b6b24f78f7f7c25d6716507c81bdf
 	sha256sums = SKIP
 	sha256sums = 9bb899ece87099716da29bac8b7da02916fc325699b68989e73c1fe333a6342f
 	sha256sums = ea8f97e66461d591b1819eab39bbc40056b89ae12f7729b3dd9fd2ce088e5e53
-	sha256sums = 72c0944cd2b04c747673a534475f2ec42c64d52fdda76714f1165c4655113de2
+	sha256sums = a6c5ac0dd4c3892b8055c38fbc6a5a3d99e1e581efbd8ee2d60cd729afdab50c
 	sha256sums = 1527afbadcf849ef551b3b7b68d1a29eec316ee620f5320f2933f73ee9924978
 
 pkgname = i2p-bin
diff --git a/PKGBUILD b/PKGBUILD
index 196a90235321..bcf7dccb9694 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 # Maintainer:  skydrome <skydrome@protonmail.com>
 
 pkgname=i2p-bin
-pkgver=0.9.41
+pkgver=0.9.42
 pkgrel=1
 pkgdesc="A distributed anonymous network (pre-compiled binary)"
 url="https://geti2p.net"
 license=('GPL2')
 arch=('any')
-depends=('java-runtime>=7' 'java-service-wrapper')
+depends=('java-runtime>=8' 'java-service-wrapper')
 #optdepends=('gtk2: for rrd graphs')
 conflicts=('i2p' 'i2p-dev')
 provides=('i2p')
@@ -23,15 +23,15 @@ _url="https://launchpad.net/i2p/trunk/${pkgver}/+download"
 source=("${_url}/i2pinstall_${pkgver}.jar"{,.sig}
         'i2prouter.service' 'i2prouter.sh' 'wrapper.config' 'router.config')
 
-#curl -s "https://geti2p.net/en/download" \
-#    |grep -A1 "<div class=\"hash\">" \
-#    |sed -e "s:.*<code>::" -e "s:</code>::" -e '5,5!d'
+_hash=$(curl -Ls "https://geti2p.net/en/download" \
+            |grep -A1 "<div class=\"hash\">" \
+            |sed -e "s:.*<code>::" -e "s:</code>::" -e '5,5!d')
 
-sha256sums=('3faf1c24c776375694d5f70c53c795ef73e00b21cd4b931ee62b1299b7073fc4'
+sha256sums=(${_hash:-'cb192e48c5f06839c99b71861364f3a9117b6b24f78f7f7c25d6716507c81bdf'}
             'SKIP'
             '9bb899ece87099716da29bac8b7da02916fc325699b68989e73c1fe333a6342f'
             'ea8f97e66461d591b1819eab39bbc40056b89ae12f7729b3dd9fd2ce088e5e53'
-            '72c0944cd2b04c747673a534475f2ec42c64d52fdda76714f1165c4655113de2'
+            'a6c5ac0dd4c3892b8055c38fbc6a5a3d99e1e581efbd8ee2d60cd729afdab50c'
             '1527afbadcf849ef551b3b7b68d1a29eec316ee620f5320f2933f73ee9924978')
 
 # https://geti2p.net/en/get-involved/develop/release-signing-key
@@ -40,12 +40,14 @@ validpgpkeys=('2D3D2D03910C6504C1210C65EE60C0C8EE7256A8')
 package() {
     source /etc/profile.d/jre.sh
     echo "INSTALL_PATH=${pkgdir}/opt/i2p" >install.properties
-    java -jar i2pinstall_${pkgver}.jar -options install.properties
+    java -jar i2pinstall_${pkgver}.jar \
+         -options install.properties \
+         -language eng
 
     cd "$pkgdir"
 
     install -dm755 "usr/bin"
-    install -dm755 "opt/i2p"
+    install -dm755 "opt/i2p/.tmp"
 
     install -Dm644 "$srcdir/router.config"     "opt/i2p/router.config"
     install -Dm644 "$srcdir/wrapper.config"    "opt/i2p/wrapper.config"
@@ -70,6 +72,7 @@ package() {
     sed -i opt/i2p/eepget \
         -e "s:$pkgdir/opt/i2p:/opt/i2p:g"
     sed -i opt/i2p/clients.config \
+        -e "s:clientApp.3.startOnLoad=.*:clientApp.3.startOnLoad=false:" \
         -e "s:clientApp.4.startOnLoad=.*:clientApp.4.startOnLoad=false:"
     rm -rf opt/i2p/{Uninstaller,.installationinformation,INSTALL-headless.txt,LICENSE.txt,runplain.sh,licenses,man,i2psvc,lib/*wrapper*,scripts/home.i2p.i2prouter}
 }
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..a8ea514a8406 100755
--- a/wrapper.config
+++ b/wrapper.config
@@ -47,6 +47,9 @@ 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"
+
 # 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