From 0b824a86406ab843ebad1cfc2e39454cf486ec32 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 26 Apr 2025 04:15:10 +0100 Subject: [PATCH] pcsc-lite: update to version 2.3.3 2.3.3: Ludovic Rousseau 2 April 2025 - Make polkit rules work again (bug introduced in 2.3.2) 2.3.2: Ludovic Rousseau 26 March 2025 - Hardening systemd pcscd.service file - pcscd.service: add missing Requires=polkit.service - pcsc-spy: add missing PCSCv2_PART10_PROPERTY_* definitions - Support udev PCSCLITE_IGNORE property to filter readers - debuglog: force use of colors when --color is used - Some other minor improvements 2.3.1: Ludovic Rousseau 24 December 2024 - Install a default /etc/default/pcscd file - auth.c: implement polkit support for FreeBSD - meson: . also build static version of libpcsclite . add options to disable polkit and libsystemd . add "filter_names" in features when needed - Doxygen: document dwCurrentState use for "\\?PnP?\Notification" - Some other minor improvements 2.3.0: Ludovic Rousseau 3 August 2024 - SCardGetStatusChange(): add the number of reader events - Add Appstream metainfo announcing HW support - meson: specify minimum meson version to use - fix formats under musl libc - Send libpcsclite.so logs to stderr instead of stdout - Some other minor improvements Signed-off-by: Daniel Golle --- utils/pcsc-lite/Makefile | 8 +-- utils/pcsc-lite/patches/010-format.patch | 77 ------------------------ 2 files changed, 4 insertions(+), 81 deletions(-) delete mode 100644 utils/pcsc-lite/patches/010-format.patch diff --git a/utils/pcsc-lite/Makefile b/utils/pcsc-lite/Makefile index 32258ebf9e..57ec73903f 100644 --- a/utils/pcsc-lite/Makefile +++ b/utils/pcsc-lite/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcsc-lite -PKG_VERSION:=2.2.3 -PKG_RELEASE:=3 +PKG_VERSION:=2.3.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://pcsclite.apdu.fr/files/ -PKG_HASH:=cab1e62755713f62ce1b567954dbb0e9a7e668ffbc3bbad3ce85c53f8f4e00a4 +PKG_HASH:=cdff7d7153a0b37aa74e26dfec89ec7dc5c5286aa21b91b903e38739d227e8e7 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING @@ -79,7 +79,7 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/PCSC/* $(1)/usr/include/PCSC/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcsclite.{a,so*} $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcsclite_real.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcsclite_real.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpcsclite.pc $(1)/usr/lib/pkgconfig/ endef diff --git a/utils/pcsc-lite/patches/010-format.patch b/utils/pcsc-lite/patches/010-format.patch deleted file mode 100644 index 79354add3b..0000000000 --- a/utils/pcsc-lite/patches/010-format.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 2c82451650e0fe781cee6728c3ceef4cb3161562 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Sat, 29 Jun 2024 17:05:33 -0700 -Subject: [PATCH] pcsc-lite: fix formats under musl - -pthread_t is a pointer on musl libc. - -../src/debuglog.c: In function 'log_line': -../src/debuglog.c:279:40: error: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'pthread_t' {aka 'struct __pthread *'} [-Werror=format=] - 279 | printf("%s%.8d%s [" THREAD_FORMAT "] %s%s%s, %s%s%s\n", - | ^~~~~~~~~~~~ - 280 | time_pfx, delta, time_sfx, thread_id, - | ~~~~~~~~~ - | | - | pthread_t {aka struct __pthread *} -../src/debuglog.c:268:26: note: format string is defined here - 268 | #define THREAD_FORMAT "%lu" - | ~~^ - | | - | long unsigned int -../src/debuglog.c:285:40: error: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'pthread_t' {aka 'struct __pthread *'} [-Werror=format=] - 285 | printf("%s%.8d%s [" THREAD_FORMAT "] %s%s%s\n", - | ^~~~~~~~~~~~ - 286 | time_pfx, delta, time_sfx, thread_id, - | ~~~~~~~~~ - | | - | pthread_t {aka struct __pthread *} -../src/debuglog.c:268:26: note: format string is defined here - 268 | #define THREAD_FORMAT "%lu" - | ~~^ - | | - | long unsigned int -cc1: some warnings being treated as errors -ninja: build stopped: subcommand failed. - -Signed-off-by: Rosen Penev ---- - src/debuglog.c | 6 +++--- - src/spy/libpcscspy.c | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - ---- a/src/debuglog.c -+++ b/src/debuglog.c -@@ -262,10 +262,10 @@ static void log_line(const int priority, - break; - } - --#ifdef __APPLE__ --#define THREAD_FORMAT "%p" --#else -+#ifdef __GLIBC__ - #define THREAD_FORMAT "%lu" -+#else -+#define THREAD_FORMAT "%p" - #endif - if (rv_text) - { ---- a/src/spy/libpcscspy.c -+++ b/src/spy/libpcscspy.c -@@ -121,7 +121,7 @@ static void spy_line_direct(char *line) - if (Log_fd < 0) - return; - -- snprintf(threadid, sizeof threadid, "%lX@", pthread_self()); -+ snprintf(threadid, sizeof threadid, "%lX@", (unsigned long)pthread_self()); - pthread_mutex_lock(&Log_fd_mutex); - r = write(Log_fd, threadid, strlen(threadid)); - r = write(Log_fd, line, strlen(line)); -@@ -150,7 +150,7 @@ static void spy_line(const char *fmt, .. - printf("libpcsc-spy: Buffer is too small!\n"); - return; - } -- snprintf(threadid, sizeof threadid, "%lX@", pthread_self()); -+ snprintf(threadid, sizeof threadid, "%lX@", (unsigned long)pthread_self()); - pthread_mutex_lock(&Log_fd_mutex); - r = write(Log_fd, threadid, strlen(threadid)); - r = write(Log_fd, line, size); -- 2.30.2