* [gentoo-commits] repo/gentoo:master commit in: sys-apps/pcsc-lite/, sys-apps/pcsc-lite/files/
@ 2024-06-02 10:24 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2024-06-02 10:24 UTC (permalink / raw
To: gentoo-commits
commit: 823568f4fef6abcbcaef9c7c85d1b5202e2b498f
Author: Thibaud CANALE <thican <AT> thican <DOT> net>
AuthorDate: Sun Jun 2 10:22:28 2024 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 10:22:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823568f4
sys-apps/pcsc-lite: fix udev rule for pcscd hotplug, #902847
Closes: https://bugs.gentoo.org/902847
Closes: https://github.com/gentoo/gentoo/pull/36964
Signed-off-by: Thibaud CANALE <thican <AT> thican.net>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/{99-pcscd-hotplug-r1.rules => 99-pcscd-hotplug-r2.rules} | 4 ++--
.../pcsc-lite/{pcsc-lite-2.0.0.ebuild => pcsc-lite-2.0.0-r1.ebuild} | 2 +-
.../pcsc-lite/{pcsc-lite-2.0.1.ebuild => pcsc-lite-2.0.1-r1.ebuild} | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r1.rules b/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r2.rules
similarity index 55%
rename from sys-apps/pcsc-lite/files/99-pcscd-hotplug-r1.rules
rename to sys-apps/pcsc-lite/files/99-pcscd-hotplug-r2.rules
index fc612d5e25f3..218417932aa2 100644
--- a/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r1.rules
+++ b/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r2.rules
@@ -1,6 +1,6 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# We add this here so that it runs after ccid's and ifd-gempc's rules;
# if we just added a pcscd-owned device, we hotplug the pcscd service.
-ACTION=="add", ENV{PCSCD}=="1", GROUP="pcscd", TAG+="systemd", ENV{SYSTEMD_WANTS}+="pcscd.service", RUN+="pcscd.sh"
+ACTION=="add", ENV{ID_SMARTCARD_READER}=="1", GROUP="pcscd", TAG+="systemd", ENV{SYSTEMD_WANTS}+="pcscd.service", RUN+="pcscd.sh"
diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.0.0-r1.ebuild
similarity index 98%
rename from sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild
rename to sys-apps/pcsc-lite/pcsc-lite-2.0.0-r1.ebuild
index 661385f197ba..49f41d4e17ea 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-2.0.0-r1.ebuild
@@ -70,7 +70,7 @@ multilib_src_install_all() {
newexe "${FILESDIR}"/pcscd-udev pcscd.sh
insinto "$(get_udevdir)"/rules.d
- newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
+ newins "${FILESDIR}"/99-pcscd-hotplug-r2.rules 99-pcscd-hotplug.rules
fi
python_fix_shebang "${ED}"/usr/bin/pcsc-spy
diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.0.1-r1.ebuild
similarity index 98%
rename from sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild
rename to sys-apps/pcsc-lite/pcsc-lite-2.0.1-r1.ebuild
index 5d5823a7adbb..a3a1b872c2cd 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-2.0.1-r1.ebuild
@@ -70,7 +70,7 @@ multilib_src_install_all() {
newexe "${FILESDIR}"/pcscd-udev pcscd.sh
insinto "$(get_udevdir)"/rules.d
- newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
+ newins "${FILESDIR}"/99-pcscd-hotplug-r2.rules 99-pcscd-hotplug.rules
fi
python_fix_shebang "${ED}"/usr/bin/pcsc-spy
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/pcsc-lite/, sys-apps/pcsc-lite/files/
@ 2024-12-01 12:04 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-12-01 12:04 UTC (permalink / raw
To: gentoo-commits
commit: ab104752fce208d3f26b4330fa13ab3272cef752
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Thu Jul 18 03:54:56 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 1 12:03:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab104752
sys-apps/pcsc-lite: add 2.2.3
pcsc-lite now uses meson instead of autotools, so the ebuild has been modified
appropriately. Also patched a file getting installed in the wrong place.
Licensing problems fixed, as the newer version solves some no-longer-relevant bugs.
Closes: https://bugs.gentoo.org/684878
Closes: https://bugs.gentoo.org/912861
Closes: https://bugs.gentoo.org/871096
Closes: https://bugs.gentoo.org/618738
Closes: https://github.com/gentoo/gentoo/pull/35892
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37600
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/pcsc-lite/Manifest | 1 +
...te-2.2.3-change-setup-spy-script-location.patch | 13 +++
sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild | 110 +++++++++++++++++++++
3 files changed, 124 insertions(+)
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 391e8cc91436..eb76ee1fc0e9 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1 +1,2 @@
DIST pcsc-lite-2.0.1.tar.bz2 815103 BLAKE2B a9eea4a4da1a78fc22797b17c128889b2f7caf8c4aa02dd77f4ac79e4ec458fb0162578b5422552545cd39303750d5396f3687f8cfee7603fad8d60cb54ee1e8 SHA512 af007f00f43e8d897710580f6f27814c9e7d3ca489ff01edf2e3b979e46267915aa04d9c15f225a420fa681de936e42a1d4779d962717cf9a9f4a3d1ca31502b
+DIST pcsc-lite-2.3.0.tar.xz 209064 BLAKE2B 48fc1a513a217ff499e8da63e026ce6adcd37987c878a0dda50756cfac5cc64245c95715df40df14e29883410c3d55670432ba0c658eff84add25b76c1828b11 SHA512 194c175ba7cf4610f09c08d463edf12f63e8e6a694938049988efb10c91e15b05d91747d58013f2f35452427996e8fe2ffb3706806d17ee278dc4896eab901c0
diff --git a/sys-apps/pcsc-lite/files/pcsc-lite-2.2.3-change-setup-spy-script-location.patch b/sys-apps/pcsc-lite/files/pcsc-lite-2.2.3-change-setup-spy-script-location.patch
new file mode 100644
index 000000000000..035c49b653a7
--- /dev/null
+++ b/sys-apps/pcsc-lite/files/pcsc-lite-2.2.3-change-setup-spy-script-location.patch
@@ -0,0 +1,13 @@
+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'],
diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild
new file mode 100644
index 000000000000..5b9b77db7340
--- /dev/null
+++ b/sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson-multilib python-single-r1 tmpfiles udev
+
+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"
+
+# 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 ~amd64-linux ~x86-linux ~ppc-macos ~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.
+IUSE="doc embedded libusb policykit selinux systemd +udev"
+REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
+
+# No dependencies need the MULTILIB_DEPS because the libraries are actually
+# standalone, the deps are only needed for the daemon itself.
+DEPEND="
+ libusb? ( virtual/libusb:1 )
+ udev? ( virtual/libudev:= )
+ policykit? ( >=sys-auth/polkit-0.111 )
+ acct-group/openct
+ acct-group/pcscd
+ acct-user/pcscd
+ ${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-pcscd )"
+BDEPEND="
+ app-alternatives/lex
+ 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
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dusbdropdir="${EPREFIX}"/usr/$(get_libdir)/readers/usb
+ -Dipcdir=/run/pcscd
+ -Dsystemdunit=system
+ $(meson_native_use_bool embedded)
+ $(meson_native_use_bool systemd libsystemd)
+ $(meson_native_use_bool udev libudev)
+ $(meson_native_use_bool libusb)
+ $(meson_native_use_bool policykit polkit)
+ )
+
+ meson_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ dodoc HELP SECURITY
+
+ newinitd "${FILESDIR}"/pcscd-init.7 pcscd
+ dotmpfiles "${FILESDIR}"/pcscd.conf
+
+ if use udev; then
+ exeinto "$(get_udevdir)"
+ newexe "${FILESDIR}"/pcscd-udev pcscd.sh
+
+ insinto "$(get_udevdir)"/rules.d
+ newins "${FILESDIR}"/99-pcscd-hotplug-r2.rules 99-pcscd-hotplug.rules
+ fi
+
+ python_fix_shebang "${ED}"/usr/bin/pcsc-spy
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
+ elog "the pcscd group, to avoid running as root."
+ elog
+ elog "This also means you need the newest drivers available so that the"
+ elog "devices get the proper owner."
+ elog
+ elog "Furthermore, a conf.d file is no longer installed by default, as"
+ elog "the default configuration does not require one. If you need to"
+ elog "pass further options to pcscd, create a file and set the"
+ elog "EXTRA_OPTS variable."
+ elog
+
+ if use udev; then
+ elog "Hotplug support is provided by udev rules."
+ elog "When using OpenRC you additionally need to tell it to hotplug"
+ elog "pcscd by setting this variable in /etc/rc.conf:"
+ elog
+ elog " rc_hotplug=\"pcscd\""
+ fi
+
+ tmpfiles_process pcscd.conf
+
+ use udev && udev_reload
+}
+
+pkg_postrm() {
+ use udev && udev_reload
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/pcsc-lite/, sys-apps/pcsc-lite/files/
@ 2022-02-03 7:07 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-02-03 7:07 UTC (permalink / raw
To: gentoo-commits
commit: 80805d85ad317c4c9e484b68272552f6aedfc8d9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 3 07:07:39 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 3 07:07:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80805d85
sys-apps/pcsc-lite: fix build without udev/libusb
Closes: https://bugs.gentoo.org/832593
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/pcsc-lite-1.9.5-no-libusb-udev.patch | 29 ++++++++++++++++++++++
sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild | 1 +
2 files changed, 30 insertions(+)
diff --git a/sys-apps/pcsc-lite/files/pcsc-lite-1.9.5-no-libusb-udev.patch b/sys-apps/pcsc-lite/files/pcsc-lite-1.9.5-no-libusb-udev.patch
new file mode 100644
index 000000000000..2f4793b03fb4
--- /dev/null
+++ b/sys-apps/pcsc-lite/files/pcsc-lite-1.9.5-no-libusb-udev.patch
@@ -0,0 +1,29 @@
+https://github.com/LudovicRousseau/PCSC/commit/a4bdfd2eb6e908c8306fe421137a83573ba05d8c
+https://bugs.gentoo.org/832593
+
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 14 Dec 2021 08:20:59 +0100
+Subject: [PATCH] src/hotplug_generic.c: fix build without lib{udev,usb}
+
+Fix the following build failure without lib{udev,usb} raised since
+version 1.9.5 and
+https://github.com/LudovicRousseau/PCSC/commit/6f8f170db3c88c59a5ddb5ae5319b921a901a6aa:
+
+/home/giuliobenetti/autobuild/run/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: pcscd-pcscdaemon.o: in function `signal_thread':
+pcscdaemon.c:(.text+0x444): undefined reference to `HPReCheckSerialReaders'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/6cf323229f32967aa554418410dc94b7094d09af
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+--- a/src/hotplug_generic.c
++++ b/src/hotplug_generic.c
+@@ -48,7 +48,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #define FALSE 0
+ #endif
+
+-#if !defined(__APPLE__) && !defined(HAVE_LIBUSB) && !defined(__linux__) && !defined(HAVE_LIBUDEV)
++#if !defined(__APPLE__) && !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUDEV)
+
+ LONG HPSearchHotPluggables(void)
+ {
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
index 0f45e4dc5bb1..147fd36f5bc0 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
@@ -42,6 +42,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
+ "${FILESDIR}"/${P}-no-libusb-udev.patch
)
DOCS=( AUTHORS HELP README SECURITY ChangeLog )
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-01 12:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-02 10:24 [gentoo-commits] repo/gentoo:master commit in: sys-apps/pcsc-lite/, sys-apps/pcsc-lite/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-12-01 12:04 Sam James
2022-02-03 7:07 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox