From 1a1244b3e601c2cc0ea62bbdfccb11a4c74efa07 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Thu, 6 Jul 2023 11:58:48 +0200 Subject: gnupg2: bump to 2.4.3 --- extra/gnupg2/build | 4 +++- extra/gnupg2/checksums | 3 ++- extra/gnupg2/patches/fix-ldap.patch | 12 ++++++++++++ extra/gnupg2/sources | 3 ++- extra/gnupg2/version | 2 +- 5 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 extra/gnupg2/patches/fix-ldap.patch diff --git a/extra/gnupg2/build b/extra/gnupg2/build index 972daaed..e112d126 100755 --- a/extra/gnupg2/build +++ b/extra/gnupg2/build @@ -8,9 +8,11 @@ if cpt l gnutls; then export LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS fi +patch -p1 < fix-ldap.patch + ./configure \ --prefix=/usr \ - --sbindir=/usr/bin \ + --sbindir=/usr/bin make make DESTDIR="$1" install diff --git a/extra/gnupg2/checksums b/extra/gnupg2/checksums index f086873f..23355b5b 100644 --- a/extra/gnupg2/checksums +++ b/extra/gnupg2/checksums @@ -1,2 +1,3 @@ %BLAKE3 -fe5ed2bb29eef7505c24f9b106aa06ef3cbebe9ed63ee467091e309952e1da94 gnupg-2.4.2.tar.bz2 +e5e8f56b21da5c7fd791b494d193a80d2e072060663c41884b35e50cd8b8e610 gnupg-2.4.3.tar.bz2 +c8b97b99d49e3790e30c53875077a40c5a5d64b4b837464625c64946e0f1ce3d fix-ldap.patch diff --git a/extra/gnupg2/patches/fix-ldap.patch b/extra/gnupg2/patches/fix-ldap.patch new file mode 100644 index 00000000..9359484d --- /dev/null +++ b/extra/gnupg2/patches/fix-ldap.patch @@ -0,0 +1,12 @@ +--- a/dirmngr/server.c Fri Jun 30 10:53:58 2023 ++++ b/dirmngr/server.c Thu Jul 6 11:56:44 2023 +@@ -2776,7 +2776,9 @@ + + if (opt_help) + { ++#if USE_LDAP + ks_ldap_help_variables (ctrl); ++#endif /*USE_LDAP*/ + err = 0; + goto leave; + } diff --git a/extra/gnupg2/sources b/extra/gnupg2/sources index 14cd7421..bdeeb736 100644 --- a/extra/gnupg2/sources +++ b/extra/gnupg2/sources @@ -1 +1,2 @@ -https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.2.tar.bz2 +https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.3.tar.bz2 +patches/fix-ldap.patch diff --git a/extra/gnupg2/version b/extra/gnupg2/version index 3085eaac..a066d610 100644 --- a/extra/gnupg2/version +++ b/extra/gnupg2/version @@ -1 +1 @@ -2.4.2 1 +2.4.3 1 -- cgit v1.2.3