diff options
| -rw-r--r-- | package/ccid/Makefile | 15 | ||||
| -rw-r--r-- | package/ccid/files/gemalto.conf (renamed from package/pcsc-lite/files/reader.conf) | 2 | ||||
| -rw-r--r-- | package/pcsc-lite/Makefile | 12 | ||||
| -rw-r--r-- | package/pcsc-lite/files/pcscd.init | 2 | ||||
| -rw-r--r-- | target/linux/patches/2.6.36/gemalto.patch | 11 |
5 files changed, 27 insertions, 15 deletions
diff --git a/package/ccid/Makefile b/package/ccid/Makefile index 87f48c483..d927c4264 100644 --- a/package/ccid/Makefile +++ b/package/ccid/Makefile @@ -4,14 +4,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:= ccid -PKG_VERSION:= 1.3.12 +PKG_VERSION:= 1.4.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7fcdbacacd955659286f988fa9b6e0be +PKG_MD5SUM:= fef5f950dc35202df2fed832498986b9 PKG_DESCR:= a generic USB CCID and ICCD driver PKG_SECTION:= crypto PKG_BUILDDEP:= pcsc-lite PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html -PKG_SITES:= https://alioth.debian.org/frs/download.php/3281/ +PKG_SITES:= http://alioth.debian.org/frs/download.php/3281/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -22,8 +22,11 @@ $(eval $(call PKG_template,CCID,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_ CONFIGURE_ARGS+= --enable-twinserial post-install: - $(INSTALL_DIR) $(IDIR_CCID)/usr/pcsc/drivers/serial - $(CP) $(WRKINST)/usr/pcsc/drivers/serial/libccidtwin.so* \ - $(IDIR_CCID)/usr/pcsc/drivers/serial + $(INSTALL_DIR) $(IDIR_CCID)/etc/reader.conf.d + $(INSTALL_DIR) $(IDIR_CCID)/usr/lib/pcsc/drivers/ + $(INSTALL_DATA) ./files/gemalto.conf \ + $(IDIR_CCID)/etc/reader.conf.d + $(CP) $(WRKINST)/usr/lib/pcsc/drivers/* \ + $(IDIR_CCID)/usr/lib/pcsc/drivers/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pcsc-lite/files/reader.conf b/package/ccid/files/gemalto.conf index f56f290fb..a033f80ac 100644 --- a/package/pcsc-lite/files/reader.conf +++ b/package/ccid/files/gemalto.conf @@ -12,5 +12,5 @@ FRIENDLYNAME "GemPCTwin serial" DEVICENAME /dev/ttyS0 -LIBPATH /usr/pcsc/drivers/serial/libccidtwin.so +LIBPATH /usr/lib/pcsc/drivers/serial/libccidtwin.so CHANNELID 0 diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile index 0f691f7f5..45e2cde8f 100644 --- a/package/pcsc-lite/Makefile +++ b/package/pcsc-lite/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pcsc-lite -PKG_VERSION:= 1.6.0 -PKG_RELEASE:= 2 -PKG_MD5SUM:= fc3fd0e83090ecc81e5b32700fa246c2 +PKG_VERSION:= 1.6.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f80d3ecd9569b71d557f283f16295c74 PKG_DESCR:= middleware for smartcards PKG_SECTION:= crypto PKG_DEPENDS:= libusb libusb-compat libpthread PKG_BUILDDEP:= libusb libusb-compat PKG_URL:= http://pcsclite.alioth.debian.org/ -PKG_SITES:= https://alioth.debian.org/frs/download.php/3279/ +PKG_SITES:= http://alioth.debian.org/frs/download.php PKG_SUBPKGS:= PCSC_LITE PCSC_LITE_DEV PKGSD_PCSC_LITE_DEV:= header files for pcsc-lite @@ -32,11 +32,9 @@ SUB_INSTALLS-m:= SUB_INSTALLS-${ADK_PACKAGE_PCSC_LITE_DEV}+= pcsc-lite-dev-install post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} - $(INSTALL_DIR) $(IDIR_PCSC_LITE)/etc + $(INSTALL_DIR) $(IDIR_PCSC_LITE)/etc/reader.conf.d $(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/sbin $(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/lib - $(INSTALL_DATA) ./files/reader.conf \ - $(IDIR_PCSC_LITE)/etc $(INSTALL_BIN) $(WRKINST)/usr/sbin/pcscd \ $(IDIR_PCSC_LITE)/usr/sbin $(CP) $(WRKINST)/usr/lib/libpcsclite.so* \ diff --git a/package/pcsc-lite/files/pcscd.init b/package/pcsc-lite/files/pcscd.init index 557762eca..5e86ae00a 100644 --- a/package/pcsc-lite/files/pcscd.init +++ b/package/pcsc-lite/files/pcscd.init @@ -1,5 +1,5 @@ #!/bin/sh -#PKG pcscd +#PKG pcsc-lite #INIT 80 . /etc/rc.conf diff --git a/target/linux/patches/2.6.36/gemalto.patch b/target/linux/patches/2.6.36/gemalto.patch new file mode 100644 index 000000000..9461d0317 --- /dev/null +++ b/target/linux/patches/2.6.36/gemalto.patch @@ -0,0 +1,11 @@ +diff -Nur linux-2.6.36.orig/drivers/serial/serial_cs.c linux-2.6.36/drivers/serial/serial_cs.c +--- linux-2.6.36.orig/drivers/serial/serial_cs.c 2010-10-20 22:30:22.000000000 +0200 ++++ linux-2.6.36/drivers/serial/serial_cs.c 2010-12-13 23:03:40.000000000 +0100 +@@ -794,6 +794,7 @@ + PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0025), + PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0045), + PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0052), ++ PCMCIA_DEVICE_MANF_CARD(0x0157, 0x0100), /* Gemalto SCR */ + PCMCIA_DEVICE_MANF_CARD(0x016c, 0x0006), /* Psion 56K+Fax */ + PCMCIA_DEVICE_MANF_CARD(0x0200, 0x0001), /* MultiMobile */ + PCMCIA_DEVICE_PROD_ID134("ADV", "TECH", "COMpad-32/85", 0x67459937, 0x916d02ba, 0x8fbe92ae), |