<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/1199e1fcdbdc8d17307d8f02faca3f5fb59c6fa8">https://github.com/macports/macports-ports/commit/1199e1fcdbdc8d17307d8f02faca3f5fb59c6fa8</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 1199e1fcdbd openssh: update to 9.3p1
</span>1199e1fcdbd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1199e1fcdbdc8d17307d8f02faca3f5fb59c6fa8
</span>Author: グレェ <artkiver@gmail.com>
AuthorDate: Fri Mar 17 08:22:11 2023 +0000
<span style='display:block; white-space:pre;color:#404040;'> openssh: update to 9.3p1
</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/67109
</span>---
net/openssh/Portfile | 11 +++++------
net/openssh/files/launchd.patch | 24 ++++++++++++------------
2 files changed, 17 insertions(+), 18 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 769b3047ae9..31dacc4cccd 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,8 +5,8 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name openssh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 9.2p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 9.3p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net
maintainers {@artkiver gmail.com:artkiver} openmaintainer
license BSD
<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 f8dedc73a99b4038da08c63cb2a85c25b0139ca0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1852380
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 29768ab6830484f797d0138d2c7f53791a319d4c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1856839
</span>
master_sites openbsd:OpenSSH/portable \
ftp://ftp.cise.ufl.edu/pub/mirrors/openssh/portable/ \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,6 @@ if {${name} eq ${subport}} {
</span> depends_build-append port:cctools
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # the HPN patch needs this, so rewrite all other patches to support it, too
</span> patch.args -p1
patchfiles launchd.patch \
agent.patch \
<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 1663e49895b..4aee72e871a 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;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/clientloop.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/clientloop.c 2019-10-11 11:43:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -287,6 +287,10 @@ client_x11_get_proto(struct ssh *ssh, co
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clientloop.c 2023-03-15 16:28:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clientloop.c 2023-03-16 13:56:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,6 +295,10 @@
</span> struct stat st;
u_int now, x11_timeout_real;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span> *_proto = proto;
*_data = data;
proto[0] = data[0] = xauthfile[0] = xauthdir[0] = '\0';
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -303,6 +307,19 @@ client_x11_get_proto(struct ssh *ssh, co
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,6 +315,19 @@
</span> }
if (xauth_path != NULL) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@
</span> /*
* Handle FamilyLocal case where $DISPLAY does
* not match an authorization entry. For this we
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -426,6 +443,9 @@ client_x11_get_proto(struct ssh *ssh, co
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -433,6 +450,9 @@
</span> u_int8_t rnd[16];
u_int i;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +41,9 @@
</span> logit("Warning: No xauth data; "
"using fake authentication data for X11 forwarding.");
strlcpy(proto, SSH_X11_PROTO, sizeof proto);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/channels.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/channels.c 2019-10-11 11:43:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4710,7 +4710,7 @@ connect_local_xsocket(u_int dnr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/channels.c 2023-03-15 16:28:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/channels.c 2023-03-16 13:56:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5066,7 +5066,7 @@
</span> }
#ifdef __APPLE__
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,12 +52,12 @@
</span> is_path_to_xsocket(const char *display, char *path, size_t pathlen)
{
struct stat sbuf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/channels.h 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/channels.h 2019-10-11 11:43:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -321,6 +321,9 @@ int permitopen_port(const char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/channels.h 2023-03-15 16:28:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/channels.h 2023-03-16 13:58:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -376,6 +376,9 @@
</span> /* x11 forwarding */
<span style='display:block; white-space:pre;background:#ffe0e0;'>- void channel_set_x11_refuse_time(struct ssh *, u_int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void channel_set_x11_refuse_time(struct ssh *, time_t);
</span> +#ifdef __APPLE__
+int is_path_to_xsocket(const char *, char *, size_t);
+#endif
</pre><pre style='margin:0'>
</pre>