<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a6b4f2ae7671dcaa1ca30dee1a42e6226911cfbf">https://github.com/macports/macports-ports/commit/a6b4f2ae7671dcaa1ca30dee1a42e6226911cfbf</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 a6b4f2a opendkim: fix building with OpenSSL 1.1
</span>a6b4f2a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a6b4f2ae7671dcaa1ca30dee1a42e6226911cfbf
</span>Author: Chih-Hsuan Yen <yan12125@gmail.com>
AuthorDate: Thu Sep 12 19:44:58 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> opendkim: fix building with OpenSSL 1.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> By borrowing a patch from Debian
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fixes a milter issue reported and fixed by BjarneDMat in the Trac
</span><span style='display:block; white-space:pre;color:#404040;'> ticket linked below.
</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/59024
</span>---
mail/opendkim/Portfile | 18 +++++-
mail/opendkim/files/openssl_1.1.0_compat.patch | 90 ++++++++++++++++++++++++++
2 files changed, 105 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/opendkim/Portfile b/mail/opendkim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fc9ae1..187b9ea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/opendkim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/opendkim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,12 +16,23 @@ long_description ${description}
</span> homepage http://www.opendkim.org/
master_sites sourceforge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/libssl.dylib:openssl \
</span> path:lib/libmilter.dylib:libmilter \
port:unbound
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://lists.gnu.org/archive/html/autoconf/2005-08/msg00089.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums rmd160 c6553757ae9675434e647f3cc1e6357bc60c7d2a \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1210224
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://sources.debian.org/data/main/o/opendkim/2.11.0~alpha-12/debian/patches/openssl_1.1.0_compat.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles openssl_1.1.0_compat.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch above modifies configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span>
post-patch {
reinplace "s|/var/|${prefix}/var/|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +42,8 @@ post-patch {
</span> }
configure.args --with-openssl=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-unbound=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-unbound=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-milter=${prefix}
</span>
destroot.keepdirs ${destroot}${prefix}/var/db/${name} \
${destroot}${prefix}/var/run/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/opendkim/files/openssl_1.1.0_compat.patch b/mail/opendkim/files/openssl_1.1.0_compat.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3957bb1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/opendkim/files/openssl_1.1.0_compat.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,90 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Build and work with either openssl 1.0.2 or 1.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - Thanks to Sebastian Andrzej Siewior for the patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Sebastian Andrzej Siewior
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: http://bugs.debian.org/828466
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Origin: vendor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Forwarded: no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-By: Scott Kitterman <scott@kitterman.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Update: <YYYY-MM-DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -864,26 +864,28 @@ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([libcrypto not found]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test x"$enable_shared" = x"yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([Cannot build shared opendkim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- against static openssl libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Configure with --disable-shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- to get this working or obtain a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- shared libssl library for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- opendkim to use.])
</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;'>+- # avoid caching issue - last result of SSL_library_init
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # shouldn't be cached for this next check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unset ac_cv_search_SSL_library_init
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([libssl not found]), [-ldl])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_LINK_IFELSE(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [[SSL_library_init();]])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [od_have_ossl="yes";],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [od_have_ossl="no";])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test x"$od_have_ossl" = x"no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test x"$enable_shared" = x"yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([Cannot build shared opendkim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ against static openssl libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Configure with --disable-shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ to get this working or obtain a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ shared libssl library for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ opendkim to use.])
</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;'>++ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([libssl not found]), [-ldl])
</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;'>+ AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE([HAVE_SHA256], 1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- opendkim/opendkim-crypto.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ opendkim/opendkim-crypto.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert(pthread_setspecific(id_key, ptr) == 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OPENSSL_VERSION_NUMBER >= 0x10100000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OPENSSL_thread_stop();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ERR_remove_state(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (crypto_init_done)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OPENSSL_VERSION_NUMBER >= 0x10100000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OPENSSL_thread_stop();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CRYPTO_cleanup_all_ex_data();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONF_modules_free();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EVP_cleanup();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ERR_free_strings();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ERR_remove_state(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nmutexes > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>
</pre>