From 3de46177798f1b50d677ff2e574c471b3a6bdcdb Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 3 Mar 2012 17:54:13 +0200 Subject: [PATCH 01/13] new package: pcsc-lite-1.8.2 --- packages/3rdparty/system/pcsc-lite/build | 39 ++++++++++++++++++++ packages/3rdparty/system/pcsc-lite/install | 42 ++++++++++++++++++++++ packages/3rdparty/system/pcsc-lite/meta | 38 ++++++++++++++++++++ 3 files changed, 119 insertions(+) create mode 100755 packages/3rdparty/system/pcsc-lite/build create mode 100755 packages/3rdparty/system/pcsc-lite/install create mode 100644 packages/3rdparty/system/pcsc-lite/meta diff --git a/packages/3rdparty/system/pcsc-lite/build b/packages/3rdparty/system/pcsc-lite/build new file mode 100755 index 0000000000..5bbf10611e --- /dev/null +++ b/packages/3rdparty/system/pcsc-lite/build @@ -0,0 +1,39 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +cd $PKG_BUILD + +PCSCD_ADDON_DIR="/storage/.xbmc/addons/service.system.pcscd-addon" + +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-shared \ + --disable-static \ + --disable-libudev \ + --enable-libusb \ + --enable-usbdropdir=$PCSCD_ADDON_DIR/drivers + +$MAKEINSTALL diff --git a/packages/3rdparty/system/pcsc-lite/install b/packages/3rdparty/system/pcsc-lite/install new file mode 100755 index 0000000000..c915cfae65 --- /dev/null +++ b/packages/3rdparty/system/pcsc-lite/install @@ -0,0 +1,42 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ + + cp -Pa $PKG_BUILD/src/pcscd $ADDON_BUILD/$PKG_ADDON_ID/bin/pcscd.bin + + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -Pa $PKG_BUILD/src/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -Pa $PKG_BUILD/src/spy/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib + + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial + cp -Pa $BUILD/libccid-*/src/.libs/libccidtwin.so $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial + + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/drivers/ifd-ccid.bundle/Contents/Linux/ + cp -Pa $BUILD/libccid-*/src/.libs/libccid.so $ADDON_BUILD/$PKG_ADDON_ID/drivers/ifd-ccid.bundle/Contents/Linux/ + cp -Pa $BUILD/libccid-*/src/Info.plist $ADDON_BUILD/$PKG_ADDON_ID/drivers/ifd-ccid.bundle/Contents + + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config + cp -Pa $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/ diff --git a/packages/3rdparty/system/pcsc-lite/meta b/packages/3rdparty/system/pcsc-lite/meta new file mode 100644 index 0000000000..ae1ec2330b --- /dev/null +++ b/packages/3rdparty/system/pcsc-lite/meta @@ -0,0 +1,38 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="pcsc-lite" +PKG_VERSION="1.8.2" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://pcsclite.alioth.debian.org/pcsclite.html" +PKG_URL="https://alioth.debian.org/frs/download.php/3695/${PKG_NAME}-${PKG_VERSION}.tar.bz2" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain libusb" +PKG_PRIORITY="optional" +PKG_SECTION="service/system" +PKG_SHORTDESC="Middleware to access a smart card using SCard API (PC/SC)" +PKG_LONGDESC="Middleware to access a smart card using SCard API (PC/SC)" +PKG_IS_ADDON="yes" +PKG_AUTORECONF="no" + +PKG_AUTORECONF="no" From edae841ee4974309b0ed021e6e4314a0609c8100 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 3 Mar 2012 17:55:36 +0200 Subject: [PATCH 02/13] new package: libccid-1.4.5 --- packages/3rdparty/lib/libccid/build | 16 +++++++++++++ packages/3rdparty/lib/libccid/meta | 35 ++++++++++++++++++++++++++++ packages/3rdparty/lib/libccid/rename | 6 +++++ 3 files changed, 57 insertions(+) create mode 100755 packages/3rdparty/lib/libccid/build create mode 100644 packages/3rdparty/lib/libccid/meta create mode 100755 packages/3rdparty/lib/libccid/rename diff --git a/packages/3rdparty/lib/libccid/build b/packages/3rdparty/lib/libccid/build new file mode 100755 index 0000000000..97281294e1 --- /dev/null +++ b/packages/3rdparty/lib/libccid/build @@ -0,0 +1,16 @@ +#!/bin/sh + +. config/options $1 + +cd $PKG_BUILD + +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --enable-shared \ + --enable-static \ + --enable-twinserial + +make +make -C src/ Info.plist +$MAKEINSTALL diff --git a/packages/3rdparty/lib/libccid/meta b/packages/3rdparty/lib/libccid/meta new file mode 100644 index 0000000000..804b3af16d --- /dev/null +++ b/packages/3rdparty/lib/libccid/meta @@ -0,0 +1,35 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="libccid" +PKG_VERSION="1.4.5" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="LGPL" +PKG_SITE="http://pcsclite.alioth.debian.org/ccid.html" +PKG_URL="https://alioth.debian.org/frs/download.php/3672/${PKG_NAME}-${PKG_VERSION}.tar.bz2" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain pcsc-lite" +PKG_PRIORITY="optional" +PKG_SECTION="driver" +PKG_SHORTDESC="CCID free software driver" +PKG_LONGDESC="CCID free software driver" +PKG_IS_ADDON="no" +PKG_AUTORECONF="no" diff --git a/packages/3rdparty/lib/libccid/rename b/packages/3rdparty/lib/libccid/rename new file mode 100755 index 0000000000..ba366abae7 --- /dev/null +++ b/packages/3rdparty/lib/libccid/rename @@ -0,0 +1,6 @@ +#!/bin/sh + +. config/options $1 + +cd $BUILD +mv ccid-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION} From 3a860fc77214c5e88dbf95e5358bbad998c8ea8d Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 3 Mar 2012 17:57:47 +0200 Subject: [PATCH 03/13] new addon: pcscd-addon --- .../addons/service/system/pcscd-addon/addon | 42 +++++++++++++ .../service/system/pcscd-addon/changelog.txt | 2 + .../system/pcscd-addon/config/reader.conf | 10 ++++ .../service/system/pcscd-addon/icon/icon.png | Bin 0 -> 12944 bytes .../addons/service/system/pcscd-addon/meta | 37 ++++++++++++ .../system/pcscd-addon/source/bin/pcscd.start | 55 ++++++++++++++++++ .../system/pcscd-addon/source/bin/pcscd.stop | 30 ++++++++++ .../system/pcscd-addon/source/default.py | 44 ++++++++++++++ 8 files changed, 220 insertions(+) create mode 100755 packages/addons/service/system/pcscd-addon/addon create mode 100644 packages/addons/service/system/pcscd-addon/changelog.txt create mode 100644 packages/addons/service/system/pcscd-addon/config/reader.conf create mode 100644 packages/addons/service/system/pcscd-addon/icon/icon.png create mode 100755 packages/addons/service/system/pcscd-addon/meta create mode 100755 packages/addons/service/system/pcscd-addon/source/bin/pcscd.start create mode 100755 packages/addons/service/system/pcscd-addon/source/bin/pcscd.stop create mode 100755 packages/addons/service/system/pcscd-addon/source/default.py diff --git a/packages/addons/service/system/pcscd-addon/addon b/packages/addons/service/system/pcscd-addon/addon new file mode 100755 index 0000000000..72608cf464 --- /dev/null +++ b/packages/addons/service/system/pcscd-addon/addon @@ -0,0 +1,42 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ + + cp -Pa $BUILD/pcsc-lite-*/src/pcscd $ADDON_BUILD/$PKG_ADDON_ID/bin/pcscd.bin + + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -Pa $BUILD/pcsc-lite-*/src/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -Pa $BUILD/pcsc-lite-*/src/spy/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib + + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial + cp -Pa $BUILD/libccid-*/src/.libs/libccidtwin.so $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial + + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/drivers/ifd-ccid.bundle/Contents/Linux/ + cp -Pa $BUILD/libccid-*/src/.libs/libccid.so $ADDON_BUILD/$PKG_ADDON_ID/drivers/ifd-ccid.bundle/Contents/Linux/ + cp -Pa $BUILD/libccid-*/src/Info.plist $ADDON_BUILD/$PKG_ADDON_ID/drivers/ifd-ccid.bundle/Contents + + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config + cp -Pa $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/ diff --git a/packages/addons/service/system/pcscd-addon/changelog.txt b/packages/addons/service/system/pcscd-addon/changelog.txt new file mode 100644 index 0000000000..1a3d1c4a38 --- /dev/null +++ b/packages/addons/service/system/pcscd-addon/changelog.txt @@ -0,0 +1,2 @@ +2.0.1 +- initial version for pcsc-lite 1.8.2 / ccid 1.4.5 diff --git a/packages/addons/service/system/pcscd-addon/config/reader.conf b/packages/addons/service/system/pcscd-addon/config/reader.conf new file mode 100644 index 0000000000..d984d4a45c --- /dev/null +++ b/packages/addons/service/system/pcscd-addon/config/reader.conf @@ -0,0 +1,10 @@ +# Gemalto reader with serial communication +# - n is the serial port to use n in [0..3] +# - reader is the reader name. It is needed for multi-slot readers. +# Possible reader values are: GemPCPinPad, GemCorePOSPro, GemCoreSIMPro, +# GemPCTwin (default value) +# example: /dev/ttyS0:GemPCPinPad +#FRIENDLYNAME "GemPCTwin serial" +#DEVICENAME /dev/ttySn[:reader] +#LIBPATH /storage/.xbmc/addons/service.system.pcscd-addon/drivers/serial/libccidtwin.so +#CHANNELID n diff --git a/packages/addons/service/system/pcscd-addon/icon/icon.png b/packages/addons/service/system/pcscd-addon/icon/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..41cb661419983317da3b23aa0126619b7b37b56e GIT binary patch literal 12944 zcmZu%Q*b80vW{)rwvCN#Cx2|)wr$(CZF6H|V<#IYcTe4y^Khzbx@TUxYNn>Uzv})X z73C%1VQ^r8fPmnoBt@0~+3o)~s-NHlk2?Q%#&!|YbWyQ4 zb8$CxG6fPcu{Sa$lCm{4H&r$@H1TwtH01*V0tHf(RTVoqK9`kM?&=yI8J+?MhX@T# z^zsR|vT;_|HgR(C-rPJaF0TG~|Kj4{ZE5LM)ijEXOwGzIR@E>70L**?!l$Q~!Xi?Z zm$zeMGjj^cG_}oW$SGqJ)48R?`1ynl3@z0(^=qn|6XG({8YHEq>NFn6xG!< z0J;X|QerZ3xng3XQd(L@T3ULhCbrUQF?xCyfxe-Vx-^)WSb>4DS^!gFA+hbP9YuMS zl#D!eEh9Itz~PYvH8pKv0byk|U44C1LqjuVWzDp#0(DJYD@*%=yfS$O^@N0+f&TI6 zn2gZSxbW~~b1O$(U897QtiXWC{oNyNT{CsV7mT20fa zw`V|9T#6>Z+|jdGTgM7)MjpeBhWuAC8faB)XLPtuA#1VZFSqw z#40waKt)w6AS7yRe9#{EjKtQX8+(^RarAKBqk;* zEiJR%(b2=m$T};%NJGcW*vPW7v@ta`Q%%bxG$_){%)!&mr@VTYijdgG&aJVrYh-F8 zJ}$}4FLi%=mw}o#CnYy5GSkjA%fmg8ga#)zD$&3?Lr2eCTh}-`v9Ygz>h$CwG&CwJ zDapjxCN!pzjh9A8+dzOvKv7voLsLIAI9^dkVQqaUIyNV_dN?I94~GOTCOT77&7h#9 z$530pqM|V}G%O`4GblKIa$?TiJ3KMIFd?&sfu0GVXJTn+p{Z@4qiqrxmReTbeSh~% z&q5_3A&ZAgpsE50^a@1BMsj!bKtn-CL`2lmGf~qrP|+|#Mn)kfCWS|ZRns!k&@$C@ z;AZ$0(9_!$9i9dY1GllhrlDgJ8t*bTGO#o=A+I26?-H%4W1bq9sA3|Lkx{ClWuc*? zs-vo{rK=GVl%fF;VP#>Dh|c~ODJA{ius}eJ7*e7_svetHxv+p_jl37nA@UHcAvMK> zErEmt_(n})c!N455GY_ei(g`kB%l~NBP2l!7T`6K*s5p_a9u3;(xoeo(`w_JX~<+c=?~xYk7P&;G&Bo4eq0bD%b>*W2@@ssQ1?k z7-yZ!+U0Zj9c$F4bWJU@rnzIe+j7Fp<7K#>*uf!Au0ho3E(zqi$ZxA2wYjI$7kJs9 z>0YU&qv$WUE*kZdyZ^PG1`g}_CRvcvQSIF9SNHILdx;r;Rh3_-JSr+yJLTW9<9zxj_~UeOx!TrSw|MF@t$XX%_0Gj$)@%B) zcmJ#pRZRwK`O&;-$zto=5g*d{5mdNce`8nOcMM}hMuFR+$G1LI>Fl>w7_PuywYkJ+ zwYA)`qjY z6dHNUhb#s!wFh$w}Y_UzAEY3{=W}j z^U9TMgNOS!kYxmhnEX{n+x)}rV_Gw?FI9hSt11{26gIkM1okG@P2CP;u`I1s*7Qz$ zOe$FlG=0eOcV8=JLDe-iwI&B+5!mr>KIs1{>Dmr*OwaOBdE*;t5a{w$v!W#z+FyXK z>N9#(hB$yG>zukP61;JvIEi!wlzUuy5XdCGEYsn{19}gZ%VHJQiBo z>fHfO+WoB+g6o!~fxppmoIQkThN?V#ErP6*K{^1e>!_)jF@BMR^0JtYDCa!Hq7O+OhqNXZ`*t)nPL(E_c@cL)$f#sRd2Jo_|WwKb4(q&Oj+hlNCAg$9SNI6qNETRPA0$tf@uzmV(FNPw{99N84RZ0XO(*2t^i)#U z+aw5>XC^(YowK0Lu$(m)@);0oOUdutG*6AtoVm(_u!H>f9h}n69gc$Z`PDf{W z(MKA$4H3!EuM8axssTqKmJc*jTADw3GCKTpNu zavoS~)1Vq)LW(E1PD*E$HAA=a2uOSyCtam<%Op3{$gi;P{2B{RsV%Dz-8DMZ>^FI{ z5@qx6BhE=h|7<%VnEIOnFMy@LQ2oT;;Bk+wu_cR+f;bM|ge0Xrajg{^+@R%xKlGZwV&PvOY*Imof^Y%K4|u_0iIiX831OILs9@aG`tS64f1$h(h3C)Yni3w&>?)gwucRm592`O zMZYMMl;3$V7L16N5o#P^_VZk&{q+~-{pOm8cl?czgbM^wZ2nCL|4_$9i-93XeG457 zPxDV8Yk>Q&BCz{}Q^Oi%@>DO+f5}-6ONvrHq)dRI?aOwNsqOuqzD0wFNwk?$fKbAI zE7;03KIf!hs~)HQ_M3g**9LRt4Yd-WzWVuw?A_ExfVjTDJnpXKvk0p$wRC<*Q-aca zYFJ8BiKoL;?GSMKg#NY3B+iI$hVR1%ptAq|u1X`g^lSL@xmSn|4@*1!c6THez5B7m zwK{Q@>>bel3}w5MM`simYG%8G&!{(n(rHlp4P<6redH`w=l(}FRP~%Rr7$NPRyzCG zvk12t2GWtW_OH0rQo}xzxu!$j@BoT}GD4RiO|`x*-k*Ed(|3O_)5XibWA)n~9vkKP z0fygGBpln^;FD&plt%HE<2N$;EieE8nmZ;*jmo>&#A(zW*%SqF^nmeXiV`>=Su2$F z0O0!W+dTQFA0DuiqZ*NE+w$_tPqOv=iFLe=RQa z`}$${L`P_v@3a>0m5Uu0sci_X4A=gG6{pS+|LG9 zf*dZn04uLQIzEs{J!lTd`@ET7g2i9Xl!gm@P9Wq@V>p8{M7Vr#=7H*AkWot z4}abX)eLGT9?S*lK!0a9%H8);Ca2C*k8Tc;wi->Cq#J@qYimd3`!0qK&ZF3{OnHwu z1m2h(=B696o83Yp_y4*SyRH3PasIe`!RYN};Sh8)mCZ#DL5U!bchiXm{mn27xGxYq zxAo%iZ&6S11O|aEc~Vc3Cpw~+KSZ1%z)K;G`D-5)Hl18G7nUC{6A|;tGc$a2StW0h zRIeB#@MX71tMB(V)hpKDrm$o2v=)O#yF9@^>b<()jv1Xv&j44u`H57hX3scSQm*4T zwUrG;N2W*pz=u@d5=jH#iFO#K(8$ha)CkG%$uRKTok!*Yif<}DO_1vAJG<`9ALHo> zN7+gDZ~d{>kn7A(r6#-0UvP27~xYXb5cfWn+6#TmH^?uQd-|{H= zGyc(nRZS0VEvZI+77cdnQs&v3O!VMnLmKUYXNc1wp#_nO-1aU1vM%C+$ zT!&ATFGSzCzE(efC>7lUFMHkha{C6jQp|8N!KsO?b++%j(tbga`-nXZg(G4z_;lPI z=st$NKO?QeB*lV}vGN>vnFG4BLo6nOgtk*ubRoqHtzn%M`QS23e z`js=2Q|?Tyuo=yNrr7U&4*OGiDQ4IhB9QFlfpJQSLv~$&qN5N@!C3slND@bfpF!IO zntvV78cykOChYsLa};%S1ly?oT1k6QsAueYxlbqjr>E?1y36ghJ=scUrdFn`zDwQX ze~7zFQOwz#b!cuG_}B>$ETFmke;OT37)4d-6z$ELw6GvSU{#k@&rOrD1CQK2yOz_n z!e#|uZaSS$CEMN-E7IQ_CKuZ=15bB8cE%LWpYBjk43ZMn6EBzgw|~mh()^&vweNSj zX%o7UZNjR~_r>pRT&LI2wJ3*z^`Q6^qLcEZs}AUM{W@?d{jQ4E*eFbVHGSd$$lf(I z1N9MZ6cqP@1;5_R!;=Mhwgu%_ui4mVr!HjQZeHWQ(*y*TWVUz$mC z2hlw(Wu!m+R#^;ZChC1gHG4to%zi5r`Qydq;XmOMGUrd1yZhEtm=l(x(Tg=?mh3l1 zlA_3JuK>HPZ0d)(vwqNUe$nta8aG0~87a<%=fr?i<&4i{`g_sBuZ+B0X7lPZ&ih4j+!C4p8($+RFLD9kxnbm;q~JaTU-hnGLd0H zM#n_SD+^~Kgnda1w2d1&Ka6@g3z$(G67i)Y&SRloJ|{ouGdC?E;KM@3w=)4&kKAX_ zJU^!xLZ+piwyPd?FV}u&KDImj5$%K<{i+wWpSoBh(K9pT^#J_vfI6kMTfMedN^ zv7U1H2TkK{lfVs|p!EXKpbM#Qp5tp&X9l)*RqV zZZS4=;6T*CW=T`m2ZSdgKdq^}ieU-fS!+8P*L#p+sw?j8UgA>6`n%9HHvHop(O$3W z%Gj}RUpWF4^foE0-FsO_}O%-a(=t4@<)=or-Reh{q!;ReY1qd&?{pC=)2{ z?S(pvR!Ts9><~VVF4^Jo{!?rMr}Vk#s4}pWf?AX;D(Vw;zLK4MNOx|Ux-Wm(2wT&& zkjZf{tapu3-7UbfGe$Vm{jYBSoGTb^=1gF9ZEbV&qwdrVEImCgSB#m!uF)_Y**VQP zHgO<3iUL9`y~+aa7o5?8zsZHUrZlQAT~?!Hs@#YYR7<9wkg>0zD_3%L(glpCuB?v9 z)JCDc}90=h1kPE@p(%ZulCJzr@p*dYHekHklzo`uxuKI;}ATfrR!S?8Tk zI^_X)7OWTXFLw>EN zQ1tMScTBH56hA-Z-ke%yWt`allCWr}ar*9Z5uCn`MVlIZJ{eJtFIi`d%2O5P?x zjeyz+fTyPbOZk;l=~Ux{ijo72!97d%jZ2#=G(-xFtP8GW-$j#6MBC!b6sRqw#={Rg zC#qwbCgR>uzT&cQZhCUgY)iFUi~)%b@N;EO(`8Q^qpi2;-#;~fuW+;v5?@>k7XjHf zrZ+Mxm=)y`IT`cJ4|Gxp5b-$rBSF-p)9L5vZVY(UkBw=&DY&}6voiDr#s>eSq{O z@fYCw8t~=ILD56mCzW+}46SXF8sM?T*Z059j=DTLHHL7Ym^F{9yUubSrCK%Y=0~X~ zJt!cp$DM5uh`Aj?a%@cV!^JJ*cD|~@>zC}AqI}KoGazTsEB1(omVFzF88+t`P~{bt0uwHN26BhL|&Q>{}KYXZ`VK*M{wWcG`f6N6Fh7u zdYbo(u{bR~=6vh(f``6chpsqB$zV3dED=Mb37ZbLB@cAY$A2UGR-Loy#~JC>T?$I z{wU8?tG;*!#ZK28EqPdp2x$G>+xUy#?I<>txK-ipUuZm7&Q-c`MFCKGje(e8Tpfii z9BIh7aDYNy+Ukf(YLm294vD-sueFQL;J%7x2b)|MJH?=Ye}7_mVkr1NHmCC8Ht(6A zk}DYgaht2(WBcvzeIJOx)iuNujN?n@s#qmEu;j?0XaYO78ChVv1$|C_oO-;aIn09- zbydj}=}I6I>+!8E!f1-29iz$QnV|Y|y7gT9#=QxPesCDt12mbJkOfIbZE3iX)Ec_} zxv^f?8pb=blvd);?2lKQ^@hOXK&nZX<^Ei@Ha?ZkL=xu~Y3$l!%40AzcHhVpzp|o3 zS|aOHw86s^y&*zbN-Nu$2@VUgDwxfDuzU#` zeC++y(ohK49ce|ce|^wD;9t2XOAQXwQB^G0bui1v9r*MW*$?l8?j!sO#B~`u$Mjxd zp`3+9U4AcdC}y8x-A}17O1x7=*B8Q$orqW)2nley%t~>)j`x?5)3rBiW8W6o8-hBp z-LvSY+is$$BQ?<2QJ8M?3q-$nY*aAV-`U*_<#$h1!)b~fH5$(U8((OA@%Y}n59iH` z5{K0+8?elsr(7#bliuze{Z#FHJ_2*n*z#Giu{kRd$92mBTkKNH7tP1G2fQ@YBpzit zyE-?v!03Q!Hw{6tJYK$5-rl}8ZhkOy?3Ybh_f1*)G-Zx`TA@Y4u~Jt|pPFba@$FR& zcJ9&C^YAcI%!eRF0n**W4xK|*$wz8-{f-K}*sUBl0=(mQ#|InTymkEovily=0ka)C zY-MW-@qV_ZTOi}+?bk7N8c0fkT-=@N#U)C4Z#rGVwz)V$?nEC*0dgQpfqEdl%$5bm z%FD}py1zeLtHj9>)X;m?>;;=nMasa9Lb$_mS}h0+ty$1_$n=2sfJh^{cO zWp7d`C5Oq(l&2$UEong1k%e%>u*oWyH^Pw*V*U-{Kr6}R>q9)ZMMK_ObK|6)o2eU@ zs~e+=`0{!|<{)oo?rt^3Y7t3Dr!N*?JpNI8qxlEOMbS=gL%-dRKb-h((kArotXXJp z4+%B7`>2)FNmx*ur(x1cE?Df-=58Tlce}xu9BA+nAr`wfz|t-uSICB&o0*y0O*N-Q zdT?S`0q#InGsRPI({fdl(sO0&x`eTTA&#!hh7Y#&smJs5Qn`^B{W->#amji(f&wZ* zkx_A+4TMv?m2zMwQ0(&+jmuZ@{)IC@EPO)#t?J{r#l@f*v<;0nD*%n*TA#vJz1}P* z2eX@eleEhH`Vi~Vy;j7%=AmKR`oPmvPry}0nOIz=M7>| z82MyE^KymV18ige%#+#I4eROUFJ`xrWlL8KUUv>wcMe+f$WoD+QsP3FM!8A3awo!uC6bg|HbG1xKrD%~^BGJnjs)YA8YNL2;p16eb@)9cRCWj6sSWV-$ z9a^~~oe>y!{buVl-D36T+A5`@J~inu+5SuINd^siu|05vlmRpR`OO(LBqf8t|B(1( znjw-GZzE6k!tC7K3|ytUd}=u~usrwEN^g+PL+az7(XyqAyZ9s&=XVnREW2D3{o^E+ zTReRHe!ndS)+~zoXEbgNtgQ*~3*K(Z0p{`HSO)%W)bvgQgxy*!n@%aY67r%PxJ+2l z=_9F9Il8`xwa*%Qy7Z67I=X5>B(N;~F0^JwL!rsOB;mY`y65{r;6ProLaM4=b@qBnSANEcJ`_nDkU%OQla$ z`=kW0C83>qLgi}`_M7dK*qIb^$=9(w1b;HHg7)_>{b2B%LGT`UDUv-{f#;aw&bl<8 zsyWdGJxZ4s`uQi)&Pu5*82Qw7vNQ${ zTXoP0@f#3FL_C!0$`N*mRhO3wHHgk-kd%l*hoiZT5+E`ID@jEo{utXXBh54I#fGd5 z3OT}d=y<)8TMPv)_4Yh?6dBw19FR>&4V8+h@K!aZ^f~VKe6Uqf@bfQbIcbKRP9;wT zU#;3~pdle$_v95!3$S~blL>F03B%p1kw_&Y=P&@`WW2*1j2Ga#RwxJFKH6JEg{Y)B zyV1~6GS1M|28{4{|G3nok&cJdR1!3Gl5h7o?OIn?;?zHZr(~G{sApwBSod1V1-Q5d zJf~?=&>jF98IUaFl=dhHQk+?cV+ZFy$Qkd7p60U33*>i=4kd*UG$RAzpd74dUymu< z+6K;5rhFJMDeYx`d>2hUM^k*#Uat5%EOX$PVJ;dIy%s`l)j6O+pd6$28)oj2;^6bF zcf6eZ`2RXm_Dnn%gfiw(ag!J z`3|H~IgS_FUF=^RPO8tti^mqS+z4*f(}O~s7SL{4)OA0^88BPv5P>?B$|ks1$&Z@e z_3_9T>`pdv)B%J#p-tYYI>c5C8Wha=FK*4kV!p!%O^Q@8w#Y79VaVLQTv9Xb+)N5~ zaw%&Z@vrtR0)UMk2^tSm#6ed<1Ic!xwG}sGOq{FeP4;O3?33k7d5*geRSv(c^K^EY zlZgX{!7pSj^|;|j(L*51p!3Qn-M)x3xmg~X7R&iS>ikDI%E8>neNaS~lyAX6bb!yq zWe|f}EMh*UCdPqFM#iZKtVWciKm&@ z(1WQww>k!KCOt*Pah2>~9R4V15#hm*tB#~0B$7oXT*D{WMi38qV3pxz9IG(Thp=|m z(ou3?_F+zffyiPk=>nBmw%huC_U#Awii*D!nSCVj17~Ah#|AfN25BYrb77~(c_&mV znv-UilrCFjRRm##p&E7btpGwoD_TdAx$_9;?nsY>F<52^EK@L3T&e0bZ=?14A<(mx zc7r*0#LF8ivQVCYwY! zU@KIncJzEgrq&&@0DB2XlPLtBLERU%*HFqf?}umG%^WLn4c#WWUOeNLfIvkj56GG2 zbm<2eI8DH-oGJmw{Q>W!=S?m)KQb<*kwR5qVuB}R#>G;GWs)73bBTR`AsK;PZ-M^3 zgrxD%^Cf{7O*clAit6D0F+QXwk5KN-+7=2P+~aJn7}I$oX4&(LyFt=ky?OaxQzmp4 zFD;5PHRZuhcKY-*%v!4yE3ERXcaSakSI?P6#aK?EN`Tj>cW9qV!=hLM@<~#DDPHCw z6w~89OrL3RsELH-z!8xo#%me}Z(`vHczUBwDmtCiHL8Ho%XT{RwiB}OifRKcQQfZ< zKx^n3nxgp26s;!n*&mLk%u-H;L&d3PpE;zsD?D+(dHtHRNm4v{RJH5tVAcpG&&PsVtgc-eYnfTFHjH>N% z`-GKP;aQw;mu1mIkL_;;Q6*(wu*8trKT=NM(kHc+A-H-`BI_dsdX=kW5TiCaM^`m}JB+xYz36F6-BtY`McP%{+!6`pnQRszVn4)Ks0J{uD&QmN-MUB|pd4ZnBE2XfQL`d{WV6$QyP;*$cV~3a;K6?@slKLN z??ffuxM7%BPuZBMU*2=foV^idE%h4uklJGE1@O{w^siUWu}hH5#R8k z%CC_VwPlZN4YX@Fgk4$PaT)NQlsUI=5(~^3J*w_Vp@VSydu$$r*>_Z|fB**7%|rl= zTdiZ67DlemQ7=TvmI;ftHe<1x84w0MdpH_(NK=J%xVUr^bJ0;zQ?y*ai||P{ut)+m z(GOP(CQa3#Ak2X5JYG41nGo!9 zs?U>O_VF8whK;#Zp4h|@ti2u$8GXE~w9S79dQB8mm;-!Ni5DNuE6Ov3}hi8#uCYAUXJ^59H9>9N}11vxcmVs zR|oUL?CA3P*)JZF+!-Jv27Yp(?LJ{k`!(eM*PN*Qpr{_0UV%7-Kv(!#SP6BJ9%{AR zCCSd}AC||Oc)~Q!+}$nEd69GDH4=eG(4a6er%9E*Pzo#n%Kk35;wv;zsty5(p`Uz| zZqaEL;2FRf*%FO_d|ofehIfX`VE~pdfnD*$XGL1y#_7@R4V0rZNU#wBgm$&I7V2b* z(xOW?25JR~w6;XiqgLp^4zL-w*+wGh8OV9%VaIAaSl!KaR22F1(r6d>A;R6;o}nLJ z-9XseTLx!ik(Rs5C+rMRu%_1Oom^`Mx=H6x=hl6k0$4m*0ISQnr(!c>H9~wWvd=l77=s?Awa91C(#HaokK zQe0&t<*)1td$WOx4N!{#qr6poP@4q-2G%5XHI3aV6~tvXGt6e(M%l#<79U{3C-@an zoUd>kuX{FzkxyNdAp)5@(ve!+?Y+WGqzX-*;_-1W1>#hqNfI`YVyH^21D^1WriZttqthwG&4zD8LGT@tOM}b z0CiY&tg<<}2pS1$#0zvZjW(NRR+$j>1NxOyIX*S(qcOJd^jO@DA@D;ioe8s-*On^u zPh&7#P|WZr6F1IdhD0Z3YX6J;`}|#4`ueF57Pw?nVP&RZ0t|9+YhC5Ls0RcW5wfHB zCQ3*v5u9}!GO|Kk1~ixrVt$)K*-KFya3%-hZi&j7ncAcWaP-g9SEsVKwmD!-jtIzH zkP-AIJ>VW7NfdLSKpx;*r?9KA})`-71I^;T1X?s5ji>0Oh~4 zGhq;(2=UWN0&6EE%YNwRwlR=p)JMotz{+_H#q~mvE)PB4V|j?q&FB5oUuVVhg6`*9 zP!QhE4Pw;>jVo3a8t54jSn@1P?6}JABA#I}w8;W{*^w<&w?d7YS7yT$9I`gs>qgFl`GW7C|GZki&Hrl84)z7e7Aj5v$rJDMoEt%R zQ#K0;cZXS2bE~*;1Bq3QO(Vd!?txkWtnI(bTVbkT$)rO z^!j00cz$<7;)g&y+W?__JW9y?oIK9YWEyekY!Cf5YS6Sw16mgT4gNir7<$K&+G(cD zP?y60k}JgO{8cZ-nms$jWJs}iQdrUuVDT7{`v-*6WiA_@%`VE{AAQ4Q6vE|3XOKKE zJFroc4$hw9ol~GXK0PxtoA|(3`tRdjIGc()F5_t8>Ew2ol5#*yA0i*)E7WF<>=O-^ zN%W{M5*PaQZO{9K`K<~eNRHwlrUopKJaE?m!+0FB%@q<<@|sL12=xniUM#yYCTBLB zX_Z!oa1J&2y<6>O6XHqFiiJ@Nw9>L1m05es&yir? zzDwoli>$E zADFxNB{F+^PPJ005xUH>%{KM149FTP>kJNz=Vk5lqWZS~(O!>Z2&qkTWOhzO#{nEk zxn<(O3R{d0oi}!M4q4Sg|A{z()ko`H**0D=a9TLU1P~}L>0iaHbiYwu-}mm1>RVuB z=Bx`Set4)*!l5ZUxwGDLsG>iH4Uv0j`Aeey5-oV?UuGY~S$S<39^k>BfL4$aMv#kD zU!#@xEzr>Wqu=*s)Q)tmSQfTE5n0sK3BY87LouYu`=mwSBzq*c1I>Q3zOjd8*+}SN zDRpX@m0b|RJqFxw@YeVJ^li$~nb2Zw^FdLl21Hw(Jc!9tWk7jKC6Vxn-m`G#&hl;F z0R_jpWo=|`=m`R|o6zx{i@dMf+2jFX`R3pPC|96420H;Oee)yokis8T68 zz*T=F<)5ri#4wTYng!=t6XIPZBn_x8aO#-I24Tgs(}p5)HZ3~>>$tsx~(NWXoy zXslVfRsh33Yzd>M?_kXU{9YHm$au2}zcLj^x=1k+UeD;&y#H!JvSX>pEIJr2dlk+S zVL7%rY=vcyn;ojZdj8QT%Cr=a5-NUO)W34pPfoO+wJU^*qD$b19bGh4IgsZ5Ye>a8 zYs0DXlNmDSrj+nnP{(26PiO_Yb|w!iqY|fHA!CEvZX11L<^dsjxCKdlUBXiZxY%b; zNf`-4xz6i@{(8+|;j)DAwpd6g8dxGWqXF;^kC%)dF()sLLLTM3YwDdeb1l@oE#sl_ z&ZlLEspa4Og#~>78EQ0WSQqFWoJDAuP)kow&ra|WQuR)sbdtUZ+@b8W>Dm8qC#x=K zdm50eQ>}VXU}gT#m(5uzQU-29xDGc?;k`J^b!Ts25i1n{xn1J6NW z9i1bn$*L?d!|s+Ck*^nkYa9JyW`62}CKY-H6{v+uakdRWD|xe`B9R(LrO7p(AFHtO z{oSS|tWh(JL>vch2o{C0Op%3|o7*iYFrI;7Pi^;mM^}4B%bt8zEmKU1Cd!UZDjp|V}%cm2i8HM>~aiY z`dNIV2&@>AL=F=QJMqtre=t&XNSWBZ;@@m6f>zO~pYWS}PzW$-aMQ+VGDk4 Date: Sat, 3 Mar 2012 18:02:56 +0200 Subject: [PATCH 04/13] oscam: add -DOPTIONAL_INCLUDE_DIR. required for pcsc support --- packages/addons/service/softcam/oscam/build | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/addons/service/softcam/oscam/build b/packages/addons/service/softcam/oscam/build index ce80afb29f..c1b351c50f 100755 --- a/packages/addons/service/softcam/oscam/build +++ b/packages/addons/service/softcam/oscam/build @@ -33,6 +33,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ -DHAVE_DVBAPI=1 -DWITH_STAPI=0 \ -DMODULE_CAMD33=1 \ -DWEBIF=1 \ + -DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \ .. make From 713d0335029442e95b2f591c89fd8f5a20ac134e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 3 Mar 2012 18:05:05 +0200 Subject: [PATCH 05/13] oscam: add pcsc support. depends on pcsc-lite --- packages/addons/service/softcam/oscam/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/softcam/oscam/meta b/packages/addons/service/softcam/oscam/meta index 69b7c24882..294c13f1a7 100644 --- a/packages/addons/service/softcam/oscam/meta +++ b/packages/addons/service/softcam/oscam/meta @@ -27,7 +27,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://streamboard.gmc.to/wiki/index.php/OSCam/en" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="openssl" -PKG_BUILD_DEPENDS="toolchain openssl" +PKG_BUILD_DEPENDS="toolchain openssl pcsc-lite" PKG_PRIORITY="optional" PKG_SECTION="service/softcam" PKG_SHORTDESC="oscam: OSCam is Open Source Conditional Access Modul." From f7cd4f44e5b6c794c9fac30b587e58e325b4ec6c Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 3 Mar 2012 18:06:09 +0200 Subject: [PATCH 06/13] oscam: add pcsc libs to addon bundle --- packages/addons/service/softcam/oscam/addon | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/softcam/oscam/addon b/packages/addons/service/softcam/oscam/addon index 2c2d406c23..aeea0fff59 100755 --- a/packages/addons/service/softcam/oscam/addon +++ b/packages/addons/service/softcam/oscam/addon @@ -27,4 +27,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin cp -P $PKG_BUILD/build/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin cp -PR $PKG_DIR/config/oscam.conf $ADDON_BUILD/$PKG_ADDON_ID/oscam-default.conf - +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -aP $BUILD/pcsc-lite-*/src/.libs/libpcsclite.so $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -aP $BUILD/pcsc-lite-*/src/.libs/libpcsclite.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib From cda036250a18090f6cbe59a23de81956e2a27ff1 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 3 Mar 2012 18:07:13 +0200 Subject: [PATCH 07/13] oscam: set LD_LIBRARY_PATH in oscam.start --- packages/addons/service/softcam/oscam/source/bin/oscam.start | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/softcam/oscam/source/bin/oscam.start b/packages/addons/service/softcam/oscam/source/bin/oscam.start index 2ceaa0ddfa..9cc46920ab 100755 --- a/packages/addons/service/softcam/oscam/source/bin/oscam.start +++ b/packages/addons/service/softcam/oscam/source/bin/oscam.start @@ -79,7 +79,7 @@ if [ ! "$(pidof oscam)" ]; then if [ -f "$LOCKDIR/$LOCKFILE" ] ; then break fi - oscam $OSCAM_ARG > /dev/null 2>&1 + LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" oscam $OSCAM_ARG > /dev/null 2>&1 sleep 1 done & fi From d6deee92e3e6f78a3fccfd402ed559ba9c37b654 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 3 Mar 2012 18:08:57 +0200 Subject: [PATCH 08/13] oscam: update to svn-6472 --- packages/addons/service/softcam/oscam/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/softcam/oscam/meta b/packages/addons/service/softcam/oscam/meta index 294c13f1a7..902bf1421c 100644 --- a/packages/addons/service/softcam/oscam/meta +++ b/packages/addons/service/softcam/oscam/meta @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="oscam" -PKG_VERSION="6136" +PKG_VERSION="6472" PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" From eb3d26653ce0de245e9f5c181a5f9e2bb27c5751 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 3 Mar 2012 18:09:33 +0200 Subject: [PATCH 09/13] oscam: remove trunk-vdr & dvbapi_ca patches: already included in oscam-svn --- .../patches/oscam-6136-1-trunk-vdr.patch | 73 ------------ .../patches/oscam-6136-2-dvbapi_ca.patch | 104 ------------------ 2 files changed, 177 deletions(-) delete mode 100644 packages/addons/service/softcam/oscam/patches/oscam-6136-1-trunk-vdr.patch delete mode 100644 packages/addons/service/softcam/oscam/patches/oscam-6136-2-dvbapi_ca.patch diff --git a/packages/addons/service/softcam/oscam/patches/oscam-6136-1-trunk-vdr.patch b/packages/addons/service/softcam/oscam/patches/oscam-6136-1-trunk-vdr.patch deleted file mode 100644 index 26fccad8f8..0000000000 --- a/packages/addons/service/softcam/oscam/patches/oscam-6136-1-trunk-vdr.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- oscam-1.10/module-dvbapi.c 2011-12-08 00:02:39.058737655 +0100 -+++ /emu/backup/oscam-1.10/module-dvbapi.c 2011-12-07 23:35:15.708736813 +0100 -@@ -4,7 +4,7 @@ - - #include "module-dvbapi.h" - --const char *boxdesc[] = { "none", "dreambox", "duckbox", "ufs910", "dbox2", "ipbox", "ipbox-pmt", "dm7000", "qboxhd", "coolstream", "neumo" }; -+const char *boxdesc[] = { "none", "dreambox", "duckbox", "ufs910", "dbox2", "ipbox", "ipbox-pmt", "dm7000", "qboxhd", "coolstream", "neumo", "pc" }; - - const struct box_devices devices[BOX_COUNT] = { - /* QboxHD (dvb-api-3)*/ { "/tmp/virtual_adapter/", "ca%d", "demux%d", "/tmp/camd.socket" }, -@@ -214,6 +214,9 @@ - if (cfg.dvbapi_boxtype==BOXTYPE_QBOXHD) - num=0; - -+ if (cfg.dvbapi_boxtype==BOXTYPE_PC) -+ num=0; -+ - snprintf(device_path2, sizeof(device_path2), devices[selected_box].ca_device, num+ca_offset); - snprintf(device_path, sizeof(device_path), devices[selected_box].path, adapter); - -@@ -1090,6 +1093,12 @@ - adapter_index = buffer[21]; // with STONE 1.0.4 adapter index can be 0,1,2 - ca_mask = (1 << adapter_index); // use adapter_index as ca_mask (used as index for ca_fd[] array) - } -+ -+ if (cfg.dvbapi_boxtype == BOXTYPE_PC ) { -+ demux_index = buffer[6]; // it always 0 but you never know -+ adapter_index = buffer[7]; // adapter index can be 0,1,2 -+ ca_mask = (1 << adapter_index); // use adapter_index as ca_mask (used as index for ca_fd[] array) -+ } - - demux[demux_id].program_number=((buffer[1] << 8) | buffer[2]); - demux[demux_id].demux_index=demux_index; -@@ -1106,10 +1115,10 @@ - cs_strncpy(demux[demux_id].pmt_file, pmtfile, sizeof(demux[demux_id].pmt_file)); - - if (program_info_length > 1 && program_info_length < length) -- dvbapi_parse_descriptor(demux_id, program_info_length-1, buffer+7); -+ dvbapi_parse_descriptor(demux_id, program_info_length-1, buffer+9); - - uint32_t es_info_length=0; -- for (i = program_info_length + 6; i < length; i += es_info_length + 5) { -+ for (i = program_info_length + 8; i < length; i += es_info_length + 5) { - int32_t stream_type = buffer[i]; - uint16_t elementary_pid = ((buffer[i + 1] & 0x1F) << 8) | buffer[i + 2]; - es_info_length = ((buffer[i + 3] & 0x0F) << 8) | buffer[i + 4]; -@@ -1301,9 +1310,10 @@ - if (pthread_mutex_trylock(&event_handler_lock) == EBUSY) - return; - -- int32_t standby_fd = open(STANDBY_FILE, O_RDONLY); -- pausecam = (standby_fd > 0) ? 1 : 0; -- if (standby_fd) close(standby_fd); -+ //int32_t standby_fd = open(STANDBY_FILE, O_RDONLY); -+ //pausecam = (standby_fd > 0) ? 1 : 0; -+ //if (standby_fd) close(standby_fd); -+ pausecam = 0; - - if (cfg.dvbapi_boxtype==BOXTYPE_IPBOX || cfg.dvbapi_pmtmode == 1) { - pthread_mutex_unlock(&event_handler_lock); ---- oscam-1.10/globals.h 2011-12-08 00:02:39.068737655 +0100 -+++ /emu/backup/oscam-1.10/globals.h 2011-12-07 23:34:38.678736793 +0100 -@@ -234,7 +234,8 @@ - #define BOXTYPE_QBOXHD 8 - #define BOXTYPE_COOLSTREAM 9 - #define BOXTYPE_NEUMO 10 --#define BOXTYPES 10 -+#define BOXTYPE_PC 11 -+#define BOXTYPES 11 - extern const char *boxdesc[]; - #endif - diff --git a/packages/addons/service/softcam/oscam/patches/oscam-6136-2-dvbapi_ca.patch b/packages/addons/service/softcam/oscam/patches/oscam-6136-2-dvbapi_ca.patch deleted file mode 100644 index 1eea1ac300..0000000000 --- a/packages/addons/service/softcam/oscam/patches/oscam-6136-2-dvbapi_ca.patch +++ /dev/null @@ -1,104 +0,0 @@ -commit 35ce4dd3c5871b5a700d4e07965d93a561299df0 -Author: Mariusz Bialonczyk -Date: Mon Dec 19 13:45:08 2011 +0100 - - Include dvbapi_ca.c functionality in oscam - -diff --git a/module-dvbapi.c b/module-dvbapi.c -index 89221b1..cfc2c41 100644 ---- a/module-dvbapi.c -+++ b/module-dvbapi.c -@@ -232,6 +232,32 @@ int32_t dvbapi_open_device(int32_t type, int32_t num, int32_t adapter) { - return dmx_fd; - } - -+int32_t dvbapi_open_netdevice(int32_t type, int32_t num, int32_t adapter) { -+ int32_t socket_fd; -+ -+ socket_fd = socket(PF_INET,SOCK_DGRAM,IPPROTO_UDP); -+ if(socket_fd==-1) { -+ cs_debug_mask(D_DVBAPI, "Failed to open socket (%d %s)", errno, strerror(errno)); -+ } -+ else { -+ struct sockaddr_in saddr; -+ fcntl(socket_fd,F_SETFL,O_NONBLOCK); -+ bzero(&saddr,sizeof(saddr)); -+ saddr.sin_family = AF_INET; -+ saddr.sin_port = htons(PORT + adapter); // port = PORT + adapter number -+ saddr.sin_addr.s_addr = inet_addr("127.0.0.1"); -+ int r = connect(socket_fd, (struct sockaddr *) &saddr, sizeof(saddr)); -+ if (r<0) { -+ cs_debug_mask(D_DVBAPI, "Failed to connect socket (%d %s), at localhost, port=%d", errno, strerror(errno), PORT + adapter); -+ close(socket_fd); -+ socket_fd=-1; -+ } -+ } -+ -+ cs_debug_mask(D_DVBAPI, "NET DEVICE open (port = %d) fd %d", PORT + adapter, socket_fd); -+ return socket_fd; -+} -+ - int32_t dvbapi_stop_filter(int32_t demux_index, int32_t type) { - int32_t g; - -@@ -515,16 +541,21 @@ void dvbapi_set_pid(int32_t demux_id, int32_t num, int32_t index) { - for (i=0;i<8;i++) { - if (demux[demux_id].ca_mask & (1 << i)) { - if (ca_fd[i]<=0) -- ca_fd[i]=dvbapi_open_device(1, i, demux[demux_id].adapter_index); -+ ca_fd[i]=dvbapi_open_netdevice(1, i, demux[demux_id].adapter_index); - if (ca_fd[i]>0) { - ca_pid_t ca_pid2; - memset(&ca_pid2,0,sizeof(ca_pid2)); - ca_pid2.pid = demux[demux_id].STREAMpids[num]; - ca_pid2.index = index; -- if (ioctl(ca_fd[i], CA_SET_PID, &ca_pid2)==-1) -- cs_debug_mask(D_DVBAPI, "Error CA_SET_PID pid=0x%04x index=%d (errno=%d %s)", ca_pid2.pid, ca_pid2.index, errno, strerror(errno)); -- else -- cs_debug_mask(D_DVBAPI, "CA_SET_PID pid=0x%04x index=%d", ca_pid2.pid, ca_pid2.index); -+ -+ int request=CA_SET_PID; -+ send(ca_fd[i],(void*)&request, sizeof(request), 0); -+ send(ca_fd[i],(void*)&ca_pid2, sizeof(ca_pid2), 0); -+ -+// if (ioctl(ca_fd[i], CA_SET_PID, &ca_pid2)==-1) -+// cs_debug_mask(D_DVBAPI, "Error CA_SET_PID pid=0x%04x index=%d (errno=%d %s)", ca_pid2.pid, ca_pid2.index, errno, strerror(errno)); -+// else -+// cs_debug_mask(D_DVBAPI, "CA_SET_PID pid=0x%04x index=%d", ca_pid2.pid, ca_pid2.index); - } - } - } -@@ -1836,13 +1867,17 @@ static void dvbapi_write_cw(int32_t demux_id, uchar *cw, int32_t index) { - if (demux[demux_id].ca_mask & (1 << i)) { - cs_debug_mask(D_DVBAPI, "write cw%d index: %d (ca%d)", n, ca_descr.index, i); - if (ca_fd[i]<=0) { -- ca_fd[i]=dvbapi_open_device(1, i, demux[demux_id].adapter_index); -+ ca_fd[i]=dvbapi_open_netdevice(1, i, demux[demux_id].adapter_index); - if (ca_fd[i]<=0) - return; - } - -- if (ioctl(ca_fd[i], CA_SET_DESCR, &ca_descr) < 0) -- cs_debug_mask(D_DVBAPI, "Error CA_SET_DESCR"); -+ int request=CA_SET_DESCR; -+ send(ca_fd[i],(void*)&request, sizeof(request), 0); -+ send(ca_fd[i],(void*)&ca_descr, sizeof(ca_descr), 0); -+ -+// if (ioctl(ca_fd[i], CA_SET_DESCR, &ca_descr) < 0) -+// cs_debug_mask(D_DVBAPI, "Error CA_SET_DESCR"); - } - } - #endif -diff --git a/module-dvbapi.h b/module-dvbapi.h -index 2802b03..8720b01 100644 ---- a/module-dvbapi.h -+++ b/module-dvbapi.h -@@ -16,6 +16,8 @@ - #define STAPI 2 - #define COOLAPI 3 - -+#define PORT 9000 -+ - #define TMPDIR "/tmp/" - #define STANDBY_FILE "/tmp/.pauseoscam" - #define ECMINFO_FILE "/tmp/ecm.info" From ea16ed6c1e9bd0f51954036e0fcf7972fd792bd6 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 3 Mar 2012 18:14:26 +0200 Subject: [PATCH 10/13] oscam: bump version --- packages/addons/service/softcam/oscam/changelog.txt | 3 +++ packages/addons/service/softcam/oscam/meta | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/softcam/oscam/changelog.txt b/packages/addons/service/softcam/oscam/changelog.txt index b9bfa0daac..483f29e91e 100644 --- a/packages/addons/service/softcam/oscam/changelog.txt +++ b/packages/addons/service/softcam/oscam/changelog.txt @@ -1,3 +1,6 @@ +2.0.3 +- add pcsc reader support + 2.0.2 - add possibilty to start / stop addon from addon manager with enable / disable diff --git a/packages/addons/service/softcam/oscam/meta b/packages/addons/service/softcam/oscam/meta index 902bf1421c..cd700292e8 100644 --- a/packages/addons/service/softcam/oscam/meta +++ b/packages/addons/service/softcam/oscam/meta @@ -21,7 +21,7 @@ PKG_NAME="oscam" PKG_VERSION="6472" -PKG_REV="2" +PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://streamboard.gmc.to/wiki/index.php/OSCam/en" From a18d1a166d8e894f47fa9556168deafe4d289ae3 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 3 Mar 2012 19:16:21 +0200 Subject: [PATCH 11/13] pcsc-lite: remove install script. not needed --- packages/3rdparty/system/pcsc-lite/install | 42 ---------------------- 1 file changed, 42 deletions(-) delete mode 100755 packages/3rdparty/system/pcsc-lite/install diff --git a/packages/3rdparty/system/pcsc-lite/install b/packages/3rdparty/system/pcsc-lite/install deleted file mode 100755 index c915cfae65..0000000000 --- a/packages/3rdparty/system/pcsc-lite/install +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ - - cp -Pa $PKG_BUILD/src/pcscd $ADDON_BUILD/$PKG_ADDON_ID/bin/pcscd.bin - - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -Pa $PKG_BUILD/src/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -Pa $PKG_BUILD/src/spy/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib - - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial - cp -Pa $BUILD/libccid-*/src/.libs/libccidtwin.so $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial - - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/drivers/ifd-ccid.bundle/Contents/Linux/ - cp -Pa $BUILD/libccid-*/src/.libs/libccid.so $ADDON_BUILD/$PKG_ADDON_ID/drivers/ifd-ccid.bundle/Contents/Linux/ - cp -Pa $BUILD/libccid-*/src/Info.plist $ADDON_BUILD/$PKG_ADDON_ID/drivers/ifd-ccid.bundle/Contents - - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config - cp -Pa $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/ From 617edb67251e62954f91ba197870c62c41d87731 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 5 Mar 2012 17:18:13 +0200 Subject: [PATCH 12/13] libccid: use autoreconf --- packages/3rdparty/lib/libccid/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/lib/libccid/meta b/packages/3rdparty/lib/libccid/meta index 804b3af16d..5d6d5d7a2a 100644 --- a/packages/3rdparty/lib/libccid/meta +++ b/packages/3rdparty/lib/libccid/meta @@ -32,4 +32,4 @@ PKG_SECTION="driver" PKG_SHORTDESC="CCID free software driver" PKG_LONGDESC="CCID free software driver" PKG_IS_ADDON="no" -PKG_AUTORECONF="no" +PKG_AUTORECONF="yes" From 53c31f49b6ee0e1b735c91df241d91f3f9a6e4e3 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 5 Mar 2012 17:21:40 +0200 Subject: [PATCH 13/13] pcsc-lite: use autoreconf --- packages/3rdparty/system/pcsc-lite/meta | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/3rdparty/system/pcsc-lite/meta b/packages/3rdparty/system/pcsc-lite/meta index ae1ec2330b..2adb8f57a3 100644 --- a/packages/3rdparty/system/pcsc-lite/meta +++ b/packages/3rdparty/system/pcsc-lite/meta @@ -33,6 +33,4 @@ PKG_SECTION="service/system" PKG_SHORTDESC="Middleware to access a smart card using SCard API (PC/SC)" PKG_LONGDESC="Middleware to access a smart card using SCard API (PC/SC)" PKG_IS_ADDON="yes" -PKG_AUTORECONF="no" - -PKG_AUTORECONF="no" +PKG_AUTORECONF="yes"