summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Springer2019-06-11 18:19:24 +0200
committerStephan Springer2019-06-11 18:19:24 +0200
commit49f2eac74f59eebc3209ba7dbdaa4a20bffe1f88 (patch)
tree9323e021e938697048715237438a2b1105fe0538
parent2260d4a714cc8ad6e43ad484979ba04335a0083e (diff)
downloadaur-49f2eac74f59eebc3209ba7dbdaa4a20bffe1f88.tar.gz
use /var/db/murmur to be compatible with community package
and fix murmur.ini (changed comment markers)
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD18
-rw-r--r--murmur.sysusers2
3 files changed, 13 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 07abd33f097e..1c28c183e5d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = murmur-static
pkgdesc = The voice chat application server for Mumble (static version)
pkgver = 1.3.0rc1
- pkgrel = 2
+ pkgrel = 3
url = http://www.mumble.info/
install = murmur.install
arch = i686
@@ -19,7 +19,7 @@ pkgbase = murmur-static
source = murmurd.1
sha512sums = 07e52e8d47384dbd6222434eece10f96b17f01f15af2ac95cd249373c3c968df21e985b0309060397152b3a9112dd08c4b100cce2cdc6eaf78e0d5dc3684a20e
sha512sums = fc230c3d7119afed34485eeb84fd935968dc69e4a00cbdbebc3a4f4d4ce155613b4581e43c07208d513a6ba4d240ba84058a85f04b2188bfa406f70256f13f65
- sha512sums = e41ed656cc7c1d60e77a108631adaab1f623d12883990731ac80b5c2a780ba17641859d12cfd7d708aa5a69965d0f82011db83f6b1bbf7f18a48483669f2a090
+ sha512sums = 5af28d0c2b2b072cfbd500b5f63549e88a86cf3fc15e4d2df89e787c4d2bafdecbe078a518e0d1b25d82f9873cb06838ec1c9ebed625ffb7e8c80fcd942ebf74
sha512sums = 98bcb96e98b3cdbd07be20774978bd309e7cbc3279e0bbf5682794689d7ad5aeb09bb332540c965f5d93be61bdbd9e23fd9074d9b1a4ff2d55c6176365f69142
pkgname = murmur-static
diff --git a/PKGBUILD b/PKGBUILD
index b254062685eb..efaf07962795 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname="murmur-static"
pkgver=1.3.0rc1
_pkgver=1.3.0-rc1
-pkgrel=2
+pkgrel=3
pkgdesc="The voice chat application server for Mumble (static version)"
arch=("i686" "x86_64")
url="http://www.mumble.info/"
@@ -20,19 +20,21 @@ source=("http://mumble.info/snapshot/murmur-static_x86-${_pkgver}.tar.bz2"
"murmurd.1")
sha512sums=('07e52e8d47384dbd6222434eece10f96b17f01f15af2ac95cd249373c3c968df21e985b0309060397152b3a9112dd08c4b100cce2cdc6eaf78e0d5dc3684a20e'
'fc230c3d7119afed34485eeb84fd935968dc69e4a00cbdbebc3a4f4d4ce155613b4581e43c07208d513a6ba4d240ba84058a85f04b2188bfa406f70256f13f65'
- 'e41ed656cc7c1d60e77a108631adaab1f623d12883990731ac80b5c2a780ba17641859d12cfd7d708aa5a69965d0f82011db83f6b1bbf7f18a48483669f2a090'
+ '5af28d0c2b2b072cfbd500b5f63549e88a86cf3fc15e4d2df89e787c4d2bafdecbe078a518e0d1b25d82f9873cb06838ec1c9ebed625ffb7e8c80fcd942ebf74'
'98bcb96e98b3cdbd07be20774978bd309e7cbc3279e0bbf5682794689d7ad5aeb09bb332540c965f5d93be61bdbd9e23fd9074d9b1a4ff2d55c6176365f69142')
package() {
cd "${srcdir}/${pkgname}_x86-${_pkgver}"
- sed -e "s|database=|database=/var/lib/murmur/murmur.sqlite|" \
- -e "s|dbus=session|#dbus=session|" \
- -e "s|#logfile=murmur.log|logfile=|" \
- -e "s|#uname=|uname=murmur|" \
- -i murmur.ini
+ sed -e "1i# vi:ft=cfg" \
+ -e "s|database=|database=/var/db/murmur/murmur.sqlite|" \
+ -e "s|;logfile=murmur.log|logfile=|" \
+ -e "s|;uname=|uname=murmur|" \
+ -i murmur.ini
- install -dm755 ${pkgdir}/var/lib/murmur
+ install -dm755 ${pkgdir}/var/db/murmur
+ install -dm755 ${pkgdir}/var/lib # compatibility with
+ ln -s ../db/murmur ${pkgdir}/var/lib/murmur # murmur-static <= 1.3.0rc1-1
install -Dm755 murmur.x86 ${pkgdir}/usr/bin/murmurd
install -Dm644 murmur.ini ${pkgdir}/etc/murmur.ini
install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README
diff --git a/murmur.sysusers b/murmur.sysusers
index 0a65eac09278..9e9558da9b30 100644
--- a/murmur.sysusers
+++ b/murmur.sysusers
@@ -1 +1 @@
-u murmur 122 "Murmur User" /var/lib/murmur
+u murmur 122 "Murmur User" /var/db/murmur