Update [pcr/i2p] and do some resyncing with upstream.

    rebase on the upstream but remove all the stuff to launch chromium (browser) Cause we dont have it.

1 files changed, 45 insertions, 30 deletions

diff --git a/pcr/i2p/PKGBUILD b/pcr/i2p/PKGBUILD
index 5d68e0aca..d2ab54743 100644
--- a/pcr/i2p/PKGBUILD
+++ b/pcr/i2p/PKGBUILD
@@ -1,82 +1,97 @@
 # Contributor (AUR): skydrome <skydrome@protonmail.com>
 # Maintainer (AUR):  skydrome <skydrome@protonmail.com>
-# Maintainer: Freemor <freemor@fremor.ca>
+# Maintainer: Freemor <freemor@freemor.ca>
 
-# Uncomment if you do not want to build all language translations
+# uncomment if you do not want to build all language translations
 #export LG2=en
 
 pkgname=i2p
-pkgver=0.9.45
+pkgver=0.9.46
 pkgrel=1
 pkgdesc="A distributed anonymous network"
 url="https://geti2p.net"
 license=('GPL2')
 arch=('any')
 depends=('java-runtime>=8' 'java-service-wrapper')
-makedepends=('java-environment=8' 'apache-ant')
-[[ "$LG2" != 'en' ]] && makedepends+=('gettext')
+makedepends=('java-environment>=8' 'ant')
 #optdepends=('gtk2: for rrd graphs')
 conflicts=('i2p-bin' 'i2p-dev')
 backup=('opt/i2p/wrapper.config')
 install='i2p.install'
 options=(!strip)
 
+# 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')
+        'i2prouter.service' 'i2p.tmpfiles' 'wrapper.config' 'router.config'
+        'i2prouter.bash' 'i2prouter.sh'
+)
 
-sha256sums=('e65c7dbbf464b6bc64afb228306fbfed0f1e67ffec74f96852b82acade53921c'
+sha256sums=('ab0eb691b2753277738fe16ddc46349a24fd66b6323deae987f7c927272befd8'
             'SKIP'
-            '9bb899ece87099716da29bac8b7da02916fc325699b68989e73c1fe333a6342f'
-            'ea8f97e66461d591b1819eab39bbc40056b89ae12f7729b3dd9fd2ce088e5e53'
-            'd32da73b85be527ef0cc3791a2cedab089fed8272c7a70d23bc8edfe49d80b28'
-            '7a4688db826c3dddb762976cd8c9a5d465255c3577069243d8e5af941a4126e2')
-
-# https://geti2p.net/en/get-involved/develop/release-signing-key
-validpgpkeys=('2D3D2D03910C6504C1210C65EE60C0C8EE7256A8')
+            '644b771ec7f5db3efab3206bf1f896566cdb00d410a54608fda85bdb4c2ad876'
+            'fc30dd32f48fe1c93bf36c8297ca48203a1479e4e221ebe62c57cf3c3c0347d3'
+            'ba4bcb8d9aef307045d1d24385a456d096ea45f69d95a474467728ea140188ec'
+            '90f202e5b66d5a5b425522b409e71fb892d34c534e32ce2d6fe5284015cacf94'
+            '7a19b9f90c8792460fd58e8b8aa435a065e34d29a942479850472510e9d3078a'
+            '8d39f080c7a2e49226db3a785f3e18583159ef2f95e1ab467fd9984c4e38c9f5')
+
+prepare() {
+    cd "$pkgname-$pkgver"
+}
 
 build() {
     cd "$pkgname-$pkgver"
+    export JAVA_HOME="${JAVA_HOME:-/usr/lib/jvm/default}"
 
-    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() {
     cd "$pkgdir"
 
     install -dm755 "usr/bin"
-    install -dm755 "opt/i2p/.tmp"
+    install -dm755 "opt/i2p"
 
     cp -r "$srcdir/$pkgname-$pkgver"/pkg-temp/* "opt/i2p"
 
+    install -Dm644 "$srcdir/i2prouter.service" "usr/lib/systemd/system/i2prouter.service"
+    install -Dm644 "$srcdir/i2p.tmpfiles"      "usr/lib/tmpfiles.d/i2p.conf"
+    echo 'u i2p - "I2P Router" /opt/i2p /bin/sh' |
+    install -Dm644 /dev/stdin                  "usr/lib/sysusers.d/i2p.conf"
+
     install -Dm644 "$srcdir/router.config"     "opt/i2p/router.config"
     install -Dm644 "$srcdir/wrapper.config"    "opt/i2p/wrapper.config"
-    install -Dm755 "$srcdir/i2prouter.sh"      "opt/i2p/i2prouter"
-    install -Dm644 "$srcdir/i2prouter.service" "usr/lib/systemd/system/i2prouter.service"
+    install -Dm754 "$srcdir/i2prouter.sh"      "opt/i2p/i2prouter"
+
+    install -Dm644 "$srcdir/i2prouter.bash"    "usr/share/bash-completion/completions/i2prouter"
+    install -Dm644 "$srcdir/$pkgname-$pkgver/installer/resources/bash-completion/eepget" \
+                                               "usr/share/bash-completion/completions/eepget"
+
     install -Dm644 "opt/i2p/man/eepget.1"      "usr/share/man/man1/eepget.1"
     install -Dm644 "opt/i2p/LICENSE.txt"       "usr/share/licenses/i2p/LICENSE"
     mv opt/i2p/licenses/*                      "usr/share/licenses/i2p/"
 
     ln -s /opt/i2p/{eepget,i2prouter} "usr/bin/"
-    chmod +x opt/i2p/{eepget,i2prouter}
-
-    chmod  -x opt/i2p/*.config
-    chmod 755 opt/i2p
-    chown  -R 985:985 opt/i2p
-
-    echo 'u i2p 985 "I2P Router" /opt/i2p /bin/sh' |
-    install -Dm644 /dev/stdin "usr/lib/sysusers.d/i2p.conf"
-    echo 'd /run/i2p 0700 i2p i2p' |
-    install -Dm644 /dev/stdin "usr/lib/tmpfiles.d/i2p.conf"
+    chmod +x opt/i2p/eepget
 
     sed -i opt/i2p/eepget \
         -e 's:%INSTALL_PATH:/opt/i2p:g'
+
+    # dont automatically start the webserver(3) or open a webbrowser(4)
     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 -r opt/i2p/{osid,postinstall.sh,runplain.sh,INSTALL-headless.txt,LICENSE.txt,licenses,man,lib/wrapper*}
+
 }