From unknown Sun Jun 22 08:11:01 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74004] [PATCH] gnu: busybox: Update to 1.37.0. [security fixes] Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Oct 2024 07:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74004 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74004@debbugs.gnu.org Cc: Nicolas Graves X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172984210318840 (code B ref -1); Fri, 25 Oct 2024 07:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Oct 2024 07:41:43 +0000 Received: from localhost ([127.0.0.1]:37126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4Ex5-0004ti-CJ for submit@debbugs.gnu.org; Fri, 25 Oct 2024 03:41:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:37598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4Ex2-0004tX-BN for submit@debbugs.gnu.org; Fri, 25 Oct 2024 03:41:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4EuQ-0001kz-Il for guix-patches@gnu.org; Fri, 25 Oct 2024 03:38:58 -0400 Received: from 13.mo581.mail-out.ovh.net ([87.98.150.175]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4EuO-0005Vp-NE for guix-patches@gnu.org; Fri, 25 Oct 2024 03:38:58 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.148.175]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4XZZR20CL5z1N8g for ; Fri, 25 Oct 2024 07:38:53 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-wjxxw (unknown [10.110.178.161]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BD2C21FD71; Fri, 25 Oct 2024 07:38:53 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-5b5ff79f4f-wjxxw with ESMTPSA id JWA0Gg1LG2fR6RgAfmDdGw (envelope-from ); Fri, 25 Oct 2024 07:38:53 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R00612db1dd5-f29e-47e5-949a-54f7710a17e6, 5EE14B5C4448DA89B06CB3C74449DFBF0D417FAC) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 From: Nicolas Graves Date: Fri, 25 Oct 2024 09:38:47 +0200 Message-ID: <20241025073849.8217-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 5407978730172375778 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdejuddguddvudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddtieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedupdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=zBxzcPYfS/DxKED7a/PII1Cumg1fQeGeWb1m/2dmmas=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729841934; v=1; b=JXbWk2MMtZyScI/DUAbeyvzxbJjvnaFn/QW7OzjuuzkUcA4P4/yEf6vc12XKi22Rx1UvQtNs 8Z8UVrgyikZZQXtSksQRPAhteru/Rlg5EYx+/gQx1zRRTfc8QXH3ZnsEGPlpN9ErFsDKqSWxgmY NZLYqJaravzuSRa374SDtsRQYMeo1oJ/wdj42cpc7bK8HDDgPZy+8ptQfPvwTEMcjv4HNxfxmUI rqsApQGUa1QupbDkzD2TOOpzaKmww9XU5rxImUc8toe3HsVkLKyoxvlS/m2aONjdSiudbakiAvQ L9wKyqXnGtip8BOjUkp54N55rtXVlf8JtlsLIJwzu52Mw== Received-SPF: pass client-ip=87.98.150.175; envelope-from=ngraves@ngraves.fr; helo=13.mo581.mail-out.ovh.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This fixes CVE-2023-42363, CVE-2023-42364, CVE-2023-42365 and CVE-2023-42366. * gnu/packages/busybox.scm (busybox): Update to 1.37.0. --- gnu/packages/busybox.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index f811a7175f..46398da213 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -36,7 +36,7 @@ (define-module (gnu packages busybox) (define-public busybox (package (name "busybox") - (version "1.36.1") + (version "1.37.0") (source (origin (method url-fetch) (uri (string-append @@ -44,7 +44,7 @@ (define-public busybox version ".tar.bz2")) (sha256 (base32 - "0573gpj51phcz04sg77iznvcxmf5jnbk9gn3g5r9x02daz4j9k5q")))) + "1923f21rnlbv1qjvk2qhgqnki5mkgr6z0p8dvzs9jr3l5vrxy49k")))) (build-system gnu-build-system) (arguments (list #:phases -- 2.46.0 From unknown Sun Jun 22 08:11:01 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Nicolas Graves Subject: bug#74004: closed (Re: [bug#74004] [PATCH] gnu: busybox: Update to 1.37.0. [security fixes]) Message-ID: References: <87ed43ipc3.fsf@iscas.ac.cn> <20241025073849.8217-1-ngraves@ngraves.fr> X-Gnu-PR-Message: they-closed 74004 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 74004@debbugs.gnu.org Date: Sat, 26 Oct 2024 02:15:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1729908902-26150-1" This is a multi-part message in MIME format... ------------=_1729908902-26150-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #74004: [PATCH] gnu: busybox: Update to 1.37.0. [security fixes] which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 74004@debbugs.gnu.org. --=20 74004: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74004 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1729908902-26150-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 74004-done) by debbugs.gnu.org; 26 Oct 2024 02:14:27 +0000 Received: from localhost ([127.0.0.1]:40002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4WJv-0006me-0r for submit@debbugs.gnu.org; Fri, 25 Oct 2024 22:14:27 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21]:38284 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4WJs-0006mM-Cr for 74004-done@debbugs.gnu.org; Fri, 25 Oct 2024 22:14:26 -0400 Received: from m (unknown [107.174.64.25]) by APP-01 (Coremail) with SMTP id qwCowADX3SlIUBxn+vOnCg--.27504S2; Sat, 26 Oct 2024 10:13:43 +0800 (CST) From: Zheng Junjie To: Nicolas Graves via Guix-patches via Subject: Re: [bug#74004] [PATCH] gnu: busybox: Update to 1.37.0. [security fixes] In-Reply-To: <20241025073849.8217-1-ngraves@ngraves.fr> (Nicolas Graves via Guix-patches via's message of "Fri, 25 Oct 2024 09:38:47 +0200") References: <20241025073849.8217-1-ngraves@ngraves.fr> Date: Sat, 26 Oct 2024 10:13:16 +0800 Message-ID: <87ed43ipc3.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: qwCowADX3SlIUBxn+vOnCg--.27504S2 X-Coremail-Antispam: 1UD129KBjvdXoW7JFWkuF48ZF4UZFW3AFy7ZFb_yoWDZFbEvr 9xAw12qrZYvr4UKay8uwsxXa45ZrWUGrW0gF43tFsrKF9a9w4DWrs29ry8A3W7CFW8tF18 tan8Ar40g398WjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbsAYjsxI4VWkKwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26r4j6F4UM28EF7xvwVC2z2 80aVCY1x0267AKxVW8Jr0_Cr1UM2vj62AExVA0xI801c8C04v26x02cVCv0xWle2I262IY c4CY6c8Ij28IcVAaY2xG8wASzI0EjI02j7AqF2xKxwAqx4xG64xvF2IEw4CE5I8CrVC2j2 WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkE bVWUJVW8JwACjcxG0xvEwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJV W8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF 1VAFwI0_Jrv_JF1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6x IIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvE x4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnU UI43ZEXa7IUeAHUPUUUUU== X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74004-done Cc: 74004-done@debbugs.gnu.org, Nicolas Graves X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Nicolas Graves via Guix-patches via writes: > This fixes CVE-2023-42363, CVE-2023-42364, CVE-2023-42365 and > CVE-2023-42366. > > * gnu/packages/busybox.scm (busybox): Update to 1.37.0. > --- > gnu/packages/busybox.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm > index f811a7175f..46398da213 100644 > --- a/gnu/packages/busybox.scm > +++ b/gnu/packages/busybox.scm > @@ -36,7 +36,7 @@ (define-module (gnu packages busybox) > (define-public busybox > (package > (name "busybox") > - (version "1.36.1") > + (version "1.37.0") > (source (origin > (method url-fetch) > (uri (string-append > @@ -44,7 +44,7 @@ (define-public busybox > version ".tar.bz2")) > (sha256 > (base32 > - "0573gpj51phcz04sg77iznvcxmf5jnbk9gn3g5r9x02daz4j9k5q")))) > + "1923f21rnlbv1qjvk2qhgqnki5mkgr6z0p8dvzs9jr3l5vrxy49k")))) > (build-system gnu-build-system) > (arguments > (list #:phases push, close. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmccUDwACgkQO1qpk+Gi 3/A2nw/+P52FByTvy+gVaxVkt+n97iSOzDfqBlnOjteSDhK7faOCtp122N9Khway 3t3iwy7CohOQJMkTiQUqyEfQjc3KJeoHcJXG2qrSkq2lZApsBfxNA19O+dBxJI7i FhouXomaIyWtZEz7jsrjrRcGpxrqiWES6oSYS2X2lbUjI0dliPIxR+KNNt/HKFWm zcuB7t9XRcqXtTZvawJ9MMXzvzwbw0uOkSUy/tjFSVlzKJR8CX2NSTr0jbTA6/GF Sf2nI3m876lRUaeXSMQTAm0Yf9+vJGrnqzzmNAV6JMPyzmIiIHHEmI8Qu+voaIe1 0KZAqjt0eY72EXsZ4Tnuqk06dKPZz8DGmX6oW7RW7cXSnsXKU6FdTEUc8cH8Qta9 k0LGMMVV7n0Glwn0Bctop55oFrKNJXKKUVcGof4iTPAtrqz4U5wn38KXaVpDkqQN FSC7m75uBibAaupX7qMp7Li78GY/RijSS0dteO7nY793PZUbTlD2XUrAbrdzxtza pmh0SbNl4uTOvS3/6gGHWxVM8t1hiKfLTuf7S0uaEi4uUWuVP3+wVGVvoEXUQPkN L3olRKCO59qKoZsNR931CHPOiLHJpPqt2NwZXK2e5oUMYslVtj67H6fXpq+j/y2c wy2a7CfodjrvE95D93cYyhBBoEgXHjqoFBxXn5kd/tuqcoltuyc= =ql7t -----END PGP SIGNATURE----- --=-=-=-- ------------=_1729908902-26150-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 25 Oct 2024 07:41:43 +0000 Received: from localhost ([127.0.0.1]:37126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4Ex5-0004ti-CJ for submit@debbugs.gnu.org; Fri, 25 Oct 2024 03:41:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:37598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4Ex2-0004tX-BN for submit@debbugs.gnu.org; Fri, 25 Oct 2024 03:41:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4EuQ-0001kz-Il for guix-patches@gnu.org; Fri, 25 Oct 2024 03:38:58 -0400 Received: from 13.mo581.mail-out.ovh.net ([87.98.150.175]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4EuO-0005Vp-NE for guix-patches@gnu.org; Fri, 25 Oct 2024 03:38:58 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.148.175]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4XZZR20CL5z1N8g for ; Fri, 25 Oct 2024 07:38:53 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-wjxxw (unknown [10.110.178.161]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BD2C21FD71; Fri, 25 Oct 2024 07:38:53 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-5b5ff79f4f-wjxxw with ESMTPSA id JWA0Gg1LG2fR6RgAfmDdGw (envelope-from ); Fri, 25 Oct 2024 07:38:53 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R00612db1dd5-f29e-47e5-949a-54f7710a17e6, 5EE14B5C4448DA89B06CB3C74449DFBF0D417FAC) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 From: Nicolas Graves To: guix-patches@gnu.org Subject: [PATCH] gnu: busybox: Update to 1.37.0. [security fixes] Date: Fri, 25 Oct 2024 09:38:47 +0200 Message-ID: <20241025073849.8217-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 5407978730172375778 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdejuddguddvudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddtieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedupdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=zBxzcPYfS/DxKED7a/PII1Cumg1fQeGeWb1m/2dmmas=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729841934; v=1; b=JXbWk2MMtZyScI/DUAbeyvzxbJjvnaFn/QW7OzjuuzkUcA4P4/yEf6vc12XKi22Rx1UvQtNs 8Z8UVrgyikZZQXtSksQRPAhteru/Rlg5EYx+/gQx1zRRTfc8QXH3ZnsEGPlpN9ErFsDKqSWxgmY NZLYqJaravzuSRa374SDtsRQYMeo1oJ/wdj42cpc7bK8HDDgPZy+8ptQfPvwTEMcjv4HNxfxmUI rqsApQGUa1QupbDkzD2TOOpzaKmww9XU5rxImUc8toe3HsVkLKyoxvlS/m2aONjdSiudbakiAvQ L9wKyqXnGtip8BOjUkp54N55rtXVlf8JtlsLIJwzu52Mw== Received-SPF: pass client-ip=87.98.150.175; envelope-from=ngraves@ngraves.fr; helo=13.mo581.mail-out.ovh.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Nicolas Graves X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This fixes CVE-2023-42363, CVE-2023-42364, CVE-2023-42365 and CVE-2023-42366. * gnu/packages/busybox.scm (busybox): Update to 1.37.0. --- gnu/packages/busybox.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index f811a7175f..46398da213 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -36,7 +36,7 @@ (define-module (gnu packages busybox) (define-public busybox (package (name "busybox") - (version "1.36.1") + (version "1.37.0") (source (origin (method url-fetch) (uri (string-append @@ -44,7 +44,7 @@ (define-public busybox version ".tar.bz2")) (sha256 (base32 - "0573gpj51phcz04sg77iznvcxmf5jnbk9gn3g5r9x02daz4j9k5q")))) + "1923f21rnlbv1qjvk2qhgqnki5mkgr6z0p8dvzs9jr3l5vrxy49k")))) (build-system gnu-build-system) (arguments (list #:phases -- 2.46.0 ------------=_1729908902-26150-1-- From unknown Sun Jun 22 08:11:01 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74004] [PATCH] gnu: busybox: Update to 1.37.0. [security fixes] Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Oct 2024 02:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74004 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74004@debbugs.gnu.org Cc: 74004-done@debbugs.gnu.org, Nicolas Graves X-Debbugs-Original-To: Nicolas Graves via Guix-patches via Received: via spool by submit@debbugs.gnu.org id=B.172990900426724 (code B ref -1); Sat, 26 Oct 2024 02:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Oct 2024 02:16:44 +0000 Received: from localhost ([127.0.0.1]:40013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4WM7-0006wx-LZ for submit@debbugs.gnu.org; Fri, 25 Oct 2024 22:16:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:49068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4WM5-0006wp-Je for submit@debbugs.gnu.org; Fri, 25 Oct 2024 22:16:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4WJS-0000qy-Ok for guix-patches@gnu.org; Fri, 25 Oct 2024 22:13:58 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1t4WJQ-00060U-Ff for guix-patches@gnu.org; Fri, 25 Oct 2024 22:13:58 -0400 Received: from m (unknown [107.174.64.25]) by APP-01 (Coremail) with SMTP id qwCowADX3SlIUBxn+vOnCg--.27504S2; Sat, 26 Oct 2024 10:13:43 +0800 (CST) From: Zheng Junjie In-Reply-To: <20241025073849.8217-1-ngraves@ngraves.fr> (Nicolas Graves via Guix-patches via's message of "Fri, 25 Oct 2024 09:38:47 +0200") References: <20241025073849.8217-1-ngraves@ngraves.fr> Date: Sat, 26 Oct 2024 10:13:16 +0800 Message-ID: <87ed43ipc3.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: qwCowADX3SlIUBxn+vOnCg--.27504S2 X-Coremail-Antispam: 1UD129KBjvdXoW7JFWkuF48ZF4UZFW3AFy7ZFb_yoWDZFbEvr 9xAw12qrZYvr4UKay8uwsxXa45ZrWUGrW0gF43tFsrKF9a9w4DWrs29ry8A3W7CFW8tF18 tan8Ar40g398WjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbsAYjsxI4VWkKwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26r4j6F4UM28EF7xvwVC2z2 80aVCY1x0267AKxVW8Jr0_Cr1UM2vj62AExVA0xI801c8C04v26x02cVCv0xWle2I262IY c4CY6c8Ij28IcVAaY2xG8wASzI0EjI02j7AqF2xKxwAqx4xG64xvF2IEw4CE5I8CrVC2j2 WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkE bVWUJVW8JwACjcxG0xvEwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJV W8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF 1VAFwI0_Jrv_JF1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6x IIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvE x4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnU UI43ZEXa7IUeAHUPUUUUU== X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.21; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Nicolas Graves via Guix-patches via writes: > This fixes CVE-2023-42363, CVE-2023-42364, CVE-2023-42365 and > CVE-2023-42366. > > * gnu/packages/busybox.scm (busybox): Update to 1.37.0. > --- > gnu/packages/busybox.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm > index f811a7175f..46398da213 100644 > --- a/gnu/packages/busybox.scm > +++ b/gnu/packages/busybox.scm > @@ -36,7 +36,7 @@ (define-module (gnu packages busybox) > (define-public busybox > (package > (name "busybox") > - (version "1.36.1") > + (version "1.37.0") > (source (origin > (method url-fetch) > (uri (string-append > @@ -44,7 +44,7 @@ (define-public busybox > version ".tar.bz2")) > (sha256 > (base32 > - "0573gpj51phcz04sg77iznvcxmf5jnbk9gn3g5r9x02daz4j9k5q")))) > + "1923f21rnlbv1qjvk2qhgqnki5mkgr6z0p8dvzs9jr3l5vrxy49k")))) > (build-system gnu-build-system) > (arguments > (list #:phases push, close. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmccUDwACgkQO1qpk+Gi 3/A2nw/+P52FByTvy+gVaxVkt+n97iSOzDfqBlnOjteSDhK7faOCtp122N9Khway 3t3iwy7CohOQJMkTiQUqyEfQjc3KJeoHcJXG2qrSkq2lZApsBfxNA19O+dBxJI7i FhouXomaIyWtZEz7jsrjrRcGpxrqiWES6oSYS2X2lbUjI0dliPIxR+KNNt/HKFWm zcuB7t9XRcqXtTZvawJ9MMXzvzwbw0uOkSUy/tjFSVlzKJR8CX2NSTr0jbTA6/GF Sf2nI3m876lRUaeXSMQTAm0Yf9+vJGrnqzzmNAV6JMPyzmIiIHHEmI8Qu+voaIe1 0KZAqjt0eY72EXsZ4Tnuqk06dKPZz8DGmX6oW7RW7cXSnsXKU6FdTEUc8cH8Qta9 k0LGMMVV7n0Glwn0Bctop55oFrKNJXKKUVcGof4iTPAtrqz4U5wn38KXaVpDkqQN FSC7m75uBibAaupX7qMp7Li78GY/RijSS0dteO7nY793PZUbTlD2XUrAbrdzxtza pmh0SbNl4uTOvS3/6gGHWxVM8t1hiKfLTuf7S0uaEi4uUWuVP3+wVGVvoEXUQPkN L3olRKCO59qKoZsNR931CHPOiLHJpPqt2NwZXK2e5oUMYslVtj67H6fXpq+j/y2c wy2a7CfodjrvE95D93cYyhBBoEgXHjqoFBxXn5kd/tuqcoltuyc= =ql7t -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 08:11:01 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74004] [PATCH] gnu: busybox: Update to 1.37.0. [security fixes] Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Oct 2024 23:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74004 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Zheng Junjie Cc: 74004@debbugs.gnu.org, 74004-done@debbugs.gnu.org, Nicolas Graves Received: via spool by 74004-submit@debbugs.gnu.org id=B74004.17299851191018 (code B ref 74004); Sat, 26 Oct 2024 23:26:02 +0000 Received: (at 74004) by debbugs.gnu.org; 26 Oct 2024 23:25:19 +0000 Received: from localhost ([127.0.0.1]:43181 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4q9n-0000GG-0c for submit@debbugs.gnu.org; Sat, 26 Oct 2024 19:25:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4q9l-0000Fo-IG; Sat, 26 Oct 2024 19:25:18 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4q6w-0005Yb-J3; Sat, 26 Oct 2024 19:22:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=OXjQstXze/NdHfQQ4SQffvvLwzq+VPTKt+BRxbudmM4=; b=eP0S33I9vMa4uf6uB0nH XG9VqOKSP4um5Lzmo6ok2sVjeA+y5OXa+2vyITd9hBBkpQOQpAkG1M3rSwmPqL32hwFXyS0bx3NT/ PnIBu6Nr0NM+n59YnegyegequLU2CD7HJeT+SFYWp2dWSNo5al/1GOjo4gdiJkSD5yOyVgyvGGhGp aYE/+2rSdlQ9Kl2OqS41YrrcjY2lIOU/gRzCPN0xUbRI6458uV0DuCDZ1YT8qvteY/IBkQG8fBjFZ IdWn9e/atrOLWHpdaZmm9K5E83u+dUejpsDr0pJjZE2TGBcAcd0ERI11Rz52fhIN9qEgMDGXdDP/R 7jufIcfYEVFh3g==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <87ed43ipc3.fsf@iscas.ac.cn> (Zheng Junjie's message of "Sat, 26 Oct 2024 10:13:16 +0800") References: <20241025073849.8217-1-ngraves@ngraves.fr> <87ed43ipc3.fsf@iscas.ac.cn> Date: Sun, 27 Oct 2024 01:22:19 +0200 Message-ID: <87ed42o3f8.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) The updated package fails to build on powerpc64le-linux: https://ci.guix.gnu.org/build/6263835/details Excerpt: --8<---------------cut here---------------start------------->8--- libbb/hash_md5_sha.c: In function =E2=80=98sha1_end=E2=80=99: libbb/hash_md5_sha.c:1316:35: error: =E2=80=98sha1_process_block64_shaNI=E2= =80=99 undeclared (first use in this function); did you mean =E2=80=98sha1_= process_block64=E2=80=99? 1316 | || ctx->process_block =3D=3D sha1_process_block64_shaNI | ^~~~~~~~~~~~~~~~~~~~~~~~~~ | sha1_process_block64 libbb/hash_md5_sha.c:1316:35: note: each undeclared identifier is reported = only once for each function it appears in make[1]: *** [scripts/Makefile.build:198: libbb/hash_md5_sha.o] Error 1 make: *** [Makefile:744: libbb] Error 2 --8<---------------cut here---------------end--------------->8--- Ludo=E2=80=99. From unknown Sun Jun 22 08:11:01 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74004] [PATCH] gnu: busybox: Update to 1.37.0. [security fixes] Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Oct 2024 03:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74004 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 74004@debbugs.gnu.org, 74004-done@debbugs.gnu.org, Nicolas Graves Received: via spool by 74004-submit@debbugs.gnu.org id=B74004.173000037913854 (code B ref 74004); Sun, 27 Oct 2024 03:40:01 +0000 Received: (at 74004) by debbugs.gnu.org; 27 Oct 2024 03:39:39 +0000 Received: from localhost ([127.0.0.1]:43439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4u7u-0003bL-Nq for submit@debbugs.gnu.org; Sat, 26 Oct 2024 23:39:39 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21]:49190 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4u7p-0003ap-K5; Sat, 26 Oct 2024 23:39:36 -0400 Received: from m (unknown [107.174.64.25]) by APP-01 (Coremail) with SMTP id qwCowAAXAH_CtR1nGETnCg--.55912S2; Sun, 27 Oct 2024 11:38:47 +0800 (CST) From: Zheng Junjie In-Reply-To: <87ed42o3f8.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Sun, 27 Oct 2024 01:22:19 +0200") References: <20241025073849.8217-1-ngraves@ngraves.fr> <87ed43ipc3.fsf@iscas.ac.cn> <87ed42o3f8.fsf@gnu.org> Date: Sun, 27 Oct 2024 11:38:39 +0800 Message-ID: <87wmhu43ls.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: qwCowAAXAH_CtR1nGETnCg--.55912S2 X-Coremail-Antispam: 1UD129KBjvdXoW7Jr45XF18tFyfCF45XrW5KFg_yoWfKwcEva 47J3WUW34Ygr4kXFWjgr4DXr12yw1qqF17AF1Utr4Yqr9xZr4UGF48WrWkZF1YgF97KwnI yr18uw18JF1ftjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbskYjsxI4VWkKwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26r4j6F4UM28EF7xvwVC2z2 80aVCY1x0267AKxVW8JVW8Jr1lnx0Ee4C267I2x7xF54xIwI0E7I0Y6sxI4wAS0I0E0xvY zxvE52x082IY62kv0487M2AExVA0xI801c8C04v7Mc02F40EFcxC0VAKzVAqx4xG6I80ew Av7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY 6r1j6r4UM4x0Y48IcVAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r 4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF 67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2I x0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2 z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73Uj IFyTuYvjxU6cdbDUUUU X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > The updated package fails to build on powerpc64le-linux: > > https://ci.guix.gnu.org/build/6263835/details > > Excerpt: > > --8<---------------cut here---------------start------------->8--- > libbb/hash_md5_sha.c: In function =E2=80=98sha1_end=E2=80=99: > libbb/hash_md5_sha.c:1316:35: error: =E2=80=98sha1_process_block64_shaNI= =E2=80=99 undeclared (first use in this function); did you mean =E2=80=98sh= a1_process_block64=E2=80=99? > 1316 | || ctx->process_block =3D=3D sha1_process_block64_shaNI > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > | sha1_process_block64 > libbb/hash_md5_sha.c:1316:35: note: each undeclared identifier is reporte= d only once for each function it appears in > make[1]: *** [scripts/Makefile.build:198: libbb/hash_md5_sha.o] Error 1 > make: *** [Makefile:744: libbb] Error 2 > --8<---------------cut here---------------end--------------->8--- > > Ludo=E2=80=99. please try this patch. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-busybox-Fix-build-on-non-x86-platform.patch Content-Transfer-Encoding: quoted-printable From=20f50eacabce6a9955e3b673c202d6a0a6fa2c2623 Mon Sep 17 00:00:00 2001 Message-ID: From: Zheng Junjie Date: Sun, 27 Oct 2024 11:20:16 +0800 Subject: [PATCH] gnu: busybox: Fix build on non x86 platform. * gnu/packages/patches/busybox-add-missing-sha-NI-guard.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/busybox.scm (busybox): Use it. Change-Id: I1e6a24dd5b86871a3479ab6ecd247b31c746ec75 =2D-- gnu/local.mk | 1 + gnu/packages/busybox.scm | 5 +- .../busybox-add-missing-sha-NI-guard.patch | 48 +++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/busybox-add-missing-sha-NI-guard.p= atch diff --git a/gnu/local.mk b/gnu/local.mk index 6bd7c750900..af9a08f0613 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1032,6 +1032,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/breezy-fix-gio.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/bubblewrap-fix-locale-in-tests.patch \ + %D%/packages/patches/busybox-add-missing-sha-NI-guard.patch \ %D%/packages/patches/cadical-add-shared-library.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-sqlite.patch \ diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 46398da2136..053994a52af 100644 =2D-- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -3,6 +3,7 @@ ;;; Copyright =C2=A9 2016-2020, 2023 Efraim Flashner ;;; Copyright =C2=A9 2018=E2=80=932022 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2022 LuHui +;;; Copyright =C2=A9 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,7 +45,9 @@ (define-public busybox version ".tar.bz2")) (sha256 (base32 =2D "1923f21rnlbv1qjvk2qhgqnki5mkgr6z0p8dvzs9jr3l5vrxy49k"))= )) + "1923f21rnlbv1qjvk2qhgqnki5mkgr6z0p8dvzs9jr3l5vrxy49k")) + (patches + (search-patches "busybox-add-missing-sha-NI-guard.patch")))) (build-system gnu-build-system) (arguments (list #:phases diff --git a/gnu/packages/patches/busybox-add-missing-sha-NI-guard.patch b/= gnu/packages/patches/busybox-add-missing-sha-NI-guard.patch new file mode 100644 index 00000000000..9fe78cb0bed =2D-- /dev/null +++ b/gnu/packages/patches/busybox-add-missing-sha-NI-guard.patch @@ -0,0 +1,48 @@ +from https://lists.busybox.net/pipermail/busybox/2024-September/090899.html + +The ENABLE_SHA1_HWACCEL Kconfig symbol is meant to be archicture +agnostic, so can be enabled regardless of whether your build +architecture provides hardware acceleration or not. + At the moment only +x86 implements this, so every piece of optimised code should be guarded +by both ENABLE_SHA1_HWACCEL and (__x86_64__ || __i386__). + This is missing +at one place, so compiling for arm64 breaks when ENABLE_SHA1_HWACCEL is +enabled: +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D +libbb/hash_md5_sha.c: In function =E2=80=98sha1_end=E2=80=99: +libbb/hash_md5_sha.c:1316:28: error: =E2=80=98sha1_process_block64_shaNI= =E2=80=99 undeclared (first use in this function); did you mean =E2=80=98sh= a1_process_block64=E2=80=99? + + 1316 | || ctx->process_block =3D=3D sha1_process_block64_shaNI + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ + | sha1_process_block64 +libbb/hash_md5_sha.c:1316:28: note: each undeclared identifier is reported= only once for each function it appears in +make[1]: *** [scripts/Makefile.build:197: libbb/hash_md5_sha.o] Error 1 +make: *** [Makefile:744: libbb] Error 2 +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D + +Add the missing guards around the call to sha1_process_block64_shaNI to +fix the build on other architectures with ENABLE_SHA1_HWACCEL enabled. + +Change-Id: I40bba388422625f4230abf15a5de23e1fdc654fc +Signed-off-by: Andre Przywara +--- + libbb/hash_md5_sha.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c +index 57a801459..75a61c32c 100644 +--- a/libbb/hash_md5_sha.c ++++ b/libbb/hash_md5_sha.c +@@ -1313,7 +1313,9 @@ unsigned FAST_FUNC sha1_end(sha1_ctx_t *ctx, void *r= esbuf) + hash_size =3D 8; + if (ctx->process_block =3D=3D sha1_process_block64 + #if ENABLE_SHA1_HWACCEL ++# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + || ctx->process_block =3D=3D sha1_process_block64_shaNI ++# endif + #endif + ) { + hash_size =3D 5; +--=20 +2.25.1 \ No newline at end of file base-commit: 269e4034fcaf55324187efffb6ed5ba14d5e9286 prerequisite-patch-id: f64c7b345e9d8e398b2f8c146ea8f161679ad369 prerequisite-patch-id: b752a2999f51803f96394183d08b19003d1e6bc0 =2D-=20 2.46.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmcdtb8ACgkQO1qpk+Gi 3/Dytw//QK9xY7EpWQ2mWaOQT/kctNLTxiY7U3m+T01b1xNiLloCt4WjVuaur+TW D45o3m7AcEQIDCs0bKTirUFJ8xS50L7aYqVbbke6X0+Nlb/vsPEyP3v8nVCvLSZj 4ucz5rbh+6cpnHK3NJW9bveKoKCtpWfTKqVCr/Snd2aJCeKf688o9S3wN7egyKlS S2wN33Hj2mAsG/IFK2AR8dhb1/jAOckqZPNiOgx3bY9WQy7YCJpCYBo1KuImtNhQ eUUZU6gwEYuNwW2AIkWdw7VXPx0OeDZ7uQAJYx3v4HdFuILaR1JT/8NvwZ5CBNlF iGOfI8U42zoe6a2uccNNkmyvBAbOanPpgE6WjmJfMCyh1EPwyRoD/a2yXUTOjJYL xzGcUe0/k2VsO68cjx8rEhT0f3NlzlZTSdlkktQ62Rl80a3h0L64AQ3sd7lJy4Dg rwrpvXxp7OqteYvmPQEBkMa1MsLv8ib1XctBUvdteX1YyNDO0SAaPNsJV+X94FEE gwScNtSlSAnIt1MjSAeAeqQW1oUlTU/PHu2F/Y7E9X/o124zp9aJk2N6K0tzS0xA aovplxn18ra0UfnzenWvfCn+euejfJ0LlQB0223JXn2MB0BhoKPm0E04X6zzFNKH 2PBE2eyAexPnZ71+0lEu1oRUxWmMLC1eiUpWBRI8IhfKKanuoxU= =rLjx -----END PGP SIGNATURE----- --==-=-=--