[MacPorts] #67877: WIP: OpenSSH 9.4 snapshot Call For Testing
MacPorts
noreply at macports.org
Mon Jul 31 07:32:15 UTC 2023
#67877: WIP: OpenSSH 9.4 snapshot Call For Testing
-----------------------+--------------------
Reporter: artkiver | Owner: (none)
Type: update | Status: new
Priority: Normal | Milestone:
Component: ports | Version:
Resolution: | Keywords:
Port: |
-----------------------+--------------------
Comment (by artkiver):
For some reason I am encountering errors when I attempt to attached the
Oops.rej generated after port -v install stalls applying the launchd.patch
so pasting it below.
{{{
@@ -295,6 +295,10 @@
struct stat st;
u_int now, x11_timeout_real;
+#if __APPLE__
+ int is_path_to_socket = 0;
+#endif /* __APPLE__ */
+
*_proto = proto;
*_data = data;
proto[0] = data[0] = xauthfile[0] = xauthdir[0] = '\0';
@@ -311,6 +315,19 @@
}
if (xauth_path != NULL) {
+#if __APPLE__
+ {
+ /*
+ * If using launchd socket, remove the screen
number from the end
+ * of $DISPLAY. is_path_to_socket is used later in
this function
+ * to determine if an error should be displayed.
+ */
+ char path[PATH_MAX];
+
+ is_path_to_socket = is_path_to_xsocket(display,
path, sizeof(path));
+ }
+#endif /* __APPLE__ */
+
/*
* Handle FamilyLocal case where $DISPLAY does
* not match an authorization entry. For this we
@@ -433,6 +450,9 @@
u_int8_t rnd[16];
u_int i;
+#if __APPLE__
+ if (!is_path_to_socket)
+#endif /* __APPLE__ */
logit("Warning: No xauth data; "
"using fake authentication data for X11 forwarding.");
strlcpy(proto, SSH_X11_PROTO, sizeof proto);
}}}
--
Ticket URL: <https://trac.macports.org/ticket/67877#comment:1>
MacPorts <https://www.macports.org/>
Ports system for macOS
More information about the macports-tickets
mailing list