From af085f49e4dbaac339d5bdb8ccfc06688322f5ff Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Thu, 18 Apr 2013 15:22:41 +0000 Subject: main/oscam: new snapshot and some fixes --- main/oscam/APKBUILD | 67 ++++++++++++++++++++++++++++++++++---------------- main/oscam/oscam.conf | 11 +++++++++ main/oscam/oscam.confd | 2 +- 3 files changed, 58 insertions(+), 22 deletions(-) create mode 100644 main/oscam/oscam.conf (limited to 'main/oscam') diff --git a/main/oscam/APKBUILD b/main/oscam/APKBUILD index 8fdecb3bc..7bb7d4237 100644 --- a/main/oscam/APKBUILD +++ b/main/oscam/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Carlo Landmeter # Maintainer: pkgname=oscam -pkgver=0_svn20130112 -pkgrel=2 +pkgver=0_svn20130417 +pkgrel=0 pkgdesc="An Open Source Conditional Access Module software" url="http://www.streamboard.tv/oscam/" arch="all" license="GPL" depends="" depends_dev="openssl-dev libusb-dev" -makedepends="$depends_dev bash cmake" +makedepends="$depends_dev bash" install="$pkgname.pre-install" pkgusers="$pkgname" subpackages="$pkgname-doc $pkgname-list-smargo:list_smargo" @@ -17,7 +17,8 @@ svnurl="http://www.streamboard.tv/svn/oscam/trunk" disturl="dev.alpinelinux.org:/archive/$pkgname/" source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.initd - $pkgname.confd" + $pkgname.confd + $pkgname.conf" _builddir="$srcdir"/oscam-$pkgver @@ -33,34 +34,58 @@ prepare() { build() { cd "$_builddir" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DHAVE_DVBAPI=1 \ - -DWEBIF=1 \ - -WITH_SSL=1 \ - "$_builddir" - make || return 1 + make allyesconfig + make OSCAM_BIN=oscam \ + LIST_SMARGO_BIN=list_smargo \ + CONF_DIR=/etc/oscam \ + USE_LIBUSB=1 || return 1 } package() { cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 - install -d "$pkgdir"/var/log/$pkgname/cw || return 1 - install -d "$pkgdir"/etc/$pkgname || return 1 - chown -R oscam "$pkgdir"/var/log/$pkgname || return 1 - install -m755 -D "$srcdir"/$pkgname.initd \ + install -d "$pkgdir"/var/log/$pkgname/cw \ + "$pkgdir"/usr/share/doc/oscam/example \ + "$pkgdir"/usr/share/doc/oscam/monitor \ + "$pkgdir"/usr/share/man/man1 \ + "$pkgdir"/usr/share/man/man5 || return 1 + install -m644 "$_builddir"/Distribution/doc/txt/* \ + "$pkgdir"/usr/share/doc/oscam/ || return 1 + install -m644 "$_builddir"/Distribution/doc/example/* \ + "$pkgdir"/usr/share/doc/oscam/example/ || return 1 + install -m644 "$_builddir"/Distribution/monitor/* \ + "$pkgdir"/usr/share/doc/oscam/monitor/ || return 1 + install -m644 "$_builddir"/Distribution/doc/man/*.1 \ + "$pkgdir"/usr/share/man/man1/ || return 1 + install -m644 "$_builddir"/Distribution/doc/man/*.5 \ + "$pkgdir"/usr/share/man/man5/ || return 1 + install -D -m755 "$_builddir/oscam" \ + "$pkgdir/usr/bin/oscam" || return 1 + install -D -m644 "$srcdir"/$pkgname.conf \ + "$pkgdir"/etc/$pkgname/$pkgname.conf || return 1 + chown -R $pkgname "$pkgdir"/var/log/$pkgname \ + "$pkgdir"/etc/$pkgname || return 1 + install -D -m755 "$srcdir"/$pkgname.initd \ "$pkgdir"/etc/init.d/$pkgname || return 1 - install -m644 -D "$srcdir"/$pkgname.confd \ + install -D -m644 "$srcdir"/$pkgname.confd \ "$pkgdir"/etc/conf.d/$pkgname || return 1 rm -f "$pkgdir"/usr/lib/*.la } list_smargo() { pkgdesc="Tool to identify your smargo card reader" - mkdir -p "$subpkgdir"/usr/bin - mv "$_builddir"/utils/list_smargo \ - "$subpkgdir"/usr/bin/ || return 1 + install -m755 -D "$_builddir"/list_smargo \ + "$subpkgdir"/usr/bin/list_smargo || return 1 } -md5sums="65568897527ded7f73577c4d692a3fd2 oscam-0_svn20130112.tar.gz +md5sums="e60d01b57e78375a7ded9be3b861e1e6 oscam-0_svn20130417.tar.gz 56f8a71e018973b6fb8f2efa2873b6cb oscam.initd -185840b037fc59248f8ea2f84c2b67ed oscam.confd" +209c3747e235def3ba374b4aab237a15 oscam.confd +90939047384482ba8d4428b127b53785 oscam.conf" +sha256sums="1c23d45db72e82f17d2da75ee946eff4120bcf9f2447ac0744da8c32b4c23e6c oscam-0_svn20130417.tar.gz +3b925940d39eff9dd98733b777214e4503cef7e845fb24ef29cdd2ecc2e6fbc7 oscam.initd +71464c3c2f8a25899fe064d9a99938ca7fc9871e1b99e15e9a6babcd266b68d9 oscam.confd +7a2e4cb5da504027b858086966eee57fcc1cc14115a7978997857e631e459b6e oscam.conf" +sha512sums="6f764c26d0eae9bc38f833d7adfbe1deeaf6e9bbd5b9ebb62b7070d3861c5d86ed52fc191363dbfd0eff93d8afbec8d8c7a5c8696ce6bda232a11d64eeb1b732 oscam-0_svn20130417.tar.gz +f33821de7441fb59a2339d0323b18199d326c7f47a139128f02bf0661bc43c36dfa9dc2a9d6b4d9415da576d829d50123173537037008be93adb4a0458e6613a oscam.initd +c5567457763eb01f6287215f29547c867ae3f5b224691ff690616bb7598ea831299f73784064a571284b88d34c6504a2594b46e8275d5db2e1fb1394c11945eb oscam.confd +0f3c4b9940bd27169dfe934599525558bc712d43f07959f19dce6ccfbf0e4d35d345272500fba2bff30e4ecf23f11f72b75321f8a45df908373620349d7f8808 oscam.conf" diff --git a/main/oscam/oscam.conf b/main/oscam/oscam.conf new file mode 100644 index 000000000..e48324305 --- /dev/null +++ b/main/oscam/oscam.conf @@ -0,0 +1,11 @@ +[global] +logfile = stdout;/var/log/oscam/oscam.log +nice = -1 +maxlogsize = 512 +preferlocalcards = 1 + +[webif] +httpport = 8080 +httprefresh = 10 +httpallowed = 127.0.0.1,192.168.0.0-192.168.255.255 + diff --git a/main/oscam/oscam.confd b/main/oscam/oscam.confd index 3366dcd6b..86bd30ec9 100644 --- a/main/oscam/oscam.confd +++ b/main/oscam/oscam.confd @@ -2,4 +2,4 @@ user="oscam" group="video" -args="-b -c /etc/oscam" +args="-b" -- cgit v1.2.3