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