[PR PATCH] gnupg: update to 2.2.30; libgcrypt: update to 1.9.4

[PR PATCH] gnupg: update to 2.2.30; libgcrypt: update to 1.9.4

[4ricci]

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

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

https://github.com/4ricci/void-packages gnupg
https://github.com/void-linux/void-packages/pull/32817

gnupg: update to 2.2.30; libgcrypt: update to 1.9.4
- libgcrypt: update to 1.9.4.
- gnupg: update to 2.2.30.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32817.patch is attached

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

From 4dec54bc7a3d37f23e2139995c9a60e5243e5019 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 1 Sep 2021 09:28:05 +0200
Subject: [PATCH 1/2] libgcrypt: update to 1.9.4.

---
 .../hwf-x86-fix-wrong-operand-type.patch      | 46 -------------------
 srcpkgs/libgcrypt/template                    |  4 +-
 2 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 srcpkgs/libgcrypt/patches/hwf-x86-fix-wrong-operand-type.patch

diff --git a/srcpkgs/libgcrypt/patches/hwf-x86-fix-wrong-operand-type.patch b/srcpkgs/libgcrypt/patches/hwf-x86-fix-wrong-operand-type.patch
deleted file mode 100644
index 51165dcb0022..000000000000
--- a/srcpkgs/libgcrypt/patches/hwf-x86-fix-wrong-operand-type.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ec87511d9cd2dc31434e939b6351d74a38d4ceaa Mon Sep 17 00:00:00 2001
-From: Jussi Kivilinna <jussi.kivilinna@iki.fi>
-Date: Wed, 28 Apr 2021 19:19:15 +0300
-Subject: [PATCH] hwf-x86: fix use of wrong operand type
-
-* src/hwf-x86.c (get_cpuid): Use xchg for swapping %ebx back
-and forth between operand register.
---
-
-HW feature routine was giving wrong results with certain compiler &
-compiler flag combinations on i386. Issue was that "=g" operand was
-used which caused problem if compiler allocated %ebx register for
-this operand. CPUID assembly block attempts to save %ebx as in older
-GCC versions this register was fixed for GOT pointer use and could
-not be modified otherwise (could not be used as operand or clobber).
-
-Reported-by: Iru Cai <vimacs@disroot.org>
-Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
----
- src/hwf-x86.c | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/src/hwf-x86.c b/src/hwf-x86.c
-index 91e4c411e..a1aa02e78 100644
---- a/src/hwf-x86.c
-+++ b/src/hwf-x86.c
-@@ -83,14 +83,12 @@ get_cpuid(unsigned int in, unsigned int *eax, unsigned int *ebx,
-   unsigned int regs[4];
- 
-   asm volatile
--    ("movl %%ebx, %%edi\n\t"     /* Save GOT register.  */
--     "xorl %%ebx, %%ebx\n\t"
-+    ("xchgl %%ebx, %1\n\t"     /* Save GOT register.  */
-      "cpuid\n\t"
--     "movl %%ebx, %1\n\t"
--     "movl %%edi, %%ebx\n\t"     /* Restore GOT register. */
--     : "=a" (regs[0]), "=g" (regs[1]), "=c" (regs[2]), "=d" (regs[3])
--     : "0" (in), "2" (0), "3" (0)
--     : "cc", "edi"
-+     "xchgl %%ebx, %1\n\t"     /* Restore GOT register. */
-+     : "=a" (regs[0]), "=D" (regs[1]), "=c" (regs[2]), "=d" (regs[3])
-+     : "0" (in), "1" (0), "2" (0), "3" (0)
-+     : "cc"
-      );
- 
-   if (eax)
diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index e466a315e7f3..1dc4d0a19ca2 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -1,6 +1,6 @@
 # Template file for 'libgcrypt'
 pkgname=libgcrypt
-version=1.9.3
+version=1.9.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-static --without-capabilities"
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gnupg.org"
 distfiles="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2"
-checksum=97ebe4f94e2f7e35b752194ce15a0f3c66324e0ff6af26659bbfb5ff2ec328fd
+checksum=ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_sys_symbol_underscore=no"

From 6ff7319121415a24dc73db43eab46f3f3aade712 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 1 Sep 2021 09:28:11 +0200
Subject: [PATCH 2/2] gnupg: update to 2.2.30.

---
 srcpkgs/gnupg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 65e76eb0923b..ed9962c54d6e 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,6 +1,6 @@
 # Template file for 'gnupg'
 pkgname=gnupg
-version=2.2.29
+version=2.2.30
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable ldap)
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/"
 distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
-checksum=39d07cdb4524818f9ebce49294931974af504519e6a7476c52e9d38fc0bd0cc9
+checksum=cc636d6e22a673993d94814c09be469df2ce27a0c66b1cab39bbab1786cf2184
 build_options="ldap"
 build_options_default="ldap"
 

Re: [PR PATCH] [Closed]: gnupg: update to 2.2.30; libgcrypt: update to 1.9.4

[ahesford]

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

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

gnupg: update to 2.2.30; libgcrypt: update to 1.9.4
https://github.com/void-linux/void-packages/pull/32817

Description:
- libgcrypt: update to 1.9.4.
- gnupg: update to 2.2.30.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->