From 8fd434e8bfc2cb8bf2ae761becb18dead6a0ff91 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Thu, 12 Oct 2017 21:21:16 +0200
Subject: [PATCH] make neccessary changes in other files

---
 .SRCINFO       |  5 ++++-
 PKGBUILD       | 10 +++++++---
 murmur.install | 10 ----------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 6b72cae..36ec634 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = murmur-snapshot-ice
 	pkgdesc = The voice chat application server for Mumble (development snapshot)
 	pkgver = 1.3.0_2569_gd196a4b
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wiki.mumble.info/wiki/
 	install = murmur.install
 	arch = i686
@@ -18,14 +18,17 @@ pkgbase = murmur-snapshot-ice
 	conflicts = murmur-static
 	conflicts = murmur-ice
 	conflicts = murmur-snapshot-noice
+	options = emptydirs
 	backup = etc/murmur.ini
 	source = https://mumble.info/snapshot/mumble-1.3.0~2569~gd196a4b~snapshot.tar.gz
 	source = https://mumble.info/snapshot/mumble-1.3.0~2569~gd196a4b~snapshot.tar.gz.sig
 	source = murmur.tmpfilesd
+	source = murmur.sysusers
 	validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0
 	sha256sums = 7ed89709a3dd51aa149e2bd215bb14463118669e8bb1b43854f9581c9b535503
 	sha256sums = SKIP
 	sha256sums = 25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e
+	sha256sums = ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d
 
 pkgname = murmur-snapshot-ice
 
diff --git a/PKGBUILD b/PKGBUILD
index 29724d1..1257737 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=murmur-snapshot-ice
 pkgver=1.3.0_2569_gd196a4b
-pkgrel=1
+pkgrel=2
 pkgdesc="The voice chat application server for Mumble (development snapshot)"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://wiki.mumble.info/wiki/"
@@ -20,11 +20,14 @@ provides=('murmur')
 backup=("etc/murmur.ini")
 install=murmur.install
 source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig}
-	murmur.tmpfilesd)
+	murmur.tmpfilesd
+	murmur.sysusers)
 sha256sums=('7ed89709a3dd51aa149e2bd215bb14463118669e8bb1b43854f9581c9b535503'
             'SKIP'
-            '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e')
+            '25bf2dbd7574459724b4621fb93c09484dc7520297fa1d0f247a19b592d8cb8e'
+            'ff58059e77eb73a5c9ad8eb4ad8d8d7c865f3ae1fb6cb236a729f742da95d83d')
 validpgpkeys=('C4666C6767A26017CE68406988048D0D625297A0')
+options=('emptydirs')
 
 build() {
     cd $srcdir/mumble-${pkgver//_/\~}~snapshot
@@ -55,4 +58,5 @@ package() {
     install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     install -Dm644 src/murmur/Murmur.ice ${pkgdir}/usr/share/murmur/Murmur.ice
     install -Dm644 ${srcdir}/murmur.tmpfilesd ${pkgdir}/usr/lib/tmpfiles.d/murmur.conf
+    install -dm644 ${srcdir}/murmur.sysusers ${pkgdir}/usr/lib/sysusers.d/murmur.conf
 }
diff --git a/murmur.install b/murmur.install
index 9a52b86..39a108a 100644
--- a/murmur.install
+++ b/murmur.install
@@ -1,14 +1,4 @@
-post_install () {
-  # Check user/group murmur exists
-  getent group murmur >/dev/null || groupadd --system murmur
-  getent passwd murmur >/dev/null || \
-	  useradd --system -c "Murmur voice server" -g murmur -s /bin/false -d /var/lib/murmur murmur
-  post_upgrade
-}
-
 post_upgrade() {
-  # Ensure directories exist
-  mkdir -p /var/lib/murmur /run/murmur
   # Fix permissions on necessary directories
   chown murmur.murmur /var/lib/murmur /run/murmur
 }