testing/tvheadend-git: fix group/permissions and scan file location

* remove usb group
* add to video group
* use correct permissions on confd file
* install both dvb scan files in same location

5 files changed, 24 insertions, 34 deletions

diff --git a/testing/tvheadend-git/APKBUILD b/testing/tvheadend-git/APKBUILD
index d493383717..db6c6734e6 100644
--- a/testing/tvheadend-git/APKBUILD
+++ b/testing/tvheadend-git/APKBUILD
@@ -2,10 +2,10 @@
 pkgname=tvheadend-git
 verbase=4.1
 # stable versions have an even minor version number
-pkgver=4.1_git20160306
+pkgver=4.1_git20160307
 pkgrel=0
 pkgdesc="TV Streaming server for linux"
-url="http://www.lonelycoder.com/hts/tvheadend_overview.html"
+url="http://tvheadend.org/"
 arch="all"
 license="GPL3"
 depends=""
@@ -13,8 +13,8 @@ depends_dev=""
 makedepends="$depends_dev findutils bash git python linux-headers wget
 	bsd-compat-headers coreutils openssl-dev ffmpeg-dev gettext-dev
 	libhdhomerun-dev"
-pkgusers="$pkgname"
-pkggroups="$pkgname"
+pkgusers="tvheadend"
+pkggroups="tvheadend"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-dvb-scan:dvb_scan $pkgname-satellites-xml:satellites_xml"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz
@@ -57,15 +57,15 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install || return 1
 	install -m755 -D "$srcdir"/$pkgname.initd \
 		"$pkgdir"/etc/init.d/$pkgname || return 1
-	install -m755 -D "$srcdir"/$pkgname.confd \
+	install -m644 -D "$srcdir"/$pkgname.confd \
 		"$pkgdir"/etc/conf.d/$pkgname || return 1
-	install -d -o $pkgname -g $pkgname \
+	install -d -o tvheadend -g tvheadend \
 		"$pkgdir/etc/$pkgname" || return 1
 }
 
 dvb_scan() {
 	pkgdesc="$pkgname dvb scan files"
-	depends="$pkgname"
+	depends="$pkgname !$pkgname-satellites_xml"
 	arch="noarch"
 	cd "$_builddir"
 	mkdir -p "$subpkgdir"/usr/share/tvheadend/data
@@ -75,24 +75,24 @@ dvb_scan() {
 
 satellites_xml() {
 	pkgdesc="$pkgname sattelites from http://satellites-xml.eu"
-	depends="$pkgname"
+	depends="$pkgname !$pkgname-dvb_scan"
 	arch="noarch"
 	cd "$_builddir"
-	mkdir -p "$subpkgdir"/usr/share/tvheadend/data/satellites-xml/dvb-s
+	mkdir -p "$subpkgdir"/usr/share/tvheadend/data/dvb-scan/dvb-s
         msg "Generating sattelites from satellites.xml"
 	support/sat_xml_scan.py "$srcdir"/satellites.xml \
-		"$subpkgdir"/usr/share/tvheadend/data/satellites-xml/dvb-s || return 1
+		"$subpkgdir"/usr/share/tvheadend/data/dvb-scan/dvb-s || return 1
 }
 
-md5sums="1283f960d1c2ea5b600e67e5464130c4  tvheadend-git-4.1_git20160306.tar.gz
-67d1cfcaf2dc211d702abe67285f9333  tvheadend-git.initd
-a409c44aecd93626a1a3a39306993c5d  tvheadend-git.confd
+md5sums="63c5fff6d6f79bcc9d4d391dedcdb834  tvheadend-git-4.1_git20160307.tar.gz
+c58a089ff256bb9dadee3db768e67d3f  tvheadend-git.initd
+a29e609cc5f02c34812df253aa7bf623  tvheadend-git.confd
 84e9f5d3446be49624303cbef43a2523  satellites.xml"
-sha256sums="8ec46f6d9f958392e4c1f60374e26d72ad54b6b3020718633aca9eb116529dce  tvheadend-git-4.1_git20160306.tar.gz
-cd0db26b3da95df7cd100e5e30b47cd884fa4a7d2cd27f1bee2f6bec0d6ad211  tvheadend-git.initd
-671f7d410e51aaed4c93f284c180f646680f6b195b5bef47b3ae1fb99ed76dce  tvheadend-git.confd
+sha256sums="35fa975dddb39f99e34b6c8648a77208f7e683a7b071bc0605cbf2a2de5bfaaa  tvheadend-git-4.1_git20160307.tar.gz
+ba0c4f1ae2f2c82d80949a6edc5edb7418f3887d10d20081394954299fe824b7  tvheadend-git.initd
+1fd4b100142ba9d7aa9b73d3168b3c015abd786894c6a284e9ecabae421d2cb9  tvheadend-git.confd
 63e8a27474d88b821c5768b59043620ff92e0a4d2d8a87290d1a2ef2e3f8c39b  satellites.xml"
-sha512sums="0e667c5aa07ee57ac46459282e8176fbd531121202261af1583c6501e15512e4b3997a15818568e13e6e32029665b92b7b2780c92b8767ef97037109e3c630b2  tvheadend-git-4.1_git20160306.tar.gz
-41143b33e18000aad99d7b17433ac7935fa40a6980c4bf0733e5cc16e2948d18810ce198ca435791c93992ba1e39dc6d55ca6af33c49087557310fd31ad22447  tvheadend-git.initd
-f81ace2fd2a86c561f70dca6c89a6217e632db01d5f5d1c6ccfd951c4a798a131767140c176a0a764fe3842363958b31fb2a707a871836795688136bc458f7d5  tvheadend-git.confd
+sha512sums="03159d6a96f79086e8fa255d3d57b52d81c2e66ff3b805244a6c20c0467911963590b676aa2f5cafb31676883a3b6f12200b2808e70dc0a35cf5210c16e0855f  tvheadend-git-4.1_git20160307.tar.gz
+5f0a7aa80857d9d71f1fea973d063ffca358e80cdce70c3faa18cee60ade1a6a475ba5ee0403124c8c3a28ad61aa2e38aa546f5e3287f7725a71bcb466476621  tvheadend-git.initd
+dd55c56ffb0b090fc03537556340ac0dd17741d2ce9eeabb388af43b566e2764385affc2e4457fa7a6d94e44c491d7cf43c6b6d89dc1ba60dd9724cc488c0ef1  tvheadend-git.confd
 38eb39ecdc0a165b18bab5dcd236a89f44b1e7c77e224612e45a50b3b8b2a6b20e72cdf3fe2ef75278b4c515906b75f547c8e1e7c86fef1712437bbbb7a0caeb  satellites.xml"
diff --git a/testing/tvheadend-git/include-syscall-h.patch b/testing/tvheadend-git/include-syscall-h.patch
deleted file mode 100644
index f037d54dfd..0000000000
--- a/testing/tvheadend-git/include-syscall-h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/wrappers.c.orig
-+++ ./src/wrappers.c
-@@ -8,6 +8,7 @@
- #include <unistd.h>
- #include <signal.h>
- #include <pthread.h>
-+#include <syscall.h>
- 
- #ifdef PLATFORM_LINUX
- #include <sys/prctl.h>
diff --git a/testing/tvheadend-git/tvheadend-git.confd b/testing/tvheadend-git/tvheadend-git.confd
index b3faed1102..54aaf955b3 100644
--- a/testing/tvheadend-git/tvheadend-git.confd
+++ b/testing/tvheadend-git/tvheadend-git.confd
@@ -1,7 +1,7 @@
 # config directory
-TVHCONF="/etc/tvheadend"
+TVHCONF="/etc/tvheadend-git"
 # pidfile
-TVHPID=/var/run/tvheadend.pid
+TVHPID=/var/run/tvheadend-git.pid
 # addititonal arguments
 # use -C at first run
 TVHARGS=""
diff --git a/testing/tvheadend-git/tvheadend-git.initd b/testing/tvheadend-git/tvheadend-git.initd
index 05b6fea8a3..5cc5a2a7e3 100644
--- a/testing/tvheadend-git/tvheadend-git.initd
+++ b/testing/tvheadend-git/tvheadend-git.initd
@@ -5,7 +5,7 @@ command_args="-f -c $TVHCONF -u tvheadend -g video $TVHARGS"
 retry="TERM/30/KILL/5"
 command_background=true
 pidfile=$TVHPID
-name="tvheadend"
+name="tvheadend-git"
 required_dirs=$TVHCONF
 
 depend() {
diff --git a/testing/tvheadend-git/tvheadend-git.pre-install b/testing/tvheadend-git/tvheadend-git.pre-install
index 0580cb5006..237161e83d 100644
--- a/testing/tvheadend-git/tvheadend-git.pre-install
+++ b/testing/tvheadend-git/tvheadend-git.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend tvheadend 2>/dev/null
-addgroup tvheadend usb 2>/dev/null
+adduser -S -s /sbin/nologin -H -h /usr/share/tvheadend tvheadend 2>/dev/null
+adduser tvheadend video
 exit 0