From eabcc5b7208d3816a23a00239841275c51f8ad41 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Thu, 7 Sep 2023 17:00:18 -0700 Subject: [PATCH] Update openssh to 9.2p1-2+deb12u1 (the version in Debian Bookworm) Signed-off-by: Saikrishna Arcot Co-authored-by: Aravind Mani --- rules/openssh.mk | 2 +- .../patch/0003-Export-remote-info-for-authorization.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/openssh.mk b/rules/openssh.mk index 5609bf34e4..98dda081ec 100644 --- a/rules/openssh.mk +++ b/rules/openssh.mk @@ -1,6 +1,6 @@ # openssh package -OPENSSH_VERSION = 8.4p1-5+deb11u2 +OPENSSH_VERSION = 9.2p1-2+deb12u1 export OPENSSH_VERSION diff --git a/src/openssh/patch/0003-Export-remote-info-for-authorization.patch b/src/openssh/patch/0003-Export-remote-info-for-authorization.patch index 3ef7623d7b..661659ac66 100755 --- a/src/openssh/patch/0003-Export-remote-info-for-authorization.patch +++ b/src/openssh/patch/0003-Export-remote-info-for-authorization.patch @@ -14,9 +14,9 @@ diff --git a/auth.c b/auth.c index c3693ba3f..96d551922 100644 --- a/auth.c +++ b/auth.c -@@ -914,3 +914,14 @@ auth_authorise_keyopts(struct ssh *ssh, struct passwd *pw, - - return 0; +@@ -764,3 +764,14 @@ auth_authorise_keyopts(struct ssh *ssh, struct passwd *pw, + fatal_f("failed to restrict session"); + sshauthopt_free(restricted); } + +/* Export remote IP address and port for authorization. */