sys-apps/pcsc-lite: Sync with Gentoo

It's from Gentoo commit a8a86dfb03b98f37ac0e3463396dc3be5801055c.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot 2026-03-02 07:29:16 +00:00 committed by Krzesimir Nowak
parent d72d4afc62
commit 2bf5357565
6 changed files with 24 additions and 67 deletions

View File

@ -1,2 +1,3 @@
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
DIST pcsc-lite-2.4.1.tar.xz 212412 BLAKE2B c26f0e4999a35588b30ed6835c1bb12d7cec96e34a7ee2e71a29f601eb8b64ce59963fd2a2645a646d2f6432fc4de27177c01536d3d36c04f5a961b9888f665c SHA512 e35924b0f983aaa4b0b5f7b9e59d09609ea8c83e94137c8c985e5d6fff1ca9c6a52a742306edd3cd72f5c14fc9cb0a22b86c0f3f23f4836d3d01a2ccb8f1b4e5
DIST pcsc-lite-2.4.1.tar.xz.asc 833 BLAKE2B 4a80654899695d3ee171ff2f756df0292648d6810248ffef3237af475b22c5d555b302c1a94e75804818bb02087e6809bcaecd34f74de95b52e97d79df07b2cc SHA512 2fcb3fa97e1a002ec1228719447f0d904b2acf6449a2eea90380aa1cfaa0bfe890b194969cfb83edf9e117c9d7f41c70c24ca9303c4afd0d631766a10521a107

View File

@ -1,20 +0,0 @@
Index: pcsc-lite-1.8.11/doc/org.debian.pcsc-lite.policy
===================================================================
--- pcsc-lite-1.8.11.orig/doc/org.debian.pcsc-lite.policy
+++ pcsc-lite-1.8.11/doc/org.debian.pcsc-lite.policy
@@ -15,6 +15,7 @@
<allow_inactive>auth_admin</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
+ <annotate key="org.freedesktop.policykit.owner">unix-user:pcscd</annotate>
</action>
<action id="org.debian.pcsc-lite.access_card">
@@ -25,6 +26,7 @@
<allow_inactive>auth_admin</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
+ <annotate key="org.freedesktop.policykit.owner">unix-user:pcscd</annotate>
</action>
</policyconfig>

View File

@ -1,18 +0,0 @@
Don't run the daemon as root
https://bugs.gentoo.org/545390
--- a/etc/pcscd.service.in
+++ b/etc/pcscd.service.in
@@ -4,9 +4,12 @@
Documentation=man:pcscd(8)
[Service]
+PIDFile=/run/pcscd/pcscd.pid
ExecStart=@sbindir_exp@/pcscd --foreground --auto-exit $PCSCD_ARGS
ExecReload=@sbindir_exp@/pcscd --hotplug
EnvironmentFile=-@sysconfdir@/default/pcscd
+User=pcscd
+Group=pcscd
[Install]
Also=pcscd.socket

View File

@ -1,13 +0,0 @@
diff --git a/meson.build b/meson.build
index acb51ddf..0c7b3a8f 100644
--- a/meson.build
+++ b/meson.build
@@ -202,7 +202,7 @@ install_data('src/spy/pcsc-spy',
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'],

View File

@ -1,4 +1,4 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@ -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 ~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.

View File

@ -1,21 +1,24 @@
# 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} )
inherit meson-multilib python-single-r1 tmpfiles udev
PYTHON_COMPAT=( python3_{11..13} )
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ludovicrousseau.asc
inherit meson-multilib python-single-r1 tmpfiles udev verify-sig
DESCRIPTION="PC/SC Architecture smartcard middleware library"
HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.xz"
SRC_URI="
https://pcsclite.apdu.fr/files/${P}.tar.xz
verify-sig? ( https://pcsclite.apdu.fr/files/${P}.tar.xz.asc )
"
# GPL-2 is there for the init script; everything else comes from
# 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 ~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 +34,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
verify-sig? ( sec-keys/openpgp-keys-ludovicrousseau )
"
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-sysusers-fixup.patch
)
multilib_src_configure() {