<pre style='margin:0'>
roederja pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d644837344a9c30b587899a9b58c5b249a666e09">https://github.com/macports/macports-ports/commit/d644837344a9c30b587899a9b58c5b249a666e09</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 d644837344a gnupg2: Update to 2.2.25, fix +openldap on Big Sur
</span>d644837344a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d644837344a9c30b587899a9b58c5b249a666e09
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Wed Nov 25 19:51:00 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> gnupg2: Update to 2.2.25, fix +openldap on Big Sur
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update gnupg2 to the latest version 2.2.25.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> | Noteworthy changes in version 2.2.25
</span><span style='display:block; white-space:pre;color:#404040;'> | ====================================
</span><span style='display:block; white-space:pre;color:#404040;'> |
</span><span style='display:block; white-space:pre;color:#404040;'> | * scd: Fix regression in 2.2.24 requiring gpg --card-status before
</span><span style='display:block; white-space:pre;color:#404040;'> | signing or decrypting.
</span><span style='display:block; white-space:pre;color:#404040;'> | https://dev.gnupg.org/T5065
</span><span style='display:block; white-space:pre;color:#404040;'> |
</span><span style='display:block; white-space:pre;color:#404040;'> | * gpgsm: Using Libksba 1.5.0 signatures with a rarely used
</span><span style='display:block; white-space:pre;color:#404040;'> | combination of attributes can now be verified.
</span><span style='display:block; white-space:pre;color:#404040;'> | https://dev.gnupg.org/T5146
</span><span style='display:block; white-space:pre;color:#404040;'> |
</span><span style='display:block; white-space:pre;color:#404040;'> | Release-info: https://dev.gnupg.org/T5140
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Additionally, fix a failure to correctly compile against OpenLDAP when
</span><span style='display:block; white-space:pre;color:#404040;'> +openldap is enabled (which is the default) due to
</span><span style='display:block; white-space:pre;color:#404040;'> -Werror=implicit-function-declaration.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> | conftest.c:84:1: error: implicit declaration of function 'ldap_open' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;color:#404040;'> | ldap_open("foobar",1234);
</span><span style='display:block; white-space:pre;color:#404040;'> | ^
</span><span style='display:block; white-space:pre;color:#404040;'> | conftest.c:84:1: note: did you mean 'ldap_turn'?
</span><span style='display:block; white-space:pre;color:#404040;'> | /opt/local/include/ldap.h:2097:1: note: 'ldap_turn' declared here
</span><span style='display:block; white-space:pre;color:#404040;'> | ldap_turn LDAP_P(( LDAP *ld,
</span><span style='display:block; white-space:pre;color:#404040;'> | ^
</span><span style='display:block; white-space:pre;color:#404040;'> | 1 error generated.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This happens because the configure script checks for ldap_open(3), which
</span><span style='display:block; white-space:pre;color:#404040;'> was deprecated 20 years ago in [1], and hidden behind a preprocessor
</span><span style='display:block; white-space:pre;color:#404040;'> define 16 years ago in [2]. With -Werror=implicit-function-declaration,
</span><span style='display:block; white-space:pre;color:#404040;'> the unavailability of the function declaration makes the configure test
</span><span style='display:block; white-space:pre;color:#404040;'> fail and gnupg2 build without LDAP support.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix this by adding -DLDAP_DEPRECATED=1 to the preprocessor flags, which
</span><span style='display:block; white-space:pre;color:#404040;'> makes the configure test pass again. This is a stop-gap measure, and if
</span><span style='display:block; white-space:pre;color:#404040;'> the LDAP support in gnupg depends on code that was deprecated 16 years
</span><span style='display:block; white-space:pre;color:#404040;'> ago, maybe it should just be disabled, or at least removed from the
</span><span style='display:block; white-space:pre;color:#404040;'> default variants.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [1]: https://git.openldap.org/openldap/openldap/-/commit/5417fdfea7004888c3f40840f8ed1c29fa738581
</span><span style='display:block; white-space:pre;color:#404040;'> [2]: https://git.openldap.org/openldap/openldap/-/commit/4d29df5bd1fabcdc50975651c746365686b62b53
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/60583
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/pull/2625
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/pull/3214
</span>---
mail/gnupg2/Portfile | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
<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 9bc111fd23b..012ab801dd2 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
set my_name gnupg
name ${my_name}2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.2.24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2.25
</span> categories mail security
maintainers {jann @roederja} {ionic @Ionic} openmaintainer
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@ master_sites ${my_name}:${my_name}
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6d69ede08c5607714ecbe90bb3fe5c8c6a91b038 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9090b400faae34f08469d78000cfec1cee5b9c553ce11347cc96ef16eab98c46 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7196489
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8e2a92a23241568356dc2915a3322327ac092b1c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c55307b247af4b6f44d2916a25ffd1fb64ce2e509c3c3d028dbe7fbf309dc30a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7195857
</span>
platform darwin {
if {![variant_isset pinentry] && ![variant_isset pinentry_mac]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,6 +82,8 @@ variant pinentry_mac conflicts pinentry description {Handle user input via pinen
</span> configure.args-append --disable-openldap --with-ldap=no
variant openldap description {Support openldap} {
depends_lib-append port:openldap
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLDAP_DEPRECATED=1
</span> configure.args-delete --disable-openldap
configure.args-delete --with-ldap=no
configure.args-append --with-ldap=${prefix}
</pre><pre style='margin:0'>
</pre>