guix_mirror_bot pushed a commit to branch crypto-team
in repository guix.
commit a8263ad19f99a5307ea860e873d1a46bfcd17a8d
Author: Cayetano Santos <[email protected]>
AuthorDate: Sun Jun 7 19:17:01 2026 +0200
gnu: libgcrypt: Update to 1.12.2.
Patch ‘libgcrypt-arm32-register-pressure.patch’ is already included in
1.12.2:
https://github.com/gpg/libgcrypt/commit/9c93b4607adcf9b3efd53aba43e2d33bf5aef9df
* gnu/packages/gnupg.scm (libgcrypt): Update to 1.12.2.
[arguments]: Delete ’apply-upstream-patch #:phase.
* gnu/packages/patches/libgcrypt-arm32-register-pressure.patch: Delete
file.
* gnu/local.mk (dist_patch_DATA): Unregister patch.
Change-Id: If94275b9a26b6f2bb6593d401723b4b8d5ae7572
---
gnu/local.mk | 1 -
gnu/packages/gnupg.scm | 12 +-
.../libgcrypt-arm32-register-pressure.patch | 133 ---------------------
3 files changed, 2 insertions(+), 144 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 39b9db529c..471732939d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1782,7 +1782,6 @@ dist_patch_DATA =
\
%D%/packages/patches/libcyaml-libyaml-compat.patch \
%D%/packages/patches/libexpected-use-provided-catch2.patch \
%D%/packages/patches/libfaketime-32bit.patch \
- %D%/packages/patches/libgcrypt-arm32-register-pressure.patch \
%D%/packages/patches/libgda-CVE-2021-39359.patch \
%D%/packages/patches/libgda-disable-data-proxy-test.patch \
%D%/packages/patches/libgda-fix-build.patch \
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index df46a57706..0630ee682d 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -186,7 +186,7 @@ Daemon and possibly more in the future.")
(define-public libgcrypt
(package
(name "libgcrypt")
- (version "1.11.0")
+ (version "1.12.2")
(source
(origin
(method git-fetch)
@@ -196,7 +196,7 @@ Daemon and possibly more in the future.")
(file-name (git-file-name name version))
(sha256
(base32
- "0pmxp91sirqmsiy7asnjbz5ksglzbqhh11baz4v086i2j8j3rqvw"))))
+ "1mrh5dwzvw63pdl2jvahgd5vacrk684qjzlhimm58gj68shndssh"))))
(build-system gnu-build-system)
(arguments
;; The '--with-gpg-error-prefix' argument is needed because otherwise
@@ -233,14 +233,6 @@ Daemon and possibly more in the future.")
((system-hurd?)
#~((add-before 'config 'setenv
(lambda _ (setenv "GCRYPT_NO_BENCHMARKS" "t")))))
- ((target-arm32?)
- #~((add-after 'unpack 'apply-upstream-patch
- (lambda _
- (let ((patch-file
- #$(local-file
- (search-patch
- "libgcrypt-arm32-register-pressure.patch"))))
- (invoke "patch" "--force" "-p1" "-i" patch-file))))))
(else #~())))))
(outputs '("out" "debug"))
(propagated-inputs (list libgpg-error))
diff --git a/gnu/packages/patches/libgcrypt-arm32-register-pressure.patch
b/gnu/packages/patches/libgcrypt-arm32-register-pressure.patch
deleted file mode 100644
index 9eff5c42e1..0000000000
--- a/gnu/packages/patches/libgcrypt-arm32-register-pressure.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-This patch is from upstream and probably can be dropped with any version
-after 1.11.0.
-
-From 9c93b4607adcf9b3efd53aba43e2d33bf5aef9df Mon Sep 17 00:00:00 2001
-From: Jussi Kivilinna <[email protected]>
-Date: Sun, 4 Aug 2024 18:04:49 +0300
-Subject: [PATCH] mpi/ec-inline: reduce register pressure on 32-bit ARM
-
-* mpi/ec-inline.h [HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS] (ADD4_LIMB32)
-(ADD6_LIMB32, SUB4_LIMB32, SUB6_LIMB32): Reuse input registers
-as output (use just two unique operators).
---
-
-This fixes building ec-nist.c with GCC-14 on 32-bit ARM.
-
-GnuPG-bug-id: 7226
-Signed-off-by: Jussi Kivilinna <[email protected]>
----
- mpi/ec-inline.h | 63 ++++++++++++++++++++++++-------------------------
- 1 file changed, 31 insertions(+), 32 deletions(-)
-
-diff --git a/mpi/ec-inline.h b/mpi/ec-inline.h
-index c24d5352..3a526246 100644
---- a/mpi/ec-inline.h
-+++ b/mpi/ec-inline.h
-@@ -836,18 +836,18 @@ LIMB64_HILO(mpi_limb_t hi, mpi_limb_t lo)
- #ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS
-
- #define ADD4_LIMB32(A3, A2, A1, A0, B3, B2, B1, B0, C3, C2, C1, C0) \
-- __asm__ ("adds %3, %7, %11\n" \
-- "adcs %2, %6, %10\n" \
-- "adcs %1, %5, %9\n" \
-- "adc %0, %4, %8\n" \
-+ __asm__ ("adds %3, %3, %11\n" \
-+ "adcs %2, %2, %10\n" \
-+ "adcs %1, %1, %9\n" \
-+ "adc %0, %0, %8\n" \
- : "=r" (A3), \
- "=&r" (A2), \
- "=&r" (A1), \
- "=&r" (A0) \
-- : "r" ((mpi_limb_t)(B3)), \
-- "r" ((mpi_limb_t)(B2)), \
-- "r" ((mpi_limb_t)(B1)), \
-- "r" ((mpi_limb_t)(B0)), \
-+ : "0" ((mpi_limb_t)(B3)), \
-+ "1" ((mpi_limb_t)(B2)), \
-+ "2" ((mpi_limb_t)(B1)), \
-+ "3" ((mpi_limb_t)(B0)), \
- "Ir" ((mpi_limb_t)(C3)), \
- "Ir" ((mpi_limb_t)(C2)), \
- "Ir" ((mpi_limb_t)(C1)), \
-@@ -857,18 +857,18 @@ LIMB64_HILO(mpi_limb_t hi, mpi_limb_t lo)
- #define ADD6_LIMB32(A5, A4, A3, A2, A1, A0, B5, B4, B3, B2, B1, B0, \
- C5, C4, C3, C2, C1, C0) do { \
- mpi_limb_t __carry6_32; \
-- __asm__ ("adds %3, %7, %10\n" \
-- "adcs %2, %6, %9\n" \
-- "adcs %1, %5, %8\n" \
-- "adc %0, %4, %4\n" \
-+ __asm__ ("adds %3, %3, %10\n" \
-+ "adcs %2, %2, %9\n" \
-+ "adcs %1, %1, %8\n" \
-+ "adc %0, %0, %0\n" \
- : "=r" (__carry6_32), \
- "=&r" (A2), \
- "=&r" (A1), \
- "=&r" (A0) \
-- : "r" ((mpi_limb_t)(0)), \
-- "r" ((mpi_limb_t)(B2)), \
-- "r" ((mpi_limb_t)(B1)), \
-- "r" ((mpi_limb_t)(B0)), \
-+ : "0" ((mpi_limb_t)(0)), \
-+ "1" ((mpi_limb_t)(B2)), \
-+ "2" ((mpi_limb_t)(B1)), \
-+ "3" ((mpi_limb_t)(B0)), \
- "Ir" ((mpi_limb_t)(C2)), \
- "Ir" ((mpi_limb_t)(C1)), \
- "Ir" ((mpi_limb_t)(C0)) \
-@@ -878,18 +878,18 @@ LIMB64_HILO(mpi_limb_t hi, mpi_limb_t lo)
- } while (0)
-
- #define SUB4_LIMB32(A3, A2, A1, A0, B3, B2, B1, B0, C3, C2, C1, C0) \
-- __asm__ ("subs %3, %7, %11\n" \
-- "sbcs %2, %6, %10\n" \
-- "sbcs %1, %5, %9\n" \
-- "sbc %0, %4, %8\n" \
-+ __asm__ ("subs %3, %3, %11\n" \
-+ "sbcs %2, %2, %10\n" \
-+ "sbcs %1, %1, %9\n" \
-+ "sbc %0, %0, %8\n" \
- : "=r" (A3), \
- "=&r" (A2), \
- "=&r" (A1), \
- "=&r" (A0) \
-- : "r" ((mpi_limb_t)(B3)), \
-- "r" ((mpi_limb_t)(B2)), \
-- "r" ((mpi_limb_t)(B1)), \
-- "r" ((mpi_limb_t)(B0)), \
-+ : "0" ((mpi_limb_t)(B3)), \
-+ "1" ((mpi_limb_t)(B2)), \
-+ "2" ((mpi_limb_t)(B1)), \
-+ "3" ((mpi_limb_t)(B0)), \
- "Ir" ((mpi_limb_t)(C3)), \
- "Ir" ((mpi_limb_t)(C2)), \
- "Ir" ((mpi_limb_t)(C1)), \
-@@ -899,18 +899,17 @@ LIMB64_HILO(mpi_limb_t hi, mpi_limb_t lo)
- #define SUB6_LIMB32(A5, A4, A3, A2, A1, A0, B5, B4, B3, B2, B1, B0, \
- C5, C4, C3, C2, C1, C0) do { \
- mpi_limb_t __borrow6_32; \
-- __asm__ ("subs %3, %7, %10\n" \
-- "sbcs %2, %6, %9\n" \
-- "sbcs %1, %5, %8\n" \
-- "sbc %0, %4, %4\n" \
-+ __asm__ ("subs %3, %3, %9\n" \
-+ "sbcs %2, %2, %8\n" \
-+ "sbcs %1, %1, %7\n" \
-+ "sbc %0, %0, %0\n" \
- : "=r" (__borrow6_32), \
- "=&r" (A2), \
- "=&r" (A1), \
- "=&r" (A0) \
-- : "r" ((mpi_limb_t)(0)), \
-- "r" ((mpi_limb_t)(B2)), \
-- "r" ((mpi_limb_t)(B1)), \
-- "r" ((mpi_limb_t)(B0)), \
-+ : "1" ((mpi_limb_t)(B2)), \
-+ "2" ((mpi_limb_t)(B1)), \
-+ "3" ((mpi_limb_t)(B0)), \
- "Ir" ((mpi_limb_t)(C2)), \
- "Ir" ((mpi_limb_t)(C1)), \
- "Ir" ((mpi_limb_t)(C0)) \
---
