From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 0ItmFRoKUGdhlwAA62LTzQ:P1 (envelope-from ) for ; Wed, 04 Dec 2024 07:51:54 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 0ItmFRoKUGdhlwAA62LTzQ (envelope-from ) for ; Wed, 04 Dec 2024 08:51:54 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=FA0sqoDb; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021081301 header.b=Ey1y0Igw; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=fsfe.org (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733298714; a=rsa-sha256; cv=none; b=F/d9DOd0PZF69YRXEAuoORYXXJOt2XICG4U2767sQ128qnPgCCbZo+9R7pNkhj8/Ah81zl es4yym8j7TDed13ey9TMRB5NqdfmhPy9QT2h/flAZfKdZulMG2xTAFWEbe1TrvXLdmOEek fYpIaIpa0gbCeTyfjWhE51Hnnwl2hVYAL+hJzb0oC4qP1DfdBTwF2eM2xj4Nae4xAR1HBe F/DtajCEP8X0M2lkegZlta4+nliyfCIyLOJZc7s3azEtcQEgurH8YDQ04RQFwOrzBNE9xn IdxqZTbaWXjhYNc/FsWqxKBhsJtCsqZyD1Wh6jvPGi2d1YSfO0B5r8OI5ruT4A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=FA0sqoDb; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021081301 header.b=Ey1y0Igw; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=fsfe.org (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733298714; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=F18uMgFMjT70dOfJAjFlCkNVMgvtpbt+F4F/t9WxZ0Y=; b=cIlJtxIaInX+/2YGYTWcTNnWp93AGzunyGteMh+8VO7OE+kGGG72mJH+0D9QZjwqfw0z3g yYShPIZmcG6ucWzwY8R1UDYdMOCLBDhKGM4nMpx7dzb+fPwED7f30ytMAZ1lwdnt67eh1d R5rqs7TXbaA97avmhdgLibvzFBORUrVj34cwJlz3Fdog+DxgTxQOjqvzMan2uIzRn7cF75 FWMhpBf1VxnKcJpczjo2PQHfg9+IfFU/sENw3Z4Np8k4goyL9a7dQAhDjOFcm5A7ijfFbL 2UCu3OuZGfKhRLturlzwxjy/tcsnN2vR57S4Hpq/nw08ngShShvOGY1RDLILkA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F38798A650 for ; Wed, 04 Dec 2024 08:51:53 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIkAQ-0007CG-9v; Wed, 04 Dec 2024 02:51:30 -0500 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 1tIkA8-00076m-SJ for guix-patches@gnu.org; Wed, 04 Dec 2024 02:51:11 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tIkA5-0001z0-Ti; Wed, 04 Dec 2024 02:51:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=F18uMgFMjT70dOfJAjFlCkNVMgvtpbt+F4F/t9WxZ0Y=; b=FA0sqoDbD+p1TF9XfvjYM32eU542iUFmHGXI3Y/9fTopRDPgonvoEJEvvWOOXOD2sbhqmoJ5OhpWH5EvK7BMtFxeZpKgcJulG9AhrXk2R8rdZTOJf9svXZS+L/UqmamcHnCYenx+mdJrKgiU8V2dIyeV5UaR5OTPAsq5hA0C/UMl5WX4BpxXXb6ygJnCbHBdq5zEffHhel2qZ+xV17OdzEHwlQ1Vi0eShcDHbX/EBvAIQ9KKU1eADjpKyMnYmj16ifcDfAQfatxlcI5d/G08XbrXdR0JAyeVfc5r2TwL76I17uzErj8BawV6wReyXbL6KliPnU70dkJQ5tt8IrfKHQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIkA4-0001bO-D8; Wed, 04 Dec 2024 02:51:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74187] [PATCH v2 07/24] gnu: node-lts: Update to 20.18.1 [security fixes]. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: jlicht@fsfe.org, rekado@elephly.net, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Wed, 04 Dec 2024 07:51:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74187 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74187@debbugs.gnu.org Cc: Jelle Licht , jlicht@fsfe.org, Ricardo Wurmus , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: jlicht@fsfe.org, Ricardo Wurmus , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74187-submit@debbugs.gnu.org id=B74187.17332986285901 (code B ref 74187); Wed, 04 Dec 2024 07:51:04 +0000 Received: (at 74187) by debbugs.gnu.org; 4 Dec 2024 07:50:28 +0000 Received: from localhost ([127.0.0.1]:33998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIk9U-0001X5-8i for submit@debbugs.gnu.org; Wed, 04 Dec 2024 02:50:28 -0500 Received: from mail2.fsfe.org ([213.95.165.55]:35414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIk9R-0001WZ-Nc for 74187@debbugs.gnu.org; Wed, 04 Dec 2024 02:50:26 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021081301; t=1733298624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F18uMgFMjT70dOfJAjFlCkNVMgvtpbt+F4F/t9WxZ0Y=; b=Ey1y0IgwrmJNHhZqlU53VvqTxjbZv2kzP4lDFaUcifqq9cdaXQRPO3pul90Q0XLFomysTm zA3SLX2SMLc44dSdJCYkIL3zeoplkTkWX15wShEcUWlqb0e4WUe4BaXhJHB8uQVMViKn45 pW336XkwUSFxu5natZvd1j2jEMnqCSI= Date: Wed, 4 Dec 2024 08:49:29 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.13 X-Spam-Score: -4.13 X-Migadu-Queue-Id: F38798A650 X-Migadu-Scanner: mx12.migadu.com X-TUID: AmMP99tIWHD4 From: Jelle Licht * gnu/packages/node.scm (node-lts): Update to 20.18.1. [origin]: Delete bundled brotli, ngtcp2 and uv. [:configure-flags]: Add shared-nghtcp2 flag. Add shared-nghttp3 flag. [#:phases]: Remove tests that fail due to linking to unbundled libuv. Delete tests that depend on 64-bit time_t for 32-bit builds. [native-inputs]: Replace libuv by libuv-for-node-lts. [inputs]: Replace libuv by libuv-for-node-lts. Add ngtpc2, nghttp3. Change-Id: I932e64f212283b34f0affad65c3d9f92fdea3d79 --- gnu/packages/node.scm | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 36ed22e052..13d2575333 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -750,14 +750,14 @@ (define-public llhttp-bootstrap (define-public node-lts (package (inherit node) - (version "18.19.0") + (version "20.18.1") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.gz")) (sha256 (base32 - "05qc1dgmrms73073n4l36jrcxf6ygqj959d3cngy5qclrg0isk6x")) + "1f180vgr6lrg4gs48q5c414j5sdwaqqp1vnswwr3pvryhznqrbav")) (modules '((guix build utils))) (snippet '(begin @@ -768,9 +768,12 @@ (define-public node-lts (not (string-contains file "nodejs-openssl.cnf"))))) ;; Remove bundled software, where possible (for-each delete-file-recursively - '("deps/cares" + '("deps/brotli" + "deps/cares" "deps/icu-small" "deps/nghttp2" + "deps/ngtcp2" + "deps/uv" "deps/zlib")) (substitute* "Makefile" ;; Remove references to bundled software. @@ -786,6 +789,8 @@ (define-public node-lts "--shared-zlib" "--shared-brotli" "--with-intl=system-icu" + "--shared-ngtcp2" + "--shared-nghttp3" ;;Needed for correct snapshot checksums "--v8-enable-snapshot-compression")) ((#:phases phases) @@ -868,13 +873,27 @@ (define-public node-lts "test/parallel/test-zlib-write-after-flush.js"))) '()) + ;; https://github.com/nodejs/node/issues/45906 + ;; This test depends on 64-bit time_t so skipping on 32-bit systems. + ,@(if (not (target-64bit?)) + '((delete-file "test/parallel/test-fs-utimes-y2K38.js")) + '()) + ;; These tests have an expiry date: they depend on the validity of ;; TLS certificates that are bundled with the source. We want this ;; package to be reproducible forever, so remove those. ;; TODO: Regenerate certs instead. (for-each delete-file '("test/parallel/test-tls-passphrase.js" - "test/parallel/test-tls-server-verify.js")))) + "test/parallel/test-tls-server-verify.js")) + + ;; These tests fail when linking to upstream libuv. + ;; https://github.com/nodejs/node/commit/3f6addd590 + (for-each delete-file + '("test/parallel/test-process-euid-egid.js" + "test/parallel/test-process-initgroups.js" + "test/parallel/test-process-setgroups.js" + "test/parallel/test-process-uid-gid.js")))) (add-after 'delete-problematic-tests 'replace-llhttp-sources (lambda* (#:key inputs #:allow-other-keys) ;; Replace pre-generated llhttp sources @@ -940,10 +959,11 @@ (define-public node-lts c-ares brotli icu4c - libuv + libuv-for-node-lts `(,nghttp2 "lib") openssl zlib + ; ngtcp2? nghttp3? ;; Regular build-time dependencies. perl pkg-config @@ -955,9 +975,11 @@ (define-public node-lts coreutils c-ares icu4c - libuv + libuv-for-node-lts llhttp-bootstrap brotli + ngtcp2 + nghttp3 `(,nghttp2 "lib") openssl zlib)))) -- 2.46.0