rehaul i2p user creation/permissions and service file

1 files changed, 17 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 8d14ee2a0e2b..b83eb4fde17b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: skydrome <skydrome@protonmail.com>
 # Maintainer:  skydrome <skydrome@protonmail.com>
 
-# 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
@@ -27,20 +27,21 @@ validpgpkeys=('2D3D2D03910C6504C1210C65EE60C0C8EE7256A8')
 _url="https://launchpad.net/i2p/trunk/${pkgver}/+download"
 
 source=("${_url}/i2psource_${pkgver}.tar.bz2"{,.sig}
-        'i2prouter.service' 'i2prouter.sh' 'wrapper.config' 'router.config'
-        'https://github.com/i2p/i2p.i2p/commit/eef6c5cb33d8292ce247fcd49578cc9fa1acf6cb.patch')
+        'i2prouter.service' 'i2p.tmpfiles' 'i2prouter.sh' 'wrapper.config' 'router.config'
+        gettext-0.20.patch::'https://github.com/i2p/i2p.i2p/commit/eef6c5cb33d8292ce247fcd49578cc9fa1acf6cb.patch')
 
 sha256sums=('beb2a3c62efce826cd5aa3e296b483143ad2c581ddb038677f960f7d110df81c'
             'SKIP'
-            '9bb899ece87099716da29bac8b7da02916fc325699b68989e73c1fe333a6342f'
-            'ea8f97e66461d591b1819eab39bbc40056b89ae12f7729b3dd9fd2ce088e5e53'
+            '644b771ec7f5db3efab3206bf1f896566cdb00d410a54608fda85bdb4c2ad876'
+            'df26da04c8415ac24ec73b0dd08d3459a8964553bb77e5da5ab9833b0a31d865'
+            'ae1ff9026f0a9180718249e6d8a973ffe03501bf55491cb3866d72230e89dc8a'
             '5d134ee5bc614b54ec48de7c5214f6dbe08abcfab7d286c5b1c7616e39b478ed'
             '7a4688db826c3dddb762976cd8c9a5d465255c3577069243d8e5af941a4126e2'
             'a3be87c6ed2a253a393ef39b47bb0c8d91bbbd80111557e412753e78c590e5b8')
 
 prepare() {
     cd "$pkgname-$pkgver"
-    patch -Np1 -i "$srcdir/eef6c5cb33d8292ce247fcd49578cc9fa1acf6cb.patch"
+    patch -Np1 -i "$srcdir/gettext-0.20.patch"
 }
 
 build() {
@@ -57,34 +58,33 @@ 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 -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/*.config
 
     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*}
 }