Projetos/rpi-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/openssh: security bump version to 9.9p2

Browse Source 
Release note: https://www.openssh.com/txt/release-9.9p2

Fixes: CVE-2025-26465 (ssh) , CVE-2025-26466 (sshd)

Drop upstream patch: 0001-build-construct_utmp-when-USE_BTMP-is-set.patch

Signed-off-by: Michael Fischer <mf@go-sys.de>
Tested-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Michael Fischer
2025-02-20 14:36:35 +01:00
committed by Peter Korsgaard
parent 4d6e3ea7a5
commit 002931cc3a
3 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
package/openssh/0001-build-construct_utmp-when-USE_BTMP-is-set.patch
View File

@@ -1,35 +0,0 @@
From 76a618d2842c34c16cd21a4efc7230e2f459008d Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 25 Sep 2024 11:13:05 +1000
Subject: [PATCH] build construct_utmp() when USE_BTMP is set
Fixes compile error on Void Linux/Musl
Upstream: https://anongit.mindrot.org/openssh.git/commit/?id=76a618d2842c34c16cd21a4efc7230e2f459008d
Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
---
loginrec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/loginrec.c b/loginrec.c
index 45f13dee8b1f..7b1818b86753 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -614,7 +614,7 @@ line_abbrevname(char *dst, const char *src, int dstsize)
** into account.
**/
-#if defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN)
+#if defined(USE_BTMP) || defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN)
/* build the utmp structure */
void
@@ -698,7 +698,7 @@ construct_utmp(struct logininfo *li,
}
# endif
}
-#endif /* USE_UTMP || USE_WTMP || USE_LOGIN */
+#endif /* USE_BTMP || USE_UTMP || USE_WTMP || USE_LOGIN */
/**
** utmpx utility functions

4
package/openssh/openssh.hash
View File

@@ -1,4 +1,4 @@
# From https://www.openssh.com/txt/release-9.9
sha256 b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02 openssh-9.9p1.tar.gz
# From https://www.openssh.com/txt/release-9.9p2
sha256 91aadb603e08cc285eddf965e1199d02585fa94d994d6cae5b41e1721e215673 openssh-9.9p2.tar.gz
# Locally calculated
sha256 5bb5b160726ef5756e4f32fe95b35249c294962419650f48d05134b486d27ccb LICENCE

2
package/openssh/openssh.mk
View File

@@ -5,7 +5,7 @@
################################################################################
OPENSSH_VERSION_MAJOR = 9.9
OPENSSH_VERSION_MINOR = p1
OPENSSH_VERSION_MINOR = p2
OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR)
OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR)
OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR)