From 6d2d552b129d975cf0dd0d254f8fa63be7795a50 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Sat, 26 Apr 2025 04:24:41 +0100
Subject: [PATCH] ccid: update to version 1.6.2.

1.6.2 - 19 March 2025, Ludovic Rousseau

    Add support of
        Arculus AuthentiKey
        BHDC Reader-HHD02
        CHERRY Smart Terminal 1150
        HSIC CCID-Reader
        Ledger Flex
        SYC USB CCID Reader
        Thales RF CR2000
        TOKEN2 FIDO2 Security Key(0026)
    Give more time to initialize the ACS ACR122U
    Do not build examples and contrib by default
    meson: add missing check for pthread_condattr_setclock
    Don't assume that all notifications are NotifySlotChange
    Hide unexported functions and variables
    Some other minor improvements

1.6.1 - 5 July 2024, Ludovic Rousseau

    fix 'parse' build issues on some systems (pthread & strlcpy)
    Some other minor improvements

1.6.0 - 1 June 2024, Ludovic Rousseau

    Add support of
        Aladdin R.D. JCR SecurBio
        AvidCard CAC Smart Card Reader
        FujitsuTechnologySolutions GmbH Dual Smartcard Reader D321
        Ledger Stax
        NXP Pegoda 3
        authenton #1 (closed)- CTAP2.1
    provide files for meson build tool (replaces autoconf/automake)
    Add possibility to set/get NAD on T=1 for MEP
    multi-slots readers
        Better handling of reader removal
        Use CLOCK_MONOTONIC for timeouts
    Some other minor improvements

1.5.5 - 5 January 2024, Ludovic Rousseau

    Add support of
        Alpha-Project ANGARA Token
        Broadcom Corp 58200 (idProduct: 0x5864)
        Broadcom Corp 58200 (idProduct: 0x5865)
        Imprivata USB CCID
        KAPELSE eS-KAP-Ad
        Kapelse inSide
        KAPELSE KAP-Care
        KAPELSE KAP-eCV
        KAPELSE KAP-GO
        KAPELSE KAP-LINK2
        Kapelse KAP-Move
        Kapelse Ti-Kap
        rf IDEAS USB CCID
        SIMHUB pcsc reader
    support Kapelse readers on macOS (composite as multislot)
    Some other minor improvements

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 utils/ccid/Makefile                | 6 +++---
 utils/ccid/patches/010-macos.patch | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/utils/ccid/Makefile b/utils/ccid/Makefile
index 963552b71d..e0413565b2 100644
--- a/utils/ccid/Makefile
+++ b/utils/ccid/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ccid
-PKG_VERSION:=1.5.4
+PKG_VERSION:=1.6.2
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://ccid.apdu.fr/files/
-PKG_HASH:=6e832adc172ecdcfdee2b56f33144684882cbe972daff1938e7a9c73a64f88bf
+PKG_HASH:=41958410950157e622f9d91c9e78c7b708db74e22f71190c581d24d20564d449
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING
diff --git a/utils/ccid/patches/010-macos.patch b/utils/ccid/patches/010-macos.patch
index 7d25c0896b..114ee44457 100644
--- a/utils/ccid/patches/010-macos.patch
+++ b/utils/ccid/patches/010-macos.patch
@@ -1,11 +1,11 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -83,7 +83,7 @@ AC_CHECK_FUNCS(select strerror strncpy m
+@@ -82,7 +82,7 @@ AC_CHECK_FUNCS(strlcpy strlcat secure_ge
  # Select OS specific versions of source files.
  AC_SUBST(BUNDLE_HOST)
  AC_SUBST(DYN_LIB_EXT)
 -BUNDLE_HOST=`uname | sed -e s,/,_,`
 +BUNDLE_HOST=Linux
  DYN_LIB_EXT="so"
- case "$BUNDLE_HOST" in
- Darwin)
+ AS_CASE([$BUNDLE_HOST],
+ 	[Darwin], [BUNDLE_HOST=MacOS DYN_LIB_EXT="dylib"],