Skip to contentSkip to conversation

package/pcsc-lite: bump version to 2.5.2

PATCH Applied Yegor Yefremov via buildroot 1 participant 2 messages Sep 28

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/pcsc-lite: bump version to 2.5.2

From: Yegor Yefremov <[email protected]>

Autotools support was removed upstream in 2.5.0, so switch to the meson build system:
- the tarball is now only provided as .tar.xz
- --disable-strict has no meson equivalent and is dropped
- there is no debugatr option anymore, so define ATR_DEBUG via CFLAGS
- pass -latomic via LDFLAGS instead of LIBS
- meson installs the systemd units into the user unit directory by default, so pass -Dsystemdunit=system to keep them in the system unit directory as before

Since 2.4.0, pcscd.service runs pcscd as the unprivileged pcscd user, so add it to the users table.

COPYING hash changed because doc/example/pcsc_demo.c was removed from the list of GPL-3.0+ files; Buildroot already listed it as BSD-3-Clause.

https://github.com/LudovicRousseau/PCSC/blob/2.5.2/ChangeLog

Assisted-by Claude:claude-opus-5-5
---
 package/pcsc-lite/pcsc-lite.hash |  4 ++--
 package/pcsc-lite/pcsc-lite.mk   | 34 +++++++++++++++++++-------------
 2 files changed, 22 insertions(+), 16 deletions(-)
package/pcsc-lite/pcsc-lite.hash +2 -2
index 806792faee..eab6397438 100644
@@ -1,4 +1,4 @@
 # Locally calculated
-sha256  85cab61cc744c81e2bc432656863293b8428d0136f079e3b12a84b335b5b35aa  pcsc-lite-2.1.0.tar.bz2
-sha256  40d4358bb8dc8d30f5365ae6d999b6f820bbc051b292912482f2e4d0ebd837e1  COPYING
+sha256  60a08942d8c00a1d86a3bf4c64eddbf7a5569c7c54f6904e3f07801bb5316acd  pcsc-lite-2.5.2.tar.xz
+sha256  7dffe53fb02dd12a3518335d9c948484ee91ca098f1fac2ee9f9af639bbde7c9  COPYING
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  GPL-3.0.txt
package/pcsc-lite/pcsc-lite.mk +20 -14
index 8418d6a32a..a3a8fff323 100644
@@ -4,56 +4,62 @@
 #
 ################################################################################
 
-PCSC_LITE_VERSION = 2.1.0
-PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
+PCSC_LITE_VERSION = 2.5.2
+PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.xz
 PCSC_LITE_SITE = https://pcsclite.apdu.fr/files
 PCSC_LITE_INSTALL_STAGING = YES
 PCSC_LITE_DEPENDENCIES = host-pkgconf host-flex
 PCSC_LITE_LICENSE = BSD-2-Clause (auth), BSD-3-Clause, GPL-3.0+ (spy, tests), ISC (simclist)
 PCSC_LITE_LICENSE_FILES = COPYING GPL-3.0.txt
 PCSC_LITE_SELINUX_MODULES = pcscd
-PCSC_LITE_CONF_OPTS = --disable-strict
+PCSC_LITE_CONF_OPTS = -Dsystemdunit=system
 
 # - libudev and libusb are optional
 # - libudev and libusb can't be used together
 # - libudev has a priority over libusb
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-PCSC_LITE_CONF_OPTS += --enable-libudev --disable-libusb
+PCSC_LITE_CONF_OPTS += -Dlibudev=true -Dlibusb=false
 PCSC_LITE_DEPENDENCIES += udev
 else
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
-PCSC_LITE_CONF_OPTS += --enable-libusb --disable-libudev
+PCSC_LITE_CONF_OPTS += -Dlibusb=true -Dlibudev=false
 PCSC_LITE_DEPENDENCIES += libusb
 else
-PCSC_LITE_CONF_OPTS += --disable-libusb --disable-libudev
+PCSC_LITE_CONF_OPTS += -Dlibusb=false -Dlibudev=false
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
-PCSC_LITE_CONF_OPTS += --enable-libsystemd
+PCSC_LITE_CONF_OPTS += -Dlibsystemd=true
 PCSC_LITE_DEPENDENCIES += systemd
 else
-PCSC_LITE_CONF_OPTS += --disable-libsystemd
+PCSC_LITE_CONF_OPTS += -Dlibsystemd=false
 endif
 
 ifeq ($(BR2_PACKAGE_PCSC_LITE_DEBUGATR),y)
-PCSC_LITE_CONF_OPTS += --enable-debugatr
+PCSC_LITE_CFLAGS = $(TARGET_CFLAGS) -DATR_DEBUG
 endif
 
 ifeq ($(BR2_PACKAGE_PCSC_LITE_EMBEDDED),y)
-PCSC_LITE_CONF_OPTS += --enable-embedded
+PCSC_LITE_CONF_OPTS += -Dembedded=true
+else
+PCSC_LITE_CONF_OPTS += -Dembedded=false
 endif
 
 ifeq ($(BR2_PACKAGE_POLKIT),y)
-PCSC_LITE_CONF_OPTS += --enable-polkit
+PCSC_LITE_CONF_OPTS += -Dpolkit=true
 PCSC_LITE_DEPENDENCIES += polkit
 else
-PCSC_LITE_CONF_OPTS += --disable-polkit
+PCSC_LITE_CONF_OPTS += -Dpolkit=false
 endif
 
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
-PCSC_LITE_CONF_ENV += LIBS=-latomic
+PCSC_LITE_LDFLAGS = $(TARGET_LDFLAGS) -latomic
 endif
 
-$(eval $(autotools-package))
+define PCSC_LITE_USERS
+	pcscd -1 pcscd -1 * - - - PC/SC Smart Card Daemon
+endef
+
+$(eval $(meson-package))
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 15 lines · Yegor Yefremov via buildroot

From: Yegor Yefremov <[email protected]>

Autotools support was removed upstream in 2.5.0, so switch to the meson build system:
- the tarball is now only provided as .tar.xz
- --disable-strict has no meson equivalent and is dropped
- there is no debugatr option anymore, so define ATR_DEBUG via CFLAGS
- pass -latomic via LDFLAGS instead of LIBS
- meson installs the systemd units into the user unit directory by default, so pass -Dsystemdunit=system to keep them in the system unit directory as before

Since 2.4.0, pcscd.service runs pcscd as the unprivileged pcscd user, so add it to the users table.

Quoted 8 lines

COPYING hash changed because doc/example/pcsc_demo.c was removed from the list of GPL-3.0+ files; Buildroot already listed it as BSD-3-Clause.

https://github.com/LudovicRousseau/PCSC/blob/2.5.2/ChangeLog

Assisted-by Claude:claude-opus-5-5

Applied to master, thanks!

Best regards,

Thomas Petazzoni

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot