gRPC, sysusers

4 files changed, 41 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca4d631397fe..c9a9289ccad8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Mar 20 10:55:03 UTC 2017
+# Sun Dec 31 11:28:39 UTC 2017
 pkgbase = murmur-git
 	pkgdesc = The voice chat application server for Mumble (git version)
-	pkgver = 1.2.5.2194.ge414bd3b
-	pkgrel = 2
+	pkgver = 1.2.5.2624.g742a5d98
+	pkgrel = 1
 	url = http://mumble.sourceforge.net
 	install = murmur.install
 	arch = i686
@@ -17,6 +17,7 @@ pkgbase = murmur-git
 	depends = lsb-release
 	depends = protobuf
 	depends = qt5-base
+	depends = zeroc-ice
 	provides = murmur
 	conflicts = murmur
 	conflicts = murmur-static
@@ -25,9 +26,11 @@ pkgbase = murmur-git
 	source = git://github.com/mumble-voip/mumble.git
 	source = murmur.dbus.conf
 	source = murmur.service
-	md5sums = SKIP
-	md5sums = eddea4cdbd0bde4b960a67e16b5d5478
-	md5sums = d27a9adcd7561859e7b033046729bc0e
+	source = murmur.sysusers
+	sha512sums = SKIP
+	sha512sums = 97c7effdddec324e40195c36ef4927950a5de26d2ee2d268d89df6fb547207bbbe30292773316cae6f57ec9923244f205fb0edc377b798771ba7385e3c11d86a
+	sha512sums = fc230c3d7119afed34485eeb84fd935968dc69e4a00cbdbebc3a4f4d4ce155613b4581e43c07208d513a6ba4d240ba84058a85f04b2188bfa406f70256f13f65
+	sha512sums = 5af28d0c2b2b072cfbd500b5f63549e88a86cf3fc15e4d2df89e787c4d2bafdecbe078a518e0d1b25d82f9873cb06838ec1c9ebed625ffb7e8c80fcd942ebf74
 
 pkgname = murmur-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 3f325b4a0846..de45fba6f28e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,12 @@
 # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com>
 # Contributor: Malte Rabenseifner <malte@zearan.de>
 
-_use_zeroc_ice="0"
+_use_zeroc_ice="1"
+_use_grpc="0"
 
 pkgname=murmur-git
-pkgver=1.2.5.2194.ge414bd3b
-pkgrel=2
+pkgver=1.2.5.2624.g742a5d98
+pkgrel=1
 pkgdesc="The voice chat application server for Mumble (git version)"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://mumble.sourceforge.net"
@@ -15,7 +16,11 @@ license=('BSD')
 depends=('avahi' 'lsb-release' 'protobuf' 'qt5-base')
 
 if [[ ${_use_zeroc_ice} == "1" ]]; then
-    depends=( "${depends[@]}" zeroc-ice )
+    depends+=('zeroc-ice')
+fi
+
+if [[ ${_use_grpc} == "1" ]]; then
+    depends+=('grpc')
 fi
 
 makedepends=('git' 'boost' 'python')
@@ -25,29 +30,35 @@ backup=("etc/murmur.ini")
 install="murmur.install"
 source=("git://github.com/mumble-voip/mumble.git"
     "murmur.dbus.conf"
-    "murmur.service")
-md5sums=('SKIP'
-         'eddea4cdbd0bde4b960a67e16b5d5478'
-         'd27a9adcd7561859e7b033046729bc0e')
+    "murmur.service"
+    "murmur.sysusers")
+sha512sums=('SKIP'
+            '97c7effdddec324e40195c36ef4927950a5de26d2ee2d268d89df6fb547207bbbe30292773316cae6f57ec9923244f205fb0edc377b798771ba7385e3c11d86a'
+            'fc230c3d7119afed34485eeb84fd935968dc69e4a00cbdbebc3a4f4d4ce155613b4581e43c07208d513a6ba4d240ba84058a85f04b2188bfa406f70256f13f65'
+            '5af28d0c2b2b072cfbd500b5f63549e88a86cf3fc15e4d2df89e787c4d2bafdecbe078a518e0d1b25d82f9873cb06838ec1c9ebed625ffb7e8c80fcd942ebf74')
 
 _gitname="mumble"
 
 pkgver() {
-    cd ${srcdir}/$_gitname
+    cd ${srcdir}/${_gitname}
     git describe | sed 's/^v//;s/-/./g'
 }
 
 build() {
     cd ${srcdir}/${_gitname}
 
-    # build
+    CONFIG_OPTS="no-client"
+
+    if [[ ${_use_zeroc_ice} == "0" ]]; then
+        CONFIG_OPTS+=" no-ice"
+    fi
 
-    if [[ $_use_zeroc_ice == "1" ]]; then
-        qmake-qt5 main.pro CONFIG+="no-client"
-    else
-        qmake-qt5 main.pro CONFIG+="no-client no-ice"
+    if [[ ${_use_grpc} == "1" ]]; then
+        CONFIG_OPTS+=" grpc"
     fi
 
+    qmake-qt5 main.pro CONFIG+="${CONFIG_OPTS}"
+
     make release
 }
 
@@ -68,8 +79,13 @@ package() {
     install -Dm644 man/murmurd.1 ${pkgdir}/usr/share/man/man1/murmurd.1
     install -Dm644 ${srcdir}/murmur.service ${pkgdir}/usr/lib/systemd/system/murmur.service
     install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    install -Dm644 ${srcdir}/murmur.sysusers ${pkgdir}/usr/lib/sysusers.d/$pkgname.conf
 
-    if [[ $_use_zeroc_ice == "1" ]]; then
+    if [[ ${_use_zeroc_ice} == "1" ]]; then
         install -Dm644 src/murmur/Murmur.ice ${pkgdir}/usr/share/murmur/Murmur.ice
     fi
+
+    if [[ ${_use_grpc} == "1" ]]; then
+        install -Dm644 src/murmur/MurmurRPC.proto ${pkgdir}/usr/share/murmur/MurmurRPC.proto
+    fi
 }
diff --git a/murmur.install b/murmur.install
index d2cfd5345b7e..b9e1eb1f5055 100644
--- a/murmur.install
+++ b/murmur.install
@@ -1,7 +1,4 @@
 post_install() {
-    getent group murmur > /dev/null || groupadd -g 122 murmur 1>/dev/null
-    getent passwd murmur > /dev/null || useradd -u 122 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null
-
     echo "You might have to reload dbus before launching murmur:"
     echo "    systemctl reload dbus"
     echo "Don't forget to set the superuser password:"
diff --git a/murmur.sysusers b/murmur.sysusers
new file mode 100644
index 000000000000..9e9558da9b30
--- /dev/null
+++ b/murmur.sysusers
@@ -0,0 +1 @@
+u murmur 122 "Murmur User" /var/db/murmur