Merge pull request #508 from msthev/umurmur

umurmur 0.2.12-1 -> 0.2.12-2

aur/umurmur/PKGBUILD

@@ -3,21 +3,31 @@
 
 pkgname=umurmur
 pkgver=0.2.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A minimalistic Mumble server"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/umurmur/"
-license=('GPL')
+license=('custom')
 depends=('openssl' 'libconfig' 'protobuf-c')
 source=(
   "http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
   "${pkgname}.service"
+  "opus.patch"
 )
 sha256sums=(
   '2c2a0c34defeda59bea437fb99ba1086f94e6156f9236cd3dcc1e198b42ef68f'
   '86f396a042d02b9f9ed9f23596ed650ae7604d2de3e0f560f1f2fe03167fbbba'
+  '5d16aa5f8a0abc5d42c9f64c7272b303e0ec4a67166c3253d03916514400d028'
 )
 install="${pkgname}.install"
+backup=(
+  'etc/umurmur/umurmur.conf'
+)
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch 'src/client.c' "${srcdir}/opus.patch"
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -30,4 +40,5 @@ package() {
   make DESTDIR=${pkgdir} install || return 1
   install -Dm644 'umurmur.conf.example' "${pkgdir}/etc/umurmur/umurmur.conf"
   install -Dm644 "${srcdir}/umurmur.service" "${pkgdir}/usr/lib/systemd/system/umurmur.service"
+  install -Dm644 'LICENSE' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

aur/umurmur/opus.patch

@@ -0,0 +1,4 @@
+884a885
+> 	counter = Pds_get_numval(pdi); /* step past session id */
+886d886
+< 		counter = Pds_get_numval(pdi); /* step past session id */

aur/umurmur/umurmur.1

@@ -1,32 +0,0 @@
-.TH umurmur 1 "2010 July 17"
-.SH NAME
-uMurmur \- minimalistic Mumble VoIP server.
-.SH SYNOPSIS
-.B umurmurd
-.RI [ options ]
-.SH DESCRIPTION
-uMurmur is a minimalistic Mumble server primarily targeted to run on routers with an open OS like OpenWRT. The server part of Mumble is called Murmur, hence the name uMurmur.
-.SH OPTIONS
-.TP
-.B \-h, \-\-help
-Show a summary of the options.
-.TP
-.BI \-c \ "configfile"
-Specify which configuration file to use.
-.TP
-.BI \-p \ "pidfile"
-Write uMurmur PID to this file.
-.TP
-.BI \-d
-Run in the foreground (do not fork).
-.br
-This is very usefull for debugging.
-.TP
-.BI \-r
-Run with realtime priority.
-.SH SEE ALSO
-.BR mumble (1),
-.br
-.SH AUTHOR
-Written by Martin Johansson <martin@fatbob.nu>.
-Mumble and Murmurd was written by Thorvald Natvig <slicer@users.sourceforge.net>. 

aur/umurmur/umurmur.conf.d

@@ -1,5 +0,0 @@
-#
-# Arguments to be passed to the uMurmur daemon
-#
-
-UMURMUR_ARGS="-c /etc/umurmur/umurmur.conf -p /var/run/umurmur.pid -r"

aur/umurmur/umurmur.rc.d

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-CONF=/etc/conf.d/umurmur
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f $CONF ] && . $CONF
-
-PID=$(pidof -o %PPID /usr/bin/umurmurd)
-case "$1" in
-  start)
-    stat_busy "Starting umurmur"
-    [ -z "$PID" ] && /usr/bin/umurmurd $UMURMUR_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon umurmur
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping umurmur"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon umurmur
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0