CVS commit: pkgsrc/security/gnupg2

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Jul 11 08:40:45 UTC 2023

Modified Files:
        pkgsrc/security/gnupg2: distinfo
Added Files:
        pkgsrc/security/gnupg2/patches: patch-dirmngr_server.c

Log Message:
gnupg2: fix build w/o ldap. From upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/security/gnupg2/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/security/gnupg2/patches/patch-dirmngr_server.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/gnupg2/distinfo
diff -u pkgsrc/security/gnupg2/distinfo:1.83 pkgsrc/security/gnupg2/distinfo:1.84
--- pkgsrc/security/gnupg2/distinfo:1.83        Tue Jul 11 06:46:36 2023
+++ pkgsrc/security/gnupg2/distinfo     Tue Jul 11 08:40:45 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.83 2023/07/11 06:46:36 adam Exp $
+$NetBSD: distinfo,v 1.84 2023/07/11 08:40:45 tnn Exp $
 
 BLAKE2s (gnupg-2.4.3.tar.bz2) = 72f42d3f52e4a1d57dda7afadc334b820edb69c605024a561306945dd1820d0e
 SHA512 (gnupg-2.4.3.tar.bz2) = 193a9398445272ec3eb5b79e802efb7414f74bcfffc3db0bf72c0056e04228120c419ed91db168e5733a16a33e548bab5368dd9cf11ecd483825bce189341a1e
 Size (gnupg-2.4.3.tar.bz2) = 7351327 bytes
 SHA1 (patch-common_sysutils.c) = 569c12e21172c1521284922244b2f4f361c945d6
+SHA1 (patch-dirmngr_server.c) = 216b35a4d489a9c7341b90fc0517b196a12593e7

Added files:

Index: pkgsrc/security/gnupg2/patches/patch-dirmngr_server.c
diff -u /dev/null pkgsrc/security/gnupg2/patches/patch-dirmngr_server.c:1.3
--- /dev/null   Tue Jul 11 08:40:45 2023
+++ pkgsrc/security/gnupg2/patches/patch-dirmngr_server.c       Tue Jul 11 08:40:45 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-dirmngr_server.c,v 1.3 2023/07/11 08:40:45 tnn Exp $
+
+From: NIIBE Yutaka <gniibe%fsij.org@localhost>
+Date: Wed, 5 Jul 2023 00:29:54 +0000 (+0900)
+Subject: dirmngr: Enable the call of ks_ldap_help_variables when USE_LDAP.
+X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff_plain;h=dc13361524c1477b2106c7385f2059f9ea111b84;hp=2c5a93e66e3e0f15b17e5dc92b503b708ce9b58f
+
+dirmngr: Enable the call of ks_ldap_help_variables when USE_LDAP.
+
+* dirmngr/server.c [USE_LDAP] (cmd_ad_query): Conditionalize.
+
+--- dirmngr/server.c.orig      2023-06-30 08:53:58.000000000 +0000
++++ dirmngr/server.c
+@@ -2776,7 +2776,9 @@ cmd_ad_query (assuan_context_t ctx, char
+ 
+   if (opt_help)
+     {
++#if USE_LDAP
+       ks_ldap_help_variables (ctrl);
++#endif
+       err = 0;
+       goto leave;
+     }