[PR PATCH] gnupg: update to 2.3.8.

[PR PATCH] gnupg: update to 2.3.8.

[jcgruenhage]

[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]

There is a new pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages gnupg-2.3.8_1
https://github.com/void-linux/void-packages/pull/40026

gnupg: update to 2.3.8.
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- 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/40026.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnupg-2.3.8_1-40026.patch --]
[-- Type: text/x-diff, Size: 5195 bytes --]

From e3188dc6cc21eedf43d1c0db7e0b3418eb188c3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 18 Oct 2022 19:23:52 +0200
Subject: [PATCH] gnupg: update to 2.3.8.

---
 ...csclite-library-on-musl-libc-as-well.patch |  8 +--
 ...ix-workaround-for-Yubikey-heuristics.patch | 58 -------------------
 srcpkgs/gnupg/template                        |  6 +-
 3 files changed, 7 insertions(+), 65 deletions(-)
 delete mode 100644 srcpkgs/gnupg/patches/0002-scd-openpgp-Fix-workaround-for-Yubikey-heuristics.patch

diff --git a/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch b/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
index 23bc690b9dcb..f677cb0d8ea7 100644
--- a/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
+++ b/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
@@ -1,15 +1,15 @@
-From 94b3bedd1ed56d70168dfd09594d2f0d8d6dea96 Mon Sep 17 00:00:00 2001
+From 5242588814474653bb0de15ebda3b0c6bb539ff6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
  <congdanhqx@gmail.com>
 Date: Sun, 29 Sep 2019 12:32:46 +0700
-Subject: [PATCH 1/2] use versioned pcsclite library on musl-libc as well
+Subject: [PATCH] use versioned pcsclite library on musl-libc as well
 
 ---
  scd/scdaemon.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/scd/scdaemon.c b/scd/scdaemon.c
-index 6d068d3d3..2f2586452 100644
+index e43769f85..97449eff2 100644
 --- a/scd/scdaemon.c
 +++ b/scd/scdaemon.c
 @@ -207,7 +207,7 @@ static struct debug_flags_s debug_flags [] =
@@ -22,5 +22,5 @@ index 6d068d3d3..2f2586452 100644
  #else
  #define DEFAULT_PCSC_DRIVER "libpcsclite.so"
 -- 
-2.37.1
+2.38.0
 
diff --git a/srcpkgs/gnupg/patches/0002-scd-openpgp-Fix-workaround-for-Yubikey-heuristics.patch b/srcpkgs/gnupg/patches/0002-scd-openpgp-Fix-workaround-for-Yubikey-heuristics.patch
deleted file mode 100644
index b6cdf2bb35ae..000000000000
--- a/srcpkgs/gnupg/patches/0002-scd-openpgp-Fix-workaround-for-Yubikey-heuristics.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 65255fd387b57bae83c5c08d1534ae58dbb5c264 Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Wed, 13 Jul 2022 03:40:00 +0200
-Subject: [PATCH 2/2] scd:openpgp: Fix workaround for Yubikey heuristics.
-
-* scd/app-openpgp.c (parse_algorithm_attribute): Handle the case
-of firmware 5.4, too.
-
-GnuPG-bug-id: T6070
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
----
- scd/app-openpgp.c | 29 +++++++++++++++++++++--------
- 1 file changed, 21 insertions(+), 8 deletions(-)
-
-diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
-index 8bb346a86..4667416df 100644
---- a/scd/app-openpgp.c
-+++ b/scd/app-openpgp.c
-@@ -6259,15 +6259,28 @@ parse_algorithm_attribute (app_t app, int keyno)
-       app->app_local->keyattr[keyno].ecc.algo = *buffer;
-       app->app_local->keyattr[keyno].ecc.flags = 0;
- 
--      if (APP_CARD(app)->cardtype == CARDTYPE_YUBIKEY
--	  || buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
--        { /* Found "pubkey required"-byte for private key template.  */
--          oidlen--;
--          if (buffer[buflen-1] == 0xff)
--            app->app_local->keyattr[keyno].ecc.flags |= ECC_FLAG_PUBKEY;
-+      if (APP_CARD(app)->cardtype == CARDTYPE_YUBIKEY)
-+        {
-+          /* Yubikey implementations vary.
-+           * Firmware version 5.2 returns "pubkey required"-byte with
-+           * 0x00, but after removal and second time insertion, it
-+           * returns bogus value there.
-+           * Firmware version 5.4 returns none.
-+           */
-+          curve = ecc_curve (buffer + 1, oidlen);
-+          if (!curve)
-+            curve = ecc_curve (buffer + 1, oidlen - 1);
-+        }
-+      else
-+        {
-+          if (buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
-+            { /* Found "pubkey required"-byte for private key template.  */
-+              oidlen--;
-+              if (buffer[buflen-1] == 0xff)
-+                app->app_local->keyattr[keyno].ecc.flags |= ECC_FLAG_PUBKEY;
-+            }
-+          curve = ecc_curve (buffer + 1, oidlen);
-         }
--
--      curve = ecc_curve (buffer + 1, oidlen);
- 
-       if (!curve)
-         {
--- 
-2.37.1
-
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index d43787470fff..08751d2bea31 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,7 +1,7 @@
 # Template file for 'gnupg'
 pkgname=gnupg
-version=2.3.7
-revision=3
+version=2.3.8
+revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable ldap)
  --with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr
@@ -18,7 +18,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/"
 distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
-checksum=ee163a5fb9ec99ffc1b18e65faef8d086800c5713d15a672ab57d3799da83669
+checksum=540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed
 build_options="ldap"
 build_options_default="ldap"
 

Re: [PR PATCH] [Merged]: gnupg: update to 2.3.8.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 1061 bytes --]

There's a merged pull request on the void-packages repository

gnupg: update to 2.3.8.
https://github.com/void-linux/void-packages/pull/40026

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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- 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
-->