Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7B50FC021B2 for ; Thu, 20 Feb 2025 13:36:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 32EF961AC8; Thu, 20 Feb 2025 13:36:46 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Ssy0oHFO_eae; Thu, 20 Feb 2025 13:36:45 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 3A85661AD5 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id 3A85661AD5; Thu, 20 Feb 2025 13:36:45 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists1.osuosl.org (Postfix) with ESMTP id 431A0CF for ; Thu, 20 Feb 2025 13:36:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 3D98083AC8 for ; Thu, 20 Feb 2025 13:36:43 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id MY7To4TP0Cd1 for ; Thu, 20 Feb 2025 13:36:41 +0000 (UTC) X-Greylist: delayed 2249 seconds by postgrey-1.37 at util1.osuosl.org; Thu, 20 Feb 2025 13:36:40 UTC DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org B273A83AB3 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org B273A83AB3 Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=80.67.29.7; helo=smtprelay03.ispgateway.de; envelope-from=mf@go-sys.de; receiver= Received: from smtprelay03.ispgateway.de (smtprelay03.ispgateway.de [80.67.29.7]) by smtp1.osuosl.org (Postfix) with ESMTPS id B273A83AB3 for ; Thu, 20 Feb 2025 13:36:40 +0000 (UTC) Received: from [91.21.124.170] (helo=mail.go-sys.de) by smtprelay03.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.98) (envelope-from ) id 1tl6jS-000000005jF-2Vda for buildroot@busybox.net; Thu, 20 Feb 2025 14:36:50 +0100 Received: from mail.go-sys.de (192.168.1.9) by mail.go-sys.de (192.168.1.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Thu, 20 Feb 2025 14:36:36 +0100 Received: from go-sys.de (192.168.1.210) by mail.go-sys.de (192.168.1.9) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Thu, 20 Feb 2025 14:36:36 +0100 From: Michael Fischer To: CC: Michael Fischer , Fiona Klute Date: Thu, 20 Feb 2025 14:36:35 +0100 Message-ID: <20250220133635.26056-1-mf@go-sys.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-C2ProcessedOrg: 5fa85167-cd6f-46be-bafe-19070fe3dac3 X-CrossPremisesHeadersFilteredBySendConnector: mail.go-sys.de X-OrganizationHeadersPreserved: mail.go-sys.de X-Df-Sender: c21hcnRob3N0QGdvLXN5cy5kZQ== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=none (p=none dis=none) header.from=go-sys.de Subject: [Buildroot] [PATCH v2] package/openssh: security bump version to 9.9p2 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" 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 --- ...-construct_utmp-when-USE_BTMP-is-set.patch | 35 ------------------- package/openssh/openssh.hash | 4 +-- package/openssh/openssh.mk | 2 +- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 package/openssh/0001-build-construct_utmp-when-USE_BTMP-is-set.patch diff --git a/package/openssh/0001-build-construct_utmp-when-USE_BTMP-is-set.patch b/package/openssh/0001-build-construct_utmp-when-USE_BTMP-is-set.patch deleted file mode 100644 index 85ad5a538c..0000000000 --- a/package/openssh/0001-build-construct_utmp-when-USE_BTMP-is-set.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 76a618d2842c34c16cd21a4efc7230e2f459008d Mon Sep 17 00:00:00 2001 -From: Damien Miller -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) ---- - 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 diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 5758ce4f36..0bbc4874df 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -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 diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 95c059e03d..115290ce13 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -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) -- 2.20.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot