From 3de46177798f1b50d677ff2e574c471b3a6bdcdb Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
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 <stefan@saraev.ca>
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 <stefan@saraev.ca>
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
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
Ao&W#<

literal 0
HcmV?d00001

diff --git a/packages/addons/service/system/pcscd-addon/meta b/packages/addons/service/system/pcscd-addon/meta
new file mode 100755
index 0000000000..4d15b81abc
--- /dev/null
+++ b/packages/addons/service/system/pcscd-addon/meta
@@ -0,0 +1,37 @@
+################################################################################
+#      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="pcscd-addon"
+PKG_VERSION="2.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.openelec.tv"
+PKG_URL=""
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain pcsc-lite libusb libccid"
+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_ADDON_TYPE="xbmc.service"
+PKG_AUTORECONF="no"
diff --git a/packages/addons/service/system/pcscd-addon/source/bin/pcscd.start b/packages/addons/service/system/pcscd-addon/source/bin/pcscd.start
new file mode 100755
index 0000000000..d79015d41c
--- /dev/null
+++ b/packages/addons/service/system/pcscd-addon/source/bin/pcscd.start
@@ -0,0 +1,55 @@
+#!/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
+################################################################################
+
+ADDON_NAME="service.system.pcscd-addon"
+ADDON_DIR="$HOME/.xbmc/addons/$ADDON_NAME"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/$ADDON_NAME"
+
+ADDON_CONFIG_DIR="$ADDON_HOME/config"
+
+LOCKDIR="/var/lock/"
+LOCKFILE="pcscd.disabled"
+
+mkdir -p $ADDON_HOME
+
+export PATH=$ADDON_DIR/bin:$PATH
+
+cd $ADDON_DIR/config
+mkdir -p $ADDON_CONFIG_DIR
+for config in `find . -type f -name "*.conf*"`; do
+  if [ ! -f $ADDON_CONFIG_DIR/$config ]; then
+    cp $config $ADDON_CONFIG_DIR/$config
+  fi
+done
+
+if [ ! "$(pidof pcscd.bin)" ];then
+  if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
+    rm -rf "$LOCKDIR/$LOCKFILE"
+  fi
+  while [ true ] ; do
+    if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
+      break
+    fi
+    pcscd.bin --foreground -c $ADDON_CONFIG_DIR/reader.conf
+    sleep 1
+  done &
+fi
diff --git a/packages/addons/service/system/pcscd-addon/source/bin/pcscd.stop b/packages/addons/service/system/pcscd-addon/source/bin/pcscd.stop
new file mode 100755
index 0000000000..4722ea09ff
--- /dev/null
+++ b/packages/addons/service/system/pcscd-addon/source/bin/pcscd.stop
@@ -0,0 +1,30 @@
+#!/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
+################################################################################
+
+LOCKDIR="/var/lock/"
+LOCKFILE="pcscd.disabled"
+
+if [ "$(pidof pcscd.bin)" ];then
+  mkdir -p "$LOCKDIR"
+  touch "$LOCKDIR/$LOCKFILE"
+  killall -9 pcscd.bin
+fi
diff --git a/packages/addons/service/system/pcscd-addon/source/default.py b/packages/addons/service/system/pcscd-addon/source/default.py
new file mode 100755
index 0000000000..b361cbe120
--- /dev/null
+++ b/packages/addons/service/system/pcscd-addon/source/default.py
@@ -0,0 +1,44 @@
+################################################################################
+#      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
+################################################################################
+
+import os
+import sys
+import xbmcaddon
+import time
+import subprocess
+
+__scriptname__ = "PCSC lite"
+__author__     = "OpenELEC"
+__url__        = "http://www.openelec.tv"
+__settings__   = xbmcaddon.Addon(id='service.system.pcscd-addon')
+__cwd__        = __settings__.getAddonInfo('path')
+__start__      = xbmc.translatePath( os.path.join( __cwd__, 'bin', "pcscd.start") )
+__stop__       = xbmc.translatePath( os.path.join( __cwd__, 'bin', "pcscd.stop") )
+
+#make binary files executable in adson bin folder
+subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True)
+
+subprocess.Popen(__start__, shell=True, close_fds=True)
+
+while (not xbmc.abortRequested):
+  time.sleep(0.250)
+
+subprocess.Popen(__stop__, shell=True, close_fds=True)

From d1623079a9b582016c9312d7656f18aae37a2d4e Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
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 <stefan@saraev.ca>
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 <stefan@saraev.ca>
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 <stefan@saraev.ca>
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 <stefan@saraev.ca>
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 <stefan@saraev.ca>
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 <manio@skyboo.net>
-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 <stefan@saraev.ca>
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 <stefan@saraev.ca>
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 <stefan@saraev.ca>
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 <stefan@saraev.ca>
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"