From patchwork Sun Jan 5 17:57:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 36634 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2DD1F27BBE2; Sun, 5 Jan 2025 17:58:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E138727BBE2 for ; Sun, 5 Jan 2025 17:58:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tUUt9-0008RR-8k; Sun, 05 Jan 2025 12:58:11 -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 1tUUt1-0008Pq-Ky for guix-patches@gnu.org; Sun, 05 Jan 2025 12:58:03 -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 1tUUt0-0007FW-Vm for guix-patches@gnu.org; Sun, 05 Jan 2025 12:58:03 -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=1gHm5+r0NLjTWololblDjwHrETSkwWjDm6l1Mmcp8Mg=; b=Exikt3VnL7Vu+4RsM4mumb9q6JDkZe6mcZewxLitcdLSeHqFU16Edtuv0Za07Rx5Kx252DijSeTtmoOzvy5jonuAEonoYWLneJwDJfYxCAZn6FOP798QA2PkY//MqRAuYsR+phFHdch9FV/YbIXrfdtm7xBrnHsjJG8/KrO8uYPNI4V7UUXrhRmqMQDCHyu1PC6r1Hem2bEDnKkp62XAcs+6/N2kFzHsD21tG8HOs1LR9aAyP3wJdODQnJSizAi0o/fCQImdCKPQOpkTf2nN5wbSTUerf8V2cynS64c/MJ/fsP0CY6PjPv4tWvt6QgFXvTRiNdMrCKvei1SYwmzdbw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tUUt0-0008Ur-Bc; Sun, 05 Jan 2025 12:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75384] [PATCH 1/4] gnu: Add c-ares-for-node-lts. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: jlicht@fsfe.org, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 05 Jan 2025 17:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75384 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75384@debbugs.gnu.org Cc: Jelle Licht , jlicht@fsfe.org, Sharlatan Hellseher X-Debbugs-Original-Xcc: jlicht@fsfe.org, Sharlatan Hellseher Received: via spool by 75384-submit@debbugs.gnu.org id=B75384.173609983632561 (code B ref 75384); Sun, 05 Jan 2025 17:58:02 +0000 Received: (at 75384) by debbugs.gnu.org; 5 Jan 2025 17:57:16 +0000 Received: from localhost ([127.0.0.1]:35071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUUsG-0008T7-E1 for submit@debbugs.gnu.org; Sun, 05 Jan 2025 12:57:16 -0500 Received: from mail2.fsfe.org ([213.95.165.55]:52038) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tUUsC-0008Sh-OC for 75384@debbugs.gnu.org; Sun, 05 Jan 2025 12:57:14 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021081301; t=1736099830; 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=1gHm5+r0NLjTWololblDjwHrETSkwWjDm6l1Mmcp8Mg=; b=UQLFfco3cCo2o4QLQGe21B0VZbs8jUi1dXJJm8CPZD1QEv9hpxPFGwb1zDU2SDhAdCpps4 BxjZHU2uLTrzFG6XKFvHkFuxUz9lyKB99wGy7o6KqaYGScD6zTjcEnmzb0zP2CmHZrf/Hb qBR4PxsDHawWaXKXYi9YA6oEN2m2dbY= Date: Sun, 5 Jan 2025 18:57:19 +0100 Message-ID: <198f8648dea237e3619376fe0b3e59cf481e10a5.1736092552.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/adns.scm (c-ares-for-node-lts): New variable. Change-Id: I547272f3fa3419a7659bf5b2d91a3e917c20d434 --- gnu/packages/adns.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index 1097b84062..8f37d970c3 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -148,6 +148,21 @@ (define-public c-ares multiple clients and programs with graphical user interfaces.") (license (x11-style "https://c-ares.haxx.se/license.html")))) +(define-public c-ares-for-node-lts + (hidden-package + (package + (inherit c-ares) + (version "1.34.4") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/c-ares/c-ares/releases/download/v" + version "/c-ares-" version + ".tar.gz")) + (sha256 + (base32 + "0br2msk3bpl5myhjp9vr5j2scpspvbg2fpnz69dcrr4ycpnxnf7s"))))))) + ;; gRPC requires a c-ares built with CMake in order to get the .cmake modules. ;; We can not build c-ares itself with CMake because that would introduce a ;; circular dependency through nghttp2. From patchwork Sun Jan 5 17:57:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 36633 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C956E27BBE9; Sun, 5 Jan 2025 17:58:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 05C4527BBE2 for ; Sun, 5 Jan 2025 17:58:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tUUt5-0008QO-AJ; Sun, 05 Jan 2025 12:58:07 -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 1tUUt1-0008Pr-M1 for guix-patches@gnu.org; Sun, 05 Jan 2025 12:58:03 -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 1tUUt1-0007Fa-DM for guix-patches@gnu.org; Sun, 05 Jan 2025 12:58:03 -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=ziox5fr+8JM6KK4Nm+N4Cpca9hO+CYTlmwq5b19p538=; b=ryyWZU9Z5jLEyR1lKU3JvrhP2sD3HPXKr964Hh33DkCCZyWONAzpdM1BDb3UN3ucg2ZJYI3BI9aHImJlLcshoXAfTSRbwAF2JvYk4TukfXmJ7W48TvWOpxYC6DPNEscqGDZo6IAk6BhELt5HogoTg2etsaAZDWJDtWsKPnL+GeUPcT0ttGp9kWHSrOOKUORqL9YsVoL7cBSwlYJ12qKnM8fgwcNb0cvkce6zHurAHsClQNxpIaUljcNUw2hM0+FLxpj/d/bTLSCXmE5+B9NEAYhed+CZulOP2Jdh762XwTu8zPaPNzAS6qn0aluqKiQAKTZDds7aBQDwSOJf4NOiLA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tUUt0-0008Uz-SX; Sun, 05 Jan 2025 12:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75384] [PATCH 2/4] gnu: libuv-for-node-lts: Update to 1.49.1. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: jlicht@fsfe.org, guix-patches@gnu.org Resent-Date: Sun, 05 Jan 2025 17:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75384 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75384@debbugs.gnu.org Cc: Jelle Licht , jlicht@fsfe.org X-Debbugs-Original-Xcc: jlicht@fsfe.org Received: via spool by 75384-submit@debbugs.gnu.org id=B75384.173609983932574 (code B ref 75384); Sun, 05 Jan 2025 17:58:02 +0000 Received: (at 75384) by debbugs.gnu.org; 5 Jan 2025 17:57:19 +0000 Received: from localhost ([127.0.0.1]:35073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUUsI-0008TG-Nf for submit@debbugs.gnu.org; Sun, 05 Jan 2025 12:57:18 -0500 Received: from mail2.fsfe.org ([2001:780:215:1::55]:36420) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tUUsF-0008Sm-0O for 75384@debbugs.gnu.org; Sun, 05 Jan 2025 12:57:15 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021081301; t=1736099832; 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=ziox5fr+8JM6KK4Nm+N4Cpca9hO+CYTlmwq5b19p538=; b=EOM7qeYc7R+XFvRVudJsCZN/N2bKHHB0vpZnEJIHAxv0MPnASSjGt3ZHGJWhBRTdEhDeLZ /rXYXFFdVJMC8ECIGOmp+6AeseQPmkKBU3toBn6RkBfnA/b+o2Y9nTAIjaeL2y4F1IYgsW 18nUF8IBCpGlcZVN+GFLhTKlyZXhIa8= Date: Sun, 5 Jan 2025 18:57:20 +0100 Message-ID: <922b4c4235913b3d76f79015d52b589145a06051.1736092552.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/libevent.scm (libuv-for-node-lts): Update to 1.49.1. Change-Id: I8acf2fb174fffa90f7c3271088d0476c682df904 --- gnu/packages/libevent.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 202deaea47..40de182ff8 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -164,22 +164,14 @@ (define-public libuv-for-node-lts (package (inherit libuv) (name "libuv") - (version "1.46.0") + (version "1.49.1") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1knxvp6bl3y0c87cch1id0z7m7rb6igx55ci93qnbp4zifaq67qi")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Disable io_uring by default due to CVE-2024-22017. Can be removed once - ;; https://github.com/libuv/libuv/issues/4468 is released and compatible - ;; with Node.js - (substitute* "src/unix/linux.c" - (("val == NULL \\|\\|") "val != NULL &&")))))) + "0rk73b373zb495jd0qsl2gpnc8fc60jbhn3aayqnglfgyhagg14d")))) (properties '((hidden? . #t))))) (define-public libuv-for-r-httpuv From patchwork Sun Jan 5 17:57:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 36635 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 87E1827BBE2; Sun, 5 Jan 2025 17:58:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2861D27BBEA for ; Sun, 5 Jan 2025 17:58:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tUUt6-0008Qn-Vf; Sun, 05 Jan 2025 12:58:09 -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 1tUUt2-0008Q8-Hn for guix-patches@gnu.org; Sun, 05 Jan 2025 12:58:05 -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 1tUUt2-0007Fq-8j for guix-patches@gnu.org; Sun, 05 Jan 2025 12:58:04 -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=hUqnthV1Ar2tdc5LUbQTMSklYe5GfRebU1k+aAQmbYk=; b=Vfn0Oc8c5Q8JqRAp8mJhYq6JlhvL140VX5+sQ1CcbtvuwDcV0FKI5y303qbnUScq6xfUUvb5i4cssM8dS36rLGUmzfKaF/aAw4zpfgn/23TJtORC99qmIX+UetmYMn13An0CXEo5c8mv2/2V13NjBBkacssxrexceEI/JFy7kTkVKg+FKUgZMwlD7Le1JOMzBhqkh6tpxbKsNrdApNHDTYPMr0iGjnTKtuirVZtYZo6315bh2b8l1BxbzsOYc8y0HdJPrrWAH9yTo6R5wQpiRl+0SFVr6AdbC8ath7ZRdycLhFSiY49k7Kx4mur8XTgwUiZgSUykjh3EItsJO5mz0Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tUUt2-0008VH-17; Sun, 05 Jan 2025 12:58:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75384] [PATCH 3/4] gnu: llhttp-bootstrap: Update to 9.2.1. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: jlicht@fsfe.org, guix-patches@gnu.org Resent-Date: Sun, 05 Jan 2025 17:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75384 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75384@debbugs.gnu.org Cc: Jelle Licht , jlicht@fsfe.org X-Debbugs-Original-Xcc: jlicht@fsfe.org Received: via spool by 75384-submit@debbugs.gnu.org id=B75384.173609984332594 (code B ref 75384); Sun, 05 Jan 2025 17:58:03 +0000 Received: (at 75384) by debbugs.gnu.org; 5 Jan 2025 17:57:23 +0000 Received: from localhost ([127.0.0.1]:35077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUUsM-0008TX-2W for submit@debbugs.gnu.org; Sun, 05 Jan 2025 12:57:22 -0500 Received: from mail2.fsfe.org ([213.95.165.55]:52044) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tUUsE-0008Sn-8u for 75384@debbugs.gnu.org; Sun, 05 Jan 2025 12:57:18 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021081301; t=1736099833; 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=hUqnthV1Ar2tdc5LUbQTMSklYe5GfRebU1k+aAQmbYk=; b=AXH3/8+QXmX2DrSJb9LZLAxdBNWOlQjnnq/zFzn+sNU1RU4EgezGHH0uyKohmXqVYM+10s xqkQeGwIoxYae86g+I6WLtCu4tX6y+P8JC0NcoHySdOd0PJY3BeWjIMC7UMoc7+e9PYuIR snSDGOpOdD/zE0194E5ppzRQ50cB75I= Date: Sun, 5 Jan 2025 18:57:21 +0100 Message-ID: <276a2bf80aa768835c189a361d7b29ec5de1656d.1736092552.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/patches/llhttp-ponyfill-object-fromentries.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register patch. * gnu/packages/node.scm (llhttp-bootstrap): Update to 9.2.1. [source]: Use patch. --- gnu/local.mk | 1 + gnu/packages/node.scm | 5 +- .../llhttp-ponyfill-object-fromentries.patch | 46 +++++++++++++++++++ 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/llhttp-ponyfill-object-fromentries.patch diff --git a/gnu/local.mk b/gnu/local.mk index f118fe4442..61f91d2e9f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1812,6 +1812,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/libmemcached-build-with-gcc7.patch \ %D%/packages/patches/libmhash-hmac-fix-uaf.patch \ + %D%/packages/patches/llhttp-ponyfill-object-fromentries.patch \ %D%/packages/patches/lvm2-no-systemd.patch \ %D%/packages/patches/maturin-no-cross-compile.patch \ %D%/packages/patches/mecab-variable-param.patch \ diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 20acffb3df..6c0031aa5a 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -679,7 +679,7 @@ (define-public node-llparse-bootstrap (define-public llhttp-bootstrap (package (name "llhttp") - (version "8.1.2") + (version "9.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -688,7 +688,8 @@ (define-public llhttp-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "1808y8mpdcmsi8rxndilngg4nn2fbqfgb29f47kk9mmdpqg5s17r")) + "0mzg19aqb1am498gms0z75cwd5kmfg9p78b1hhxw67019nsjcbac")) + (patches (search-patches "llhttp-ponyfill-object-fromentries.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/llhttp-ponyfill-object-fromentries.patch b/gnu/packages/patches/llhttp-ponyfill-object-fromentries.patch new file mode 100644 index 0000000000..16ac6b45f6 --- /dev/null +++ b/gnu/packages/patches/llhttp-ponyfill-object-fromentries.patch @@ -0,0 +1,46 @@ +diff --git a/src/llhttp/constants.ts b/src/llhttp/constants.ts +index 226342e..1a4c93a 100644 +--- a/src/llhttp/constants.ts ++++ b/src/llhttp/constants.ts +@@ -1,4 +1,4 @@ +-import { enumToMap } from './utils'; ++import { enumToMap, fromEntries } from './utils'; + + export type IntDict = Record; + +@@ -328,7 +328,7 @@ export const METHODS_RTSP = [ + + export const METHOD_MAP = enumToMap(METHODS); + +-export const H_METHOD_MAP = Object.fromEntries( ++export const H_METHOD_MAP = fromEntries( + Object.entries(METHODS).filter(([ k ]) => k.startsWith('H')) + ); + +diff --git a/src/llhttp/utils.ts b/src/llhttp/utils.ts +index 2251125..5ac4aeb 100644 +--- a/src/llhttp/utils.ts ++++ b/src/llhttp/utils.ts +@@ -1,5 +1,13 @@ + import { IntDict } from './constants'; + ++/*! fromentries. MIT License. Copyright (c) 2018-2020 Feross Aboukhadijeh */ ++export function fromEntries (iterable) { ++ return [...iterable].reduce((obj, [key, val]) => { ++ obj[key] = val ++ return obj ++ }, {}) ++} ++ + export function enumToMap( + obj: IntDict, + filter: ReadonlyArray = [], +@@ -8,7 +16,7 @@ export function enumToMap( + const emptyFilter = (filter?.length ?? 0) === 0; + const emptyExceptions = (exceptions?.length ?? 0) === 0; + +- return Object.fromEntries(Object.entries(obj).filter(([ , value ]) => { ++ return fromEntries(Object.entries(obj).filter(([ , value ]) => { + return ( + typeof value === 'number' && + (emptyFilter || filter.includes(value)) && \ No newline at end of file From patchwork Sun Jan 5 17:57:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 36632 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B02C627BBEA; Sun, 5 Jan 2025 17:58:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 99A0F27BBE2 for ; Sun, 5 Jan 2025 17:58:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tUUt5-0008Ql-Uq; Sun, 05 Jan 2025 12:58:07 -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 1tUUt2-0008Q5-0C for guix-patches@gnu.org; Sun, 05 Jan 2025 12:58:04 -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 1tUUt1-0007Fh-JM for guix-patches@gnu.org; Sun, 05 Jan 2025 12:58:03 -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=ITeVxZzlhYEi/NN6z9fqbolXAI55Gwt0MeApzSW3olA=; b=el/1H6S7TEph4NGVymzfBSjwFbk2RKeCFuiPiZPDANK8uw6++S5TzRsyakT5nwhjR+Q0qLfJNQN3ZBo3xJwtVs5BOFEtl92zWwOEaWzFaa0In9Ez008qGJ43cORkfFov9mj/2mZLDsGwDBiAFftA5I9rMEVxswKjruVkptlsWac7py0PwAu+7NhGR2jeCl6tKqCljRrP4mOkOgWs89gUa9AL/yRBTKsb/r2Z9vpcTDvLLXAO14MZRRcNAtnGvSeYb1I9yiisFg+E/8ksjv2gr6y9ciVTP5YV98rzaJwCbpwbF/qigxxv7tq8FoP4vfp02Uuk9MAhEDxIhxq/ddvhAA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tUUt1-0008V8-Ec; Sun, 05 Jan 2025 12:58:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75384] [PATCH 4/4] gnu: node-lts: Update to 22.12.0. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: jlicht@fsfe.org, guix-patches@gnu.org Resent-Date: Sun, 05 Jan 2025 17:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75384 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75384@debbugs.gnu.org Cc: Jelle Licht , jlicht@fsfe.org X-Debbugs-Original-Xcc: jlicht@fsfe.org Received: via spool by 75384-submit@debbugs.gnu.org id=B75384.173609984232586 (code B ref 75384); Sun, 05 Jan 2025 17:58:03 +0000 Received: (at 75384) by debbugs.gnu.org; 5 Jan 2025 17:57:22 +0000 Received: from localhost ([127.0.0.1]:35075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUUsJ-0008TJ-1S for submit@debbugs.gnu.org; Sun, 05 Jan 2025 12:57:22 -0500 Received: from mail2.fsfe.org ([2001:780:215:1::55]:54226) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tUUsF-0008St-L9 for 75384@debbugs.gnu.org; Sun, 05 Jan 2025 12:57:16 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021081301; t=1736099834; 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=ITeVxZzlhYEi/NN6z9fqbolXAI55Gwt0MeApzSW3olA=; b=EtDkRyjcUNefcP7G7kivJbD3JwMhT7HRIdp5ObBNGVFPkrFBDfrLtTo7T7/IzfF8DB6/bN LxkXVpxiDDiDx+QdiGUsrStsla9azRngcJ0LUylAHNBTmooxtAuxB4OTB3+d5BvooYWmVH kCegtVghEz6cCRI/MukCTIfCK7DaU/I= Date: Sun, 5 Jan 2025 18:57:22 +0100 Message-ID: <579454384194171753a365f1aa6d3aaab36a2256.1736092552.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node.scm (node-lts): Update to 22.12.0. [#:phases]: Delete tests that fail due to the build container. Delete tests that require a DNS resolver. [inputs]: Replace c-ares by c-ares-for-node-lts. Replace icu4c by icu4c-73. [native-inputs]: Replace c-ares by c-ares-for-node-lts. Replace icu4c by icu4c-73. Change-Id: I8cbc790bd82c55b48f8917e6405b37569b29dc1c --- gnu/packages/node.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 6c0031aa5a..75a1a12c53 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-bootstrap) - (version "20.18.1") + (version "22.12.0") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.gz")) (sha256 (base32 - "1f180vgr6lrg4gs48q5c414j5sdwaqqp1vnswwr3pvryhznqrbav")) + "1qrcn9hm85bmh81ircaa0vmxrqmiip1iwczvpsyn9sdn0b0ffmri")) (modules '((guix build utils))) (snippet '(begin @@ -838,14 +838,16 @@ (define-public node-lts ;; seem to be indicative of real problems in practice. (for-each delete-file '("test/parallel/test-cluster-primary-error.js" - "test/parallel/test-cluster-primary-kill.js")) + "test/parallel/test-cluster-primary-kill.js" + "test/parallel/test-node-run.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-net-socket-connect-without-cb.js" - "test/parallel/test-tcp-wrap-listen.js")) + "test/parallel/test-tcp-wrap-listen.js" + "test/report/test-report-exclude-network.js")) ;; These tests require networking. (for-each delete-file @@ -956,9 +958,9 @@ (define-public node-lts (chmod file #o555)))))))) (native-inputs (list ;; Runtime dependencies for binaries used as a bootstrap. - c-ares + c-ares-for-node-lts brotli - icu4c + icu4c-73 libuv-for-node-lts `(,nghttp2 "lib") openssl @@ -973,8 +975,8 @@ (define-public node-lts (inputs (list bash-minimal coreutils - c-ares - icu4c + c-ares-for-node-lts + icu4c-73 libuv-for-node-lts llhttp-bootstrap brotli