mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 00:32:12 +02:00
openssh: upgrade 9.6p1 -> 9.7p1
0001-systemd-Add-optional-support-for-systemd-sd_notify.patch refresh for 9.7p1 Changelog: ============ New features ------------ * ssh(1), sshd(8): add a "global" ChannelTimeout type that watches all open channels and will close all open channels if there is no traffic on any of them for the specified interval. This is in addition to the existing per-channel timeouts added recently. * All: make DSA key support compile-time optional, defaulting to on. Bugfixes -------- * sshd(8): don't append an unnecessary space to the end of subsystem arguments * ssh(1): fix the multiplexing "channel proxy" mode, broken when keystroke timing obfuscation was added. * ssh(1), sshd(8): fix spurious configuration parsing errors when options that accept array arguments are overridden * ssh-agent(1): fix potential spin in signal handler * Many fixes to manual pages and other documentation * Greatly improve interop testing against PuTTY. (From OE-Core rev: e409b8ceb514d67d6472b4433cc9869c43401b94) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
6287ef4865
commit
d8f61735a4
@@ -1,4 +1,4 @@
|
||||
From be187435911cde6cc3cef6982a508261074f1e56 Mon Sep 17 00:00:00 2001
|
||||
From b02ef7621758f06eb686ef4f620636dbad086eda Mon Sep 17 00:00:00 2001
|
||||
From: Matt Jolly <Matt.Jolly@footclan.ninja>
|
||||
Date: Thu, 2 Feb 2023 21:05:40 +1100
|
||||
Subject: [PATCH] systemd: Add optional support for systemd `sd_notify`
|
||||
@@ -15,10 +15,10 @@ Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
|
||||
2 files changed, 37 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 22fee70f..486c189f 100644
|
||||
index 82e8bb7..d1145d3 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4835,6 +4835,29 @@ AC_SUBST([GSSLIBS])
|
||||
@@ -4870,6 +4870,29 @@ AC_SUBST([GSSLIBS])
|
||||
AC_SUBST([K5LIBS])
|
||||
AC_SUBST([CHANNELLIBS])
|
||||
|
||||
@@ -48,7 +48,7 @@ index 22fee70f..486c189f 100644
|
||||
# Looking for programs, paths and files
|
||||
|
||||
PRIVSEP_PATH=/var/empty
|
||||
@@ -5634,6 +5657,7 @@ echo " libldns support: $LDNS_MSG"
|
||||
@@ -5688,6 +5711,7 @@ echo " libldns support: $LDNS_MSG"
|
||||
echo " Solaris process contract support: $SPC_MSG"
|
||||
echo " Solaris project support: $SP_MSG"
|
||||
echo " Solaris privilege support: $SPP_MSG"
|
||||
@@ -57,7 +57,7 @@ index 22fee70f..486c189f 100644
|
||||
echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
|
||||
echo " BSD Auth support: $BSD_AUTH_MSG"
|
||||
diff --git a/sshd.c b/sshd.c
|
||||
index 6321936c..859d6a0b 100644
|
||||
index b4f2b97..6820a41 100644
|
||||
--- a/sshd.c
|
||||
+++ b/sshd.c
|
||||
@@ -88,6 +88,10 @@
|
||||
@@ -71,7 +71,7 @@ index 6321936c..859d6a0b 100644
|
||||
#include "xmalloc.h"
|
||||
#include "ssh.h"
|
||||
#include "ssh2.h"
|
||||
@@ -310,6 +314,10 @@ static void
|
||||
@@ -308,6 +312,10 @@ static void
|
||||
sighup_restart(void)
|
||||
{
|
||||
logit("Received SIGHUP; restarting.");
|
||||
@@ -82,7 +82,7 @@ index 6321936c..859d6a0b 100644
|
||||
if (options.pid_file != NULL)
|
||||
unlink(options.pid_file);
|
||||
platform_pre_restart();
|
||||
@@ -2086,6 +2094,11 @@ main(int ac, char **av)
|
||||
@@ -2093,6 +2101,11 @@ main(int ac, char **av)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,6 +94,3 @@ index 6321936c..859d6a0b 100644
|
||||
/* Accept a connection and return in a forked child */
|
||||
server_accept_loop(&sock_in, &sock_out,
|
||||
&newsock, config_s);
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
|
||||
file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch \
|
||||
file://0001-systemd-Add-optional-support-for-systemd-sd_notify.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c"
|
||||
SRC_URI[sha256sum] = "490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd"
|
||||
|
||||
CVE_STATUS[CVE-2007-2768] = "not-applicable-config: This CVE is specific to OpenSSH with the pam opie which we don't build/use here."
|
||||
|
||||
Reference in New Issue
Block a user