You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
openssh: update to 10.4p1
This commit is contained in:
Marius Schamschula
@@ -3,8 +3,8 @@
|
||||
PortSystem 1.0
|
||||
|
||||
name openssh
|
||||
version 10.3p1
|
||||
revision 2
|
||||
version 10.4p1
|
||||
revision 0
|
||||
categories net
|
||||
maintainers {@artkiver gmail.com:artkiver} openmaintainer
|
||||
license BSD
|
||||
@@ -26,9 +26,9 @@ long_description OpenSSH is a FREE version of the SSH protocol suite of \
|
||||
|
||||
homepage https://www.openbsd.org/openssh/
|
||||
|
||||
checksums rmd160 07e8abdbc3ab8300bd72185b634fa223bde551a4 \
|
||||
sha256 56682a36bb92dcf4b4f016fd8ec8e74059b79a8de25c15d670d731e7d18e45f4 \
|
||||
size 2007369
|
||||
checksums rmd160 c532f6eef002543caa65da18c6b5531e79d83034 \
|
||||
sha256 ef6026dd2aea8d56059638d5d3262902c892ceba9f88395835e0d06d3fb63238 \
|
||||
size 2321796
|
||||
|
||||
master_sites openbsd:OpenSSH/portable \
|
||||
ftp://ftp.cise.ufl.edu/pub/mirrors/openssh/portable/ \
|
||||
@@ -47,9 +47,7 @@ if {${name} eq ${subport}} {
|
||||
}
|
||||
|
||||
patch.pre_args-replace -p0 -p1
|
||||
patchfiles launchd.patch \
|
||||
pam.patch \
|
||||
macports-config.patch
|
||||
patchfiles macports-config.patch
|
||||
|
||||
# We need a couple of patches
|
||||
# - pam.patch
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
--- a/clientloop.c 2023-03-15 16:28:19.000000000 -0500
|
||||
+++ b/clientloop.c 2023-03-16 13:56:15.000000000 -0500
|
||||
@@ -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);
|
||||
--- a/channels.c 2023-03-15 16:28:19.000000000 -0500
|
||||
+++ b/channels.c 2023-03-16 13:56:15.000000000 -0500
|
||||
@@ -5127,7 +5127,7 @@
|
||||
}
|
||||
|
||||
#ifdef __APPLE__
|
||||
-static int
|
||||
+int
|
||||
is_path_to_xsocket(const char *display, char *path, size_t pathlen)
|
||||
{
|
||||
struct stat sbuf;
|
||||
--- a/channels.h 2023-03-15 16:28:19.000000000 -0500
|
||||
+++ b/channels.h 2023-03-16 13:58:02.000000000 -0500
|
||||
@@ -376,6 +376,9 @@
|
||||
/* x11 forwarding */
|
||||
|
||||
void channel_set_x11_refuse_time(struct ssh *, time_t);
|
||||
+#ifdef __APPLE__
|
||||
+int is_path_to_xsocket(const char *, char *, size_t);
|
||||
+#endif
|
||||
int x11_connect_display(struct ssh *);
|
||||
int x11_create_display_inet(struct ssh *, int, int, int, u_int *, int **);
|
||||
void x11_request_forwarding_with_spoofing(struct ssh *, int,
|
||||
@@ -16,20 +16,22 @@
|
||||
+ SendEnv LANG LC_*
|
||||
--- a/ssh_config.5 2019-10-17 01:02:18.000000000 +0200
|
||||
+++ b/ssh_config.5 2019-10-17 01:11:33.000000000 +0200
|
||||
@@ -71,6 +71,15 @@ Since the first obtained value for each
|
||||
--- ssh_config.5.orig 2026-07-06 02:57:12
|
||||
+++ ssh_config.5 2026-07-06 08:02:38
|
||||
@@ -71,6 +71,15 @@
|
||||
host-specific declarations should be given near the beginning of the
|
||||
file, and general defaults at the end.
|
||||
.Pp
|
||||
+The MacPorts software distribution modifies the default example file
|
||||
+with some options which are not the default in
|
||||
+.Xr ssh 1 :
|
||||
+.Pp
|
||||
+.Bl -bullet -offset indent -compact
|
||||
+.It
|
||||
+.Cm SendEnv No LANG LC_*
|
||||
+.El
|
||||
+.Pp
|
||||
The file contains keyword-argument pairs, one per line.
|
||||
++The MacPorts software distribution modifies the default example file
|
||||
++with some options which are not the default in
|
||||
++.Xr ssh 1 :
|
||||
++.Pp
|
||||
++.Bl -bullet -offset indent -compact
|
||||
++.It
|
||||
++.Cm SendEnv No LANG LC_*
|
||||
++.El
|
||||
++.Pp
|
||||
The file contains directive/values pairs, one per line.
|
||||
Lines starting with
|
||||
.Ql #
|
||||
--- a/sshd_config 2019-10-17 01:02:18.000000000 +0200
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
--- a/servconf.c 2019-10-09 02:31:03.000000000 +0200
|
||||
+++ b/servconf.c 2019-10-11 11:43:39.000000000 +0200
|
||||
@@ -295,7 +295,7 @@
|
||||
|
||||
/* Portable-specific options */
|
||||
if (options->use_pam == -1)
|
||||
- options->use_pam = 0;
|
||||
+ options->use_pam = 1;
|
||||
if (options->pam_service_name == NULL)
|
||||
options->pam_service_name = xstrdup(SSHD_PAM_SERVICE);
|
||||
Reference in New Issue
Block a user