diff --git a/.gitignore b/.gitignore index 68ec08d..e678a51 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/cjs-module-lexer-1.2.2.tar.gz -SOURCES/icu4c-74_2-src.tgz -SOURCES/node-v20.12.2-stripped.tar.gz -SOURCES/undici-5.28.4.tar.gz +SOURCES/icu4c-75_1-src.tgz +SOURCES/node-v20.14.0-stripped.tar.gz +SOURCES/undici-6.13.0.tar.gz SOURCES/wasi-sdk-11.0-linux.tar.gz SOURCES/wasi-sdk-16.0-linux.tar.gz diff --git a/.nodejs.metadata b/.nodejs.metadata index 1e6ed3c..8df6832 100644 --- a/.nodejs.metadata +++ b/.nodejs.metadata @@ -1,6 +1,6 @@ 164f7f39841415284b0280a648c43bd7ea1615ac SOURCES/cjs-module-lexer-1.2.2.tar.gz -43a8d688a3a6bc8f0f8c5e699d0ef7a905d24314 SOURCES/icu4c-74_2-src.tgz -f25c352600b72849a7241017ffc64bb0fe339d4d SOURCES/node-v20.12.2-stripped.tar.gz -2be9cb115c2832e1fda9e730fa92e0bf725b6f3d SOURCES/undici-5.28.4.tar.gz +da3614aa496c5f0fde12f7aa155f235b5e239f1b SOURCES/icu4c-75_1-src.tgz +19fcaf5747bfb4680e6f05471c670bf3383ae7b9 SOURCES/node-v20.14.0-stripped.tar.gz +85aca53a0e7dec0305078b256cd2ea5636e3cf7f SOURCES/undici-6.13.0.tar.gz ff114dd45b4efeeae7afe4621bfc6f886a475b4b SOURCES/wasi-sdk-11.0-linux.tar.gz fbe01909bf0e8260fcc3696ec37c9f731b5e356a SOURCES/wasi-sdk-16.0-linux.tar.gz diff --git a/SOURCES/0003-Limit-CONTINUATION-frames-following-an-incoming-HEAD.patch b/SOURCES/0003-Limit-CONTINUATION-frames-following-an-incoming-HEAD.patch deleted file mode 100644 index 257705d..0000000 --- a/SOURCES/0003-Limit-CONTINUATION-frames-following-an-incoming-HEAD.patch +++ /dev/null @@ -1,107 +0,0 @@ -From d9a06fe94439d9f103aeffe597441c0a2c0a4eb3 Mon Sep 17 00:00:00 2001 -From: Tatsuhiro Tsujikawa -Date: Sat, 9 Mar 2024 16:26:42 +0900 -Subject: [PATCH] Limit CONTINUATION frames following an incoming HEADER frame - -Signed-off-by: rpm-build ---- - deps/nghttp2/lib/includes/nghttp2/nghttp2.h | 7 ++++++- - deps/nghttp2/lib/nghttp2_helper.c | 2 ++ - deps/nghttp2/lib/nghttp2_session.c | 7 +++++++ - deps/nghttp2/lib/nghttp2_session.h | 10 ++++++++++ - 4 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h -index 8891760..a9629c7 100644 ---- a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h -+++ b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h -@@ -466,7 +466,12 @@ typedef enum { - * exhaustion on server side to send these frames forever and does - * not read network. - */ -- NGHTTP2_ERR_FLOODED = -904 -+ NGHTTP2_ERR_FLOODED = -904, -+ /** -+ * When a local endpoint receives too many CONTINUATION frames -+ * following a HEADER frame. -+ */ -+ NGHTTP2_ERR_TOO_MANY_CONTINUATIONS = -905, - } nghttp2_error; - - /** -diff --git a/deps/nghttp2/lib/nghttp2_helper.c b/deps/nghttp2/lib/nghttp2_helper.c -index 93dd475..b3563d9 100644 ---- a/deps/nghttp2/lib/nghttp2_helper.c -+++ b/deps/nghttp2/lib/nghttp2_helper.c -@@ -336,6 +336,8 @@ const char *nghttp2_strerror(int error_code) { - "closed"; - case NGHTTP2_ERR_TOO_MANY_SETTINGS: - return "SETTINGS frame contained more than the maximum allowed entries"; -+ case NGHTTP2_ERR_TOO_MANY_CONTINUATIONS: -+ return "Too many CONTINUATION frames following a HEADER frame"; - default: - return "Unknown error code"; - } -diff --git a/deps/nghttp2/lib/nghttp2_session.c b/deps/nghttp2/lib/nghttp2_session.c -index 226cdd5..e343365 100644 ---- a/deps/nghttp2/lib/nghttp2_session.c -+++ b/deps/nghttp2/lib/nghttp2_session.c -@@ -497,6 +497,7 @@ static int session_new(nghttp2_session **session_ptr, - (*session_ptr)->max_send_header_block_length = NGHTTP2_MAX_HEADERSLEN; - (*session_ptr)->max_outbound_ack = NGHTTP2_DEFAULT_MAX_OBQ_FLOOD_ITEM; - (*session_ptr)->max_settings = NGHTTP2_DEFAULT_MAX_SETTINGS; -+ (*session_ptr)->max_continuations = NGHTTP2_DEFAULT_MAX_CONTINUATIONS; - - if (option) { - if ((option->opt_set_mask & NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE) && -@@ -6812,6 +6813,8 @@ nghttp2_ssize nghttp2_session_mem_recv2(nghttp2_session *session, - } - } - session_inbound_frame_reset(session); -+ -+ session->num_continuations = 0; - } - break; - } -@@ -6933,6 +6936,10 @@ nghttp2_ssize nghttp2_session_mem_recv2(nghttp2_session *session, - } - #endif /* DEBUGBUILD */ - -+ if (++session->num_continuations > session->max_continuations) { -+ return NGHTTP2_ERR_TOO_MANY_CONTINUATIONS; -+ } -+ - readlen = inbound_frame_buf_read(iframe, in, last); - in += readlen; - -diff --git a/deps/nghttp2/lib/nghttp2_session.h b/deps/nghttp2/lib/nghttp2_session.h -index b119329..ef8f7b2 100644 ---- a/deps/nghttp2/lib/nghttp2_session.h -+++ b/deps/nghttp2/lib/nghttp2_session.h -@@ -110,6 +110,10 @@ typedef struct { - #define NGHTTP2_DEFAULT_STREAM_RESET_BURST 1000 - #define NGHTTP2_DEFAULT_STREAM_RESET_RATE 33 - -+/* The default max number of CONTINUATION frames following an incoming -+ HEADER frame. */ -+#define NGHTTP2_DEFAULT_MAX_CONTINUATIONS 8 -+ - /* Internal state when receiving incoming frame */ - typedef enum { - /* Receiving frame header */ -@@ -290,6 +294,12 @@ struct nghttp2_session { - size_t max_send_header_block_length; - /* The maximum number of settings accepted per SETTINGS frame. */ - size_t max_settings; -+ /* The maximum number of CONTINUATION frames following an incoming -+ HEADER frame. */ -+ size_t max_continuations; -+ /* The number of CONTINUATION frames following an incoming HEADER -+ frame. This variable is reset when END_HEADERS flag is seen. */ -+ size_t num_continuations; - /* Next Stream ID. Made unsigned int to detect >= (1 << 31). */ - uint32_t next_stream_id; - /* The last stream ID this session initiated. For client session, --- -2.44.0 - diff --git a/SOURCES/0004-Add-nghttp2_option_set_max_continuations.patch b/SOURCES/0004-Add-nghttp2_option_set_max_continuations.patch deleted file mode 100644 index 87b490f..0000000 --- a/SOURCES/0004-Add-nghttp2_option_set_max_continuations.patch +++ /dev/null @@ -1,89 +0,0 @@ -From ca0a0b02da4db1d65eca8169c6e27bb635924dfb Mon Sep 17 00:00:00 2001 -From: Tatsuhiro Tsujikawa -Date: Sat, 9 Mar 2024 16:48:10 +0900 -Subject: [PATCH] Add nghttp2_option_set_max_continuations - -Signed-off-by: rpm-build ---- - deps/nghttp2/lib/includes/nghttp2/nghttp2.h | 11 +++++++++++ - deps/nghttp2/lib/nghttp2_option.c | 5 +++++ - deps/nghttp2/lib/nghttp2_option.h | 5 +++++ - deps/nghttp2/lib/nghttp2_session.c | 4 ++++ - 4 files changed, 25 insertions(+) - -diff --git a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h -index a9629c7..92c3ccc 100644 ---- a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h -+++ b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h -@@ -3210,6 +3210,17 @@ NGHTTP2_EXTERN void - nghttp2_option_set_stream_reset_rate_limit(nghttp2_option *option, - uint64_t burst, uint64_t rate); - -+/** -+ * @function -+ * -+ * This function sets the maximum number of CONTINUATION frames -+ * following an incoming HEADER frame. If more than those frames are -+ * received, the remote endpoint is considered to be misbehaving and -+ * session will be closed. The default value is 8. -+ */ -+NGHTTP2_EXTERN void nghttp2_option_set_max_continuations(nghttp2_option *option, -+ size_t val); -+ - /** - * @function - * -diff --git a/deps/nghttp2/lib/nghttp2_option.c b/deps/nghttp2/lib/nghttp2_option.c -index 43d4e95..53144b9 100644 ---- a/deps/nghttp2/lib/nghttp2_option.c -+++ b/deps/nghttp2/lib/nghttp2_option.c -@@ -150,3 +150,8 @@ void nghttp2_option_set_stream_reset_rate_limit(nghttp2_option *option, - option->stream_reset_burst = burst; - option->stream_reset_rate = rate; - } -+ -+void nghttp2_option_set_max_continuations(nghttp2_option *option, size_t val) { -+ option->opt_set_mask |= NGHTTP2_OPT_MAX_CONTINUATIONS; -+ option->max_continuations = val; -+} -diff --git a/deps/nghttp2/lib/nghttp2_option.h b/deps/nghttp2/lib/nghttp2_option.h -index 2259e18..c89cb97 100644 ---- a/deps/nghttp2/lib/nghttp2_option.h -+++ b/deps/nghttp2/lib/nghttp2_option.h -@@ -71,6 +71,7 @@ typedef enum { - NGHTTP2_OPT_SERVER_FALLBACK_RFC7540_PRIORITIES = 1 << 13, - NGHTTP2_OPT_NO_RFC9113_LEADING_AND_TRAILING_WS_VALIDATION = 1 << 14, - NGHTTP2_OPT_STREAM_RESET_RATE_LIMIT = 1 << 15, -+ NGHTTP2_OPT_MAX_CONTINUATIONS = 1 << 16, - } nghttp2_option_flag; - - /** -@@ -98,6 +99,10 @@ struct nghttp2_option { - * NGHTTP2_OPT_MAX_SETTINGS - */ - size_t max_settings; -+ /** -+ * NGHTTP2_OPT_MAX_CONTINUATIONS -+ */ -+ size_t max_continuations; - /** - * Bitwise OR of nghttp2_option_flag to determine that which fields - * are specified. -diff --git a/deps/nghttp2/lib/nghttp2_session.c b/deps/nghttp2/lib/nghttp2_session.c -index e343365..555032d 100644 ---- a/deps/nghttp2/lib/nghttp2_session.c -+++ b/deps/nghttp2/lib/nghttp2_session.c -@@ -586,6 +586,10 @@ static int session_new(nghttp2_session **session_ptr, - option->stream_reset_burst, - option->stream_reset_rate); - } -+ -+ if (option->opt_set_mask & NGHTTP2_OPT_MAX_CONTINUATIONS) { -+ (*session_ptr)->max_continuations = option->max_continuations; -+ } - } - - rv = nghttp2_hd_deflate_init2(&(*session_ptr)->hd_deflater, --- -2.44.0 - diff --git a/SPECS/nodejs.spec b/SPECS/nodejs.spec index 31c9c12..ad3c80b 100644 --- a/SPECS/nodejs.spec +++ b/SPECS/nodejs.spec @@ -32,7 +32,7 @@ # This is used by both the nodejs package and the npm subpackage that # has a separate version - the name is special so that rpmdev-bumpspec # will bump this rather than adding .1 to the end. -%global baserelease 2 +%global baserelease 1 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -43,8 +43,8 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 20 -%global nodejs_minor 12 -%global nodejs_patch 2 +%global nodejs_minor 14 +%global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 115 @@ -68,7 +68,7 @@ # c-ares - from deps/cares/include/ares_version.h # https://github.com/nodejs/node/pull/9332 -%global c_ares_version 1.27.0 +%global c_ares_version 1.28.1 # llhttp - from deps/llhttp/include/llhttp.h %global llhttp_version 8.1.2 @@ -77,17 +77,17 @@ %global libuv_version 1.46.0 # nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h -%global nghttp2_version 1.60.0 +%global nghttp2_version 1.61.0 # nghttp3 - from deps/ngtcp2/nghttp3/lib/includes/nghttp3/version.h %global nghttp3_version 0.7.0 # ngtcp2 from deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h -%global ngtcp2_version 0.8.1 +%global ngtcp2_version 1.1.0 # ICU - from tools/icu/current_ver.dep -%global icu_major 74 -%global icu_minor 2 +%global icu_major 75 +%global icu_minor 1 %global icu_version %{icu_major}.%{icu_minor} %global icudatadir %{nodejs_datadir}/icudata @@ -105,10 +105,10 @@ %endif # simduft from deps/simdutf/simdutf.h -%global simduft_version 4.0.8 +%global simduft_version 5.2.8 # ada from deps/ada/ada.h -%global ada_version 2.7.6 +%global ada_version 2.7.8 # OpenSSL minimum version %global openssl_minimum 1:1.1.1 @@ -121,7 +121,7 @@ # npm - from deps/npm/package.json %global npm_epoch 1 -%global npm_version 10.5.0 +%global npm_version 10.7.0 # In order to avoid needing to keep incrementing the release version for the # main package forever, we will just construct one for npm that is guaranteed @@ -131,10 +131,10 @@ # Node.js 16.9.1 and later comes with an experimental package management tool # corepack - from deps/corepack/package.json -%global corepack_version 0.25.2 +%global corepack_version 0.28.1 # uvwasi - from deps/uvwasi/include/uvwasi.h -%global uvwasi_version 0.0.20 +%global uvwasi_version 0.0.21 # histogram_c - from deps/histogram/include/hdr/hdr_histogram_version.h %global histogram_version 0.11.8 @@ -180,17 +180,15 @@ Source101: cjs-module-lexer-1.2.2.tar.gz Source111: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-11/wasi-sdk-11.0-linux.tar.gz # Version: jq '.version' deps/undici/src/package.json -# Original: https://github.com/nodejs/undici/archive/refs/tags/v5.28.3.tar.gz -# Adjustments: rm -f undici-5.28.3/lib/llhttp/llhttp*.wasm +# Original: https://github.com/nodejs/undici/archive/refs/tags/v6.13.0.tar.gz +# Adjustments: rm -f undici-6.13.0/lib/llhttp/llhttp*.wasm # wasi-sdk version can be found in lib/llhttp/wasm_build_env.txt -Source102: undici-5.28.4.tar.gz +Source102: undici-6.13.0.tar.gz Source112: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-16/wasi-sdk-16.0-linux.tar.gz # Disable running gyp on bundled deps we don't use Patch1: 0001-Disable-running-gyp-on-shared-deps.patch Patch2: 0002-Disable-FIPS-options.patch -Patch3: 0003-Limit-CONTINUATION-frames-following-an-incoming-HEAD.patch -Patch4: 0004-Add-nghttp2_option_set_max_continuations.patch BuildRequires: make BuildRequires: python3-devel @@ -636,6 +634,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod %changelog +* Tue Jun 11 2024 Jan Staněk - 1:20.14.0-1 +- Update to version 20.14.0 + * Tue Apr 16 2024 Jan Staněk - 1:20.12.2-2 - Backport nghttp2 patch for CVE-2024-28182