From c5f4d791ea8b946780e7b39e76d2b34600970cfc Mon Sep 17 00:00:00 2001
From: Francesco Colista <francesco.colista@gmail.com>
Date: Sat, 28 Dec 2013 18:39:05 +0000
Subject: testing/crtmpserver: upgrade to latest snapshot, varius fixes in
 initd

---
 testing/crtmpserver/APKBUILD          | 17 ++++++++++++-----
 testing/crtmpserver/crtmpserver.confd |  2 +-
 testing/crtmpserver/crtmpserver.initd | 16 ++++++++++++++--
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/testing/crtmpserver/APKBUILD b/testing/crtmpserver/APKBUILD
index cba4512b0..7a629d525 100644
--- a/testing/crtmpserver/APKBUILD
+++ b/testing/crtmpserver/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Francesco Colista <francesco.colista@gmail.com>
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=crtmpserver
-pkgver=0_git20121213
+pkgver=0_git20131228
 pkgrel=0
 pkgdesc="high performance streaming server"
 url="http://www.rtmpd.com/"
@@ -45,7 +45,7 @@ build() {
 	cd builders/cmake
 	cmake -DCRTMPSERVER_INSTALL_PREFIX=/usr
 	cd $pkgname
-	sed -i -e "46s/\${CMAKE_INSTALL_PREFIX}\/etc/\/etc/g" cmake_install.cmake
+	sed -i -e "46s/\${CMAKE_INSTALL_PREFIX}\/etc/\/etc\/crtmpserver\//g" cmake_install.cmake
 	make
 }
 
@@ -59,8 +59,15 @@ package() {
         chown rtmpd "$pkgdir"/var/log/crtmpserver
         mkdir -p "$pkgdir"/var/crtmpserver
         chown rtmpd "$pkgdir"/var/crtmpserver -R
+	cp ../../configs/*.lua "$pkgdir"/etc/$pkgname/
 }
 
-md5sums="ef55f9048d7dee7c259d12b837004731  crtmpserver-0_git20121213.tar.bz2
-b8e5437128e18ea3d7ca4b892f1664d1  crtmpserver.initd
-599eae04d8a7e49162dc9b89df66faa9  crtmpserver.confd"
+md5sums="63ace36dcbb336463702eb258bfa974d  crtmpserver-0_git20131228.tar.bz2
+8c4072f255f72736028cc736081303b8  crtmpserver.initd
+f628656f6fd50204492ed838a7993c38  crtmpserver.confd"
+sha256sums="ca57a270400c492bf9378fabe5e76fa91fe48dcab70d0518271be873558498a1  crtmpserver-0_git20131228.tar.bz2
+db010ea792cd738db98297bc7d24cb86bb5bc360a355a54622fd057197a3aa04  crtmpserver.initd
+5ff47df741664ad9fdcf567e645e569ac9f47a61a46baf15bf920508a35c7811  crtmpserver.confd"
+sha512sums="c6e501bc048989c93bae4b0f8cdfa98ea6ff46574c9a006f42e92096be5fc311ae0252b718dab43c416c41b602e35409e47a5143709789cb9121dc3419bfeba5  crtmpserver-0_git20131228.tar.bz2
+85e2fa5816c9c6afba4f54c7aa780f0e9cfa9a317936de31ad1456d02ed79eb9e3d61a5fc21c3f2891b90f89d9885f3349e4eb6e281ca1c382769e2bb3c6bcbc  crtmpserver.initd
+0695f48e644b4cea9c4e8724dfd0f28f859aacf8af2ccb3bf4a2a077202eeef7a8b2a10000eb8c1101dd5dea309d4a9df3479d2084650f9d283468cee7f4fc1a  crtmpserver.confd"
diff --git a/testing/crtmpserver/crtmpserver.confd b/testing/crtmpserver/crtmpserver.confd
index d8e0c25e7..18a285766 100644
--- a/testing/crtmpserver/crtmpserver.confd
+++ b/testing/crtmpserver/crtmpserver.confd
@@ -1,2 +1,2 @@
 RTMPD_USER="rtmpd"
-CONFFILE="/etc/crtmpserver.lua"
+CONFFILE="/etc/crtmpserver/crtmpserver.lua"
diff --git a/testing/crtmpserver/crtmpserver.initd b/testing/crtmpserver/crtmpserver.initd
index aa967b3d9..656eb4029 100644
--- a/testing/crtmpserver/crtmpserver.initd
+++ b/testing/crtmpserver/crtmpserver.initd
@@ -9,11 +9,22 @@ depend()
         need net
 }
 
+checkconfig() {
+        if [ ! -e /etc/crtmpserver/crtmpserver.lua ] ; then
+	        eerror "You need to create /etc/crtmpserver/crtmpserver.lua first."
+	        eerror "An example can be found in /etc/crtmpserver/crtmpserver.lua.sample"
+        return 1
+	fi
+}      
+
+
+
 start()
 {
+	checkconfig || return 1
         ebegin "Starting C++ RTMP Server"
-        start-stop-daemon --start --quit \ 
-		--exec /usr/sbin/crtmpserver --daemon --uid=${RTMPD_USER} --pid=/var/run/crtmpserver.pid ${CONFFILE}
+        start-stop-daemon --start --quiet --exec /usr/sbin/crtmpserver \
+			-- --daemon --uid=${RTMPD_USER} --pid=/var/run/crtmpserver.pid ${CONFFILE}
         eend ${?}
 }
 
@@ -24,3 +35,4 @@ stop()
 		--exec /usr/sbin/crtmpserver --pid=/var/run/crtmpserver.pid
         eend ${?}
 }
+
-- 
cgit v1.2.3