From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id YK9HHKB0dWP26gAAbAwnHQ (envelope-from ) for ; Thu, 17 Nov 2022 00:39:12 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UCQuHKB0dWMAgQAAauVa8A (envelope-from ) for ; Thu, 17 Nov 2022 00:39:12 +0100 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 3739E37102 for ; Thu, 17 Nov 2022 00:39:11 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovRzk-00045Y-EC; Wed, 16 Nov 2022 18:39:04 -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 1ovRzj-00043x-B9 for guix-patches@gnu.org; Wed, 16 Nov 2022 18:39:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovRzi-0003Gf-Uo for guix-patches@gnu.org; Wed, 16 Nov 2022 18:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovRzi-0005jk-GM for guix-patches@gnu.org; Wed, 16 Nov 2022 18:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v2 3/4] gnu: node-lts: Update to 18.12.1. Resent-From: Mekeor Melire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Nov 2022 23:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: hako@ultrarare.space X-Debbugs-Original-Cc: Hilton Chain , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166864193622034 (code B ref -1); Wed, 16 Nov 2022 23:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Nov 2022 23:38:56 +0000 Received: from localhost ([127.0.0.1]:58479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovRzc-0005jJ-BV for submit@debbugs.gnu.org; Wed, 16 Nov 2022 18:38:56 -0500 Received: from lists.gnu.org ([209.51.188.17]:43840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovRzY-0005j3-L5 for submit@debbugs.gnu.org; Wed, 16 Nov 2022 18:38:54 -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 1ovRzY-00043I-7J for guix-patches@gnu.org; Wed, 16 Nov 2022 18:38:52 -0500 Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovRzV-0003FP-MF for guix-patches@gnu.org; Wed, 16 Nov 2022 18:38:51 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4A72E240103 for ; Thu, 17 Nov 2022 00:38:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1668641927; bh=+ypnf2eeUH6OOROlUzEUBC0DtiEKgpX0nqeJhtdiwIY=; h=From:To:Cc:Subject:Date:From; b=RX4fdpsYXNGnRc+gxQj8bu7AZMW/sLl9UqdbpOj1OW2VH8dRfgsVIyRckrkcsCVRE ndyMSUgcyS9JMKtBG0THtSk26w7uskX3Io1FZX45JTjsSZZWNZSO+4gPUpf+b8oHSA wVBLgsji16CnhylVxuWXIRZKgCDc/QTJxQsXu1942eC51av+Iq9j2CXcj+TJkxW11s qHVCaSMbBNH5GEYo2pLxplInKfxx2hFtVCaPyUEQGocHBRAIIuzEBjzX/lgYzIPZ/V Zbp8V5JBLWm8xsKYSdQxlo0wE6itAQ54OycAYqKGKP/JILcvHM3y82AxiwsMy5a49A 1fq8jxCiC2Ijg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NCKHp1ZPbz6tmb; Thu, 17 Nov 2022 00:38:46 +0100 (CET) References: From: Mekeor Melire Date: Wed, 16 Nov 2022 23:31:24 +0000 In-reply-to: Message-ID: <87zgcq79ml.fsf@posteo.de> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=185.67.36.66; envelope-from=mekeor@posteo.de; helo=mout02.posteo.de 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1668641951; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=qurjamJgn59llR9uJohERD0pT9t+tuoTsz84EDAYYOI=; b=MbsnEBWnDqXLB7Up/5v5GfHbVSOFbHY6fgqyCY1L4MCIXQvy2TKLB0FJd0f8lQlV5M0FH1 78nMJ8APcHj24cPs3h2xuZ0c6mAxx0aelALnwlAvkn49uB/hkH1P+xNAwf7odjXBYtLTRS WRPBkjToTlUN5Cn1ZNyOHUmtdePlQTkfw6nbXi9guLUnYcO1SbC1AWjvMKgya0bzng/C1r oVNBK7i6GP0VIGk3TT4sKPTcHvg1VYsKePstzBN4E6uneOEarUNZg8pTlVMQk06Es41Nlx YTLzwZzADzIC4ItavnaT0evrp2QPfQm2sIfpa+YvohMBBtWIgUNKj9YPhhsnZw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668641951; a=rsa-sha256; cv=none; b=idEQtctb1gPAH3akH8o/D/wD70mIXLXsI8Sd6GRDfIIKORTHhlTfGQvualJwW9v6wv83G+ PZKeeOVnGgF4egPY/T2KqdnQEoWummageXOMQTWT81jpXoQrq1tzYb4AzAumooQWHS4JJ1 +HUYbrp839MUUYY00C7qWIgXJOn99V1sfiU26rSGUjnh/KaCu9p1kOGjOP/E6DGajTpTWg 6uxjkRrPLPvDEkAdFW9Ef8g2lh9umdnO22A42jU8A3I0MpbnSMN9oJHnmuVHqc5tME4IEV FcLWtNdQNRy+/oJJWiqSUTktYNuIVtPU2NQRFsHzBYNUrXVbW5VrKOkf3jBChA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.de header.s=2017 header.b=RX4fdpsY; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.de (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" X-Migadu-Spam-Score: 4.86 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.de header.s=2017 header.b=RX4fdpsY; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.de (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" X-Migadu-Queue-Id: 3739E37102 X-Spam-Score: 4.86 X-Migadu-Scanner: scn0.migadu.com X-TUID: 4dqFgWo0WZFk 2022-11-11 / 14:23 / hako@ultrarare.space: > * gnu/packages/node.scm (node-lts): Update to 18.12.1. > [snippet]: Keep file deps/openssl/nodejs-openssl.cnf. > [arguments]<#:phases>: Adjust problematic tests to delete accordingly. > Patch additional file with hardcoded references to /bin/sh. > [native-inputs,inputs]: Replace openssl-1.1 with openssl. Thank you for this submission. As I said in the other thread, I'd suggest to decline the 53414 (which updates node to version 16.x) in favor of this patch-series (which updates to 18.x). That is because it'll save us work since there'll only be a single package-breaking upgrade (instead of two). For this submission to be merged, I'd guess we should: 1. Check if we want to adapt some patches from Debian, listed here: https://sources.debian.org/patches/nodejs/18.12.1+dfsg-2/ E.g. the "dfsg/privacy_breach.patch" looks good. 2. Make sure that packages, which depend on node, still build (and run) fine. I'm not sure how to do this. Do we need a branch for this? Kindly, Mekeor > --- gnu/packages/node.scm | 35 ++++++++++++++++++++++++----------- 1 > file changed, 24 insertions(+), 11 deletions(-) > > diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm > index 0af0158f45..cae7d3b0ca 100644 > --- a/gnu/packages/node.scm > +++ b/gnu/packages/node.scm > @@ -735,23 +735,28 @@ (define-public llhttp-bootstrap > (define-public node-lts > (package > (inherit node) > - (version "14.19.3") > + (version "18.12.1") > (source (origin > (method url-fetch) > (uri (string-append "https://nodejs.org/dist/v" version > - "/node-v" version ".tar.xz")) > + "/node-v" version ".tar.gz")) > (sha256 > (base32 > - "15691j5zhiikyamiwwd7f282g6d9acfhq91nrwx54xya38gmpx2w")) > + "11n1h54wgh61inrlqjp0j4fqcz6kl60a3iip7ya90nqdl3fp90ds")) > (modules '((guix build utils))) > (snippet > `(begin > + ;; openssl.cnf is required for build. > + (for-each delete-file-recursively > + (find-files "deps/openssl" > + (lambda (file stat) > + (if (string-contains file "nodejs-openssl.cnf") > + #f #t)))) > ;; Remove bundled software, where possible > (for-each delete-file-recursively > '("deps/cares" > "deps/icu-small" > "deps/nghttp2" > - "deps/openssl" > "deps/zlib")) > (substitute* "Makefile" > ;; Remove references to bundled software. > @@ -800,23 +805,31 @@ (define-public node-lts > libuv "/lib:" > zlib "/lib" > "'],")))))) > + (add-after 'patch-hardcoded-program-references > + 'patch-additional-hardcoded-program-references > + (lambda* (#:key inputs #:allow-other-keys) > + (substitute* "test/parallel/test-stdin-from-file-spawn.js" > + (("'/bin/sh'") (string-append > + "'" (search-input-file inputs "/bin/sh") > + "'"))))) > (replace 'delete-problematic-tests > (lambda* (#:key inputs #:allow-other-keys) > ;; FIXME: These tests fail in the build container, but they don't > ;; seem to be indicative of real problems in practice. > (for-each delete-file > - '("test/parallel/test-cluster-master-error.js" > - "test/parallel/test-cluster-master-kill.js")) > + '("test/parallel/test-cluster-primary-error.js" > + "test/parallel/test-cluster-primary-kill.js")) > > ;; These require a DNS resolver. > (for-each delete-file > '("test/parallel/test-dns.js" > - "test/parallel/test-dns-lookupService-promises.js")) > + "test/parallel/test-dns-lookupService-promises.js" > + "test/parallel/test-net-socket-connect-without-cb.js" > + "test/parallel/test-tcp-wrap-listen.js")) > > ;; These tests require networking. > (for-each delete-file > - '("test/parallel/test-https-agent-unref-socket.js" > - "test/parallel/test-corepack-yarn-install.js")) > + '("test/parallel/test-https-agent-unref-socket.js")) > > ;; This test is timing-sensitive, and fails sporadically on > ;; slow, busy, or even very fast machines. > @@ -866,7 +879,7 @@ (define-public node-lts > icu4c-71 > libuv-for-node > `(,nghttp2 "lib") > - openssl-1.1 > + openssl > zlib > ;; Regular build-time dependencies. > perl > @@ -883,7 +896,7 @@ (define-public node-lts > llhttp-bootstrap > brotli > `(,nghttp2 "lib") > - openssl-1.1 > + openssl > python-wrapper ;; for node-gyp (supports python3) > zlib))))