Switched to sysusers and tmpfiles.

5 files changed, 29 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1fac4353a0df..e50a1440a3eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Tue Jul 31 14:47:02 UTC 2018
+# Tue Feb  5 08:55:36 UTC 2019
 pkgbase = snapcast
 	pkgdesc = Synchronous multi-room audio player
 	pkgver = 0.15.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/badaix/snapcast
-	install = snapcast.install
 	arch = x86_64
 	arch = armv6h
 	arch = armv7h
@@ -21,7 +20,11 @@ pkgbase = snapcast
 	backup = etc/default/snapserver
 	backup = etc/default/snapclient
 	source = https://github.com/badaix/snapcast/archive/v0.15.0.tar.gz
+	source = snapcast.sysusers
+	source = snapcast.tmpfiles
 	sha256sums = 7c584fad4941a299339fe060174e33c4d810b1cbe80d6efbee54da3dafb252cc
+	sha256sums = 9fe6e9e07adb77f555a617b772e6d01e098e1dfaad1e8075e03a7d7ba76141de
+	sha256sums = 1c58fef5d3e2de64c1df52138f0f3c841773e7881b9cbc76f23312deeebc11b5
 
 pkgname = snapcast
 
diff --git a/PKGBUILD b/PKGBUILD
index 05a186fe3ee3..2a50fac543b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=snapcast
 pkgver=0.15.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Synchronous multi-room audio player"
 arch=('x86_64' 'armv6h' 'armv7h')
 url="https://github.com/badaix/snapcast"
@@ -10,9 +10,12 @@ license=('GPL')
 depends=(alsa-lib avahi libvorbis flac)
 makedepends=(alsa-utils asio aixlog popl)
 backup=('etc/default/snapserver' 'etc/default/snapclient')
-install=snapcast.install
-source=("https://github.com/badaix/snapcast/archive/v${pkgver}.tar.gz")
-sha256sums=('7c584fad4941a299339fe060174e33c4d810b1cbe80d6efbee54da3dafb252cc')
+source=("https://github.com/badaix/snapcast/archive/v${pkgver}.tar.gz"
+        "snapcast.sysusers"
+        "snapcast.tmpfiles")
+sha256sums=('7c584fad4941a299339fe060174e33c4d810b1cbe80d6efbee54da3dafb252cc'
+            '9fe6e9e07adb77f555a617b772e6d01e098e1dfaad1e8075e03a7d7ba76141de'
+            '1c58fef5d3e2de64c1df52138f0f3c841773e7881b9cbc76f23312deeebc11b5')
 
 prepare() {
         cd "${pkgname}-${pkgver}"
@@ -25,15 +28,18 @@ build() {
 
 package() {
 	cd "${pkgname}-${pkgver}"
-	install -Dm755 -g root -o root server/snapserver "${pkgdir}/usr/bin/snapserver"
-	install -Dm644 -g root -o root server/snapserver.1 "${pkgdir}/usr/share/man/man1/snapserver.1"
+	install -Dm755 server/snapserver "${pkgdir}/usr/bin/snapserver"
+	install -Dm644 server/snapserver.1 "${pkgdir}/usr/share/man/man1/snapserver.1"
 
-	install -Dm755 -g root -o root client/snapclient "${pkgdir}/usr/bin/snapclient"
-	install -Dm644 -g root -o root client/snapclient.1 "${pkgdir}/usr/share/man/man1/snapclient.1"
+	install -Dm755 client/snapclient "${pkgdir}/usr/bin/snapclient"
+	install -Dm644 client/snapclient.1 "${pkgdir}/usr/share/man/man1/snapclient.1"
 
-	install -Dm644 -g root -o root server/debian/snapserver.service "${pkgdir}/usr/lib/systemd/system/snapserver.service"
-	install -Dm644 -g root -o root server/debian/snapserver.default "${pkgdir}/etc/default/snapserver"
-	install -Dm644 -g root -o root client/debian/snapclient.service "${pkgdir}/usr/lib/systemd/system/snapclient.service"
-	install -Dm644 -g root -o root client/debian/snapclient.default "${pkgdir}/etc/default/snapclient"
+	install -Dm644 server/debian/snapserver.service "${pkgdir}/usr/lib/systemd/system/snapserver.service"
+	install -Dm644 server/debian/snapserver.default "${pkgdir}/etc/default/snapserver"
+	install -Dm644 client/debian/snapclient.service "${pkgdir}/usr/lib/systemd/system/snapclient.service"
+	install -Dm644 client/debian/snapclient.default "${pkgdir}/etc/default/snapclient"
+
+	install -Dm644 ../../snapcast.sysusers "${pkgdir}/usr/lib/sysusers.d/snapclient.conf"
+	install -Dm644 ../../snapcast.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/snapclient.conf"
 }
 
diff --git a/snapcast.install b/snapcast.install
deleted file mode 100644
index 5911354ad7ca..000000000000
--- a/snapcast.install
+++ /dev/null
@@ -1,31 +0,0 @@
-post_install() {
-  echo "Creating snapclient and snapserver users and groups."
-  if ! getent passwd snapclient &>/dev/null; then
-    useradd --gid audio --system --home-dir /var/lib/snapclient snapclient -s /bin/false
-    passwd -l snapclient &>/dev/null
-  fi
-  if ! getent passwd snapserver &>/dev/null; then
-    useradd --user-group --system --home-dir /var/lib/snapserver snapserver -s /bin/false
-    passwd -l snapserver &>/dev/null
-  fi
-}
-
-post_upgrade() {
-  echo "Creating snapclient and snapserver users and groups."
-  if ! getent passwd snapclient &>/dev/null; then
-    useradd --gid audio --system --home-dir /var/lib/snapclient snapclient -s /bin/false
-    passwd -l snapclient &>/dev/null
-  fi
-  if ! getent passwd snapserver &>/dev/null; then
-    useradd --user-group --system --home-dir /var/lib/snapserver snapserver -s /bin/false
-    passwd -l snapserver &>/dev/null
-  fi
-}
-
-post_remove() {
-  echo "Removing snapclient and snapserver users and groups."
-  userdel --force snapclient > /dev/null || true
-  userdel --force snapserver > /dev/null || true
-  # group is automatically removed by userdel command, so not needed
-  #groupdel snapserver > /dev/null || true
-}
diff --git a/snapcast.sysusers b/snapcast.sysusers
new file mode 100644
index 000000000000..c4dd264fcf17
--- /dev/null
+++ b/snapcast.sysusers
@@ -0,0 +1,3 @@
+u snapclient - "Snapclient daemon user" /var/lib/snapclient
+m snapclient audio
+u snapserver - "Snapserver daemon user" /var/lib/snapserver
diff --git a/snapcast.tmpfiles b/snapcast.tmpfiles
new file mode 100644
index 000000000000..4fa7b04011bb
--- /dev/null
+++ b/snapcast.tmpfiles
@@ -0,0 +1,2 @@
+d /var/lib/snapclient 0755 snapclient audio
+d /var/lib/snapserver 0755 snapserver snapserver