[gentoo-commits] repo/gentoo:master commit in: sys-apps/pcsc-lite/, sys-apps/pcsc-lite/files/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/pcsc-lite/, sys-apps/pcsc-lite/files/

[Sam James]

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 )

[gentoo-commits] repo/gentoo:master commit in: sys-apps/pcsc-lite/, sys-apps/pcsc-lite/files/

[David Seifert]

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