package/gnupg2: bump version to 2.2.32

- removed 0001-dirmngr-Fix-build-with--disable-ldap.patch
  (from upstream [1])

- fix/update signature check key hash

For details (since 2.2.28) see [2], [3], [4] and [5].

[1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=c6900f5723b4edc899aaea267ed599b5ad724142
[2] https://lists.gnupg.org/pipermail/gnupg-announce/2021q3/000461.html
[3] https://lists.gnupg.org/pipermail/gnupg-announce/2021q3/000463.html
[4] https://lists.gnupg.org/pipermail/gnupg-announce/2021q3/000464.html
[5] https://lists.gnupg.org/pipermail/gnupg-announce/2021q4/000465.html

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Peter Seiderer 2021-10-17 22:03:41 +02:00 committed by Thomas Petazzoni
parent c7c8179259
commit 1f654d357c
3 changed files with 5 additions and 48 deletions

View File

@ -1,43 +0,0 @@
From c6900f5723b4edc899aaea267ed599b5ad724142 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Fri, 11 Jun 2021 10:30:02 +0900
Subject: [PATCH] dirmngr: Fix build with --disable-ldap.
* dirmngr/dirmngr.c (parse_rereadable_options) [USE_LDAP]:
Conditionalize.
--
Reported-by: Phil Pennock
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
(cherry picked from commit c8b2162c0e7eb42b74811b7ed225fa0f56be4083)
[Retrieved from:
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=c6900f5723b4edc899aaea267ed599b5ad724142]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
dirmngr/dirmngr.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 915e0e601..330983f3f 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -770,6 +770,7 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
case oRecursiveResolver: enable_recursive_resolver (1); break;
case oLDAPServer:
+#if USE_LDAP
{
ldap_server_t server;
char *p;
@@ -791,6 +792,7 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
opt.ldapservers = server;
}
}
+#endif
break;
case oKeyServer:
--
2.11.0

View File

@ -1,7 +1,7 @@
# From https://lists.gnupg.org/pipermail/gnupg-announce/2021q2/000460.html
sha1 5f92b7b32d594cf21ea2b48cdaa2e460daccd6e3 gnupg-2.2.28.tar.bz2
sha1 81684626720c91060ae9920936c768df9fc8b2f6 gnupg-2.2.32.tar.bz2
# Calculated based on the hash above and signature
# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.28.tar.bz2.sig
# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
sha256 6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec gnupg-2.2.28.tar.bz2
# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.32.tar.bz2.sig
# using key 6DAA6E64A76D2840571B4902528897B826403ADA
sha256 b2571b35f82c63e7d278aa6a1add0d73453dc14d3f0854be490c844fca7e0614 gnupg-2.2.32.tar.bz2
sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING

View File

@ -4,7 +4,7 @@
#
################################################################################
GNUPG2_VERSION = 2.2.28
GNUPG2_VERSION = 2.2.32
GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg
GNUPG2_LICENSE = GPL-3.0+