Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 crypto/gnupg-2.4/DEPENDS                                           |    3 
 crypto/gnupg-2.4/HISTORY                                           |    5 +
 crypto/gnupg-2.4/PRE_BUILD                                         |    4 +
 crypto/gnupg-2.4/patches/0001-dirmngr-ks_ldap_help_variables.patch |   32 
++++++++++
 4 files changed, 42 insertions(+), 2 deletions(-)

New commits:
commit 282af3ff69757af3fb1ac22184ca94942fe4bb71
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    crypto/gnupg-2.4: added patch to allow dirmngr to be built with no 
openldap

diff --git a/crypto/gnupg-2.4/DEPENDS b/crypto/gnupg-2.4/DEPENDS
index 2a57d1d..6225495 100755
--- a/crypto/gnupg-2.4/DEPENDS
+++ b/crypto/gnupg-2.4/DEPENDS
@@ -5,8 +5,7 @@ depends  libassuan     &&
 depends  libksba       &&
 depends  PKG-CONFIG     &&
 
-optional_depends  openldap '--enable-ldap' '--disable-ldap 
--disable-dirmngr' \
-                           'for LDAP keyserver interface'  &&
+optional_depends  openldap '--enable-ldap' '--disable-ldap' 'for LDAP 
keyserver interface' &&
 optional_depends  ccid    '--disable-ccid-driver' '' 'system card reader' &&
 optional_depends  GETTEXT '' '--disable-nls' 'NLS support' &&
 optional_depends  libusb  '' '' 'USB card reader support'  &&
diff --git a/crypto/gnupg-2.4/HISTORY b/crypto/gnupg-2.4/HISTORY
index dbeb80f..966d8c0 100644
--- a/crypto/gnupg-2.4/HISTORY
+++ b/crypto/gnupg-2.4/HISTORY
@@ -1,3 +1,8 @@
+2023-07-05 Pavel Vinogradov <public AT sourcemage.org>
+       * DEPENDS: dirmngr is back
+       * PRE_BUILD patches/0001-dirmngr-ks_ldap_help_variables.patch: added 
patch
+         to fix linking error when no openldap is selected
+
 2023-07-04 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 2.4.3
        * DEPENDS: disable dirmngr as well if no openldap
diff --git a/crypto/gnupg-2.4/PRE_BUILD b/crypto/gnupg-2.4/PRE_BUILD
new file mode 100755
index 0000000..f80ee7d
--- /dev/null
+++ b/crypto/gnupg-2.4/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir patches
diff --git 
a/crypto/gnupg-2.4/patches/0001-dirmngr-ks_ldap_help_variables.patch 
b/crypto/gnupg-2.4/patches/0001-dirmngr-ks_ldap_help_variables.patch
new file mode 100644
index 0000000..652bfb8
--- /dev/null
+++ b/crypto/gnupg-2.4/patches/0001-dirmngr-ks_ldap_help_variables.patch
@@ -0,0 +1,32 @@
+From dc13361524c1477b2106c7385f2059f9ea111b84 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe AT fsij.org>
+Date: Wed, 5 Jul 2023 09:29:54 +0900
+Subject: [PATCH] dirmngr: Enable the call of ks_ldap_help_variables when
+ USE_LDAP.
+
+* dirmngr/server.c [USE_LDAP] (cmd_ad_query): Conditionalize.
+
+--
+
+Signed-off-by: NIIBE Yutaka <gniibe AT fsij.org>
+---
+ dirmngr/server.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/dirmngr/server.c b/dirmngr/server.c
+index 51a149cb2..ee61f63d6 100644
+--- a/dirmngr/server.c
++++ b/dirmngr/server.c
+@@ -2776,7 +2776,9 @@ cmd_ad_query (assuan_context_t ctx, char *line)
+ 
+   if (opt_help)
+     {
++#if USE_LDAP
+       ks_ldap_help_variables (ctrl);
++#endif
+       err = 0;
+       goto leave;
+     }
+-- 
+2.11.0
+