From d9501be768db8497cc9eb03a59b70fba786cc799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 13 Jul 2022 14:01:40 +0200
Subject: [PATCH 1/2] New package: gnupg-smartcard-udev-rules-0.0.20210106

---
 srcpkgs/gnupg-smartcard-udev-rules/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/gnupg-smartcard-udev-rules/template

diff --git a/srcpkgs/gnupg-smartcard-udev-rules/template b/srcpkgs/gnupg-smartcard-udev-rules/template
new file mode 100644
index 000000000000..1dfbfc0a6042
--- /dev/null
+++ b/srcpkgs/gnupg-smartcard-udev-rules/template
@@ -0,0 +1,18 @@
+# Template file for 'gnupg-smartcard-udev-rules'
+pkgname=gnupg-smartcard-udev-rules
+version=0.0.20210106
+revision=1
+_commit=6cb4406c7d6962e793da0dc84ab78f186cb8fa6e
+build_style=fetch
+short_desc="GnuPG udev rules for use with OpenPGP smartcards"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://salsa.debian.org/debian/gnupg2/-/blob/debian/unstable/debian/scdaemon.udev"
+distfiles="https://salsa.debian.org/debian/gnupg2/-/raw/${_commit}/debian/scdaemon.udev"
+checksum=23e36cb8381df9461b73abdab838dbc927a475fb22b14dd53b7f8192ccdd6023
+
+do_install() {
+	sed -r 's/(, ENV\{.+\}=\".+\")+$/, GROUP="plugdev", TAG+="uaccess"/gm' -i scdaemon.udev
+	vsed -e "s/ATTR/ATTRS/g" -i scdaemon.udev
+	vinstall scdaemon.udev 644 /usr/lib/udev/rules.d/ 60-scdaemon.rules
+}

From 2606e8b4ae1b8eee1425c7cd86f56ca31e195a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 13 Jul 2022 16:28:51 +0200
Subject: [PATCH 2/2] gnupg: add dep to smartcard udev rules and INSTALL.msg

---
 srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg | 5 +++++
 srcpkgs/gnupg/template                    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg

diff --git a/srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg b/srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg
new file mode 100644
index 000000000000..f60058947191
--- /dev/null
+++ b/srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg
@@ -0,0 +1,5 @@
+GnuPG 2.3 changes the behaviour of scdaemon. While GnuPG 2.2 had a fallback to
+PC/SC when the internal CCID driver didn't work, the fallback now has to be
+explicitly configured by disabling the internal CCID driver. If you've not
+explicitly enabled pcscd, you shouldn't need to do anything. For more details,
+see https://docs.voidlinux.org/config/openpgp/gnupg-smartcards.html
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f16d68e0c541..4e1e75990220 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,7 +1,7 @@
 # Template file for 'gnupg'
 pkgname=gnupg
 version=2.3.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable ldap)
  --with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr
@@ -44,7 +44,7 @@ gnupg2_package() {
 }
 
 gnupg2-scdaemon_package() {
-	depends="${sourcepkg}>=${version}_${revision} libpcsclite"
+	depends="${sourcepkg}>=${version}_${revision} libpcsclite gnupg-smartcard-udev-rules"
 	short_desc+=" - smartcard daemon"
 	pkg_install() {
 		vmove usr/libexec/scdaemon