From e075859841633fea370ce4089db31ca6ca209cea Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 25 Nov 2009 07:58:29 +0000
Subject: testing/mediaproxy: misc fixes

* fixed dependencies
* init.d script fixes from nangel
---
 testing/mediaproxy/APKBUILD                    | 26 +++++++++++++++-----------
 testing/mediaproxy/mediaproxy-dispatcher.initd |  8 ++------
 testing/mediaproxy/mediaproxy-relay.initd      |  5 ++---
 3 files changed, 19 insertions(+), 20 deletions(-)

(limited to 'testing/mediaproxy')

diff --git a/testing/mediaproxy/APKBUILD b/testing/mediaproxy/APKBUILD
index cda81943..b8077fe8 100644
--- a/testing/mediaproxy/APKBUILD
+++ b/testing/mediaproxy/APKBUILD
@@ -2,13 +2,15 @@
 # Maintainer: 
 pkgname=mediaproxy
 pkgver=2.3.8
-pkgrel=1
+pkgrel=2
 pkgdesc="MediaProxy"
 url="http://www.ag-projects.com/MediaProxy/"
+pkgusers="kamailio"
+pkggroups="kamailio"
 license="GPL"
-depends="python"
+depends="python python-application python-gnutls twisted python-cjson iptables"
 makedepends="libnetfilter_conntrack-dev libnfnetlink-dev python26-buildutils
-	python26-setuptools python-application python-cjson python-gnutls python-dev twisted"
+	python26-setuptools python-dev"
 install=
 subpackages=""
 #subpackages="$pkgname-dev $pkgname-doc"
@@ -24,18 +26,20 @@ build() {
 
 	python setup.py install --root="$pkgdir"
 
-	echo "/usr/lib/python2.6/site-packages/$_pkgname-$pkgver-py2.6.egg" > "$pkgdir"/usr/lib/python2.6/site-packages/$_pkgname.pth
+	echo "/usr/lib/python2.6/site-packages/$_pkgname-$pkgver-py2.6.egg" \
+		> "$pkgdir"/usr/lib/python2.6/site-packages/$_pkgname.pth
 
-	sed -i -e 's:net.ipv4.ip_forward = 0:net.ipv4.ip_forward = 1:' /etc/sysctl.conf
-
-	install -D -m755 "$srcdir"/$pkgname-dispatcher.initd "$pkgdir"/etc/init.d/$pkgname-dispatcher
-	install -D -m755 "$srcdir"/$pkgname-relay.initd "$pkgdir"/etc/init.d/$pkgname-relay
-	install -D -m755 "$srcdir"/config.ini "$pkgdir"/etc/mediaproxy/config.ini
+	install -D -m755 "$srcdir"/$pkgname-dispatcher.initd \
+		"$pkgdir"/etc/init.d/$pkgname-dispatcher
+	install -D -m755 "$srcdir"/$pkgname-relay.initd \
+		"$pkgdir"/etc/init.d/$pkgname-relay
+	install -D -m755 "$srcdir"/config.ini \
+		"$pkgdir"/etc/mediaproxy/config.ini
 	install -d -o kamailio "$pkgdir"/etc/mediaproxy/tls/
 	install -d -o kamailio "$pkgdir"/var/run/$pkgname
 }
 
 md5sums="8914a2b69415946e5ffdb843823b3ef1  mediaproxy-2.3.8.tar.gz
-7fa7907b87777281c31e5ff49d8d5011  mediaproxy-dispatcher.initd
-842beb8bca2dbbf16a092fbc27ee4ac2  mediaproxy-relay.initd
+cf081e451ab5d8d5ff66a8d9fa6707d6  mediaproxy-dispatcher.initd
+1add855d86ead49c19798e9d86c69efe  mediaproxy-relay.initd
 d3df3569543d696ca102f131f7ad95e4  config.ini"
diff --git a/testing/mediaproxy/mediaproxy-dispatcher.initd b/testing/mediaproxy/mediaproxy-dispatcher.initd
index 77364104..9b37a7e0 100644
--- a/testing/mediaproxy/mediaproxy-dispatcher.initd
+++ b/testing/mediaproxy/mediaproxy-dispatcher.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 
 daemon=/usr/bin/media-dispatcher
-pidfile=/var/run/mediaproxy/mediaproxy-dispatcher.pid
+pidfile=/var/run/mediaproxy/dispatcher.pid
 
 depend() {
 	need net
@@ -11,11 +11,7 @@ depend() {
 
 start() {
 	ebegin "Starting Mediaproxy Dispatcher"
-	start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \
-		-- \
-		-u kamailio \
-		-g kamailio \
-		-P $pidfile \
+	start-stop-daemon --start --verbose --pidfile $pidfile --exec $daemon 
 	eend $?
 }
 
diff --git a/testing/mediaproxy/mediaproxy-relay.initd b/testing/mediaproxy/mediaproxy-relay.initd
index 73dc32aa..09b842f0 100644
--- a/testing/mediaproxy/mediaproxy-relay.initd
+++ b/testing/mediaproxy/mediaproxy-relay.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 
 daemon=/usr/bin/media-relay
-pidfile=/var/run/mediaproxy/mediaproxy-relay.pid
+pidfile=/var/run/mediaproxy/relay.pid
 
 depend() {
 	need net
@@ -11,8 +11,7 @@ depend() {
 
 start() {
 	ebegin "Starting Mediaproxy Relay"
-	start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \
-		-P $pidfile \
+	start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon 
 	eend $?
 }
 
-- 
cgit v1.2.3