diff options
Diffstat (limited to 'community/murmur')
-rw-r--r-- | community/murmur/PKGBUILD | 31 | ||||
-rw-r--r-- | community/murmur/murmur.conf | 1 | ||||
-rw-r--r-- | community/murmur/murmur.conf.d | 2 | ||||
-rw-r--r-- | community/murmur/murmur.install | 19 | ||||
-rw-r--r-- | community/murmur/murmur.logrotate.d | 6 | ||||
-rw-r--r-- | community/murmur/murmur.rc.d | 44 | ||||
-rw-r--r-- | community/murmur/murmur.service | 5 |
7 files changed, 17 insertions, 91 deletions
diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD index 699837545..c80917dbd 100644 --- a/community/murmur/PKGBUILD +++ b/community/murmur/PKGBUILD @@ -1,40 +1,30 @@ -# $Id: PKGBUILD 86935 2013-03-25 04:07:12Z foutrelis $ +# $Id: PKGBUILD 87551 2013-04-02 23:01:31Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com> # Contributor: Malte Rabenseifner <malte@zearan.de> pkgname=murmur pkgver=1.2.3 -pkgrel=12 +pkgrel=13 pkgdesc="The voice chat application server for Mumble" arch=('i686' 'x86_64') url="http://mumble.sourceforge.net" license=('BSD') depends=('avahi' 'lsb-release' 'protobuf' 'qt4' 'icu') makedepends=('boost') -backup=("etc/murmur.ini" - "etc/logrotate.d/murmur" - "etc/conf.d/murmur" ) +backup=("etc/murmur.ini") install="murmur.install" source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz" - "murmur.rc.d" - "murmur.conf.d" "murmur.dbus.conf" - "murmur.logrotate.d" - "murmur.service" - "murmur.conf") + "murmur.service") md5sums=('55804e3dfe98b16eeb40abca6c254625' - 'a4f6fc515f258eb4db437a226e16de5d' - '11c1cc875e8021739ec2087252cf0533' 'eddea4cdbd0bde4b960a67e16b5d5478' - 'c56726cb267ead68f37f35c28e36e6fa' - '5ad8798aea4f8b70f47f16df64f755b3' - 'e00d0d2610b77efebce5b3556609251f') + '4ce52d399ba2d95705e997146e0e2544') build() { cd ${srcdir}/mumble-$pkgver - qmake main.pro CONFIG+="no-client no-ice" + qmake-qt4 main.pro CONFIG+="no-client no-ice" make release } @@ -43,23 +33,16 @@ package() { sed -e "1i# vi:ft=cfg" \ -e "s|database=|database=/var/lib/murmur/murmur.sqlite|" \ - -e "s|dbus=session|#dbus=system|" \ - -e "s|#logfile=murmur.log|logfile=/var/log/murmur/murmur.log|" \ - -e "s|#pidfile=|pidfile=/var/run/murmur/murmur.pid|" \ + -e "s|#logfile=murmur.log|logfile=|" \ -e "s|#uname=|uname=murmur|" \ -i scripts/murmur.ini install -dm755 ${pkgdir}/var/lib/murmur - install -dm755 ${pkgdir}/var/log/murmur install -Dm755 release/murmurd ${pkgdir}/usr/sbin/murmurd install -Dm644 scripts/murmur.ini ${pkgdir}/etc/murmur.ini - install -Dm755 ${srcdir}/murmur.rc.d ${pkgdir}/etc/rc.d/murmur - install -Dm644 ${srcdir}/murmur.conf.d ${pkgdir}/etc/conf.d/murmur install -Dm644 ${srcdir}/murmur.dbus.conf ${pkgdir}/etc/dbus-1/system.d/murmur.conf - install -Dm644 ${srcdir}/murmur.logrotate.d ${pkgdir}/etc/logrotate.d/murmur install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README install -Dm644 man/murmurd.1 ${pkgdir}/usr/share/man/man1/murmurd.1 - install -Dm644 ${srcdir}/murmur.conf ${pkgdir}/usr/lib/tmpfiles.d/murmur.conf install -Dm644 ${srcdir}/murmur.service ${pkgdir}/usr/lib/systemd/system/murmur.service } diff --git a/community/murmur/murmur.conf b/community/murmur/murmur.conf deleted file mode 100644 index 0cc583c40..000000000 --- a/community/murmur/murmur.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/murmur 0775 murmur murmur - diff --git a/community/murmur/murmur.conf.d b/community/murmur/murmur.conf.d deleted file mode 100644 index 592194be9..000000000 --- a/community/murmur/murmur.conf.d +++ /dev/null @@ -1,2 +0,0 @@ -# Use /etc/murmur.ini as configuration file -PARAMS="-ini /etc/murmur.ini" diff --git a/community/murmur/murmur.install b/community/murmur/murmur.install index 8d2f96b7c..fecd2c2ca 100644 --- a/community/murmur/murmur.install +++ b/community/murmur/murmur.install @@ -1,19 +1,16 @@ post_install() { - systemd-tmpfiles --create murmur.conf + getent group murmur > /dev/null || groupadd -r -g 86 murmur 1>/dev/null + getent passwd murmur > /dev/null || useradd -r -u 86 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null - getent group murmur > /dev/null || groupadd -r -g 86 murmur 1>/dev/null - getent passwd murmur > /dev/null || useradd -r -u 86 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null + chown -R murmur:murmur /var/lib/murmur - chown -R murmur:murmur /var/lib/murmur - chown -R murmur:murmur /var/log/murmur - - echo "You might have to reload dbus before launching murmur:" + echo "You might have to reload dbus before launching murmur:" echo " systemctl reload bus" - echo "Don't forget to set the superuser password:" - echo " murmurd -ini /etc/murmur.ini -supw <your-password>" + echo "Don't forget to set the superuser password:" + echo " murmurd -ini /etc/murmur.ini -supw <your-password>" } post_remove() { - getent passwd murmur > /dev/null && userdel murmur 1>/dev/null - getent group murmur > /dev/null && groupdel murmur 1>/dev/null + getent passwd murmur > /dev/null && userdel murmur 1>/dev/null + getent group murmur > /dev/null && groupdel murmur 1>/dev/null } diff --git a/community/murmur/murmur.logrotate.d b/community/murmur/murmur.logrotate.d deleted file mode 100644 index e113175ab..000000000 --- a/community/murmur/murmur.logrotate.d +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/murmur/murmur.log { - missingok - postrotate - /bin/kill -HUP `cat /var/run/murmur/murmur.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/community/murmur/murmur.rc.d b/community/murmur/murmur.rc.d deleted file mode 100644 index e26a2a3db..000000000 --- a/community/murmur/murmur.rc.d +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -CONF=/etc/conf.d/murmur - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f $CONF ] && . $CONF - -PID=$(pidof -o %PPID /usr/sbin/murmurd) -case "$1" in - start) - stat_busy "Starting murmur" - - [ -d /var/run/murmur ] || mkdir -p /var/run/murmur - chown murmur:murmur /var/run/murmur - - [ -z "$PID" ] && /usr/sbin/murmurd $PARAMS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon murmur - stat_done - fi - ;; - stop) - stat_busy "Stopping murmur" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon murmur - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/murmur/murmur.service b/community/murmur/murmur.service index b0097796e..9d58077ab 100644 --- a/community/murmur/murmur.service +++ b/community/murmur/murmur.service @@ -3,9 +3,8 @@ Description=Mumble Daemon After=network.target [Service] -Type=forking -PIDFile=/run/murmur/murmur.pid -ExecStart=/usr/sbin/murmurd -ini /etc/murmur.ini +Type=simple +ExecStart=/usr/sbin/murmurd -ini /etc/murmur.ini -fg Restart=always [Install] |