Thu Oct 18 01:23:58 PDT 2012

5 files changed, 49 insertions, 17 deletions

diff --git a/community/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD
index 4398de8b7..907cb531f 100644
--- a/community/mediaproxy/PKGBUILD
+++ b/community/mediaproxy/PKGBUILD
@@ -1,24 +1,33 @@
-# $Id: PKGBUILD 76639 2012-09-25 15:05:50Z spupykin $
+# $Id: PKGBUILD 78383 2012-10-17 15:54:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Colin Pitrat <colin.pitrat@gmail.com>
 
 pkgname=mediaproxy
 pkgver=2.5.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Open-source media proxy for OpenSER"
 url="http://mediaproxy.ag-projects.com/"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('python2' 'libnetfilter_conntrack' 'iptables'
-	 'python-application' 'python-cjson' 'python-gnutls')
+	 'python2-application' 'python2-cjson' 'python2-gnutls')
 #backup=('opt/mediaproxy/config.ini')
 source=("http://download.ag-projects.com/MediaProxy/mediaproxy-$pkgver.tar.gz"
-	"mediaproxy.init")
+	"mediaproxy.init"
+	"mediaproxy-dispatcher.service"
+	"mediaproxy-relay.service"
+	"mediaproxy.tmpfiles")
 md5sums=('840de8f52e656991be728c15ec30bb5e'
-         '64042f4686de69a9bdd27d51cbe8a548')
+         '66f4417f40dda0dfa31569ee4ccc32c7'
+         '4a1fa0b6ce0a8bd44bf0f1d9d36a6154'
+         '23c1a584835de00a958ef963cdd40040'
+         '60a25f2cb6429a0a7d62d45d0c75a0ea')
 
 build() {
   cd $srcdir/mediaproxy-$pkgver
   install -D -m0755 $srcdir/mediaproxy.init $pkgdir/etc/rc.d/mediaproxy
   python2 setup.py install --root=$pkgdir
+  install -Dm0644 $srcdir/$pkgname-dispatcher.service $pkgdir/usr/lib/systemd/system/$pkgname-dispatcher.service
+  install -Dm0644 $srcdir/$pkgname-relay.service $pkgdir/usr/lib/systemd/system/$pkgname-relay.service
+  install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
 }
diff --git a/community/mediaproxy/mediaproxy-dispatcher.service b/community/mediaproxy/mediaproxy-dispatcher.service
new file mode 100644
index 000000000..500bb33c7
--- /dev/null
+++ b/community/mediaproxy/mediaproxy-dispatcher.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Mediaproxy dispatcher service
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/mediaproxy/dispatcher.pid
+ExecStart=media-dispatcher
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/mediaproxy/mediaproxy-relay.service b/community/mediaproxy/mediaproxy-relay.service
new file mode 100644
index 000000000..2618800e6
--- /dev/null
+++ b/community/mediaproxy/mediaproxy-relay.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Mediaproxy relay service
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/mediaproxy/relay.pid
+ExecStart=media-relay
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/mediaproxy/mediaproxy.init b/community/mediaproxy/mediaproxy.init
index c8c600aea..ba9fe90b2 100755
--- a/community/mediaproxy/mediaproxy.init
+++ b/community/mediaproxy/mediaproxy.init
@@ -1,6 +1,6 @@
 #!/bin/sh
-#
-# mediaproxy   starts and stops the SER MediaProxy server
+
+# mediaproxy starts and stops the SER MediaProxy server
 
 . /etc/rc.conf
 . /etc/rc.d/functions
@@ -14,19 +14,19 @@ case "$1" in
 	else
 	    stat_done
 	fi
-        ;;
+	;;
     stop)
 	stat_busy "Stopping mediaproxy"
-        kill `cat /var/run/mediaproxy/relay.pid`
-        kill `cat /var/run/mediaproxy/dispatcher.pid`
-        stat_done
-        ;;
+	kill `cat /var/run/mediaproxy/relay.pid`
+	kill `cat /var/run/mediaproxy/dispatcher.pid`
+	stat_done
+	;;
     restart)
-        $0 stop
-        sleep 3
-        $0 start
-        ;;
+	$0 stop
+	sleep 3
+	$0 start
+	;;
     *)
-	echo "usage: $0 {start|stop|restart}"  
+	echo "usage: $0 {start|stop|restart}"
 	;;
 esac
diff --git a/community/mediaproxy/mediaproxy.tmpfiles b/community/mediaproxy/mediaproxy.tmpfiles
new file mode 100644
index 000000000..a102c489f
--- /dev/null
+++ b/community/mediaproxy/mediaproxy.tmpfiles
@@ -0,0 +1 @@
+d /var/run/mediaproxy 0755 root root -