<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/418d19bf68fffb9489d3832d28335daf0dbce08d">https://github.com/macports/macports-ports/commit/418d19bf68fffb9489d3832d28335daf0dbce08d</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 418d19bf68f openldap: Add libfetch dep; fix build on macOS 11
</span>418d19bf68f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 418d19bf68fffb9489d3832d28335daf0dbce08d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Aug 7 02:16:55 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> openldap: Add libfetch dep; fix build on macOS 11
</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/60177
</span>---
databases/openldap/Portfile | 7 ++++--
databases/openldap/files/dynamic_lookup-11.patch | 29 ++++++++++++++++++++++++
databases/openldap/files/libressl.patch | 18 +++++++--------
3 files changed, 43 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/openldap/Portfile b/databases/openldap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 19d589c7de8..6e1bd2c3959 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/openldap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/openldap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup muniversal 1.0
</span>
name openldap
version 2.4.50
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories databases
maintainers nomaintainer
license openldap
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,11 +27,13 @@ checksums rmd160 e2e62e98cf9ea46e83ff9d111d0330d6d50b58a4 \
</span> depends_lib path:bin/perl:perl5 \
port:tcp_wrappers \
port:cyrus-sasl2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libfetch \
</span> path:lib/libssl.dylib:openssl \
port:db48 \
port:icu
patchfiles patch-ltmain \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ dynamic_lookup-11.patch \
</span> fix_implicit.patch \
libressl.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +50,7 @@ configure.ldflags-append -L${prefix}/lib/db48
</span> configure.args --mandir=${prefix}/share/man \
--localstatedir=${prefix}/var \
--with-cyrus-sasl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-fetch \
</span> --with-tls \
--enable-crypt \
--enable-wrappers \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +88,7 @@ pre-build {
</span> lappend dirs ${worksrcpath}
}
foreach dir ${dirs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${dir} && make depend"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${dir} "make depend"
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/openldap/files/dynamic_lookup-11.patch b/databases/openldap/files/dynamic_lookup-11.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..eff85397cd4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/openldap/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Handle macOS 11 and later properly. Based on patch in libtool port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-04-28 09:05:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-08-06 18:33:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9425,19 +9425,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rhapsody* | darwin1.[012])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allow_undefined_flag='${wl}-undefined ${wl}suppress'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *) # Darwin 1.3 on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ darwin1.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case ${MACOSX_DEPLOYMENT_TARGET} in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.[012])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case ${MACOSX_DEPLOYMENT_TARGET},$host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 10.[012],*|,*powerpc*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ archive_cmds_need_lc=no
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/openldap/files/libressl.patch b/databases/openldap/files/libressl.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 676ab960117..7c88c6fa0d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/openldap/files/libressl.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/openldap/files/libressl.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libraries/libldap/tls_o.c 2018-04-02 13:20:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libraries/libldap/tls_o.c 2018-04-02 13:24:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,7 +47,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libraries/libldap/tls_o.c.orig 2020-04-28 09:05:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libraries/libldap/tls_o.c 2020-08-06 18:38:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,7 @@
</span> #include <ssl.h>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> #define ASN1_STRING_data(x) ASN1_STRING_get0_data(x)
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,7 +116,7 @@ static void tlso_thr_init( void ) {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,7 +127,7 @@
</span> #endif
#endif /* OpenSSL 1.1 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> /*
* OpenSSL 1.1 API and later makes the BIO method concrete types internal.
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -197,7 +197,7 @@ tlso_init( void )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -208,7 +208,7 @@
</span> (void) tlso_seed_PRNG( lo->ldo_tls_randfile );
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@
</span> SSL_load_error_strings();
SSL_library_init();
OpenSSL_add_all_digests();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -249,7 +249,7 @@ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,7 +260,7 @@
</span> tlso_ctx_ref( tls_ctx *ctx )
{
tlso_ctx *c = (tlso_ctx *)ctx;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@
</span> #define SSL_CTX_up_ref(ctx) CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX )
#endif
SSL_CTX_up_ref( c );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -508,7 +508,7 @@ tlso_session_my_dn( tls_session *sess, s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -563,7 +563,7 @@
</span> if (!x) return LDAP_INVALID_CREDENTIALS;
xn = X509_get_subject_name(x);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@
</span> der_dn->bv_len = i2d_X509_NAME( xn, NULL );
der_dn->bv_val = xn->bytes->data;
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -544,7 +544,7 @@ tlso_session_peer_dn( tls_session *sess,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -599,7 +599,7 @@
</span> return LDAP_INVALID_CREDENTIALS;
xn = X509_get_subject_name(x);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@
</span> der_dn->bv_len = i2d_X509_NAME( xn, NULL );
der_dn->bv_val = xn->bytes->data;
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -765,7 +765,7 @@ struct tls_data {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -820,7 +820,7 @@
</span> Sockbuf_IO_Desc *sbiod;
};
</pre><pre style='margin:0'>
</pre>