<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3b3928c623f215b8afb1c388fb7223e51db0515c">https://github.com/macports/macports-ports/commit/3b3928c623f215b8afb1c388fb7223e51db0515c</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 3b3928c kerberos5: Fix build with libressl
</span>3b3928c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3b3928c623f215b8afb1c388fb7223e51db0515c
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Fri Dec 16 23:55:04 2016 -0800
<span style='display:block; white-space:pre;color:#404040;'> kerberos5: Fix build with libressl
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/53017
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
net/kerberos5/Portfile | 1 +
net/kerberos5/files/libressl.patch | 60 ++++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/kerberos5/Portfile b/net/kerberos5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 61645a0..4bed7f5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/kerberos5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/kerberos5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +42,7 @@ worksrcdir ${worksrcdir}/src
</span> patchfiles patch-util__verto__Makefile.in-use-nonzero-compat-version.diff \
patch-config__shlib.conf-do-not-pass-dylib-file-ldflags.diff \
patch-lib_rpc_Makefile.in-explicitly-link-krb5support.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ libressl.patch \
</span> no-Werror.patch
# AI_NUMERICSERV not available for OS X < 10.6
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/kerberos5/files/libressl.patch b/net/kerberos5/files/libressl.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..608dd80
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/kerberos5/files/libressl.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naupr krb5-1.15.orig/src/lib/crypto/openssl/crypto_mod.h krb5-1.15/src/lib/crypto/openssl/crypto_mod.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/crypto/openssl/crypto_mod.h 2016-12-01 14:31:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/crypto/openssl/crypto_mod.h 2016-12-16 23:51:41.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* 1.1 standardizes constructor and destructor names, renaming
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * EVP_MD_CTX_create and EVP_MD_CTX_destroy. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define EVP_MD_CTX_new EVP_MD_CTX_create
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define EVP_MD_CTX_free EVP_MD_CTX_destroy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naupr krb5-1.15.orig/src/lib/crypto/openssl/hmac.c krb5-1.15/src/lib/crypto/openssl/hmac.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/crypto/openssl/hmac.c 2016-12-01 14:31:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/crypto/openssl/hmac.c 2016-12-16 23:50:49.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +55,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/hmac.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/evp.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* OpenSSL 1.1 makes HMAC_CTX opaque, while 1.0 does not have pointer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * constructors or destructors. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naupr krb5-1.15.orig/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c krb5-1.15/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugins/preauth/pkinit/pkinit_crypto_openssl.c 2016-12-01 14:31:25.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2016-12-16 23:51:55.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -191,7 +191,7 @@ pkinit_pkcs11_code_to_text(int err);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
</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 OPENSSL_VERSION_NUMBER < 0x10100000L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* 1.1 standardizes constructor and destructor names, renaming
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naurp krb5-1.15.orig/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c krb5-1.15/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugins/preauth/pkinit/pkinit_crypto_openssl.c 2016-12-16 23:54:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2016-12-16 23:58:00.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3059,7 +3059,7 @@ cleanup:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</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;'>+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
</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;'>+ * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naurp krb5-1.15.orig/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h krb5-1.15/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugins/preauth/pkinit/pkinit_crypto_openssl.h 2016-12-01 14:31:25.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/preauth/pkinit/pkinit_crypto_openssl.h 2016-12-16 23:58:32.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,7 +46,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/asn1.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/pem.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/asn1t.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/asn1_mac.h>
</span></pre><pre style='margin:0'>
</pre>