[patch] sys-apps/pcsc-lite: Provide systemd-aware udev rule

0001-sys-apps-pcsc-lite-Provide-systemd-aware-udev-rule.patch (text/plain), 2.89 KB, created by Michael Weiser on 2019-10-08 18:49:10 UTC

From dd5accbdf7c8b81b1ca48c0a0d201581d5c460e8 Mon Sep 17 00:00:00 2001
From: Michael Weiser <[e-mail]>
Date: Tue, 8 Oct 2019 20:37:39 +0200
Subject: [PATCH] sys-apps/pcsc-lite: Provide systemd-aware udev rule

Provide a systemd-aware udev rule. Move OpenRC logic to helper script
which behaves as a no-op on non-OpenRC systems.

Closes: https://bugs.gentoo.org/554118
Signed-off-by: Michael Weiser <[e-mail]>
---
 sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules |  2 +-
 sys-apps/pcsc-lite/files/pcscd-udev             | 14 ++++++++++++++
 sys-apps/pcsc-lite/pcsc-lite-1.8.25.ebuild      |  9 ++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 sys-apps/pcsc-lite/files/pcscd-udev

diff --git a/sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules b/sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules
index e6ee464344f..10c1086039e 100644
--- a/sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules
+++ b/sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules
@@ -3,4 +3,4 @@
 
 # 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", RUN+="/bin/env IN_HOTPLUG=1 /etc/init.d/pcscd --quiet start"
+ACTION=="add", ENV{PCSCD}=="1", GROUP="pcscd", TAG+="systemd", ENV{SYSTEMD_WANTS}+="pcscd.service", RUN+="pcscd.sh"
diff --git a/sys-apps/pcsc-lite/files/pcscd-udev b/sys-apps/pcsc-lite/files/pcscd-udev
new file mode 100644
index 00000000000..e6d6c734888
--- /dev/null
+++ b/sys-apps/pcsc-lite/files/pcscd-udev
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# pcscd.sh: udev external RUN script
+#
+# based on netifrc net.sh helper
+# Copyright 2007 Roy Marples <[e-mail]>
+# Distributed under the terms of the GNU General Public License v2
+
+# make sure openrc is managing services
+if [ ! -d /run/openrc ]; then
+	exit 0
+fi
+
+IN_HOTPLUG=1 /etc/init.d/pcscd --quiet start
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.25.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.25.ebuild
index 77ffad5c232..c98e45fd872 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.25.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.25.ebuild
@@ -69,6 +69,9 @@ multilib_src_install_all() {
 	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
 
 	if use udev; then
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
+
 		insinto "$(get_udevdir)"/rules.d
 		doins "${FILESDIR}"/99-pcscd-hotplug.rules
 	fi
@@ -95,9 +98,9 @@ pkg_postinst() {
 	elog "EXTRA_OPTS variable."
 	elog ""
 	if use udev; then
-		elog "Hotplug support is provided by udev rules; you only need to tell"
-		elog "the init system to hotplug it, by setting this variable in"
-		elog "/etc/rc.conf:"
+		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
-- 
2.23.0