<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/f0a18b7908a53782f02d573ce0259c301a6fcbaf">https://github.com/macports/macports-ports/commit/f0a18b7908a53782f02d573ce0259c301a6fcbaf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f0a18b7908a53782f02d573ce0259c301a6fcbaf
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jun 2 18:31:00 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> kerberos5: Update to 1.20
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove libressl patch because it fails to apply and I don't use
</span><span style='display:block; white-space:pre;color:#404040;'> libressl. If kerberos5 doesn't build with libressl, report it to the
</span><span style='display:block; white-space:pre;color:#404040;'> developers of kerberos5 and work with them on a solution.
</span>---
net/kerberos5/Portfile | 21 ++++++----------
net/kerberos5/files/no-Werror.patch | 10 ++++----
.../files/patch-lib-apputils-net-server.c.diff | 20 +++++++++++++++
.../files/patch-src-lib-apputils-net-server.c.diff | 29 ----------------------
4 files changed, 32 insertions(+), 48 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 da3a8765807..0071bc849ae 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.19.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.20
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 dde47197b240c4d11f7f6f17f40d6479c84d622d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 56d04863cfddc9d9eb7af17556e043e3537d41c6e545610778676cf551b9dcd0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8741343
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1b17a740e6e6fac6668c70a30a9cd6406b492f07 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7e022bdd3c851830173f9faaa006a230a0e0fdad4c953e85bff4bf0da036e12f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8660756
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
conflicts fbopenssl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +32,7 @@ distname krb5-${version}
</span>
depends_build port:gettext \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python310
</span>
depends_lib port:gettext-runtime \
port:libcomerr \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,15 +45,10 @@ 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 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-lib-apputils-net-server.c.diff \
</span> patch-lib_rpc_Makefile.in-explicitly-link-krb5support.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libressl.patch \
</span> no-Werror.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# AI_NUMERICSERV not available for Leopard and earlier (OS X < 10.6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-src-lib-apputils-net-server.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_autoreconf yes
configure.checks.implicit_function_declaration.whitelist-append strchr
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,12 +56,11 @@ configure.checks.implicit_function_declaration.whitelist-append strchr
</span> # remove ${prefix}/lib from configure.ldflags to allow linking against its own libs first
# adding ${worksrcpath}/lib is not necessary and pollutes krb5-config --libs and pkg-config files
configure.ldflags-delete -L${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python3.10
</span> configure.args --with-system-et \
--without-system-db \
--without-hesiod \
--without-ldap \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-tcl \
</span> --with-crypto-impl=openssl \
--with-libedit \
--without-readline \
<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 2488fe71e33..a1a428b252a 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 2021-02-01 13:49:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aclocal.m4 2021-02-08 18:01:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -535,7 +535,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aclocal.m4.orig 2022-05-25 20:35:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aclocal.m4 2022-06-02 17:14:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -545,7 +545,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;'>-@@ -552,10 +552,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -562,10 +562,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;'>-@@ -564,10 +561,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -574,10 +571,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-lib-apputils-net-server.c.diff b/net/kerberos5/files/patch-lib-apputils-net-server.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7976ce9a681
</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/patch-lib-apputils-net-server.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix net-server.c when AI_NUMERICSERV is undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Some macOS versions do not define AI_NUMERICSERV. Other source files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+check whether it is defined before using it; do so here as well.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/krb5/krb5/commit/f8ecc0ae74c7ebd84f042e28079aa6b4b2ae405c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/apputils/net-server.c.orig 2022-05-25 20:35:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/apputils/net-server.c 2022-06-02 18:01:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -828,7 +828,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * resolution. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memset(&hints, 0, sizeof(struct addrinfo));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hints.ai_family = AF_UNSPEC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hints.ai_flags = AI_PASSIVE | AI_NUMERICSERV;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hints.ai_flags = AI_PASSIVE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef AI_NUMERICSERV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hints.ai_flags |= AI_NUMERICSERV;
</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;'>+ /* Add all the requested addresses. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < bind_addresses.n; i++) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/kerberos5/files/patch-src-lib-apputils-net-server.c.diff b/net/kerberos5/files/patch-src-lib-apputils-net-server.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dcc39be6399..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/kerberos5/files/patch-src-lib-apputils-net-server.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/apputils/net-server.c.orig 2016-12-01 16:31:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/apputils/net-server.c 2016-12-05 10:51:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,6 +67,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* XXX */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define KDC5_NONET (-1779992062L)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* AI_NUMERICSERV as a value for the `ai_flags' member
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+* of `struct addrinfo' of header <netdb.h> has only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+* been available since:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+* POSIX 1003.1-2008, Issue 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+* glibc 2.3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+* Mac OS X 10.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+* etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+* Fortunately, its main purpose seems to be only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+* to optimize calls of `getaddrinfo', and because it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+* is meant to be a bit flag, it can therefore be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+* [relatively] safely ignored by defining it to have
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+* the value zero.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef AI_NUMERICSERV
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define AI_NUMERICSERV 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int tcp_or_rpc_data_counter;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int max_tcp_or_rpc_data_connections = 45;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>