main/oscam: new snapshot and moved to main

9 files changed, 7 insertions, 146 deletions

diff --git a/testing/oscam-svn/APKBUILD b/main/oscam/APKBUILD
index 5af2502ee8..6efded7c54 100644
--- a/testing/oscam-svn/APKBUILD
+++ b/main/oscam/APKBUILD
@@ -1,10 +1,10 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer:
-pkgname=oscam-svn
-pkgver=0_svn20121230
+pkgname=oscam
+pkgver=0_svn20130112
 pkgrel=0
 pkgdesc="An Open Source Conditional Access Module software"
-url="http://oscam.to"
+url="http://www.streamboard.tv/oscam/"
 arch="all"
 license="GPL"
 depends=""
@@ -19,7 +19,7 @@ source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.confd"
 
-_builddir="$srcdir"/oscam-svn-$pkgver
+_builddir="$srcdir"/oscam-$pkgver
 
 prepare() {
 	local i
@@ -54,6 +54,6 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="9f2f283a16e6bb9743abd9644e6d0b20  oscam-svn-0_svn20121230.tar.gz
-56f8a71e018973b6fb8f2efa2873b6cb  oscam-svn.initd
-8aa89df1cb43726dc05f6df64c55781a  oscam-svn.confd"
+md5sums="65568897527ded7f73577c4d692a3fd2  oscam-0_svn20130112.tar.gz
+56f8a71e018973b6fb8f2efa2873b6cb  oscam.initd
+8aa89df1cb43726dc05f6df64c55781a  oscam.confd"
diff --git a/testing/oscam-svn/oscam-svn.confd b/main/oscam/oscam.confd
index 154d08d4b7..154d08d4b7 100644
--- a/testing/oscam-svn/oscam-svn.confd
+++ b/main/oscam/oscam.confd
diff --git a/testing/oscam/oscam.initd b/main/oscam/oscam.initd
index ed9918fd27..ed9918fd27 100644
--- a/testing/oscam/oscam.initd
+++ b/main/oscam/oscam.initd
diff --git a/testing/oscam/oscam.pre-install b/main/oscam/oscam.pre-install
index c78cb9a78e..c78cb9a78e 100644
--- a/testing/oscam/oscam.pre-install
+++ b/main/oscam/oscam.pre-install
diff --git a/testing/oscam-svn/oscam-svn.initd b/testing/oscam-svn/oscam-svn.initd
deleted file mode 100644
index ed9918fd27..0000000000
--- a/testing/oscam-svn/oscam-svn.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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-svn/oscam-svn.pre-install b/testing/oscam-svn/oscam-svn.pre-install
deleted file mode 100644
index c78cb9a78e..0000000000
--- a/testing/oscam-svn/oscam-svn.pre-install
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-adduser -H -G video -D -s /bin/false oscam 2>/dev/null
-exit 0
diff --git a/testing/oscam/APKBUILD b/testing/oscam/APKBUILD
deleted file mode 100644
index 79a82f0603..0000000000
--- a/testing/oscam/APKBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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
deleted file mode 100644
index bc20409f8b..0000000000
--- a/testing/oscam/oscam.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-[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
deleted file mode 100644
index 3366dcd6b1..0000000000
--- a/testing/oscam/oscam.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# oscam confd file
-
-user="oscam"
-group="video"
-args="-b -c /etc/oscam"