From 2de10e92de1335fab8ebe9d8bfa75bb7176c25c4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 2 Feb 2026 07:30:56 +0000 Subject: [PATCH] sys-apps/pcsc-lite: Sync with Gentoo It's from Gentoo commit 4e5ad16061e49240e844f995e7dfa44d5353fe43. Signed-off-by: Flatcar Buildbot --- .../sys-apps/pcsc-lite/Manifest | 2 +- ...4.0-change-setup-spy-script-location.patch | 13 +++ .../files/pcsc-lite-2.4.0-systemd-fixes.patch | 97 +++++++++++++++++++ ...sc-lite-2.4.0-systemd-sysusers-fixup.patch | 11 +++ .../sys-apps/pcsc-lite/pcsc-lite-2.3.3.ebuild | 2 +- ...2.3.1.ebuild => pcsc-lite-2.4.0-r1.ebuild} | 24 +++-- 6 files changed, 137 insertions(+), 12 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-change-setup-spy-script-location.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-systemd-fixes.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-systemd-sysusers-fixup.patch rename sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/{pcsc-lite-2.3.1.ebuild => pcsc-lite-2.4.0-r1.ebuild} (87%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/Manifest index 166ec0a278..e02fe605c0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/Manifest @@ -1,2 +1,2 @@ -DIST pcsc-lite-2.3.1.tar.xz 209724 BLAKE2B aafcecf34a284145eecd5e3e1c9cb6bf1d4a3f9e7dad82983cee72ecbb8682480c06bb1fe025e176ca8d34f8a50ed325d41f14217ee7cd8a96b5848398c89624 SHA512 ec70ab3cf338299b3a493344c176b73450631da208714f3ac0fb4d6aa942fdc7487467b971246407fc4f1815fe5e48a0f29dcc109fb5fef838fbce7a2207d87b DIST pcsc-lite-2.3.3.tar.xz 210592 BLAKE2B 939689bde24e53d8ed1b3146c4d379192eb7c7ceb1758b66e05c1264a983e3839cacb59b69f8a852e5fc05912c3da3cc911df9ebd360fbde3f0eb88e5a52341a SHA512 96a62364eb0221828a5e3f65d500f8b83acc27cdc0c40fad2b0f807b399c1a465524421175bd7c05fa4ece152f9afe7f8b60c57ee20fa948af7d8899543a2d12 +DIST pcsc-lite-2.4.0.tar.xz 211940 BLAKE2B 2211cf0cfde8006ece93e0704b2ffbeaeea827b43eaaabfb2abb1061b76d18b407779d509f2de07784a35ae6ca254c107339c51a1d10b17ae346c387900345b3 SHA512 5b662f3902fc352cdf83b0f819fa955781cc755a977bf78a97c86178ba6c66d9c7c489af9ccaf8e534255951c12e88e80f6684af4aed3f0dcd97bba23eec5cd3 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-change-setup-spy-script-location.patch b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-change-setup-spy-script-location.patch new file mode 100644 index 0000000000..8c56b6f859 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-change-setup-spy-script-location.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 4d4d2bf..b92beb4 100644 +--- a/meson.build ++++ b/meson.build +@@ -207,7 +207,7 @@ if get_option('default_library') != 'static' + install_dir : get_option('bindir')) + + install_data('src/spy/setup_spy.sh', +- install_dir : 'share/doc/pcsc-lite') ++ install_dir : get_option('datadir') / 'doc' / meson.project_name()+'-'+meson.project_version()) + + run_command('pod2man', + ['--date=2024-01-01', 'src/spy/pcsc-spy.pod', 'pcsc-spy.1'], diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-systemd-fixes.patch b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-systemd-fixes.patch new file mode 100644 index 0000000000..0d8332cfc4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-systemd-fixes.patch @@ -0,0 +1,97 @@ +https://github.com/LudovicRousseau/PCSC/commit/504e3ba2d81d801fee45b97fbe9e7a5b0d0c24cd +https://github.com/LudovicRousseau/PCSC/commit/448dbe2aa10780775d361ad38b0dd3cd18530bec + +From 504e3ba2d81d801fee45b97fbe9e7a5b0d0c24cd Mon Sep 17 00:00:00 2001 +From: Stephan Guilloux +Date: Fri, 5 Dec 2025 16:33:29 +0100 +Subject: [PATCH] systemd Fails to parse boolean value. + +My host is installed with a Rocky Linux 9.x +It should be the same with other distros. + +When PCSC is started, I can observe the following in /var/log/messages: +``` +... +Dec 05 16:22:43 Host-9A38CE systemd[1]: /usr/lib/systemd/system/pcscd.service:32: Failed to parse boolean value, ignoring: identity + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +... +``` + +This comes from the following line, in pcscd.service: +``` +RuntimeDirectoryPreserve=true +``` + +When `true` is replaced by `yes`, the error is no more seen. +By the way, the rest of pcscd.service is already using `yes`. +--- + etc/pcscd.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/pcscd.service.in b/etc/pcscd.service.in +index 14ab8442..874a03dc 100644 +--- a/etc/pcscd.service.in ++++ b/etc/pcscd.service.in +@@ -10,7 +10,7 @@ ExecReload=@sbindir_exp@/pcscd --hotplug + EnvironmentFile=-@sysconfdir@/default/pcscd + User=pcscd + RuntimeDirectory=pcscd +-RuntimeDirectoryPreserve=true ++RuntimeDirectoryPreserve=yes + PIDFile=@ipcdir@/pcscd.pid + + # Paths + +From 448dbe2aa10780775d361ad38b0dd3cd18530bec Mon Sep 17 00:00:00 2001 +From: Ludovic Rousseau +Date: Wed, 10 Dec 2025 15:55:29 +0100 +Subject: [PATCH] meson: install systemd files even if libsystemd is not used + +--- + meson.build | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 4d4d2bf9..1b2926f4 100644 +--- a/meson.build ++++ b/meson.build +@@ -127,11 +127,19 @@ if get_option('polkit') + features += 'polkit' + endif + ++systemdunit = get_option('systemdunit') + if get_option('libsystemd') + systemd_dep = dependency('libsystemd') + pcscd_dep += systemd_dep + conf_data.set('USE_LIBSYSTEMD', true) + features += 'systemd' ++ ++ systemd = dependency('systemd') ++ systemdsystemunitdir = systemd.get_variable(pkgconfig : 'systemd' + systemdunit + 'unitdir') ++ sysusersdir = systemd.get_variable(pkgconfig : 'sysusersdir') ++else ++ systemdsystemunitdir = get_option('prefix') / 'lib' / 'systemd' / systemdunit ++ sysusersdir = get_option('prefix') / 'sysusers.d' + endif + + # architecture +@@ -291,11 +299,6 @@ configure_file(output : 'pcsclite.h', + configure_file(output : 'pcscd.h', + input : 'src/pcscd.h.in', + configuration : confgen_data) +-if get_option('libsystemd') +- systemd = dependency('systemd') +- unit = get_option('systemdunit') +- systemdsystemunitdir = systemd.get_variable(pkgconfig : 'systemd' + unit + 'unitdir') +- sysusersdir = systemd.get_variable(pkgconfig : 'sysusersdir') + configure_file(output : 'pcscd.socket', + input : 'etc/pcscd.socket.in', + install_dir : systemdsystemunitdir, +@@ -306,7 +309,6 @@ configure_file(output : 'pcscd.service', + configuration : confgen_data) + install_data('etc/pcscd-sysusers.conf', + install_dir : sysusersdir) +-endif + configure_file(output : 'pcscd.8', + input : 'doc/pcscd.8.in', + install_dir : join_paths(get_option('mandir'), 'man8'), diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-systemd-sysusers-fixup.patch b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-systemd-sysusers-fixup.patch new file mode 100644 index 0000000000..0504123d89 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-systemd-sysusers-fixup.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -139,7 +139,7 @@ if get_option('libsystemd') + sysusersdir = systemd.get_variable(pkgconfig : 'sysusersdir') + else + systemdsystemunitdir = get_option('prefix') / 'lib' / 'systemd' / systemdunit +- sysusersdir = get_option('prefix') / 'sysusers.d' ++ sysusersdir = get_option('prefix') / 'lib' / 'sysusers.d' + endif + + # architecture diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.3.ebuild index daa668d954..e06a0399a2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.xz" # upstream. LICENSE="BSD GPL-3+ BSD-2 ISC GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos" # This is called libusb so that it doesn't fool people in thinking that # it is _required_ for USB support. Otherwise they'll disable udev and # that's going to be worse. diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.4.0-r1.ebuild similarity index 87% rename from sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.4.0-r1.ebuild index daa668d954..f96a1d3e28 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.4.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit meson-multilib python-single-r1 tmpfiles udev @@ -15,7 +15,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.xz" # upstream. LICENSE="BSD GPL-3+ BSD-2 ISC GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos" # This is called libusb so that it doesn't fool people in thinking that # it is _required_ for USB support. Otherwise they'll disable udev and # that's going to be worse. @@ -31,17 +31,21 @@ DEPEND=" acct-group/openct acct-group/pcscd acct-user/pcscd - ${PYTHON_DEPS}" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-pcscd )" + ${PYTHON_DEPS} +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-pcscd ) +" BDEPEND=" app-alternatives/lex - virtual/pkgconfig" + virtual/pkgconfig +" PATCHES=( - "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch - "${FILESDIR}"/${PN}-1.9.8-systemd-user.patch - "${FILESDIR}"/${PN}-2.2.3-change-setup-spy-script-location.patch + "${FILESDIR}"/${PN}-2.4.0-change-setup-spy-script-location.patch + "${FILESDIR}"/${PN}-2.4.0-systemd-fixes.patch + "${FILESDIR}"/${PN}-2.4.0-systemd-sysusers-fixup.patch ) multilib_src_configure() {