<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/764ef7aaa910c84fc70e8215220e7220928ce954">https://github.com/macports/macports-ports/commit/764ef7aaa910c84fc70e8215220e7220928ce954</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 764ef7aaa91 openssh: fix for zlib 1.3 from upstream
</span>764ef7aaa91 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 764ef7aaa910c84fc70e8215220e7220928ce954
</span>Author: グレェ <artkiver@gmail.com>
AuthorDate: Sat Aug 19 07:33:05 2023 +0000

<span style='display:block; white-space:pre;color:#404040;'>    openssh: fix for zlib 1.3 from upstream
</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/67986
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Co-authored-by: Ryan Schmidt <ryandesign@macports.org>
</span>---
 net/openssh/Portfile                                    |  6 ++++--
 .../files/patch.zlib1.3_configure.ac9.4pre2.diff        | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/Portfile b/net/openssh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bdf74886a53..d7b7113fc07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,13 +48,14 @@ if {${name} eq ${subport}} {
</span>         depends_build-append port:cctools
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patch.args          -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patch.pre_args      -p1
</span>     patchfiles          launchd.patch \
                         agent.patch \
                         pam.patch \
                         patch-sandbox-darwin.c-apple-sandbox-named-external.diff \
                         patch-sshd.c-apple-sandbox-named-external.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        macports-config.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        macports-config.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch.zlib1.3_configure.ac9.4pre2.diff
</span> 
     # We need a couple of patches
     # - pam.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,6 +79,7 @@ if {${name} eq ${subport}} {
</span>         reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/sandbox-darwin.c
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # We are patching configure.ac
</span>     use_autoreconf          yes
 
     # strnvis(3) isn't actually "broken".  OpenBSD decided to be special and flip
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/patch.zlib1.3_configure.ac9.4pre2.diff b/net/openssh/files/patch.zlib1.3_configure.ac9.4pre2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8c25e4ddd06
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/patch.zlib1.3_configure.ac9.4pre2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure: error: *** zlib too old - check config.log ***
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugzilla.mindrot.org/show_bug.cgi?id=3604
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1464,7 +1464,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   [[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   int a=0, b=0, c=0, d=0, n, v;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  if (n != 3 && n != 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  if (n < 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           exit(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   v = a*1000000 + b*10000 + c*100 + d;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v);
</span></pre><pre style='margin:0'>

</pre>