[patch] Provide merged udev rule with OpenRC helper

pcsc-lite-1.8.25-systemd.patch (text/plain), 2.17 KB, created by Michael Weiser on 2019-10-08 08:29:26 UTC

diff -urN /usr/portage/sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules ./files/99-pcscd-hotplug.rules
--- /usr/portage/sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules	2017-02-28 21:43:13.000000000 +0100
+++ ./files/99-pcscd-hotplug.rules	2019-10-08 10:01:39.492980004 +0200
@@ -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 -urN /usr/portage/sys-apps/pcsc-lite/files/pcscd-udev ./files/pcscd-udev
--- /usr/portage/sys-apps/pcsc-lite/files/pcscd-udev	1970-01-01 01:00:00.000000000 +0100
+++ ./files/pcscd-udev	2019-10-08 10:01:02.560211460 +0200
@@ -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 -urN /usr/portage/sys-apps/pcsc-lite/pcsc-lite-1.8.25.ebuild ./pcsc-lite-1.8.25.ebuild
--- /usr/portage/sys-apps/pcsc-lite/pcsc-lite-1.8.25.ebuild	2019-05-08 11:39:53.000000000 +0200
+++ ./pcsc-lite-1.8.25.ebuild	2019-10-08 10:12:13.507441762 +0200
@@ -69,6 +69,9 @@
 	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 @@
 	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 "it by setting this variable in /etc/rc.conf:"
 		elog ""
 		elog "    rc_hotplug=\"pcscd\""
 	fi