From 57c12b7c097c5e177648f8268e936c44eb3f382f Mon Sep 17 00:00:00 2001
From: graysky <graysky@archlinux.us>
Date: Thu, 16 Jan 2020 20:30:16 -0500
Subject: [PATCH] alarm/kodi-c2 to 17.6-8 (#1762)

---
 alarm/kodi-c2/PKGBUILD      | 16 +++++++++++++---
 alarm/kodi-c2/kodi.install  | 22 +---------------------
 alarm/kodi-c2/sysusers.conf | 16 ++++++++++++++++
 alarm/kodi-c2/tmpfiles.conf |  3 +++
 4 files changed, 33 insertions(+), 24 deletions(-)
 create mode 100644 alarm/kodi-c2/sysusers.conf
 create mode 100644 alarm/kodi-c2/tmpfiles.conf

diff --git a/alarm/kodi-c2/PKGBUILD b/alarm/kodi-c2/PKGBUILD
index 301fa718f..b29e3c590 100644
--- a/alarm/kodi-c2/PKGBUILD
+++ b/alarm/kodi-c2/PKGBUILD
@@ -25,7 +25,7 @@ pkgname=('kodi-c2' 'kodi-c2-eventclients' 'kodi-c2-tools-texturepacker' 'kodi-c2
 _commit=7e7160eacdcb0c5b70e91dd4265d20358ba33c26
 _codename=Krypton
 pkgver=17.6
-pkgrel=7
+pkgrel=8
 arch=('aarch64')
 url="http://kodi.tv"
 license=('GPL2')
@@ -56,7 +56,10 @@ source=(
   'kodi_permissions.conf'
   'kodi.service'
   'polkit.rules'
-  '99-odroid.rules')
+  '99-odroid.rules'
+  'sysusers.conf'
+  'tmpfiles.conf'
+)
 sha256sums=('aafe2852620a6bc62c929bf1bdb24760e7e9573787ca4dd37aceed2d1dbb32dd'
             'b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34'
             '312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d'
@@ -67,7 +70,9 @@ sha256sums=('aafe2852620a6bc62c929bf1bdb24760e7e9573787ca4dd37aceed2d1dbb32dd'
             '8c606f29aa9ec90f4c93e1751cfd4000872937e604e6ad7538b96ba29612d2f6'
             '255261cb781a4d75fa00f217d59cdca0789d96c9ba13c584232862b522a66f21'
             'c68ed2bd377f80b606b8815d78239b9132b479eafc1d19797cee5824debe1800'
-            '5ddf80329c9f5d054525b45f788b3405d199bfc6cf5b08c543ad29766ec27f6e')
+            '5ddf80329c9f5d054525b45f788b3405d199bfc6cf5b08c543ad29766ec27f6e'
+            'f521b98232e5035b7cada46cf03975b8d753e93d0802bf22913fceed769f9d96'
+            '9c5e79ed8719cd032a3b17dac585aeff28a198e37af1da9af68ef1b86bab4d18')
 noextract=(
  "$pkgbase-libdvdcss-$_libdvdcss_commit.tar.gz"
  "$pkgbase-libdvdnav-$_libdvdnav_commit.tar.gz"
@@ -170,6 +175,11 @@ package_kodi-c2() {
 
   # fix permissions necessary for accelerated video playback
   install -Dm0644 $srcdir/99-odroid.rules $pkgdir/etc/udev/rules.d/99-odroid.rules
+
+  # systemd manages kodi user
+  install -Dm644 "$srcdir"/sysusers.conf "$pkgdir/usr/lib/sysusers.d/kodi.conf"
+  install -Dm644 "$srcdir"/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/kodi.conf"
+
 }
 
 # kodi-eventclients
diff --git a/alarm/kodi-c2/kodi.install b/alarm/kodi-c2/kodi.install
index b9fd8f2b3..6235f3c1c 100644
--- a/alarm/kodi-c2/kodi.install
+++ b/alarm/kodi-c2/kodi.install
@@ -1,23 +1,3 @@
-post_install() {
-  update_icons
-  getent group kodi > /dev/null || groupadd -r kodi
-  getent passwd kodi > /dev/null || useradd -r -m -d /var/lib/kodi -g kodi -s /usr/bin/nologin kodi
-  usermod -a -G kodi,audio,video,power,network,optical,storage,disk,input,tty kodi
-  mkdir -p var/lib/kodi
-  chown -R kodi:kodi var/lib/kodi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
 post_remove() {
-  update_icons
-  getent passwd kodi > /dev/null && userdel kodi
-}
-
-update_icons() {
-  type -p gtk-update-icon-cache > /dev/null 2>&1 && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
-  type -p update-desktop-database > /dev/null 2>&1 && usr/bin/update-desktop-database -q usr/share/applications
-  return 0
+  echo "==> Optionally remove /var/lib/kodi/"
 }
diff --git a/alarm/kodi-c2/sysusers.conf b/alarm/kodi-c2/sysusers.conf
new file mode 100644
index 000000000..c3777ea48
--- /dev/null
+++ b/alarm/kodi-c2/sysusers.conf
@@ -0,0 +1,16 @@
+# override these settings by copying this to /etc/sysusers.d/ and modifying it therein
+
+#Type Name ID GECOS Home directory Shell
+g kodi - -
+u kodi - "Kodi User" /var/lib/kodi
+
+# supplemental groups
+m kodi audio
+m kodi disk
+m kodi input
+m kodi network
+m kodi optical
+m kodi power
+m kodi storage
+m kodi tty
+m kodi video
diff --git a/alarm/kodi-c2/tmpfiles.conf b/alarm/kodi-c2/tmpfiles.conf
new file mode 100644
index 000000000..615f016c1
--- /dev/null
+++ b/alarm/kodi-c2/tmpfiles.conf
@@ -0,0 +1,3 @@
+#Type Path Mode User Group Age Argument
+d /var/lib/kodi 0750 kodi kodi - -
+Z /var/lib/kodi - kodi kodi - -