<pre style='margin:0'>
Daniel J. Luke (danielluke) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/636da3138e764324fd5c92b233390b3761018dcd">https://github.com/macports/macports-ports/commit/636da3138e764324fd5c92b233390b3761018dcd</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 636da3138e7 openssh: update to 9.8p1 (#24754)
</span>636da3138e7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 636da3138e764324fd5c92b233390b3761018dcd
</span>Author: Daniel J. Luke <dluke@geeklair.net>
AuthorDate: Tue Jul 2 10:39:09 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> openssh: update to 9.8p1 (#24754)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - update patchfiles
</span><span style='display:block; white-space:pre;color:#404040;'> - add revision 0 line
</span><span style='display:block; white-space:pre;color:#404040;'> - remove conflicts with obsolete lsh port
</span>---
net/openssh/Portfile | 14 +++++++-------
net/openssh/files/launchd.patch | 2 +-
net/openssh/files/pam.patch | 7 +++----
...patch-sshd-session.c-apple-sandbox-named-external.diff} | 4 ++--
4 files changed, 13 insertions(+), 14 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 108ffbf7840..c06e4f84717 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;'>@@ -5,13 +5,13 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name openssh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 9.7p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 9.8p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net
maintainers {@artkiver gmail.com:artkiver} openmaintainer
license BSD
installs_libs no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts lsh pkixssh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts pkixssh
</span>
description OpenSSH secure login server
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,9 +28,9 @@ long_description OpenSSH is a FREE version of the SSH protocol suite of \
</span>
homepage https://www.openbsd.org/openssh/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5cad750b5779e16f1336fa38cec904411184d813 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1848766
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8e9bc65c953590fd755febf4282f4bb04150b00d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1910393
</span>
master_sites openbsd:OpenSSH/portable \
ftp://ftp.cise.ufl.edu/pub/mirrors/openssh/portable/ \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ if {${name} eq ${subport}} {
</span> agent.patch \
pam.patch \
patch-sandbox-darwin.c-apple-sandbox-named-external.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-sshd.c-apple-sandbox-named-external.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sshd-session.c-apple-sandbox-named-external.diff \
</span> macports-config.patch \
# We need a couple of patches
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/launchd.patch b/net/openssh/files/launchd.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 4aee72e871a..077d823b38a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/launchd.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/launchd.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@
</span> strlcpy(proto, SSH_X11_PROTO, sizeof proto);
--- a/channels.c 2023-03-15 16:28:19.000000000 -0500
+++ b/channels.c 2023-03-16 13:56:15.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5066,7 +5066,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5127,7 +5127,7 @@
</span> }
#ifdef __APPLE__
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/pam.patch b/net/openssh/files/pam.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 0b1ef7a9d60..ac2e5fdc523 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/pam.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/pam.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,10 @@
</span> --- a/servconf.c 2019-10-09 02:31:03.000000000 +0200
+++ b/servconf.c 2019-10-11 11:43:39.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -276,7 +276,7 @@ fill_default_server_options(ServerOption
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,7 +295,7 @@
</span>
/* Portable-specific options */
if (options->use_pam == -1)
- options->use_pam = 0;
+ options->use_pam = 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Standard Options */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (options->num_host_key_files == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (options->pam_service_name == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ options->pam_service_name = xstrdup(SSHD_PAM_SERVICE);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/patch-sshd.c-apple-sandbox-named-external.diff b/net/openssh/files/patch-sshd-session.c-apple-sandbox-named-external.diff
</span>similarity index 96%
rename from net/openssh/files/patch-sshd.c-apple-sandbox-named-external.diff
rename to net/openssh/files/patch-sshd-session.c-apple-sandbox-named-external.diff
<span style='display:block; white-space:pre;color:#808080;'>index 8190b345ce0..3396294e0f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/patch-sshd.c-apple-sandbox-named-external.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/patch-sshd-session.c-apple-sandbox-named-external.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshd.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshd.c 2019-11-08 15:35:54.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshd-session.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshd-session.c 2019-11-08 15:35:54.000000000 +0100
</span> @@ -534,10 +534,79 @@ privsep_preauth(struct ssh *ssh)
/* Arrange for logging to be sent to the monitor */
set_log_handler(mm_log_handler, pmonitor);
</pre><pre style='margin:0'>
</pre>