<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/99bfa91032f138d3ead42b0f1ededc750df75496">https://github.com/macports/macports-ports/commit/99bfa91032f138d3ead42b0f1ededc750df75496</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 99bfa91032f heimdal: Update to 7.7.0
</span>99bfa91032f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 99bfa91032f138d3ead42b0f1ededc750df75496
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jul 1 11:25:22 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> heimdal: Update to 7.7.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update to 7.7.0, fix libtool macOS 11+ bug, fix livecheck.
</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/63155
</span>---
net/heimdal/Portfile | 37 +++++++++++-----------
net/heimdal/files/dynamic_lookup-11.patch | 48 +++++++++++++++++++++++++++++
net/heimdal/files/lib-hdb-hdb-mitdb.c.patch | 14 +++++++++
3 files changed, 81 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/heimdal/Portfile b/net/heimdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 17b1077da43..cd9d7df133d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/heimdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/heimdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,23 +3,24 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup heimdal heimdal 7.5.0 heimdal-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup heimdal heimdal 7.7.0 heimdal-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e056d1ce93d783fdc321ad02f373e363bce47d9e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c5a2a0030fcc728022fa2332bad85569084d1c3b9a59587b7ebe141b0532acad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a29bd27e99c0e3e05752d090fba99d14a94095af \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f02d3314d634cc55eb9cf04a1eae0d96b293e45a1f837de9d894e800161b7d1b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10189293
</span>
maintainers nomaintainer
categories net security
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.h5l.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.h5l.org
</span> description Heimdal is a Kerberos 5 implementation.
long_description \
Heimdal is an implementation of Kerberos 5 (and some more stuff) largely \
written in Sweden (which was important when we started writing it, less so \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- now). It is freely available under a three clause BSD style license.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ now).
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,11 +29,16 @@ depends_lib port:readline \
</span> port:libtasn1 \
port:libcomerr
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append lib-hdb-hdb-mitdb.c.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Use a separate prefix to avoid conflicts with the port kerberos5
# (and openssl, if that variant is selected)
configure.pre_args --prefix=${prefix}/libexec/heimdal
configure.args \
--sysconfdir=${prefix}/etc \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-mdb-db \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-ndbm-db \
</span> --disable-silent-rules \
--enable-shared \
--enable-static \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +46,7 @@ configure.args \
</span> --with-readline=${prefix} \
--without-libedit \
--with-libintl=${prefix} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-berkeley-db \
</span> --without-x \
--without-openldap \
--without-openssl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,29 +62,25 @@ variant x11 description \
</span> port:xorg-libsm \
port:xorg-libX11 \
port:xorg-libXdmcp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-x=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-x --with-x=${prefix}
</span> }
variant openldap description \
{Enable LDAP database support for keeping track of Kerberos information} {
depends_lib-append port:openldap
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-openldap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-openldap=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-openldap --with-openldap=${prefix}
</span> }
variant openssl description \
{Use OpenSSL libraries instead of internal ones for crypto and ssl related functions} {
depends_lib-append path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-openssl=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-openssl --with-openssl=${prefix}
</span> }
variant sqlite3 description \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {Enable SQlite3 database support for keeping track of Kerberos information} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {Enable SQLite3 database support for keeping track of Kerberos information} {
</span> depends_lib-append port:sqlite3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-sqlite3=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-sqlite3 --with-sqlite3=${prefix}
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,6 +94,4 @@ post-patch {
</span> test.run yes
test.target check
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "[quotemeta ${name}]-(\\d+(?:\\.\\d+)*)[quotemeta ${extract.suffix}]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.livecheck.regex {(\d+(?:\.\d+)*)}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/heimdal/files/dynamic_lookup-11.patch b/net/heimdal/files/dynamic_lookup-11.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9837e19445e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/heimdal/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Recognize macOS 11 and later, remove inaccurate comment, and simplify.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44605
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2019-06-07 01:23:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-07-01 10:02:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7743,16 +7743,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin1.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- darwin*) # darwin 5.x on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # if running on 10.5 or later, the deployment target defaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # to the OS version, if on x86, and 10.4, the deployment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # target defaults to 10.4. Don't you love it?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.[012][,.]*)
</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*-darwin[5-8]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</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;'>+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/libedit/configure.orig 2019-06-07 01:23:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/libedit/configure 2021-07-01 10:02:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7723,16 +7723,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin1.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- darwin*) # darwin 5.x on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # if running on 10.5 or later, the deployment target defaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # to the OS version, if on x86, and 10.4, the deployment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # target defaults to 10.4. Don't you love it?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.[012][,.]*)
</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*-darwin[5-8]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</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;'>+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/heimdal/files/lib-hdb-hdb-mitdb.c.patch b/net/heimdal/files/lib-hdb-hdb-mitdb.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d7f077e202a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/heimdal/files/lib-hdb-hdb-mitdb.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix typo.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/heimdal/heimdal/issues/624
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/heimdal/heimdal/commit/3bcc031939d4f8cf600839d1e92b252c250d4d79
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/hdb/hdb-mitdb.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/hdb/hdb-mitdb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1116,7 +1116,7 @@ krb5_error_code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hdb_mitdb_create(krb5_context context, HDB **db,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *filename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MITDB **mdb (MITDB **)db;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MITDB **mdb = (MITDB **)db;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *mdb = calloc(1, sizeof(**mdb));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (*mdb == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
</span></pre><pre style='margin:0'>
</pre>