Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (880e89c83f0b3125ea7de41f6cb2383f40c059dc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (880e89c83f0b3125ea7de41f6cb2383f40c059dc)
  • Date: Fri, 14 Oct 2022 03:26:33 +0000

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

crypto/gnupg-2.4/BUILD | 3 -
crypto/gnupg-2.4/HISTORY | 3 +
crypto/gnupg-2.4/PRE_BUILD | 6 ++-
crypto/gnupg-2.4/patches/0001-Fix-dirmngr-no-LDAP.patch | 32
++++++++++++++++
4 files changed, 39 insertions(+), 5 deletions(-)

New commits:
commit 880e89c83f0b3125ea7de41f6cb2383f40c059dc
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

crypto/gnupg-2.4: fixed building with no openldap

diff --git a/crypto/gnupg-2.4/BUILD b/crypto/gnupg-2.4/BUILD
deleted file mode 100755
index 9b6c16d..0000000
--- a/crypto/gnupg-2.4/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS+=" --disable-dirmngr" &&
-
-default_build
diff --git a/crypto/gnupg-2.4/HISTORY b/crypto/gnupg-2.4/HISTORY
index f986d11..b5ee6bd 100644
--- a/crypto/gnupg-2.4/HISTORY
+++ b/crypto/gnupg-2.4/HISTORY
@@ -1,6 +1,7 @@
2022-10-13 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.3.8
- * BUILD: added to disable dirmngr, fails otherwise
+ * PRE_BUILD, patches/0001-Fix-dirmngr-no-LDAP.patch: added upstream
patch
+ to fix building with no openldap

2022-07-27 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: switch to PKG-CONFIG provider (automated)
diff --git a/crypto/gnupg-2.4/PRE_BUILD b/crypto/gnupg-2.4/PRE_BUILD
index 986567c..a079a9f 100755
--- a/crypto/gnupg-2.4/PRE_BUILD
+++ b/crypto/gnupg-2.4/PRE_BUILD
@@ -27,4 +27,8 @@ sha512_verify "$SOURCE" "$SOURCE_HASH" &&
# cheating and using internal function uncompress_unpack instead of
unpack_file
# so as not to trigger the gpg based verification, which we already did
# ourselves before
-uncompress_unpack "$SOURCE"
+uncompress_unpack "$SOURCE" &&
+
+cd "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir patches
diff --git a/crypto/gnupg-2.4/patches/0001-Fix-dirmngr-no-LDAP.patch
b/crypto/gnupg-2.4/patches/0001-Fix-dirmngr-no-LDAP.patch
new file mode 100644
index 0000000..350571c
--- /dev/null
+++ b/crypto/gnupg-2.4/patches/0001-Fix-dirmngr-no-LDAP.patch
@@ -0,0 +1,32 @@
+From 7011286ce6e1fb56c2989fdafbd11b931c489faa Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe AT fsij.org>
+Date: Fri, 14 Oct 2022 09:58:41 +0900
+Subject: [PATCH] dirmngr: Fix build with no LDAP support.
+
+* dirmngr/server.c [USE_LDAP] (start_command_handler): Conditionalize.
+
+--
+
+GnuPG-bug-id: 6239
+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 04ebfd317..98f354300 100644
+--- a/dirmngr/server.c
++++ b/dirmngr/server.c
+@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int
session_id)
+ ctrl->refcount);
+ else
+ {
++#if USE_LDAP
+ ks_ldap_free_state (ctrl->ks_get_state);
+ ctrl->ks_get_state = NULL;
++#endif
+ release_ctrl_ocsp_certs (ctrl);
+ xfree (ctrl->server_local);
+ dirmngr_deinit_default_ctrl (ctrl);
+--
+2.11.0



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (880e89c83f0b3125ea7de41f6cb2383f40c059dc), Pavel Vinogradov, 10/13/2022

Archive powered by MHonArc 2.6.24.

Top of Page