<pre style='margin:0'>
Blair Zajac (blair) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/771cf01ef0a65f31e201f8f88a76f491b268a36e">https://github.com/macports/macports-ports/commit/771cf01ef0a65f31e201f8f88a76f491b268a36e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 771cf01ef0a gnupg2: fix build without OpenLDAP
</span>771cf01ef0a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 771cf01ef0a65f31e201f8f88a76f491b268a36e
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Fri Aug 18 10:32:02 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> gnupg2: fix build without OpenLDAP
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67981
</span>---
mail/gnupg2/Portfile | 3 +++
mail/gnupg2/files/patch-fix-build-without-openldap.diff | 14 ++++++++++++++
2 files changed, 17 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/gnupg2/Portfile b/mail/gnupg2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1bd7b44c4b4..1b0cdd0fb4a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/gnupg2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/gnupg2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,9 @@ master_sites ${my_name}:${my_name}
</span> use_bzip2 yes
default_variants +openldap
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://dev.gnupg.org/T6579
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-build-without-openldap.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin {
if {![variant_isset pinentry] && ![variant_isset pinentry_mac]} {
# Automatically switch between pinentry and pinentry-mac, with pinentry-mac being
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/gnupg2/files/patch-fix-build-without-openldap.diff b/mail/gnupg2/files/patch-fix-build-without-openldap.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2acbfe57205
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/gnupg2/files/patch-fix-build-without-openldap.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git dirmngr/server.c dirmngr/server.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 51a149cb2..ee61f63d6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dirmngr/server.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dirmngr/server.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2776,7 +2776,9 @@ cmd_ad_query (assuan_context_t ctx, char *line)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (opt_help)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE_LDAP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ks_ldap_help_variables (ctrl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto leave;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>