<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/a76de516d4b1c24e204d1fbb0160a1e9b158a6d4">https://github.com/macports/macports-ports/commit/a76de516d4b1c24e204d1fbb0160a1e9b158a6d4</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 a76de516d4b kerberos5: Update to 1.19
</span>a76de516d4b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a76de516d4b1c24e204d1fbb0160a1e9b158a6d4
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Feb 9 17:51:14 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> kerberos5: Update to 1.19
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update to 1.19 and add lmdb dependency since otherwise it might get used
</span><span style='display:block; white-space:pre;color:#404040;'> opportunistically.
</span>---
net/kerberos5/Portfile | 11 +++++------
net/kerberos5/files/constructor_check.patch | 14 --------------
net/kerberos5/files/libressl.patch | 19 +++++++------------
net/kerberos5/files/no-Werror.patch | 10 +++++-----
...ig__shlib.conf-do-not-pass-dylib-file-ldflags.diff | 6 +++---
...b_rpc_Makefile.in-explicitly-link-krb5support.diff | 8 ++++----
6 files changed, 24 insertions(+), 44 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 3b6cb5254bb..2208cbf57a3 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;'>@@ -4,12 +4,11 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name kerberos5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.18.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.19
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b8a3c3542433442e18984456773b0a2749fc6282 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8715312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d8a34f3b3e15c29b6052c8e763875a65c325b9ee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bc7862dd1342c04e1c17c984a268d50f29c0a658a59a22bd308ffa007d532a2e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8735572
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
conflicts fbopenssl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +37,7 @@ depends_build port:pkgconfig \
</span> depends_lib port:gettext \
port:libcomerr \
port:libedit \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lmdb \
</span> port:ncurses \
path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,6 @@ patchfiles patch-util__verto__Makefile.in-use-nonzero-compat-ve
</span> patch-config__shlib.conf-do-not-pass-dylib-file-ldflags.diff \
patch-lib_rpc_Makefile.in-explicitly-link-krb5support.diff \
libressl.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- constructor_check.patch \
</span> no-Werror.patch
# AI_NUMERICSERV not available for Leopard and earlier (OS X < 10.6)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/kerberos5/files/constructor_check.patch b/net/kerberos5/files/constructor_check.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c98920fb0af..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/kerberos5/files/constructor_check.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp krb5-1.18.2.orig/src/aclocal.m4 krb5-1.18.2/src/aclocal.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aclocal.m4 2020-06-09 22:39:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aclocal.m4 2020-06-10 12:38:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1599,7 +1599,9 @@ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # blindly assume we have 'unlink'...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_TRY_RUN([void foo1() __attribute__((constructor));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_TRY_RUN([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void foo1() __attribute__((constructor));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void foo1() { unlink("conftest.1"); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void foo2() __attribute__((destructor));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void foo2() { unlink("conftest.2"); }
</span><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 8ef51bb09c1..b3e3782d0cf 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,8 +20,7 @@
</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;'>-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:#ffe0e0;'>---- 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.orig 2020-02-13 02:21:58.000000000 +0900
</span> +++ include/k5-platform.h 2020-02-13 02:21:58.000000000 +0900
@@ -1025,6 +1025,7 @@
memset_s(ptr, len, 0, len);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +30,7 @@ diff -ruN ../krb5-1.18.ORG/src/include/k5-platform.h ./src/include/k5-platform.h
</span> # define zap(ptr, len) explicit_bzero(ptr, len)
#elif defined(HAVE_EXPLICIT_MEMSET)
# define zap(ptr, len) explicit_memset(ptr, 0, len)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>---- 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.orig 1970-01-01 09:00:00.000000000 +0900
</span> +++ plugins/preauth/pkinit/asn1t_add.h 2020-02-16 19:27:17.482763180 +0900
@@ -0,0 +1,23 @@
+#ifndef HEADER_ASN1T_ADD_H
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,9 +56,8 @@ diff -ruN ../krb5-1.18.ORG/src/plugins/preauth/pkinit/asn1t_add.h ./src/plugins/
</span> + ASN1_ITEM_end(tname)
+
+#endif /* HEADER_ASN1T_ADD_H */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>---- plugins/preauth/pkinit/pkinit_crypto_openssl.c 2020-02-13 02:21:58.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ 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;'>+--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2021-02-01 13:49:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2021-02-08 17:57:47.000000000 -0600
</span> @@ -185,7 +185,7 @@
(*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +76,7 @@ diff -ruN ../krb5-1.18.ORG/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c ./
</span>
/*
* We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3076,6 +3076,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2947,6 +2947,10 @@
</span> int_dhvparams *vparams;
} int_dhx942_dh;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,8 +87,7 @@ diff -ruN ../krb5-1.18.ORG/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c ./
</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:#ffe0e0;'>-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:#ffe0e0;'>---- 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.orig 2020-02-13 02:21:58.000000000 +0900
</span> +++ plugins/preauth/pkinit/pkinit_crypto_openssl.h 2020-02-16 19:27:17.592763200 +0900
@@ -46,8 +46,11 @@
#include <openssl/asn1.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,8 +102,7 @@ diff -ruN ../krb5-1.18.ORG/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h ./
</span> #else
#include <openssl/asn1_mac.h>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>---- 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.orig 2020-02-13 02:21:58.000000000 +0900
</span> +++ tests/softpkcs11/main.c 2020-02-17 10:46:59.259976272 +0900
@@ -45,7 +45,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/kerberos5/files/no-Werror.patch b/net/kerberos5/files/no-Werror.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 2afffaba1d2..2488fe71e33 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/kerberos5/files/no-Werror.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/kerberos5/files/no-Werror.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;'>---- aclocal.m4.orig 2017-12-05 11:36:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aclocal.m4 2017-12-19 06:04:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -543,7 +543,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aclocal.m4.orig 2021-02-01 13:49:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aclocal.m4 2021-02-08 18:01:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -535,7 +535,7 @@
</span> TRY_WARN_CC_FLAG(-Wno-format-zero-length)
# Other flags here may not be supported on some versions of
# gcc that people want to use.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> TRY_WARN_CC_FLAG(-W$flag)
done
# old-style-definition? generates many, many warnings
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -560,10 +560,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -552,10 +552,7 @@
</span> # We're currently targeting C89+, not C99, so disallow some
# constructs.
for flag in declaration-after-statement ; do
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@
</span> done
# We require function declarations now.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -572,10 +569,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -564,10 +561,6 @@
</span> # version doesn't cause implicitly declared functions to be
# flagged as errors. If neither works, -Wall implies
# -Wimplicit-function-declaration so don't bother.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/kerberos5/files/patch-config__shlib.conf-do-not-pass-dylib-file-ldflags.diff b/net/kerberos5/files/patch-config__shlib.conf-do-not-pass-dylib-file-ldflags.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 29ad94ef317..7997b9bb54a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/kerberos5/files/patch-config__shlib.conf-do-not-pass-dylib-file-ldflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/kerberos5/files/patch-config__shlib.conf-do-not-pass-dylib-file-ldflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/shlib.conf.orig 2014-10-15 16:24:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/shlib.conf 2015-01-27 12:36:06.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -362,15 +362,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/shlib.conf.orig 2021-02-01 13:49:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/shlib.conf 2021-02-08 17:55:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -363,15 +363,7 @@
</span> DYNOBJEXT=.so
SHLIB_EXPORT_FILE_DEP=darwin.exports
LDCOMBINE='$(CC) -undefined error -dead_strip -dynamiclib -compatibility_version $(LIBMAJOR) -current_version $(LIBMAJOR).$(LIBMINOR) -install_name "$(KRB5_LIBDIR)/$(LIBPREFIX)$(LIBBASE)$(SHLIBVEXT)" -exported_symbols_list darwin.exports $(CFLAGS)'
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/kerberos5/files/patch-lib_rpc_Makefile.in-explicitly-link-krb5support.diff b/net/kerberos5/files/patch-lib_rpc_Makefile.in-explicitly-link-krb5support.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c63d4e9c607..1c5595d9494 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/kerberos5/files/patch-lib_rpc_Makefile.in-explicitly-link-krb5support.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/kerberos5/files/patch-lib_rpc_Makefile.in-explicitly-link-krb5support.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/rpc/Makefile.in.orig 2014-10-15 16:24:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/rpc/Makefile.in 2015-01-27 11:19:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rpc/Makefile.in.orig 2021-02-01 13:49:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rpc/Makefile.in 2021-02-08 17:56:30.000000000 -0600
</span> @@ -15,7 +15,7 @@
$(TOPLIBD)/libkrb5$(SHLIBEXT) \
$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
$(COM_ERR_DEPLIB)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--SHLIB_EXPLIBS=-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err $(LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SHLIB_EXPLIBS=-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lkrb5support $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SHLIB_EXPLIBS=-lgssapi_krb5 -lkrb5 -lk5crypto $(COM_ERR_LIB) $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SHLIB_EXPLIBS=-lgssapi_krb5 -lkrb5 -lk5crypto $(COM_ERR_LIB) -lkrb5support $(LIBS)
</span> RELDIR=rpc
SRCS = $(srcdir)/auth_none.c \
</pre><pre style='margin:0'>
</pre>