<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/c6d702d1cdf15a4e765bae6c7b50691c16359080">https://github.com/macports/macports-ports/commit/c6d702d1cdf15a4e765bae6c7b50691c16359080</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 c6d702d kerberos5: Update libressl patch
</span>c6d702d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c6d702d1cdf15a4e765bae6c7b50691c16359080
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Wed Mar 18 09:17:42 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> kerberos5: Update libressl patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://krbdev.mit.edu/rt/Ticket/Display.html?id=8878
</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 | 2 +-
net/kerberos5/files/libressl.patch | 84 ++++++++++++++++++++++++++++++++++++--
2 files changed, 81 insertions(+), 5 deletions(-)
<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 832dc27..ede97ec 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;'>@@ -48,7 +48,7 @@ patchfiles patch-util__verto__Makefile.in-use-nonzero-compat-ve
</span> libressl.patch \
no-Werror.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# AI_NUMERICSERV not available for OS X < 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# AI_NUMERICSERV not available for Leopard and earlier (OS X < 10.6)
</span> if {${os.major} < 10} {
patchfiles-append patch-src-lib-apputils-net-server.c.diff
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/kerberos5/files/libressl.patch b/net/kerberos5/files/libressl.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 3c2be5b..8ef51bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/kerberos5/files/libressl.patch
</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;'>@@ -20,17 +20,65 @@
</span>
/* OpenSSL 1.1 makes HMAC_CTX opaque, while 1.0 does not have pointer
* constructors or destructors. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-11-01 18:51:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2018-11-12 10:36:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -188,7 +188,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ruN ../krb5-1.18.ORG/src/include/k5-platform.h ./src/include/k5-platform.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/k5-platform.h 2020-02-13 02:21:58.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/k5-platform.h 2020-02-13 02:21:58.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1025,6 +1025,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memset_s(ptr, len, 0, len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(HAVE_EXPLICIT_BZERO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void explicit_bzero(void *ptr, size_t len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define zap(ptr, len) explicit_bzero(ptr, len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(HAVE_EXPLICIT_MEMSET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define zap(ptr, len) explicit_memset(ptr, 0, len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ruN ../krb5-1.18.ORG/src/plugins/preauth/pkinit/asn1t_add.h ./src/plugins/preauth/pkinit/asn1t_add.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugins/preauth/pkinit/asn1t_add.h 1970-01-01 09:00:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/preauth/pkinit/asn1t_add.h 2020-02-16 19:27:17.482763180 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef HEADER_ASN1T_ADD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HEADER_ASN1T_ADD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <openssl/asn1t.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define static_ASN1_ITEM_start(itname) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const ASN1_ITEM itname##_it = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define ASN1_ITEM_end(itname) \
</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;'>++# define static_ASN1_SEQUENCE_END_name(stname, tname) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static_ASN1_ITEM_start(tname) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ASN1_ITYPE_SEQUENCE,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ V_ASN1_SEQUENCE,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tname##_seq_tt,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NULL,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sizeof(stname),\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #stname \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ASN1_ITEM_end(tname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* HEADER_ASN1T_ADD_H */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ruN ../krb5-1.18.ORG/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c ./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 2020-02-13 02:21:58.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2020-02-16 19:27:17.542763189 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -185,7 +185,7 @@
</span> (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
</span>
/* 1.1 standardizes constructor and destructor names, renaming
* EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2924,7 +2924,7 @@
</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)) || (LIBRESSL_VERSION_NUMBER >= 0x20900000L)
</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> @@ -3076,6 +3076,10 @@
int_dhvparams *vparams;
} int_dhx942_dh;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,3 +90,31 @@
</span> ASN1_SEQUENCE(DHvparams) = {
ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ruN ../krb5-1.18.ORG/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h ./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 2020-02-13 02:21:58.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/preauth/pkinit/pkinit_crypto_openssl.h 2020-02-16 19:27:17.592763200 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,8 +46,11 @@
</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)) || (LIBRESSL_VERSION_NUMBER >= 0x20900000L)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/asn1t.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifdef LIBRESSL_VERSION_NUMBER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include "asn1t_add.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ruN ../krb5-1.18.ORG/src/tests/softpkcs11/main.c ./src/tests/softpkcs11/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/softpkcs11/main.c 2020-02-13 02:21:58.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/softpkcs11/main.c 2020-02-17 10:46:59.259976272 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,7 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <pkcs11.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;'>+ #define EVP_PKEY_get0_RSA(key) ((key)->pkey.rsa)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RSA_get0_key compat_rsa_get0_key
</span></pre><pre style='margin:0'>
</pre>