create user with systemd

1 files changed, 48 insertions, 31 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 540c4a64d772..3a47bdac2d73 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,60 @@
-# Maintainer: skydrome <skydrome@i2pmail.org>
-# Contributor: skydrome <skydrome@i2pmail.org>
+# Contributor: skydrome <skydrome@protonmail.com>
+# Maintainer:  skydrome <skydrome@protonmail.com>
 
-########[ OPTIONS ]########################################
 # Comment out if you want to build all language translations
 export LG2=en
-###########################################################
 
 pkgname=i2p-dev
-pkgver=0.9.38.0
+pkgver=0.9.38.9
 pkgrel=1
-epoch=1
 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' 'gmp' 'java-service-wrapper')
-makedepends=('apache-ant' 'git' 'java-environment>=11')
+depends=('java-runtime>=11' 'java-service-wrapper' 'gmp')
+makedepends=('java-environment>=11' 'apache-ant' 'git')
 [[ "$LG2" != 'en' ]] && makedepends+=('gettext')
 #optdepends=('gtk2: for rrd graphs')
 conflicts=('i2p' 'i2p-bin')
 provides=('i2p')
 backup=('opt/i2p/wrapper.config')
 install='i2p.install'
+options=(!strip)
 
+_tomcatver=9.0.16
 _gitname=i2p.i2p
 _commit=master
 
 source=("git+https://github.com/i2p/${_gitname}.git#commit=${_commit}"
+        "http://apache.mirrors.pair.com/tomcat/tomcat-9/v${_tomcatver}/bin/apache-tomcat-${_tomcatver}.tar.gz"
         'i2prouter.service' 'i2prouter.sh' 'wrapper.config' 'router.config')
-
 sha256sums=('SKIP'
+            '1f45dd960c6cbc044e75ce0ed5ae5d3af62aff0152fa56b8160d2e3dc23f417a'
             'ff9942ca43715b5095b0118e306c8aec1af7c68c18e8959dba10d86eac8efbfd'
             'ea8f97e66461d591b1819eab39bbc40056b89ae12f7729b3dd9fd2ce088e5e53'
             '72c0944cd2b04c747673a534475f2ec42c64d52fdda76714f1165c4655113de2'
-            'b98b00bf7c811089a12a59641e9503bd89447be9d0c0b12bbc780036c7cb6f3c')
+            '41756375ef2e8323147cec31a8675b2bc11109451f9185c036ff32d26d6c9b99')
+
 pkgver() {
-    cd "$srcdir/$_gitname"
+    cd "$_gitname"
     echo "$(grep 'VERSION =' core/java/src/net/i2p/CoreVersion.java \
         |sed 's/.*= "//;s/";//').$(grep 'BUILD =' router/java/src/net/i2p/router/RouterVersion.java \
         |sed 's/.*= //;s/;//')"
 }
 
 prepare() {
-    cd "$srcdir/$_gitname"
+    cd "$_gitname"
+
     sed -i build.properties \
         -e 's:javac.version=.*:javac.version=11:'
     sed -i {router,core}/java/build.xml \
         -e 's:1.7:11:'
+
+    sed -i build.xml \
+        -e "s:value=\"8.5.38\":value=\"${_tomcatver}\":"
+    cd apps/jetty
+    rm -rf apache-tomcat-8.5.38
+    ln -sf "$srcdir"/apache-tomcat-${_tomcatver} .
 }
 
 build_jbigi() {
@@ -72,7 +80,7 @@ fi
 }
 
 build() {
-    export ANT_HOME=/usr/share/ant
+    source /etc/ant.conf
     export ANT_OPTS="-Dfile.encoding=UTF-8"
     export JAVA_HOME="${JAVA_HOME:-/usr/lib/jvm/default}"
 
@@ -84,30 +92,39 @@ build() {
 }
 
 package() {
-    cd "$srcdir/$_gitname"
+    cd "$pkgdir"
+
+    install -dm755 "usr/bin"
+    install -dm755 "opt/i2p"
 
-    install -dm755 "$pkgdir/usr/lib/tmpfiles.d"
-    install -dm755 "$pkgdir/usr/bin"
-    install -dm750 "$pkgdir/opt/i2p"
+    cp -r "$srcdir/$_gitname"/pkg-temp/* "opt/i2p"
 
-    cp -r pkg-temp/* "$pkgdir/opt/i2p"
-    cp "$srcdir/wrapper.config" "$pkgdir/opt/i2p"
+    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 -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/"
 
-    install -Dm644 "$srcdir/router.config"        "$pkgdir/opt/i2p/router.config"
-    install -Dm755 "$srcdir/i2prouter.sh"         "$pkgdir/opt/i2p/i2prouter"
-    install -Dm644 "$srcdir/i2prouter.service"    "$pkgdir/usr/lib/systemd/system/i2prouter.service"
-    install -Dm644 "$pkgdir/opt/i2p/man/eepget.1" "$pkgdir/usr/share/man/man1/eepget.1"
-    install -Dm644 "$pkgdir/opt/i2p/LICENSE.txt"  "$pkgdir/usr/share/licenses/i2p/LICENSE"
-    mv "$pkgdir"/opt/i2p/licenses/*               "$pkgdir/usr/share/licenses/i2p/"
+    ln -s /opt/i2p/{eepget,i2prouter} "usr/bin/"
+    chmod +x opt/i2p/{eepget,i2prouter}
 
-    ln -s /opt/i2p/{eepget,i2prouter} "$pkgdir/usr/bin/"
-    chmod +x "$pkgdir"/opt/i2p/{eepget,i2prouter}
+    chmod  -x opt/i2p/*.config
+    chmod 755 opt/i2p
+    chown  -R 985:985 opt/i2p
 
-    echo 'd /run/i2p 0700 i2p i2p -' >"$pkgdir/usr/lib/tmpfiles.d/i2prouter.conf"
+    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"
 
-    sed -i "$pkgdir"/opt/i2p/{eepget,wrapper.config} \
+    sed -i opt/i2p/{eepget,wrapper.config} \
         -e 's:%INSTALL_PATH:/opt/i2p:g'
-    sed -i "$pkgdir"/opt/i2p/clients.config \
+    sed -i opt/i2p/clients.config \
+        -e "s:clientApp.3.startOnLoad=.*:clientApp.4.startOnLoad=false:" \
         -e "s:clientApp.4.startOnLoad=.*:clientApp.4.startOnLoad=false:"
-    rm -r "$pkgdir"/opt/i2p/{osid,postinstall.sh,runplain.sh,INSTALL-headless.txt,LICENSE.txt,licenses,man,lib/wrapper}
+    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}
 }