Merge git://dev.alpinelinux.org/aports

6 files changed, 142 insertions, 3 deletions

diff --git a/testing/oscam/APKBUILD b/testing/oscam/APKBUILD
new file mode 100644
index 000000000..79a82f060
--- /dev/null
+++ b/testing/oscam/APKBUILD
@@ -0,0 +1,61 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer:
+pkgname=oscam
+pkgver=1.10
+pkgrel=1
+pkgdesc="An Open Source Conditional Access Module software"
+url="http://oscam.to"
+arch="all"
+license="GPL"
+depends=""
+depends_dev="openssl-dev"
+makedepends="$depends_dev bash cmake"
+install="$pkgname.pre-install"
+pkgusers="$pkgname"
+subpackages="$pkgname-doc"
+source="http://alpine.nethq.org/distfiles/oscam-$pkgver.tar.gz
+	$pkgname.initd
+	$pkgname.confd
+	$pkgname.conf"
+
+_builddir="$srcdir"/oscam-$pkgver
+
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	cmake -DCMAKE_INSTALL_PREFIX=/usr \
+		-DWEBIF=1 \
+		-DWITH_SSL=1 \
+		"$_builddir"
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	install -d -o oscam \
+		"$pkgdir"/var/log/$pkgname || return 1
+	install -d "$pkgdir"/etc/$pkgname/cw || return 1
+        install -D "$srcdir"/$pkgname.conf \
+		"$pkgdir"/etc/$pkgname/$pkgname.conf || return 1
+	chown -R oscam "$pkgdir"/etc/$pkgname
+	install -m755 -D "$srcdir"/$pkgname.initd \
+                "$pkgdir"/etc/init.d/$pkgname || return 1
+        install -m644 -D "$srcdir"/$pkgname.confd \
+                "$pkgdir"/etc/conf.d/$pkgname || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="e6e6d0f760298fd254333b3b56f30ee6  oscam-1.10.tar.gz
+56f8a71e018973b6fb8f2efa2873b6cb  oscam.initd
+185840b037fc59248f8ea2f84c2b67ed  oscam.confd
+ad8937125595e25ad57c22c4bd93f4e3  oscam.conf"
diff --git a/testing/oscam/oscam.conf b/testing/oscam/oscam.conf
new file mode 100644
index 000000000..bc20409f8
--- /dev/null
+++ b/testing/oscam/oscam.conf
@@ -0,0 +1,40 @@
+[global]
+usrfile                       = /var/log/oscam/oscamuser.log
+logfile                       = /var/log/oscam/oscam.log
+cwlogdir                      = /etc/oscam/cw
+disablelog                    = 0
+disableuserfile               = 0
+usrfileflag                   = 0
+clienttimeout                 = 2000
+fallbacktimeout               = 1500
+clientmaxidle                 = 120
+failbantime                   = 0
+bindwait                      = 120
+netprio                       = 0
+clientdyndns                  = 0
+resolvedelay                  = 2
+unlockparental                = 0
+nice                          = -1
+serialreadertimeout           = 1000
+maxlogsize                    = 10
+waitforcards                  = 1
+preferlocalcards              = 1
+saveinithistory               = 0
+readerrestartseconds          = 5
+lb_mode                       = 0
+lb_save                       = 0
+lb_nbest_readers              = 1
+lb_nfb_readers                = 1
+lb_min_ecmcount               = 5
+lb_max_ecmcount               = 500
+lb_reopen_seconds             = 900
+resolvegethostbyname          = 0
+
+[webif]
+httpport                      = 15080
+httpuser                      = username
+httppwd                       = password
+httprefresh                   = 0
+httpallowed                   = 127.0.0.1
+httphideidleclients           = 0
+httpreadonly                  = 0
diff --git a/testing/oscam/oscam.confd b/testing/oscam/oscam.confd
new file mode 100644
index 000000000..3366dcd6b
--- /dev/null
+++ b/testing/oscam/oscam.confd
@@ -0,0 +1,5 @@
+# oscam confd file
+
+user="oscam"
+group="video"
+args="-b -c /etc/oscam"
diff --git a/testing/oscam/oscam.initd b/testing/oscam/oscam.initd
new file mode 100644
index 000000000..ed9918fd2
--- /dev/null
+++ b/testing/oscam/oscam.initd
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+
+# oscam init.d
+
+name="oscam"
+daemon="/usr/bin/$name"
+
+depend() {
+        use net
+}
+
+start() {
+	ebegin "Starting oscam" 
+	start-stop-daemon --start \
+		--quiet \
+		--user $user \
+		--group $group \
+		--name $name \
+		--exec $daemon \
+		-- $args
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping oscam" 
+        start-stop-daemon --stop \
+		--signal 2 \
+		--name $name
+        eend $?
+}
diff --git a/testing/oscam/oscam.pre-install b/testing/oscam/oscam.pre-install
new file mode 100644
index 000000000..c78cb9a78
--- /dev/null
+++ b/testing/oscam/oscam.pre-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+adduser -H -G video -D -s /bin/false oscam 2>/dev/null
+exit 0
diff --git a/testing/tvheadend/APKBUILD b/testing/tvheadend/APKBUILD
index f0730bd5c..eaad9e2f8 100644
--- a/testing/tvheadend/APKBUILD
+++ b/testing/tvheadend/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Francesco Colista <francesco.colista@gmail.com>
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=tvheadend
-pkgver=3.2_beta2
+pkgver=3.2_beta6
 _tag=aa27c42
-pkgrel=1
+pkgrel=0
 pkgdesc="TV Streaming server for linux"
 url="http://www.lonelycoder.com/hts/tvheadend_overview.html"
 arch="all"
@@ -50,6 +50,6 @@ package() {
 	install -d -o $pkgname -g $pkgname "$pkgdir/etc/$pkgname"
 }
 
-md5sums="29c5e2a823f6596f3b864a7d8d01706d  tvheadend-3.2_beta2.tar.gz
+md5sums="29c5e2a823f6596f3b864a7d8d01706d  tvheadend-3.2_beta6.tar.gz
 5df86b0859fc457c634a41a6ced3f118  tvheadend.initd
 17cf7dfaf27706409a004c246c1a2c3c  tvheadend.confd"