summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/ccid/Makefile13
-rw-r--r--package/ccid/patches/patch-configure21
-rw-r--r--package/ccid/patches/patch-ltmain_sh11
3 files changed, 7 insertions, 38 deletions
diff --git a/package/ccid/Makefile b/package/ccid/Makefile
index e7750ba84..a4943716c 100644
--- a/package/ccid/Makefile
+++ b/package/ccid/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= ccid
-PKG_VERSION:= 1.4.17
+PKG_VERSION:= 1.5.5
PKG_RELEASE:= 1
-PKG_HASH:= ccdab8a9bc1ad288242d5f9ef399405e9cb96fb09caadb43e3649cbaba84c451
+PKG_HASH:= 194708f75fe369d45dd7c15e8b3e8a7db8b49cfc5557574ca2a2e76ef12ca0ca
PKG_DESCR:= generic usb ccid and iccd driver
PKG_SECTION:= app/crypto
PKG_BUILDDEP:= pcsc-lite
-PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html
-PKG_SITES:= http://distfiles.openadk.org/
+PKG_URL:= https://ccid.apdu.fr/
+PKG_SITES:= https://ccid.apdu.fr/files/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -19,14 +19,15 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,CCID,ccid,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_ARGS+= --enable-twinserial
+CONFIGURE_ARGS+= --disable-twinserial \
+ --enable-libusb
ccid-install:
$(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/* \
+ -$(CP) $(WRKINST)/usr/lib/pcsc/drivers/* \
$(IDIR_CCID)/usr/lib/pcsc/drivers
include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ccid/patches/patch-configure b/package/ccid/patches/patch-configure
deleted file mode 100644
index 7235e9ef8..000000000
--- a/package/ccid/patches/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- ccid-1.4.4.orig/configure 2011-05-13 11:19:09.000000000 +0200
-+++ ccid-1.4.4/configure 2011-07-28 10:54:49.000000000 +0200
-@@ -12207,17 +12207,8 @@ done
- # Select OS specific versions of source files.
-
-
--BUNDLE_HOST=`uname | sed -e s,/,_,`
-+BUNDLE_HOST=Linux
- DYN_LIB_EXT="so"
--case "$BUNDLE_HOST" in
--Darwin)
-- BUNDLE_HOST=MacOS
-- DYN_LIB_EXT="dylib"
-- ;;
--SunOS)
-- BUNDLE_HOST=Solaris
-- ;;
-- esac
-
- # --disable-libusb
- # Check whether --enable-libusb was given.
diff --git a/package/ccid/patches/patch-ltmain_sh b/package/ccid/patches/patch-ltmain_sh
deleted file mode 100644
index 0801e7522..000000000
--- a/package/ccid/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ccid-1.4.4.orig/ltmain.sh 2011-05-13 11:19:08.000000000 +0200
-+++ ccid-1.4.4/ltmain.sh 2011-07-27 11:54:42.000000000 +0200
-@@ -5840,7 +5840,7 @@ func_mode_link ()
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"