* [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713
@ 2022-07-13 12:03 jcgruenhage
2022-07-13 12:04 ` [PR PATCH] [Updated] " jcgruenhage
` (18 more replies)
0 siblings, 19 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-13 12:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1294 bytes --]
There is a new pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages gnupg-smartcard-udev-rules-0.0.20220713_1
https://github.com/void-linux/void-packages/pull/38037
New package: gnupg-smartcard-udev-rules-0.0.20220713
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
This partially addresses #38034.
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38037.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnupg-smartcard-udev-rules-0.0.20220713_1-38037.patch --]
[-- Type: text/x-diff, Size: 1445 bytes --]
From a040f8cfd1de7bd487f7bb99f30e489ce3fab135 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] New package: gnupg-smartcard-udev-rules-0.0.20220713
---
srcpkgs/gnupg-smartcard-udev-rules/template | 17 +++++++++++++++++
1 file changed, 17 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..c69eccab5046
--- /dev/null
+++ b/srcpkgs/gnupg-smartcard-udev-rules/template
@@ -0,0 +1,17 @@
+# Template file for 'gnupg-smartcard-udev-rules'
+pkgname=gnupg-smartcard-udev-rules
+version=0.0.20220713
+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="???"
+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
+ vinstall scdaemon.udev 644 /usr/lib/udev/rules.d/60-scdaemon.rules
+}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] New package: gnupg-smartcard-udev-rules-0.0.20220713
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
@ 2022-07-13 12:04 ` jcgruenhage
2022-07-13 12:09 ` jcgruenhage
` (17 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-13 12:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1299 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages gnupg-smartcard-udev-rules-0.0.20220713_1
https://github.com/void-linux/void-packages/pull/38037
New package: gnupg-smartcard-udev-rules-0.0.20220713
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
This partially addresses #38034.
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38037.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnupg-smartcard-udev-rules-0.0.20220713_1-38037.patch --]
[-- Type: text/x-diff, Size: 1458 bytes --]
From bdcaa9257f7e15a8b025135c2c407277c8969b5e 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] New package: gnupg-smartcard-udev-rules-0.0.20220713
---
srcpkgs/gnupg-smartcard-udev-rules/template | 17 +++++++++++++++++
1 file changed, 17 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..5214256bec3f
--- /dev/null
+++ b/srcpkgs/gnupg-smartcard-udev-rules/template
@@ -0,0 +1,17 @@
+# Template file for 'gnupg-smartcard-udev-rules'
+pkgname=gnupg-smartcard-udev-rules
+version=0.0.20220713
+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
+ vinstall scdaemon.udev 644 /usr/lib/udev/rules.d/60-scdaemon.rules
+}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] New package: gnupg-smartcard-udev-rules-0.0.20220713
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
2022-07-13 12:04 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-07-13 12:09 ` jcgruenhage
2022-07-13 12:09 ` [PR REVIEW] " jcgruenhage
` (16 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-13 12:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1299 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages gnupg-smartcard-udev-rules-0.0.20220713_1
https://github.com/void-linux/void-packages/pull/38037
New package: gnupg-smartcard-udev-rules-0.0.20220713
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
This partially addresses #38034.
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38037.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnupg-smartcard-udev-rules-0.0.20220713_1-38037.patch --]
[-- Type: text/x-diff, Size: 1458 bytes --]
From 2ef26dbb131899cbdcee37dc44b778b5b12c42fa 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] New package: gnupg-smartcard-udev-rules-0.0.20210106
---
srcpkgs/gnupg-smartcard-udev-rules/template | 17 +++++++++++++++++
1 file changed, 17 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..be05c4c6c9db
--- /dev/null
+++ b/srcpkgs/gnupg-smartcard-udev-rules/template
@@ -0,0 +1,17 @@
+# 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
+ vinstall scdaemon.udev 644 /usr/lib/udev/rules.d/60-scdaemon.rules
+}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] New package: gnupg-smartcard-udev-rules-0.0.20220713
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
2022-07-13 12:04 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-13 12:09 ` jcgruenhage
@ 2022-07-13 12:09 ` jcgruenhage
2022-07-13 14:30 ` [PR PATCH] [Updated] " jcgruenhage
` (15 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-13 12:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 374 bytes --]
New review comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/38037#discussion_r919999439
Comment:
I'd like to use vsed here, but doing so means I can't use a regex here so I'd have to write
```
, ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg"
```
instead of
```
(, ENV\{.+\}=\".+\")+$
```
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] New package: gnupg-smartcard-udev-rules-0.0.20220713
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (2 preceding siblings ...)
2022-07-13 12:09 ` [PR REVIEW] " jcgruenhage
@ 2022-07-13 14:30 ` jcgruenhage
2022-07-13 15:15 ` Add gnupg-smartcard-udev-rules and add INSTALL.msg to gnupg2-scdaemon jcgruenhage
` (14 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-13 14:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1299 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages gnupg-smartcard-udev-rules-0.0.20220713_1
https://github.com/void-linux/void-packages/pull/38037
New package: gnupg-smartcard-udev-rules-0.0.20220713
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
This partially addresses #38034.
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38037.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnupg-smartcard-udev-rules-0.0.20220713_1-38037.patch --]
[-- Type: text/x-diff, Size: 3286 bytes --]
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
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: Add gnupg-smartcard-udev-rules and add INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (3 preceding siblings ...)
2022-07-13 14:30 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-07-13 15:15 ` jcgruenhage
2022-07-13 15:18 ` jcgruenhage
` (13 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-13 15:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/38037#issuecomment-1183353968
Comment:
Because it makes dealing with the distfiles quite a bit more complicated I'd think. Unless you want me to just include the file instead of pulling it from debian and running sed over it?
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: Add gnupg-smartcard-udev-rules and add INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (4 preceding siblings ...)
2022-07-13 15:15 ` Add gnupg-smartcard-udev-rules and add INSTALL.msg to gnupg2-scdaemon jcgruenhage
@ 2022-07-13 15:18 ` jcgruenhage
2022-07-13 15:28 ` ahesford
` (12 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-13 15:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/38037#issuecomment-1183357623
Comment:
tbh, if we're going to pull in the file into files, I'd restructure the file quite a bit anyway, because it's a bit convoluted right now IMO, so it'd have it's benefits.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: Add gnupg-smartcard-udev-rules and add INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (5 preceding siblings ...)
2022-07-13 15:18 ` jcgruenhage
@ 2022-07-13 15:28 ` ahesford
2022-07-13 15:45 ` 0x5c
` (11 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ahesford @ 2022-07-13 15:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 645 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/38037#issuecomment-1183368115
Comment:
Adding a second distfile shouldn't be terribly complicated, but since you're rewriting all of the lines anyway and `sed` (or even `vsed`) could potentially break the udev rule in subtle ways, maintaining our own known-good version seems reasonable and simplifies packaging. (If you don't maintain a copy in `$FILESDIR`, I'd advocate for a proper patch so that we can detect major structural changes in the file anyway, but the patch would be about twice as large as just carrying forward our own file.)
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: Add gnupg-smartcard-udev-rules and add INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (6 preceding siblings ...)
2022-07-13 15:28 ` ahesford
@ 2022-07-13 15:45 ` 0x5c
2022-07-13 16:03 ` [PR PATCH] [Updated] " jcgruenhage
` (10 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 0x5c @ 2022-07-13 15:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/38037#issuecomment-1183388020
Comment:
I think just plonking the known-good in the files dir might be the best option
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] Add gnupg-smartcard-udev-rules and add INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (7 preceding siblings ...)
2022-07-13 15:45 ` 0x5c
@ 2022-07-13 16:03 ` jcgruenhage
2022-07-13 16:09 ` [PR PATCH] [Updated] Add udev rules and " jcgruenhage
` (9 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-13 16:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages gnupg-smartcard-udev-rules-0.0.20220713_1
https://github.com/void-linux/void-packages/pull/38037
Add gnupg-smartcard-udev-rules and add INSTALL.msg to gnupg2-scdaemon.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
This fixes #38034. There's an `INSTALL.msg` for `gnupg2-scdaemon`, informing users of the potential breakage, and for those not using pcscd, a fix is included by shipping the new udev rules.
Still draft because it depends on https://github.com/void-linux/void-docs/pull/691
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38037.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnupg-smartcard-udev-rules-0.0.20220713_1-38037.patch --]
[-- Type: text/x-diff, Size: 4070 bytes --]
From ca5a3f68170ea0ce215f2dced7c3281c837ae750 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] gnupg: add smartcard udev rules and INSTALL.msg
---
srcpkgs/gnupg/files/60-scdaemon.rules | 39 +++++++++++++++++++++++
srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg | 5 +++
srcpkgs/gnupg/template | 3 +-
3 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnupg/files/60-scdaemon.rules
create mode 100644 srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg
diff --git a/srcpkgs/gnupg/files/60-scdaemon.rules b/srcpkgs/gnupg/files/60-scdaemon.rules
new file mode 100644
index 000000000000..568bf11eedd2
--- /dev/null
+++ b/srcpkgs/gnupg/files/60-scdaemon.rules
@@ -0,0 +1,39 @@
+# do not edit this file, it will be overwritten on update
+
+SUBSYSTEM!="usb", GOTO="gnupg_rules_end"
+ACTION!="add", GOTO="gnupg_rules_end"
+
+# USB SmartCard Readers
+## Cherry GmbH (XX33, ST2000)
+ATTRS{idVendor}=="046a", ATTRS{idProduct}=="0005|0010|003e", GROUP="plugdev", TAG+="uaccess"
+## SCM Microsystems, Inc (SCR331-DI, SCR335, SCR3320, SCR331, SCR3310 and SPR532)
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5111|5115|5116|5117|e001|e003", GROUP="plugdev", TAG+="uaccess"
+## Omnikey AG (CardMan 3821, CardMan 6121)
+ATTRS{idVendor}=="076b", ATTRS{idProduct}=="3821|6622", GROUP="plugdev", TAG+="uaccess"
+## Gemalto
+ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="3437|3438|3478|34c2|34ec", GROUP="plugdev", TAG+="uaccess"
+## Reiner (SCT cyberJack)
+ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0500", GROUP="plugdev", TAG+="uaccess"
+## Kobil (KAAN)
+ATTRS{idVendor}=="0d46", ATTRS{idProduct}=="2012", GROUP="plugdev", TAG+="uaccess"
+## VASCO (DIGIPASS 920)
+ATTRS{idVendor}=="1a44", ATTRS{idProduct}=="0920", GROUP="plugdev", TAG+="uaccess"
+## Crypto Stick
+ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4107", GROUP="plugdev", TAG+="uaccess"
+## Nitrokey
+ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4108|4109|4211", GROUP="plugdev", TAG+="uaccess"
+## Librem Key
+ATTRS{idVendor}=="316d", ATTRS{idProduct}=="4c4b", GROUP="plugdev", TAG+="uaccess"
+## Gnuk Token
+ATTRS{product}=="Gnuk Token", GROUP="plugdev", TAG+="uaccess"
+ATTRS{idVendor}=="234b", ATTRS{idProduct}=="0000|2440", GROUP="plugdev", TAG+="uaccess"
+## Alcor Micro Corp cardreader (in ThinkPad X250)
+ATTRS{idVendor}=="058f", ATTRS{idProduct}=="9540", GROUP="plugdev", TAG+="uaccess"
+## Fujitsu Siemens
+ATTRS{idVendor}=="0bf8", ATTRS{idProduct}=="1006", GROUP="plugdev", TAG+="uaccess"
+## Yubico (YubiKey Neo/4/5)
+ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0111|0112|0115|0116|0404|0405|0406|0407", GROUP="plugdev", TAG+="uaccess"
+## Trustica Cryptoucan
+ATTRS{idVendor}=="1fc9", ATTRS{idProduct}=="81e6", GROUP="plugdev", TAG+="uaccess"
+
+LABEL="gnupg_rules_end"
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..ba481a10a4f9 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
@@ -49,5 +49,6 @@ gnupg2-scdaemon_package() {
pkg_install() {
vmove usr/libexec/scdaemon
vmove usr/share/man/man1/scdaemon.1
+ vinstall ${FILESDIR}/60-scdaemon.rules 644 /usr/lib/udev/rules.d
}
}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] Add udev rules and INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (8 preceding siblings ...)
2022-07-13 16:03 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-07-13 16:09 ` jcgruenhage
2022-07-13 16:38 ` [PR REVIEW] " classabbyamp
` (8 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-13 16:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1567 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages gnupg-smartcard-udev-rules-0.0.20220713_1
https://github.com/void-linux/void-packages/pull/38037
Add udev rules and INSTALL.msg to gnupg2-scdaemon.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
This fixes #38034. There's an `INSTALL.msg` for `gnupg2-scdaemon`, informing users of the potential breakage, and for those not using pcscd, a fix is included by shipping the new udev rules.
Still draft because it depends on https://github.com/void-linux/void-docs/pull/691
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38037.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnupg-smartcard-udev-rules-0.0.20220713_1-38037.patch --]
[-- Type: text/x-diff, Size: 4051 bytes --]
From 5756233f8b7a355dc8e349740b2b5e9013ee9204 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] gnupg: add smartcard udev rules and INSTALL.msg
---
srcpkgs/gnupg/files/60-scdaemon.rules | 39 +++++++++++++++++++++++
srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg | 5 +++
srcpkgs/gnupg/template | 3 +-
3 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnupg/files/60-scdaemon.rules
create mode 100644 srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg
diff --git a/srcpkgs/gnupg/files/60-scdaemon.rules b/srcpkgs/gnupg/files/60-scdaemon.rules
new file mode 100644
index 000000000000..568bf11eedd2
--- /dev/null
+++ b/srcpkgs/gnupg/files/60-scdaemon.rules
@@ -0,0 +1,39 @@
+# do not edit this file, it will be overwritten on update
+
+SUBSYSTEM!="usb", GOTO="gnupg_rules_end"
+ACTION!="add", GOTO="gnupg_rules_end"
+
+# USB SmartCard Readers
+## Cherry GmbH (XX33, ST2000)
+ATTRS{idVendor}=="046a", ATTRS{idProduct}=="0005|0010|003e", GROUP="plugdev", TAG+="uaccess"
+## SCM Microsystems, Inc (SCR331-DI, SCR335, SCR3320, SCR331, SCR3310 and SPR532)
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5111|5115|5116|5117|e001|e003", GROUP="plugdev", TAG+="uaccess"
+## Omnikey AG (CardMan 3821, CardMan 6121)
+ATTRS{idVendor}=="076b", ATTRS{idProduct}=="3821|6622", GROUP="plugdev", TAG+="uaccess"
+## Gemalto
+ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="3437|3438|3478|34c2|34ec", GROUP="plugdev", TAG+="uaccess"
+## Reiner (SCT cyberJack)
+ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0500", GROUP="plugdev", TAG+="uaccess"
+## Kobil (KAAN)
+ATTRS{idVendor}=="0d46", ATTRS{idProduct}=="2012", GROUP="plugdev", TAG+="uaccess"
+## VASCO (DIGIPASS 920)
+ATTRS{idVendor}=="1a44", ATTRS{idProduct}=="0920", GROUP="plugdev", TAG+="uaccess"
+## Crypto Stick
+ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4107", GROUP="plugdev", TAG+="uaccess"
+## Nitrokey
+ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4108|4109|4211", GROUP="plugdev", TAG+="uaccess"
+## Librem Key
+ATTRS{idVendor}=="316d", ATTRS{idProduct}=="4c4b", GROUP="plugdev", TAG+="uaccess"
+## Gnuk Token
+ATTRS{product}=="Gnuk Token", GROUP="plugdev", TAG+="uaccess"
+ATTRS{idVendor}=="234b", ATTRS{idProduct}=="0000|2440", GROUP="plugdev", TAG+="uaccess"
+## Alcor Micro Corp cardreader (in ThinkPad X250)
+ATTRS{idVendor}=="058f", ATTRS{idProduct}=="9540", GROUP="plugdev", TAG+="uaccess"
+## Fujitsu Siemens
+ATTRS{idVendor}=="0bf8", ATTRS{idProduct}=="1006", GROUP="plugdev", TAG+="uaccess"
+## Yubico (YubiKey Neo/4/5)
+ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0111|0112|0115|0116|0404|0405|0406|0407", GROUP="plugdev", TAG+="uaccess"
+## Trustica Cryptoucan
+ATTRS{idVendor}=="1fc9", ATTRS{idProduct}=="81e6", GROUP="plugdev", TAG+="uaccess"
+
+LABEL="gnupg_rules_end"
diff --git a/srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg b/srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg
new file mode 100644
index 000000000000..f23483eeafdc
--- /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/gnupg.html
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f16d68e0c541..ba481a10a4f9 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
@@ -49,5 +49,6 @@ gnupg2-scdaemon_package() {
pkg_install() {
vmove usr/libexec/scdaemon
vmove usr/share/man/man1/scdaemon.1
+ vinstall ${FILESDIR}/60-scdaemon.rules 644 /usr/lib/udev/rules.d
}
}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] Add udev rules and INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (9 preceding siblings ...)
2022-07-13 16:09 ` [PR PATCH] [Updated] Add udev rules and " jcgruenhage
@ 2022-07-13 16:38 ` classabbyamp
2022-07-13 16:39 ` classabbyamp
` (7 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: classabbyamp @ 2022-07-13 16:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38037#discussion_r920290821
Comment:
make this `./files/README.voidlinux` and `vdoc` it
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] Add udev rules and INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (10 preceding siblings ...)
2022-07-13 16:38 ` [PR REVIEW] " classabbyamp
@ 2022-07-13 16:39 ` classabbyamp
2022-07-13 16:58 ` jcgruenhage
` (6 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: classabbyamp @ 2022-07-13 16:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38037#discussion_r920291610
Comment:
this is kinda implied by it being in `/usr/lib`
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] Add udev rules and INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (11 preceding siblings ...)
2022-07-13 16:39 ` classabbyamp
@ 2022-07-13 16:58 ` jcgruenhage
2022-07-13 16:59 ` classabbyamp
` (5 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-13 16:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 402 bytes --]
New review comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/38037#discussion_r920309829
Comment:
but then people aren't informed why their setup is breaking when installing the update that breaks their setup.. I think including this as an INSTALL.msg is good. If you want I can link it into ./files/README.voidlinux and vdoc it in addition to that.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] Add udev rules and INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (12 preceding siblings ...)
2022-07-13 16:58 ` jcgruenhage
@ 2022-07-13 16:59 ` classabbyamp
2022-07-13 17:00 ` [PR PATCH] [Updated] " jcgruenhage
` (4 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: classabbyamp @ 2022-07-13 16:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38037#discussion_r920310927
Comment:
I guess then do both, don't really like install messages though
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] Add udev rules and INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (13 preceding siblings ...)
2022-07-13 16:59 ` classabbyamp
@ 2022-07-13 17:00 ` jcgruenhage
2022-07-13 17:05 ` jcgruenhage
` (3 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-13 17:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1567 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages gnupg-smartcard-udev-rules-0.0.20220713_1
https://github.com/void-linux/void-packages/pull/38037
Add udev rules and INSTALL.msg to gnupg2-scdaemon.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
This fixes #38034. There's an `INSTALL.msg` for `gnupg2-scdaemon`, informing users of the potential breakage, and for those not using pcscd, a fix is included by shipping the new udev rules.
Still draft because it depends on https://github.com/void-linux/void-docs/pull/691
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38037.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnupg-smartcard-udev-rules-0.0.20220713_1-38037.patch --]
[-- Type: text/x-diff, Size: 3990 bytes --]
From 29a5e9d8f9607e19e54a9da772f038f51cde0be4 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] gnupg: add smartcard udev rules and INSTALL.msg
---
srcpkgs/gnupg/files/60-scdaemon.rules | 37 +++++++++++++++++++++++
srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg | 5 +++
srcpkgs/gnupg/template | 3 +-
3 files changed, 44 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnupg/files/60-scdaemon.rules
create mode 100644 srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg
diff --git a/srcpkgs/gnupg/files/60-scdaemon.rules b/srcpkgs/gnupg/files/60-scdaemon.rules
new file mode 100644
index 000000000000..fa3698e7d6a2
--- /dev/null
+++ b/srcpkgs/gnupg/files/60-scdaemon.rules
@@ -0,0 +1,37 @@
+SUBSYSTEM!="usb", GOTO="gnupg_rules_end"
+ACTION!="add", GOTO="gnupg_rules_end"
+
+# USB SmartCard Readers
+## Cherry GmbH (XX33, ST2000)
+ATTRS{idVendor}=="046a", ATTRS{idProduct}=="0005|0010|003e", GROUP="plugdev", TAG+="uaccess"
+## SCM Microsystems, Inc (SCR331-DI, SCR335, SCR3320, SCR331, SCR3310 and SPR532)
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5111|5115|5116|5117|e001|e003", GROUP="plugdev", TAG+="uaccess"
+## Omnikey AG (CardMan 3821, CardMan 6121)
+ATTRS{idVendor}=="076b", ATTRS{idProduct}=="3821|6622", GROUP="plugdev", TAG+="uaccess"
+## Gemalto
+ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="3437|3438|3478|34c2|34ec", GROUP="plugdev", TAG+="uaccess"
+## Reiner (SCT cyberJack)
+ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0500", GROUP="plugdev", TAG+="uaccess"
+## Kobil (KAAN)
+ATTRS{idVendor}=="0d46", ATTRS{idProduct}=="2012", GROUP="plugdev", TAG+="uaccess"
+## VASCO (DIGIPASS 920)
+ATTRS{idVendor}=="1a44", ATTRS{idProduct}=="0920", GROUP="plugdev", TAG+="uaccess"
+## Crypto Stick
+ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4107", GROUP="plugdev", TAG+="uaccess"
+## Nitrokey
+ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4108|4109|4211", GROUP="plugdev", TAG+="uaccess"
+## Librem Key
+ATTRS{idVendor}=="316d", ATTRS{idProduct}=="4c4b", GROUP="plugdev", TAG+="uaccess"
+## Gnuk Token
+ATTRS{product}=="Gnuk Token", GROUP="plugdev", TAG+="uaccess"
+ATTRS{idVendor}=="234b", ATTRS{idProduct}=="0000|2440", GROUP="plugdev", TAG+="uaccess"
+## Alcor Micro Corp cardreader (in ThinkPad X250)
+ATTRS{idVendor}=="058f", ATTRS{idProduct}=="9540", GROUP="plugdev", TAG+="uaccess"
+## Fujitsu Siemens
+ATTRS{idVendor}=="0bf8", ATTRS{idProduct}=="1006", GROUP="plugdev", TAG+="uaccess"
+## Yubico (YubiKey Neo/4/5)
+ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0111|0112|0115|0116|0404|0405|0406|0407", GROUP="plugdev", TAG+="uaccess"
+## Trustica Cryptoucan
+ATTRS{idVendor}=="1fc9", ATTRS{idProduct}=="81e6", GROUP="plugdev", TAG+="uaccess"
+
+LABEL="gnupg_rules_end"
diff --git a/srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg b/srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg
new file mode 100644
index 000000000000..f23483eeafdc
--- /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/gnupg.html
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f16d68e0c541..ba481a10a4f9 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
@@ -49,5 +49,6 @@ gnupg2-scdaemon_package() {
pkg_install() {
vmove usr/libexec/scdaemon
vmove usr/share/man/man1/scdaemon.1
+ vinstall ${FILESDIR}/60-scdaemon.rules 644 /usr/lib/udev/rules.d
}
}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] Add udev rules and INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (14 preceding siblings ...)
2022-07-13 17:00 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-07-13 17:05 ` jcgruenhage
2022-07-13 17:13 ` 0x5c
` (2 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: jcgruenhage @ 2022-07-13 17:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1567 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages gnupg-smartcard-udev-rules-0.0.20220713_1
https://github.com/void-linux/void-packages/pull/38037
Add udev rules and INSTALL.msg to gnupg2-scdaemon.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
This fixes #38034. There's an `INSTALL.msg` for `gnupg2-scdaemon`, informing users of the potential breakage, and for those not using pcscd, a fix is included by shipping the new udev rules.
Still draft because it depends on https://github.com/void-linux/void-docs/pull/691
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38037.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnupg-smartcard-udev-rules-0.0.20220713_1-38037.patch --]
[-- Type: text/x-diff, Size: 4517 bytes --]
From c764fbad2483e59dc087243dc35ece7c24ae7db6 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] gnupg: add smartcard udev rules and INSTALL.msg
---
srcpkgs/gnupg/files/60-scdaemon.rules | 37 +++++++++++++++++++
.../files/gnupg2-scdaemon-README.voidlinux | 1 +
srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg | 5 +++
srcpkgs/gnupg/template | 4 +-
4 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnupg/files/60-scdaemon.rules
create mode 120000 srcpkgs/gnupg/files/gnupg2-scdaemon-README.voidlinux
create mode 100644 srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg
diff --git a/srcpkgs/gnupg/files/60-scdaemon.rules b/srcpkgs/gnupg/files/60-scdaemon.rules
new file mode 100644
index 000000000000..fa3698e7d6a2
--- /dev/null
+++ b/srcpkgs/gnupg/files/60-scdaemon.rules
@@ -0,0 +1,37 @@
+SUBSYSTEM!="usb", GOTO="gnupg_rules_end"
+ACTION!="add", GOTO="gnupg_rules_end"
+
+# USB SmartCard Readers
+## Cherry GmbH (XX33, ST2000)
+ATTRS{idVendor}=="046a", ATTRS{idProduct}=="0005|0010|003e", GROUP="plugdev", TAG+="uaccess"
+## SCM Microsystems, Inc (SCR331-DI, SCR335, SCR3320, SCR331, SCR3310 and SPR532)
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5111|5115|5116|5117|e001|e003", GROUP="plugdev", TAG+="uaccess"
+## Omnikey AG (CardMan 3821, CardMan 6121)
+ATTRS{idVendor}=="076b", ATTRS{idProduct}=="3821|6622", GROUP="plugdev", TAG+="uaccess"
+## Gemalto
+ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="3437|3438|3478|34c2|34ec", GROUP="plugdev", TAG+="uaccess"
+## Reiner (SCT cyberJack)
+ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0500", GROUP="plugdev", TAG+="uaccess"
+## Kobil (KAAN)
+ATTRS{idVendor}=="0d46", ATTRS{idProduct}=="2012", GROUP="plugdev", TAG+="uaccess"
+## VASCO (DIGIPASS 920)
+ATTRS{idVendor}=="1a44", ATTRS{idProduct}=="0920", GROUP="plugdev", TAG+="uaccess"
+## Crypto Stick
+ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4107", GROUP="plugdev", TAG+="uaccess"
+## Nitrokey
+ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4108|4109|4211", GROUP="plugdev", TAG+="uaccess"
+## Librem Key
+ATTRS{idVendor}=="316d", ATTRS{idProduct}=="4c4b", GROUP="plugdev", TAG+="uaccess"
+## Gnuk Token
+ATTRS{product}=="Gnuk Token", GROUP="plugdev", TAG+="uaccess"
+ATTRS{idVendor}=="234b", ATTRS{idProduct}=="0000|2440", GROUP="plugdev", TAG+="uaccess"
+## Alcor Micro Corp cardreader (in ThinkPad X250)
+ATTRS{idVendor}=="058f", ATTRS{idProduct}=="9540", GROUP="plugdev", TAG+="uaccess"
+## Fujitsu Siemens
+ATTRS{idVendor}=="0bf8", ATTRS{idProduct}=="1006", GROUP="plugdev", TAG+="uaccess"
+## Yubico (YubiKey Neo/4/5)
+ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0111|0112|0115|0116|0404|0405|0406|0407", GROUP="plugdev", TAG+="uaccess"
+## Trustica Cryptoucan
+ATTRS{idVendor}=="1fc9", ATTRS{idProduct}=="81e6", GROUP="plugdev", TAG+="uaccess"
+
+LABEL="gnupg_rules_end"
diff --git a/srcpkgs/gnupg/files/gnupg2-scdaemon-README.voidlinux b/srcpkgs/gnupg/files/gnupg2-scdaemon-README.voidlinux
new file mode 120000
index 000000000000..7375d3340695
--- /dev/null
+++ b/srcpkgs/gnupg/files/gnupg2-scdaemon-README.voidlinux
@@ -0,0 +1 @@
+../gnupg2-scdaemon.INSTALL.msg
\ No newline at end of file
diff --git a/srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg b/srcpkgs/gnupg/gnupg2-scdaemon.INSTALL.msg
new file mode 100644
index 000000000000..f23483eeafdc
--- /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/gnupg.html
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f16d68e0c541..79a37000021c 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
@@ -49,5 +49,7 @@ gnupg2-scdaemon_package() {
pkg_install() {
vmove usr/libexec/scdaemon
vmove usr/share/man/man1/scdaemon.1
+ vinstall ${FILESDIR}/60-scdaemon.rules 644 /usr/lib/udev/rules.d
+ vdoc ${FILESDIR}/gnupg2-scdaemon-README.voidlinux README.voidlinux
}
}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: Add udev rules and INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (15 preceding siblings ...)
2022-07-13 17:05 ` jcgruenhage
@ 2022-07-13 17:13 ` 0x5c
2022-07-13 17:15 ` [PR PATCH] [Merged]: " classabbyamp
2022-07-13 17:19 ` 0x5c
18 siblings, 0 replies; 20+ messages in thread
From: 0x5c @ 2022-07-13 17:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/38037#issuecomment-1183478732
Comment:
Successfully tested on both a machine with elogind and a machine without it using the plugdev group.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Merged]: Add udev rules and INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (16 preceding siblings ...)
2022-07-13 17:13 ` 0x5c
@ 2022-07-13 17:15 ` classabbyamp
2022-07-13 17:19 ` 0x5c
18 siblings, 0 replies; 20+ messages in thread
From: classabbyamp @ 2022-07-13 17:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1369 bytes --]
There's a merged pull request on the void-packages repository
Add udev rules and INSTALL.msg to gnupg2-scdaemon.
https://github.com/void-linux/void-packages/pull/38037
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
This fixes #38034. There's an `INSTALL.msg` for `gnupg2-scdaemon`, informing users of the potential breakage, and for those not using pcscd, a fix is included by shipping the new udev rules.
Still draft because it depends on https://github.com/void-linux/void-docs/pull/691
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: Add udev rules and INSTALL.msg to gnupg2-scdaemon.
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
` (17 preceding siblings ...)
2022-07-13 17:15 ` [PR PATCH] [Merged]: " classabbyamp
@ 2022-07-13 17:19 ` 0x5c
18 siblings, 0 replies; 20+ messages in thread
From: 0x5c @ 2022-07-13 17:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 240 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/38037#issuecomment-1183478732
Comment:
Successfully tested on both a machine with elogind, and a machine without it using the plugdev group.
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2022-07-13 17:19 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-13 12:03 [PR PATCH] New package: gnupg-smartcard-udev-rules-0.0.20220713 jcgruenhage
2022-07-13 12:04 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-13 12:09 ` jcgruenhage
2022-07-13 12:09 ` [PR REVIEW] " jcgruenhage
2022-07-13 14:30 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-13 15:15 ` Add gnupg-smartcard-udev-rules and add INSTALL.msg to gnupg2-scdaemon jcgruenhage
2022-07-13 15:18 ` jcgruenhage
2022-07-13 15:28 ` ahesford
2022-07-13 15:45 ` 0x5c
2022-07-13 16:03 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-13 16:09 ` [PR PATCH] [Updated] Add udev rules and " jcgruenhage
2022-07-13 16:38 ` [PR REVIEW] " classabbyamp
2022-07-13 16:39 ` classabbyamp
2022-07-13 16:58 ` jcgruenhage
2022-07-13 16:59 ` classabbyamp
2022-07-13 17:00 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-13 17:05 ` jcgruenhage
2022-07-13 17:13 ` 0x5c
2022-07-13 17:15 ` [PR PATCH] [Merged]: " classabbyamp
2022-07-13 17:19 ` 0x5c
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).