From aecaeb0440a8c77699040a01fb241be73cb5d3f8 Mon Sep 17 00:00:00 2001
From: graysky <graysky@archlinux.us>
Date: Thu, 16 Jan 2020 20:29:51 -0500
Subject: [PATCH] alarm/kodi-c1 to 17.6-6 (#1761)

---
 alarm/kodi-c1/PKGBUILD      | 13 +++++++++++--
 alarm/kodi-c1/kodi.install  | 22 +---------------------
 alarm/kodi-c1/sysusers.conf | 16 ++++++++++++++++
 alarm/kodi-c1/tmpfiles.conf |  3 +++
 4 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 alarm/kodi-c1/sysusers.conf
 create mode 100644 alarm/kodi-c1/tmpfiles.conf

diff --git a/alarm/kodi-c1/PKGBUILD b/alarm/kodi-c1/PKGBUILD
index 10f169a38..649a8fc13 100644
--- a/alarm/kodi-c1/PKGBUILD
+++ b/alarm/kodi-c1/PKGBUILD
@@ -25,7 +25,7 @@ pkgbase=kodi-c1
 pkgname=('kodi-c1' 'kodi-c1-eventclients' 'kodi-c1-tools-texturepacker' 'kodi-c1-dev')
 pkgver=17.6
 _commit=094825c86d4995bef81419cd80dab0f2ed95eb79
-pkgrel=5
+pkgrel=6
 arch=('armv7h')
 url="http://kodi.tv"
 license=('GPL2')
@@ -47,13 +47,17 @@ source=(
   'kodi.service'
   'polkit.rules'
   '99-odroid.rules'
+  'sysusers.conf'
+  'tmpfiles.conf'
 )
 sha512sums=('3c06bb72167796539df89288b92fe4b06f36b89823731739f522c65e3916946e64b038262329b0166f0945213822f19215e5b70618ab2f4bdda4511db52797ab'
             '0f41604e38648969572a66d1124d6e090c3bfca4f9d8ccabcd1806254c38b178ee08df35e1bbbd1228f820729df52353321b3257122af601c3233dbc6405c6d2'
             '890ed1fb944c337ed04397db7b2c8de5ef74f25eb49936e2fec418baf279cfa7d3ba292ccd6beccb60f83dc94b020d068162bc2c9a4ede8392d64ad7edcd5601'
             '9953861cd17ec4c31094a2b1ef7161df13759b4b840cbc0231650ffc5349aa3ce98d8b860b1109eac22c6dcd153c43e165ed3451e5dbe2a3dbe130db53c28ad4'
             '2e28e1366b89a94848822ccf8f6874fc69c1b2ffd27b129132e793bc41d27652f87d53deb48ff9a1dc01050f39a2bafa16b58e2a9c1c0f3cdc4155cd357c9b2a'
-            'dcb23c9074a6f646c419957169642bfd565e004f221bd972ae6034bcc4ef6aa6f4f2bbda011c759fef769b682f7a686cc041a02e5326530bd1ad2011366d1529')
+            'dcb23c9074a6f646c419957169642bfd565e004f221bd972ae6034bcc4ef6aa6f4f2bbda011c759fef769b682f7a686cc041a02e5326530bd1ad2011366d1529'
+            '95365ba2d1e2a99a85d86a975ae5b23137f7191a791b342dd5774353224b84798d04f9b0e5decbb09c0405dadf067111c1d431828dba1b90131714d0cca81566'
+            '37bba7eacdfea8bed8b33c36895a2a9df0536b00645db649922ce461e5125aaf84c96c830b95e74c1aa28b9ba3e96b6864e4fab8f0bf3287207fe48f25371d47')
 
 prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
@@ -144,6 +148,11 @@ package_kodi-c1() {
 
   # 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-c1/kodi.install b/alarm/kodi-c1/kodi.install
index b9fd8f2b3..6235f3c1c 100644
--- a/alarm/kodi-c1/kodi.install
+++ b/alarm/kodi-c1/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-c1/sysusers.conf b/alarm/kodi-c1/sysusers.conf
new file mode 100644
index 000000000..c3777ea48
--- /dev/null
+++ b/alarm/kodi-c1/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-c1/tmpfiles.conf b/alarm/kodi-c1/tmpfiles.conf
new file mode 100644
index 000000000..615f016c1
--- /dev/null
+++ b/alarm/kodi-c1/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 - -