Compare commits
No commits in common. "c8-stream-16" and "c8-stream-10" have entirely different histories.
c8-stream-
...
c8-stream-
8
.gitignore
vendored
8
.gitignore
vendored
@ -1,6 +1,2 @@
|
|||||||
SOURCES/cjs-module-lexer-1.2.2.tar.gz
|
SOURCES/icu4c-64_2-src.tgz
|
||||||
SOURCES/icu4c-71_1-src.tgz
|
SOURCES/node-v10.24.0-stripped.tar.gz
|
||||||
SOURCES/node-v16.20.2-stripped.tar.gz
|
|
||||||
SOURCES/undici-5.20.0.tar.gz
|
|
||||||
SOURCES/wasi-sdk-wasi-sdk-11.tar.gz
|
|
||||||
SOURCES/wasi-sdk-wasi-sdk-14.tar.gz
|
|
||||||
|
@ -1,6 +1,2 @@
|
|||||||
b0a91341ecf6c68a9d59a1c57d000fbbcc771679 SOURCES/cjs-module-lexer-1.2.2.tar.gz
|
3127155ecf2b75ab4835f501b7478e39c07bb852 SOURCES/icu4c-64_2-src.tgz
|
||||||
406b0c8635288b772913b6ff646451e69748878a SOURCES/icu4c-71_1-src.tgz
|
be0e0b385a852c376f452b3d94727492e05407e4 SOURCES/node-v10.24.0-stripped.tar.gz
|
||||||
f50d6a8dfc8d24c29091a8cf39221e6b4d21b0d8 SOURCES/node-v16.20.2-stripped.tar.gz
|
|
||||||
a96c780a67c578c31e9c8d291e357b2ae98a0ce5 SOURCES/undici-5.20.0.tar.gz
|
|
||||||
8979d177dd62e3b167a6fd7dc7185adb0128c439 SOURCES/wasi-sdk-wasi-sdk-11.tar.gz
|
|
||||||
900a50a32f0079d53c299db92b88bb3c5d2022b8 SOURCES/wasi-sdk-wasi-sdk-14.tar.gz
|
|
||||||
|
@ -1,26 +1,31 @@
|
|||||||
From 39f761838b5fc10af995642bd44e6bb4c79085f1 Mon Sep 17 00:00:00 2001
|
From 2cd4c12776af3da588231d3eb498e6451c30eae5 Mon Sep 17 00:00:00 2001
|
||||||
From: rpm-build <rpm-build>
|
From: Zuzana Svetlikova <zsvetlik@redhat.com>
|
||||||
Date: Tue, 30 May 2023 13:12:35 +0200
|
Date: Thu, 27 Apr 2017 14:25:42 +0200
|
||||||
Subject: [PATCH] Disable running gyp on shared deps
|
Subject: [PATCH] Disable running gyp on shared deps
|
||||||
|
|
||||||
Signed-off-by: rpm-build <rpm-build>
|
Signed-off-by: rpm-build <rpm-build>
|
||||||
---
|
---
|
||||||
Makefile | 2 +-
|
Makefile | 7 +++----
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
diff --git a/Makefile b/Makefile
|
||||||
index ef3eda2..8b52a4f 100644
|
index 73feb4c..45bbceb 100644
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -148,7 +148,7 @@ with-code-cache test-code-cache:
|
@@ -123,10 +123,9 @@ with-code-cache:
|
||||||
$(warning '$@' target is a noop)
|
test-code-cache: with-code-cache
|
||||||
|
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
|
||||||
|
|
||||||
out/Makefile: config.gypi common.gypi node.gyp \
|
-out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
|
||||||
- deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \
|
- deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \
|
||||||
+ deps/llhttp/llhttp.gyp \
|
- deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
|
||||||
tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
|
- config.gypi
|
||||||
tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
|
+out/Makefile: common.gypi deps/http_parser/http_parser.gyp \
|
||||||
|
+ deps/v8/gypfiles/toolchain.gypi deps/v8/gypfiles/features.gypi \
|
||||||
|
+ deps/v8/gypfiles/v8.gyp node.gyp config.gypi
|
||||||
$(PYTHON) tools/gyp_node.py -f make
|
$(PYTHON) tools/gyp_node.py -f make
|
||||||
|
|
||||||
|
config.gypi: configure configure.py
|
||||||
--
|
--
|
||||||
2.41.0
|
2.26.2
|
||||||
|
|
||||||
|
84
SOURCES/0002-Suppress-NPM-message-to-run-global-update.patch
Normal file
84
SOURCES/0002-Suppress-NPM-message-to-run-global-update.patch
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
From e7afb2d6e2a6c8f9c9c32e12a10c3c5c4902a251 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephen Gallagher <sgallagh@redhat.com>
|
||||||
|
Date: Tue, 1 May 2018 08:05:30 -0400
|
||||||
|
Subject: [PATCH] Suppress NPM message to run global update
|
||||||
|
|
||||||
|
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
|
||||||
|
Signed-off-by: rpm-build <rpm-build>
|
||||||
|
---
|
||||||
|
deps/npm/bin/npm-cli.js | 54 -----------------------------------------
|
||||||
|
1 file changed, 54 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js
|
||||||
|
index c0d9be0..0f0892e 100755
|
||||||
|
--- a/deps/npm/bin/npm-cli.js
|
||||||
|
+++ b/deps/npm/bin/npm-cli.js
|
||||||
|
@@ -71,65 +71,11 @@
|
||||||
|
npm.command = 'help'
|
||||||
|
}
|
||||||
|
|
||||||
|
- var isGlobalNpmUpdate = conf.global && ['install', 'update'].includes(npm.command) && npm.argv.includes('npm')
|
||||||
|
-
|
||||||
|
// now actually fire up npm and run the command.
|
||||||
|
// this is how to use npm programmatically:
|
||||||
|
conf._exit = true
|
||||||
|
npm.load(conf, function (er) {
|
||||||
|
if (er) return errorHandler(er)
|
||||||
|
- if (
|
||||||
|
- !isGlobalNpmUpdate &&
|
||||||
|
- npm.config.get('update-notifier') &&
|
||||||
|
- !unsupported.checkVersion(process.version).unsupported
|
||||||
|
- ) {
|
||||||
|
- const pkg = require('../package.json')
|
||||||
|
- let notifier = require('update-notifier')({pkg})
|
||||||
|
- const isCI = require('ci-info').isCI
|
||||||
|
- if (
|
||||||
|
- notifier.update &&
|
||||||
|
- notifier.update.latest !== pkg.version &&
|
||||||
|
- !isCI
|
||||||
|
- ) {
|
||||||
|
- const color = require('ansicolors')
|
||||||
|
- const useColor = npm.config.get('color')
|
||||||
|
- const useUnicode = npm.config.get('unicode')
|
||||||
|
- const old = notifier.update.current
|
||||||
|
- const latest = notifier.update.latest
|
||||||
|
- let type = notifier.update.type
|
||||||
|
- if (useColor) {
|
||||||
|
- switch (type) {
|
||||||
|
- case 'major':
|
||||||
|
- type = color.red(type)
|
||||||
|
- break
|
||||||
|
- case 'minor':
|
||||||
|
- type = color.yellow(type)
|
||||||
|
- break
|
||||||
|
- case 'patch':
|
||||||
|
- type = color.green(type)
|
||||||
|
- break
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
- const changelog = `https://github.com/npm/cli/releases/tag/v${latest}`
|
||||||
|
- notifier.notify({
|
||||||
|
- message: `New ${type} version of ${pkg.name} available! ${
|
||||||
|
- useColor ? color.red(old) : old
|
||||||
|
- } ${useUnicode ? '→' : '->'} ${
|
||||||
|
- useColor ? color.green(latest) : latest
|
||||||
|
- }\n` +
|
||||||
|
- `${
|
||||||
|
- useColor ? color.yellow('Changelog:') : 'Changelog:'
|
||||||
|
- } ${
|
||||||
|
- useColor ? color.cyan(changelog) : changelog
|
||||||
|
- }\n` +
|
||||||
|
- `Run ${
|
||||||
|
- useColor
|
||||||
|
- ? color.green(`npm install -g ${pkg.name}`)
|
||||||
|
- : `npm i -g ${pkg.name}`
|
||||||
|
- } to update!`
|
||||||
|
- })
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
npm.commands[npm.command](npm.argv, function (err) {
|
||||||
|
// https://genius.com/Lin-manuel-miranda-your-obedient-servant-lyrics
|
||||||
|
if (
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
@ -0,0 +1,122 @@
|
|||||||
|
From 0028cc74dac4dd24b8599ade85cb49fdafa9f559 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephen Gallagher <sgallagh@redhat.com>
|
||||||
|
Date: Fri, 6 Dec 2019 16:40:25 -0500
|
||||||
|
Subject: [PATCH] build: auto-load ICU data from --with-icu-default-data-dir
|
||||||
|
|
||||||
|
When compiled with `--with-intl=small` and
|
||||||
|
`--with-icu-default-data-dir=PATH`, Node.js will use PATH as a
|
||||||
|
fallback location for the ICU data.
|
||||||
|
|
||||||
|
We will first perform an access check using fopen(PATH, 'r') to
|
||||||
|
ensure that the file is readable. If it is, we'll set the
|
||||||
|
icu_data_directory and proceed. There's a slight overhead for the
|
||||||
|
fopen() check, but it should be barely measurable.
|
||||||
|
|
||||||
|
This will be useful for Linux distribution packagers who want to
|
||||||
|
be able to ship a minimal node binary in a container image but
|
||||||
|
also be able to add on the full i18n support where needed. With
|
||||||
|
this patch, it becomes possible to ship the interpreter as
|
||||||
|
/usr/bin/node in one package for the distribution and to ship the
|
||||||
|
data files in another package (without a strict dependency
|
||||||
|
between the two). This means that users of the distribution will
|
||||||
|
not need to explicitly direct Node.js to locate the ICU data. It
|
||||||
|
also means that in environments where full internationalization is
|
||||||
|
not required, they do not need to carry the extra content (with
|
||||||
|
the associated storage costs).
|
||||||
|
|
||||||
|
Refs: https://github.com/nodejs/node/issues/3460
|
||||||
|
|
||||||
|
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
|
||||||
|
Signed-off-by: rpm-build <rpm-build>
|
||||||
|
---
|
||||||
|
configure.py | 9 +++++++++
|
||||||
|
node.gypi | 7 +++++++
|
||||||
|
src/node.cc | 20 ++++++++++++++++++++
|
||||||
|
3 files changed, 36 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/configure.py b/configure.py
|
||||||
|
index 89f7bf5..d611a88 100755
|
||||||
|
--- a/configure.py
|
||||||
|
+++ b/configure.py
|
||||||
|
@@ -433,6 +433,14 @@ intl_optgroup.add_option('--with-icu-source',
|
||||||
|
'the icu4c source archive. '
|
||||||
|
'v%d.x or later recommended.' % icu_versions['minimum_icu'])
|
||||||
|
|
||||||
|
+intl_optgroup.add_option('--with-icu-default-data-dir',
|
||||||
|
+ action='store',
|
||||||
|
+ dest='with_icu_default_data_dir',
|
||||||
|
+ help='Path to the icuXXdt{lb}.dat file. If unspecified, ICU data will '
|
||||||
|
+ 'only be read if the NODE_ICU_DATA environment variable or the '
|
||||||
|
+ '--icu-data-dir runtime argument is used. This option has effect '
|
||||||
|
+ 'only when Node.js is built with --with-intl=small-icu.')
|
||||||
|
+
|
||||||
|
parser.add_option('--with-ltcg',
|
||||||
|
action='store_true',
|
||||||
|
dest='with_ltcg',
|
||||||
|
@@ -1359,6 +1367,7 @@ def configure_intl(o):
|
||||||
|
locs.add('root') # must have root
|
||||||
|
o['variables']['icu_locales'] = string.join(locs,',')
|
||||||
|
# We will check a bit later if we can use the canned deps/icu-small
|
||||||
|
+ o['variables']['icu_default_data'] = options.with_icu_default_data_dir or ''
|
||||||
|
elif with_intl == 'full-icu':
|
||||||
|
# full ICU
|
||||||
|
o['variables']['v8_enable_i18n_support'] = 1
|
||||||
|
diff --git a/node.gypi b/node.gypi
|
||||||
|
index 466a174..65b97d6 100644
|
||||||
|
--- a/node.gypi
|
||||||
|
+++ b/node.gypi
|
||||||
|
@@ -113,6 +113,13 @@
|
||||||
|
'conditions': [
|
||||||
|
[ 'icu_small=="true"', {
|
||||||
|
'defines': [ 'NODE_HAVE_SMALL_ICU=1' ],
|
||||||
|
+ 'conditions': [
|
||||||
|
+ [ 'icu_default_data!=""', {
|
||||||
|
+ 'defines': [
|
||||||
|
+ 'NODE_ICU_DEFAULT_DATA_DIR="<(icu_default_data)"',
|
||||||
|
+ ],
|
||||||
|
+ }],
|
||||||
|
+ ],
|
||||||
|
}]],
|
||||||
|
}],
|
||||||
|
[ 'node_use_bundled_v8=="true" and \
|
||||||
|
diff --git a/src/node.cc b/src/node.cc
|
||||||
|
index 7c01187..c9840e3 100644
|
||||||
|
--- a/src/node.cc
|
||||||
|
+++ b/src/node.cc
|
||||||
|
@@ -92,6 +92,7 @@
|
||||||
|
|
||||||
|
#if defined(NODE_HAVE_I18N_SUPPORT)
|
||||||
|
#include <unicode/uvernum.h>
|
||||||
|
+#include <unicode/utypes.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(LEAK_SANITIZER)
|
||||||
|
@@ -2643,6 +2644,25 @@ void Init(std::vector<std::string>* argv,
|
||||||
|
// If the parameter isn't given, use the env variable.
|
||||||
|
if (per_process_opts->icu_data_dir.empty())
|
||||||
|
SafeGetenv("NODE_ICU_DATA", &per_process_opts->icu_data_dir);
|
||||||
|
+
|
||||||
|
+#ifdef NODE_ICU_DEFAULT_DATA_DIR
|
||||||
|
+ // If neither the CLI option nor the environment variable was specified,
|
||||||
|
+ // fall back to the configured default
|
||||||
|
+ if (per_process_opts->icu_data_dir.empty()) {
|
||||||
|
+ // Check whether the NODE_ICU_DEFAULT_DATA_DIR contains the right data
|
||||||
|
+ // file and can be read.
|
||||||
|
+ static const char full_path[] =
|
||||||
|
+ NODE_ICU_DEFAULT_DATA_DIR "/" U_ICUDATA_NAME ".dat";
|
||||||
|
+
|
||||||
|
+ FILE* f = fopen(full_path, "rb");
|
||||||
|
+
|
||||||
|
+ if (f != nullptr) {
|
||||||
|
+ fclose(f);
|
||||||
|
+ per_process_opts->icu_data_dir = NODE_ICU_DEFAULT_DATA_DIR;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+#endif // NODE_ICU_DEFAULT_DATA_DIR
|
||||||
|
+
|
||||||
|
// Initialize ICU.
|
||||||
|
// If icu_data_dir is empty here, it will load the 'minimal' data.
|
||||||
|
if (!i18n::InitializeICUDirectory(per_process_opts->icu_data_dir)) {
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/deps/npm/node_modules/y18n/index.js b/deps/npm/node_modules/y18n/index.js
|
||||||
|
index d720681628..727362aac0 100644
|
||||||
|
--- a/deps/npm/node_modules/y18n/index.js
|
||||||
|
+++ b/deps/npm/node_modules/y18n/index.js
|
||||||
|
@@ -11,7 +11,7 @@ function Y18N (opts) {
|
||||||
|
this.fallbackToLanguage = typeof opts.fallbackToLanguage === 'boolean' ? opts.fallbackToLanguage : true
|
||||||
|
|
||||||
|
// internal stuff.
|
||||||
|
- this.cache = {}
|
||||||
|
+ this.cache = Object.create(null)
|
||||||
|
this.writeQueue = []
|
||||||
|
}
|
||||||
|
|
@ -1,575 +0,0 @@
|
|||||||
Fix CVE-2024-22019
|
|
||||||
|
|
||||||
Resolves: RHEL-28064
|
|
||||||
|
|
||||||
This is a combination of the upstream commit from v18:
|
|
||||||
https://github.com/nodejs/node/commit/911cb33cdadab57a75f97186290ea8f3903a6171
|
|
||||||
|
|
||||||
and necessary rebase of llhttp from 6.0.11 to 6.1.0 that has the needed
|
|
||||||
chunk features.
|
|
||||||
|
|
||||||
From 11bd886e0a4eadd7e55502758fff6486a3fa3a4e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paolo Insogna <paolo@cowtech.it>
|
|
||||||
Date: Tue, 9 Jan 2024 18:10:04 +0100
|
|
||||||
Subject: [PATCH] http: add maximum chunk extension size
|
|
||||||
|
|
||||||
Cherry-picked from v18 patch:
|
|
||||||
https://github.com/nodejs/node/commit/911cb33cdadab57a75f97186290ea8f3903a6171
|
|
||||||
|
|
||||||
PR-URL: https://github.com/nodejs-private/node-private/pull/520
|
|
||||||
Refs: https://github.com/nodejs-private/node-private/pull/518
|
|
||||||
CVE-ID: CVE-2024-22019
|
|
||||||
---
|
|
||||||
deps/llhttp/.gitignore | 1 +
|
|
||||||
deps/llhttp/CMakeLists.txt | 2 +-
|
|
||||||
deps/llhttp/include/llhttp.h | 7 +-
|
|
||||||
deps/llhttp/src/api.c | 7 +
|
|
||||||
deps/llhttp/src/llhttp.c | 122 ++++++++++++++--
|
|
||||||
doc/api/errors.md | 12 ++
|
|
||||||
lib/_http_server.js | 9 ++
|
|
||||||
src/node_http_parser.cc | 20 ++-
|
|
||||||
.../test-http-chunk-extensions-limit.js | 131 ++++++++++++++++++
|
|
||||||
tools/update-llhttp.sh | 2 +-
|
|
||||||
10 files changed, 294 insertions(+), 19 deletions(-)
|
|
||||||
create mode 100644 deps/llhttp/.gitignore
|
|
||||||
create mode 100644 test/parallel/test-http-chunk-extensions-limit.js
|
|
||||||
|
|
||||||
diff --git a/deps/llhttp/.gitignore b/deps/llhttp/.gitignore
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..98438a2cd3
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/deps/llhttp/.gitignore
|
|
||||||
@@ -0,0 +1 @@
|
|
||||||
+libllhttp.pc
|
|
||||||
diff --git a/deps/llhttp/CMakeLists.txt b/deps/llhttp/CMakeLists.txt
|
|
||||||
index d0382038b9..747564a76f 100644
|
|
||||||
--- a/deps/llhttp/CMakeLists.txt
|
|
||||||
+++ b/deps/llhttp/CMakeLists.txt
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
cmake_minimum_required(VERSION 3.5.1)
|
|
||||||
cmake_policy(SET CMP0069 NEW)
|
|
||||||
|
|
||||||
-project(llhttp VERSION 6.0.11)
|
|
||||||
+project(llhttp VERSION 6.1.0)
|
|
||||||
include(GNUInstallDirs)
|
|
||||||
|
|
||||||
set(CMAKE_C_STANDARD 99)
|
|
||||||
diff --git a/deps/llhttp/include/llhttp.h b/deps/llhttp/include/llhttp.h
|
|
||||||
index 2da66f15e6..78f27abc03 100644
|
|
||||||
--- a/deps/llhttp/include/llhttp.h
|
|
||||||
+++ b/deps/llhttp/include/llhttp.h
|
|
||||||
@@ -2,8 +2,8 @@
|
|
||||||
#define INCLUDE_LLHTTP_H_
|
|
||||||
|
|
||||||
#define LLHTTP_VERSION_MAJOR 6
|
|
||||||
-#define LLHTTP_VERSION_MINOR 0
|
|
||||||
-#define LLHTTP_VERSION_PATCH 11
|
|
||||||
+#define LLHTTP_VERSION_MINOR 1
|
|
||||||
+#define LLHTTP_VERSION_PATCH 0
|
|
||||||
|
|
||||||
#ifndef LLHTTP_STRICT_MODE
|
|
||||||
# define LLHTTP_STRICT_MODE 0
|
|
||||||
@@ -348,6 +348,9 @@ struct llhttp_settings_s {
|
|
||||||
*/
|
|
||||||
llhttp_cb on_headers_complete;
|
|
||||||
|
|
||||||
+ /* Possible return values 0, -1, HPE_USER */
|
|
||||||
+ llhttp_data_cb on_chunk_parameters;
|
|
||||||
+
|
|
||||||
/* Possible return values 0, -1, HPE_USER */
|
|
||||||
llhttp_data_cb on_body;
|
|
||||||
|
|
||||||
diff --git a/deps/llhttp/src/api.c b/deps/llhttp/src/api.c
|
|
||||||
index c4ce197c58..d3065b3664 100644
|
|
||||||
--- a/deps/llhttp/src/api.c
|
|
||||||
+++ b/deps/llhttp/src/api.c
|
|
||||||
@@ -355,6 +355,13 @@ int llhttp__on_chunk_header(llhttp_t* s, const char* p, const char* endp) {
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+int llhttp__on_chunk_parameters(llhttp_t* s, const char* p, const char* endp) {
|
|
||||||
+ int err;
|
|
||||||
+ SPAN_CALLBACK_MAYBE(s, on_chunk_parameters, p, endp - p);
|
|
||||||
+ return err;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
int llhttp__on_chunk_complete(llhttp_t* s, const char* p, const char* endp) {
|
|
||||||
int err;
|
|
||||||
CALLBACK_MAYBE(s, on_chunk_complete);
|
|
||||||
diff --git a/deps/llhttp/src/llhttp.c b/deps/llhttp/src/llhttp.c
|
|
||||||
index 5e7c5d1093..e6db6e3188 100644
|
|
||||||
--- a/deps/llhttp/src/llhttp.c
|
|
||||||
+++ b/deps/llhttp/src/llhttp.c
|
|
||||||
@@ -340,6 +340,8 @@ enum llparse_state_e {
|
|
||||||
s_n_llhttp__internal__n_invoke_is_equal_content_length,
|
|
||||||
s_n_llhttp__internal__n_chunk_size_almost_done,
|
|
||||||
s_n_llhttp__internal__n_chunk_parameters,
|
|
||||||
+ s_n_llhttp__internal__n_span_start_llhttp__on_chunk_parameters,
|
|
||||||
+ s_n_llhttp__internal__n_chunk_parameters_ows,
|
|
||||||
s_n_llhttp__internal__n_chunk_size_otherwise,
|
|
||||||
s_n_llhttp__internal__n_chunk_size,
|
|
||||||
s_n_llhttp__internal__n_chunk_size_digit,
|
|
||||||
@@ -539,6 +541,10 @@ int llhttp__on_body(
|
|
||||||
llhttp__internal_t* s, const unsigned char* p,
|
|
||||||
const unsigned char* endp);
|
|
||||||
|
|
||||||
+int llhttp__on_chunk_parameters(
|
|
||||||
+ llhttp__internal_t* s, const unsigned char* p,
|
|
||||||
+ const unsigned char* endp);
|
|
||||||
+
|
|
||||||
int llhttp__on_status(
|
|
||||||
llhttp__internal_t* s, const unsigned char* p,
|
|
||||||
const unsigned char* endp);
|
|
||||||
@@ -1226,8 +1232,7 @@ static llparse_state_t llhttp__internal__run(
|
|
||||||
goto s_n_llhttp__internal__n_chunk_parameters;
|
|
||||||
}
|
|
||||||
case 2: {
|
|
||||||
- p++;
|
|
||||||
- goto s_n_llhttp__internal__n_chunk_size_almost_done;
|
|
||||||
+ goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_parameters;
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
goto s_n_llhttp__internal__n_error_10;
|
|
||||||
@@ -1236,6 +1241,34 @@ static llparse_state_t llhttp__internal__run(
|
|
||||||
/* UNREACHABLE */;
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
+ case s_n_llhttp__internal__n_span_start_llhttp__on_chunk_parameters:
|
|
||||||
+ s_n_llhttp__internal__n_span_start_llhttp__on_chunk_parameters: {
|
|
||||||
+ if (p == endp) {
|
|
||||||
+ return s_n_llhttp__internal__n_span_start_llhttp__on_chunk_parameters;
|
|
||||||
+ }
|
|
||||||
+ state->_span_pos0 = (void*) p;
|
|
||||||
+ state->_span_cb0 = llhttp__on_chunk_parameters;
|
|
||||||
+ goto s_n_llhttp__internal__n_chunk_parameters;
|
|
||||||
+ /* UNREACHABLE */;
|
|
||||||
+ abort();
|
|
||||||
+ }
|
|
||||||
+ case s_n_llhttp__internal__n_chunk_parameters_ows:
|
|
||||||
+ s_n_llhttp__internal__n_chunk_parameters_ows: {
|
|
||||||
+ if (p == endp) {
|
|
||||||
+ return s_n_llhttp__internal__n_chunk_parameters_ows;
|
|
||||||
+ }
|
|
||||||
+ switch (*p) {
|
|
||||||
+ case ' ': {
|
|
||||||
+ p++;
|
|
||||||
+ goto s_n_llhttp__internal__n_chunk_parameters_ows;
|
|
||||||
+ }
|
|
||||||
+ default: {
|
|
||||||
+ goto s_n_llhttp__internal__n_span_start_llhttp__on_chunk_parameters;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ /* UNREACHABLE */;
|
|
||||||
+ abort();
|
|
||||||
+ }
|
|
||||||
case s_n_llhttp__internal__n_chunk_size_otherwise:
|
|
||||||
s_n_llhttp__internal__n_chunk_size_otherwise: {
|
|
||||||
if (p == endp) {
|
|
||||||
@@ -1246,13 +1279,9 @@ static llparse_state_t llhttp__internal__run(
|
|
||||||
p++;
|
|
||||||
goto s_n_llhttp__internal__n_chunk_size_almost_done;
|
|
||||||
}
|
|
||||||
- case ' ': {
|
|
||||||
- p++;
|
|
||||||
- goto s_n_llhttp__internal__n_chunk_parameters;
|
|
||||||
- }
|
|
||||||
case ';': {
|
|
||||||
p++;
|
|
||||||
- goto s_n_llhttp__internal__n_chunk_parameters;
|
|
||||||
+ goto s_n_llhttp__internal__n_chunk_parameters_ows;
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
goto s_n_llhttp__internal__n_error_11;
|
|
||||||
@@ -6074,6 +6103,24 @@ static llparse_state_t llhttp__internal__run(
|
|
||||||
/* UNREACHABLE */;
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
+ s_n_llhttp__internal__n_span_end_llhttp__on_chunk_parameters: {
|
|
||||||
+ const unsigned char* start;
|
|
||||||
+ int err;
|
|
||||||
+
|
|
||||||
+ start = state->_span_pos0;
|
|
||||||
+ state->_span_pos0 = NULL;
|
|
||||||
+ err = llhttp__on_chunk_parameters(state, start, p);
|
|
||||||
+ if (err != 0) {
|
|
||||||
+ state->error = err;
|
|
||||||
+ state->error_pos = (const char*) (p + 1);
|
|
||||||
+ state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_chunk_size_almost_done;
|
|
||||||
+ return s_error;
|
|
||||||
+ }
|
|
||||||
+ p++;
|
|
||||||
+ goto s_n_llhttp__internal__n_chunk_size_almost_done;
|
|
||||||
+ /* UNREACHABLE */;
|
|
||||||
+ abort();
|
|
||||||
+ }
|
|
||||||
s_n_llhttp__internal__n_error_10: {
|
|
||||||
state->error = 0x2;
|
|
||||||
state->reason = "Invalid character in chunk parameters";
|
|
||||||
@@ -8441,6 +8488,8 @@ enum llparse_state_e {
|
|
||||||
s_n_llhttp__internal__n_invoke_is_equal_content_length,
|
|
||||||
s_n_llhttp__internal__n_chunk_size_almost_done,
|
|
||||||
s_n_llhttp__internal__n_chunk_parameters,
|
|
||||||
+ s_n_llhttp__internal__n_span_start_llhttp__on_chunk_parameters,
|
|
||||||
+ s_n_llhttp__internal__n_chunk_parameters_ows,
|
|
||||||
s_n_llhttp__internal__n_chunk_size_otherwise,
|
|
||||||
s_n_llhttp__internal__n_chunk_size,
|
|
||||||
s_n_llhttp__internal__n_chunk_size_digit,
|
|
||||||
@@ -8635,6 +8684,10 @@ int llhttp__on_body(
|
|
||||||
llhttp__internal_t* s, const unsigned char* p,
|
|
||||||
const unsigned char* endp);
|
|
||||||
|
|
||||||
+int llhttp__on_chunk_parameters(
|
|
||||||
+ llhttp__internal_t* s, const unsigned char* p,
|
|
||||||
+ const unsigned char* endp);
|
|
||||||
+
|
|
||||||
int llhttp__on_status(
|
|
||||||
llhttp__internal_t* s, const unsigned char* p,
|
|
||||||
const unsigned char* endp);
|
|
||||||
@@ -9299,8 +9352,7 @@ static llparse_state_t llhttp__internal__run(
|
|
||||||
goto s_n_llhttp__internal__n_chunk_parameters;
|
|
||||||
}
|
|
||||||
case 2: {
|
|
||||||
- p++;
|
|
||||||
- goto s_n_llhttp__internal__n_chunk_size_almost_done;
|
|
||||||
+ goto s_n_llhttp__internal__n_span_end_llhttp__on_chunk_parameters;
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
goto s_n_llhttp__internal__n_error_6;
|
|
||||||
@@ -9309,6 +9361,34 @@ static llparse_state_t llhttp__internal__run(
|
|
||||||
/* UNREACHABLE */;
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
+ case s_n_llhttp__internal__n_span_start_llhttp__on_chunk_parameters:
|
|
||||||
+ s_n_llhttp__internal__n_span_start_llhttp__on_chunk_parameters: {
|
|
||||||
+ if (p == endp) {
|
|
||||||
+ return s_n_llhttp__internal__n_span_start_llhttp__on_chunk_parameters;
|
|
||||||
+ }
|
|
||||||
+ state->_span_pos0 = (void*) p;
|
|
||||||
+ state->_span_cb0 = llhttp__on_chunk_parameters;
|
|
||||||
+ goto s_n_llhttp__internal__n_chunk_parameters;
|
|
||||||
+ /* UNREACHABLE */;
|
|
||||||
+ abort();
|
|
||||||
+ }
|
|
||||||
+ case s_n_llhttp__internal__n_chunk_parameters_ows:
|
|
||||||
+ s_n_llhttp__internal__n_chunk_parameters_ows: {
|
|
||||||
+ if (p == endp) {
|
|
||||||
+ return s_n_llhttp__internal__n_chunk_parameters_ows;
|
|
||||||
+ }
|
|
||||||
+ switch (*p) {
|
|
||||||
+ case ' ': {
|
|
||||||
+ p++;
|
|
||||||
+ goto s_n_llhttp__internal__n_chunk_parameters_ows;
|
|
||||||
+ }
|
|
||||||
+ default: {
|
|
||||||
+ goto s_n_llhttp__internal__n_span_start_llhttp__on_chunk_parameters;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ /* UNREACHABLE */;
|
|
||||||
+ abort();
|
|
||||||
+ }
|
|
||||||
case s_n_llhttp__internal__n_chunk_size_otherwise:
|
|
||||||
s_n_llhttp__internal__n_chunk_size_otherwise: {
|
|
||||||
if (p == endp) {
|
|
||||||
@@ -9319,13 +9399,9 @@ static llparse_state_t llhttp__internal__run(
|
|
||||||
p++;
|
|
||||||
goto s_n_llhttp__internal__n_chunk_size_almost_done;
|
|
||||||
}
|
|
||||||
- case ' ': {
|
|
||||||
- p++;
|
|
||||||
- goto s_n_llhttp__internal__n_chunk_parameters;
|
|
||||||
- }
|
|
||||||
case ';': {
|
|
||||||
p++;
|
|
||||||
- goto s_n_llhttp__internal__n_chunk_parameters;
|
|
||||||
+ goto s_n_llhttp__internal__n_chunk_parameters_ows;
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
goto s_n_llhttp__internal__n_error_7;
|
|
||||||
@@ -13951,6 +14027,24 @@ static llparse_state_t llhttp__internal__run(
|
|
||||||
/* UNREACHABLE */;
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
+ s_n_llhttp__internal__n_span_end_llhttp__on_chunk_parameters: {
|
|
||||||
+ const unsigned char* start;
|
|
||||||
+ int err;
|
|
||||||
+
|
|
||||||
+ start = state->_span_pos0;
|
|
||||||
+ state->_span_pos0 = NULL;
|
|
||||||
+ err = llhttp__on_chunk_parameters(state, start, p);
|
|
||||||
+ if (err != 0) {
|
|
||||||
+ state->error = err;
|
|
||||||
+ state->error_pos = (const char*) (p + 1);
|
|
||||||
+ state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_chunk_size_almost_done;
|
|
||||||
+ return s_error;
|
|
||||||
+ }
|
|
||||||
+ p++;
|
|
||||||
+ goto s_n_llhttp__internal__n_chunk_size_almost_done;
|
|
||||||
+ /* UNREACHABLE */;
|
|
||||||
+ abort();
|
|
||||||
+ }
|
|
||||||
s_n_llhttp__internal__n_error_6: {
|
|
||||||
state->error = 0x2;
|
|
||||||
state->reason = "Invalid character in chunk parameters";
|
|
||||||
diff --git a/doc/api/errors.md b/doc/api/errors.md
|
|
||||||
index dcf8744d8b..a76bfe528d 100644
|
|
||||||
--- a/doc/api/errors.md
|
|
||||||
+++ b/doc/api/errors.md
|
|
||||||
@@ -3043,6 +3043,18 @@ malconfigured clients, if more than 8 KiB of HTTP header data is received then
|
|
||||||
HTTP parsing will abort without a request or response object being created, and
|
|
||||||
an `Error` with this code will be emitted.
|
|
||||||
|
|
||||||
+<a id="HPE_CHUNK_EXTENSIONS_OVERFLOW"></a>
|
|
||||||
+
|
|
||||||
+### `HPE_CHUNK_EXTENSIONS_OVERFLOW`
|
|
||||||
+
|
|
||||||
+<!-- YAML
|
|
||||||
+added: REPLACEME
|
|
||||||
+-->
|
|
||||||
+
|
|
||||||
+Too much data was received for a chunk extensions. In order to protect against
|
|
||||||
+malicious or malconfigured clients, if more than 16 KiB of data is received
|
|
||||||
+then an `Error` with this code will be emitted.
|
|
||||||
+
|
|
||||||
<a id="HPE_UNEXPECTED_CONTENT_LENGTH"></a>
|
|
||||||
|
|
||||||
### `HPE_UNEXPECTED_CONTENT_LENGTH`
|
|
||||||
diff --git a/lib/_http_server.js b/lib/_http_server.js
|
|
||||||
index 4e23266f63..325bce6f54 100644
|
|
||||||
--- a/lib/_http_server.js
|
|
||||||
+++ b/lib/_http_server.js
|
|
||||||
@@ -706,6 +706,12 @@ const requestHeaderFieldsTooLargeResponse = Buffer.from(
|
|
||||||
`HTTP/1.1 431 ${STATUS_CODES[431]}\r\n` +
|
|
||||||
'Connection: close\r\n\r\n', 'ascii'
|
|
||||||
);
|
|
||||||
+
|
|
||||||
+const requestChunkExtensionsTooLargeResponse = Buffer.from(
|
|
||||||
+ `HTTP/1.1 413 ${STATUS_CODES[413]}\r\n` +
|
|
||||||
+ 'Connection: close\r\n\r\n', 'ascii',
|
|
||||||
+);
|
|
||||||
+
|
|
||||||
function socketOnError(e) {
|
|
||||||
// Ignore further errors
|
|
||||||
this.removeListener('error', socketOnError);
|
|
||||||
@@ -719,6 +725,9 @@ function socketOnError(e) {
|
|
||||||
case 'HPE_HEADER_OVERFLOW':
|
|
||||||
response = requestHeaderFieldsTooLargeResponse;
|
|
||||||
break;
|
|
||||||
+ case 'HPE_CHUNK_EXTENSIONS_OVERFLOW':
|
|
||||||
+ response = requestChunkExtensionsTooLargeResponse;
|
|
||||||
+ break;
|
|
||||||
case 'ERR_HTTP_REQUEST_TIMEOUT':
|
|
||||||
response = requestTimeoutResponse;
|
|
||||||
break;
|
|
||||||
diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc
|
|
||||||
index 74f32480b9..b92e8486ae 100644
|
|
||||||
--- a/src/node_http_parser.cc
|
|
||||||
+++ b/src/node_http_parser.cc
|
|
||||||
@@ -79,6 +79,8 @@ const uint32_t kOnExecute = 5;
|
|
||||||
const uint32_t kOnTimeout = 6;
|
|
||||||
// Any more fields than this will be flushed into JS
|
|
||||||
const size_t kMaxHeaderFieldsCount = 32;
|
|
||||||
+// Maximum size of chunk extensions
|
|
||||||
+const size_t kMaxChunkExtensionsSize = 16384;
|
|
||||||
|
|
||||||
const uint32_t kLenientNone = 0;
|
|
||||||
const uint32_t kLenientHeaders = 1 << 0;
|
|
||||||
@@ -206,6 +208,7 @@ class Parser : public AsyncWrap, public StreamListener {
|
|
||||||
|
|
||||||
int on_message_begin() {
|
|
||||||
num_fields_ = num_values_ = 0;
|
|
||||||
+ chunk_extensions_nread_ = 0;
|
|
||||||
url_.Reset();
|
|
||||||
status_message_.Reset();
|
|
||||||
header_parsing_start_time_ = uv_hrtime();
|
|
||||||
@@ -443,9 +446,22 @@ class Parser : public AsyncWrap, public StreamListener {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
- // Reset nread for the next chunk
|
|
||||||
+ int on_chunk_extension(const char* at, size_t length) {
|
|
||||||
+ chunk_extensions_nread_ += length;
|
|
||||||
+
|
|
||||||
+ if (chunk_extensions_nread_ > kMaxChunkExtensionsSize) {
|
|
||||||
+ llhttp_set_error_reason(&parser_,
|
|
||||||
+ "HPE_CHUNK_EXTENSIONS_OVERFLOW:Chunk extensions overflow");
|
|
||||||
+ return HPE_USER;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // Reset nread for the next chunk and also reset the extensions counter
|
|
||||||
int on_chunk_header() {
|
|
||||||
header_nread_ = 0;
|
|
||||||
+ chunk_extensions_nread_ = 0;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -887,6 +903,7 @@ class Parser : public AsyncWrap, public StreamListener {
|
|
||||||
const char* current_buffer_data_;
|
|
||||||
bool pending_pause_ = false;
|
|
||||||
uint64_t header_nread_ = 0;
|
|
||||||
+ uint64_t chunk_extensions_nread_ = 0;
|
|
||||||
uint64_t max_http_header_size_;
|
|
||||||
uint64_t headers_timeout_;
|
|
||||||
uint64_t header_parsing_start_time_ = 0;
|
|
||||||
@@ -921,6 +938,7 @@ const llhttp_settings_t Parser::settings = {
|
|
||||||
Proxy<DataCall, &Parser::on_header_field>::Raw,
|
|
||||||
Proxy<DataCall, &Parser::on_header_value>::Raw,
|
|
||||||
Proxy<Call, &Parser::on_headers_complete>::Raw,
|
|
||||||
+ Proxy<DataCall, &Parser::on_chunk_extension>::Raw,
|
|
||||||
Proxy<DataCall, &Parser::on_body>::Raw,
|
|
||||||
Proxy<Call, &Parser::on_message_complete>::Raw,
|
|
||||||
Proxy<Call, &Parser::on_chunk_header>::Raw,
|
|
||||||
diff --git a/test/parallel/test-http-chunk-extensions-limit.js b/test/parallel/test-http-chunk-extensions-limit.js
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..6868b3da6c
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/test/parallel/test-http-chunk-extensions-limit.js
|
|
||||||
@@ -0,0 +1,131 @@
|
|
||||||
+'use strict';
|
|
||||||
+
|
|
||||||
+const common = require('../common');
|
|
||||||
+const http = require('http');
|
|
||||||
+const net = require('net');
|
|
||||||
+const assert = require('assert');
|
|
||||||
+
|
|
||||||
+// Verify that chunk extensions are limited in size when sent all together.
|
|
||||||
+{
|
|
||||||
+ const server = http.createServer((req, res) => {
|
|
||||||
+ req.on('end', () => {
|
|
||||||
+ res.writeHead(200, { 'Content-Type': 'text/plain' });
|
|
||||||
+ res.end('bye');
|
|
||||||
+ });
|
|
||||||
+
|
|
||||||
+ req.resume();
|
|
||||||
+ });
|
|
||||||
+
|
|
||||||
+ server.listen(0, () => {
|
|
||||||
+ const sock = net.connect(server.address().port);
|
|
||||||
+ let data = '';
|
|
||||||
+
|
|
||||||
+ sock.on('data', (chunk) => data += chunk.toString('utf-8'));
|
|
||||||
+
|
|
||||||
+ sock.on('end', common.mustCall(function() {
|
|
||||||
+ assert.strictEqual(data, 'HTTP/1.1 413 Payload Too Large\r\nConnection: close\r\n\r\n');
|
|
||||||
+ server.close();
|
|
||||||
+ }));
|
|
||||||
+
|
|
||||||
+ sock.end('' +
|
|
||||||
+ 'GET / HTTP/1.1\r\n' +
|
|
||||||
+ 'Host: localhost:8080\r\n' +
|
|
||||||
+ 'Transfer-Encoding: chunked\r\n\r\n' +
|
|
||||||
+ '2;' + 'A'.repeat(20000) + '=bar\r\nAA\r\n' +
|
|
||||||
+ '0\r\n\r\n'
|
|
||||||
+ );
|
|
||||||
+ });
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+// Verify that chunk extensions are limited in size when sent in intervals.
|
|
||||||
+{
|
|
||||||
+ const server = http.createServer((req, res) => {
|
|
||||||
+ req.on('end', () => {
|
|
||||||
+ res.writeHead(200, { 'Content-Type': 'text/plain' });
|
|
||||||
+ res.end('bye');
|
|
||||||
+ });
|
|
||||||
+
|
|
||||||
+ req.resume();
|
|
||||||
+ });
|
|
||||||
+
|
|
||||||
+ server.listen(0, () => {
|
|
||||||
+ const sock = net.connect(server.address().port);
|
|
||||||
+ let remaining = 20000;
|
|
||||||
+ let data = '';
|
|
||||||
+
|
|
||||||
+ const interval = setInterval(
|
|
||||||
+ () => {
|
|
||||||
+ if (remaining > 0) {
|
|
||||||
+ sock.write('A'.repeat(1000));
|
|
||||||
+ } else {
|
|
||||||
+ sock.write('=bar\r\nAA\r\n0\r\n\r\n');
|
|
||||||
+ clearInterval(interval);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ remaining -= 1000;
|
|
||||||
+ },
|
|
||||||
+ common.platformTimeout(20),
|
|
||||||
+ ).unref();
|
|
||||||
+
|
|
||||||
+ sock.on('data', (chunk) => data += chunk.toString('utf-8'));
|
|
||||||
+
|
|
||||||
+ sock.on('end', common.mustCall(function() {
|
|
||||||
+ assert.strictEqual(data, 'HTTP/1.1 413 Payload Too Large\r\nConnection: close\r\n\r\n');
|
|
||||||
+ server.close();
|
|
||||||
+ }));
|
|
||||||
+
|
|
||||||
+ sock.write('' +
|
|
||||||
+ 'GET / HTTP/1.1\r\n' +
|
|
||||||
+ 'Host: localhost:8080\r\n' +
|
|
||||||
+ 'Transfer-Encoding: chunked\r\n\r\n' +
|
|
||||||
+ '2;'
|
|
||||||
+ );
|
|
||||||
+ });
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+// Verify the chunk extensions is correctly reset after a chunk
|
|
||||||
+{
|
|
||||||
+ const server = http.createServer((req, res) => {
|
|
||||||
+ req.on('end', () => {
|
|
||||||
+ res.writeHead(200, { 'content-type': 'text/plain', 'connection': 'close', 'date': 'now' });
|
|
||||||
+ res.end('bye');
|
|
||||||
+ });
|
|
||||||
+
|
|
||||||
+ req.resume();
|
|
||||||
+ });
|
|
||||||
+
|
|
||||||
+ server.listen(0, () => {
|
|
||||||
+ const sock = net.connect(server.address().port);
|
|
||||||
+ let data = '';
|
|
||||||
+
|
|
||||||
+ sock.on('data', (chunk) => data += chunk.toString('utf-8'));
|
|
||||||
+
|
|
||||||
+ sock.on('end', common.mustCall(function() {
|
|
||||||
+ assert.strictEqual(
|
|
||||||
+ data,
|
|
||||||
+ 'HTTP/1.1 200 OK\r\n' +
|
|
||||||
+ 'content-type: text/plain\r\n' +
|
|
||||||
+ 'connection: close\r\n' +
|
|
||||||
+ 'date: now\r\n' +
|
|
||||||
+ 'Transfer-Encoding: chunked\r\n' +
|
|
||||||
+ '\r\n' +
|
|
||||||
+ '3\r\n' +
|
|
||||||
+ 'bye\r\n' +
|
|
||||||
+ '0\r\n' +
|
|
||||||
+ '\r\n',
|
|
||||||
+ );
|
|
||||||
+
|
|
||||||
+ server.close();
|
|
||||||
+ }));
|
|
||||||
+
|
|
||||||
+ sock.end('' +
|
|
||||||
+ 'GET / HTTP/1.1\r\n' +
|
|
||||||
+ 'Host: localhost:8080\r\n' +
|
|
||||||
+ 'Transfer-Encoding: chunked\r\n\r\n' +
|
|
||||||
+ '2;' + 'A'.repeat(10000) + '=bar\r\nAA\r\n' +
|
|
||||||
+ '2;' + 'A'.repeat(10000) + '=bar\r\nAA\r\n' +
|
|
||||||
+ '2;' + 'A'.repeat(10000) + '=bar\r\nAA\r\n' +
|
|
||||||
+ '0\r\n\r\n'
|
|
||||||
+ );
|
|
||||||
+ });
|
|
||||||
+}
|
|
||||||
diff --git a/tools/update-llhttp.sh b/tools/update-llhttp.sh
|
|
||||||
index 12e2f465d7..a95eef1237 100755
|
|
||||||
--- a/tools/update-llhttp.sh
|
|
||||||
+++ b/tools/update-llhttp.sh
|
|
||||||
@@ -59,5 +59,5 @@ echo ""
|
|
||||||
echo "Please git add llhttp, commit the new version:"
|
|
||||||
echo ""
|
|
||||||
echo "$ git add -A deps/llhttp"
|
|
||||||
-echo "$ git commit -m \"deps: update nghttp2 to $LLHTTP_VERSION\""
|
|
||||||
+echo "$ git commit -m \"deps: update llhttp to $LLHTTP_VERSION\""
|
|
||||||
echo ""
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
@ -128,7 +128,7 @@ echo "$ICUMD5 $ICUTARBALL" > icu.md5
|
|||||||
md5sum -c icu.md5
|
md5sum -c icu.md5
|
||||||
rm -f icu.md5 SHASUMS256.txt
|
rm -f icu.md5 SHASUMS256.txt
|
||||||
|
|
||||||
#fedpkg new-sources node-v${version}-stripped.tar.gz icu4c*-src.tgz
|
rhpkg new-sources node-v${version}-stripped.tar.gz icu4c*-src.tgz
|
||||||
|
|
||||||
rm -f node-v${version}.tar.gz
|
rm -f node-v${version}.tar.gz
|
||||||
|
|
||||||
@ -155,11 +155,11 @@ grep "define ARES_VERSION_MAJOR" node-v${version}/deps/cares/include/ares_versio
|
|||||||
grep "define ARES_VERSION_MINOR" node-v${version}/deps/cares/include/ares_version.h
|
grep "define ARES_VERSION_MINOR" node-v${version}/deps/cares/include/ares_version.h
|
||||||
grep "define ARES_VERSION_PATCH" node-v${version}/deps/cares/include/ares_version.h
|
grep "define ARES_VERSION_PATCH" node-v${version}/deps/cares/include/ares_version.h
|
||||||
echo
|
echo
|
||||||
echo "llhttp"
|
echo "http-parser"
|
||||||
echo "========================="
|
echo "========================="
|
||||||
grep "define LLHTTP_VERSION_MAJOR" node-v${version}/deps/llhttp/include/llhttp.h
|
grep "define HTTP_PARSER_VERSION_MAJOR" node-v${version}/deps/http_parser/http_parser.h
|
||||||
grep "define LLHTTP_VERSION_MINOR" node-v${version}/deps/llhttp/include/llhttp.h
|
grep "define HTTP_PARSER_VERSION_MINOR" node-v${version}/deps/http_parser/http_parser.h
|
||||||
grep "define LLHTTP_VERSION_PATCH" node-v${version}/deps/llhttp/include/llhttp.h
|
grep "define HTTP_PARSER_VERSION_PATCH" node-v${version}/deps/http_parser/http_parser.h
|
||||||
echo
|
echo
|
||||||
echo "libuv"
|
echo "libuv"
|
||||||
echo "========================="
|
echo "========================="
|
||||||
@ -171,14 +171,6 @@ echo "nghttp2"
|
|||||||
echo "========================="
|
echo "========================="
|
||||||
grep "define NGHTTP2_VERSION " node-v${version}/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
|
grep "define NGHTTP2_VERSION " node-v${version}/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
|
||||||
echo
|
echo
|
||||||
echo "nghttp3"
|
|
||||||
echo "========================="
|
|
||||||
grep "define NGHTTP3_VERSION " node-v${version}/deps/ngtcp2/nghttp3/lib/includes/nghttp3/version.h
|
|
||||||
echo
|
|
||||||
echo "ngtcp2"
|
|
||||||
echo "========================="
|
|
||||||
grep "define NGTCP2_VERSION " node-v${version}/deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h
|
|
||||||
echo
|
|
||||||
echo "ICU"
|
echo "ICU"
|
||||||
echo "========================="
|
echo "========================="
|
||||||
grep "url" node-v${version}/tools/icu/current_ver.dep
|
grep "url" node-v${version}/tools/icu/current_ver.dep
|
||||||
@ -187,12 +179,6 @@ echo "punycode"
|
|||||||
echo "========================="
|
echo "========================="
|
||||||
grep "'version'" node-v${version}/lib/punycode.js
|
grep "'version'" node-v${version}/lib/punycode.js
|
||||||
echo
|
echo
|
||||||
echo "uvwasi"
|
|
||||||
echo "========================="
|
|
||||||
grep "define UVWASI_VERSION_MAJOR" node-v${version}/deps/uvwasi/include/uvwasi.h
|
|
||||||
grep "define UVWASI_VERSION_MINOR" node-v${version}/deps/uvwasi/include/uvwasi.h
|
|
||||||
grep "define UVWASI_VERSION_PATCH" node-v${version}/deps/uvwasi/include/uvwasi.h
|
|
||||||
echo
|
|
||||||
echo "npm"
|
echo "npm"
|
||||||
echo "========================="
|
echo "========================="
|
||||||
grep "\"version\":" node-v${version}/deps/npm/package.json
|
grep "\"version\":" node-v${version}/deps/npm/package.json
|
||||||
|
@ -1,2 +1 @@
|
|||||||
prefix=/usr/local
|
prefix=/usr/local
|
||||||
python=/usr/bin/python3
|
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
# This is the distibution-level configuration file for npm.
|
|
||||||
# To configure NPM on a system level, use the globalconfig below (defaults to @SYSCONFDIR@/npmrc).
|
|
||||||
# vim:set filetype=dosini:
|
|
||||||
|
|
||||||
globalconfig=@SYSCONFDIR@/npmrc
|
|
@ -1,41 +1,19 @@
|
|||||||
%bcond_with debug
|
%global with_debug 0
|
||||||
|
|
||||||
# PowerPC, s390x and aarch64 segfault during Debug builds
|
# PowerPC, s390x and aarch64 segfault during Debug builds
|
||||||
# https://github.com/nodejs/node/issues/20642
|
# https://github.com/nodejs/node/issues/20642
|
||||||
%ifarch %{power64} s390x aarch64
|
%ifarch %{power64} s390x aarch64
|
||||||
%bcond_with debug
|
%global with_debug 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# The following macros control the usage of dependencies bundled from upstream.
|
# bundle dependencies that are not available as Fedora modules
|
||||||
#
|
|
||||||
# When to use what:
|
|
||||||
# - Regular (presumably non-modular) build: use neither (the default in Fedora)
|
|
||||||
# - Early bootstrapping build that is not intended to be shipped:
|
|
||||||
# use --with=bootstrap; this will bundle deps and add `~bootstrap` release suffix
|
|
||||||
# - Build with some dependencies not avalaible in necessary versions (i.e. module build):
|
|
||||||
# use --with=bundled; will bundle deps, but do not add the suffix
|
|
||||||
#
|
|
||||||
# create bootstrapping build with bundled deps and extra release suffix
|
|
||||||
%bcond_with bootstrap
|
%bcond_with bootstrap
|
||||||
# bundle dependencies that are not available in CentOS
|
|
||||||
# currently hardcoded to bundle; see Fedora spec on how to make this dependent on bootstrap
|
|
||||||
%if %{with bootstrap}
|
|
||||||
%bcond_without bundled
|
|
||||||
%else
|
|
||||||
%bcond_with bundled
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?rhel} && 0%{?rhel} < 9
|
|
||||||
%bcond_without python3_fixup
|
|
||||||
%else
|
|
||||||
%bcond_with python3_fixup
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# == Master Relase ==
|
# == Master Relase ==
|
||||||
# This is used by both the nodejs package and the npm subpackage that
|
# 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
|
# has a separate version - the name is special so that rpmdev-bumpspec
|
||||||
# will bump this rather than adding .1 to the end.
|
# will bump this rather than adding .1 to the end.
|
||||||
%global baserelease 4
|
%global baserelease 1
|
||||||
|
|
||||||
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||||
|
|
||||||
@ -45,12 +23,12 @@
|
|||||||
# feature releases that are only supported for nine months, which is shorter
|
# feature releases that are only supported for nine months, which is shorter
|
||||||
# than a Fedora release lifecycle.
|
# than a Fedora release lifecycle.
|
||||||
%global nodejs_epoch 1
|
%global nodejs_epoch 1
|
||||||
%global nodejs_major 16
|
%global nodejs_major 10
|
||||||
%global nodejs_minor 20
|
%global nodejs_minor 24
|
||||||
%global nodejs_patch 2
|
%global nodejs_patch 0
|
||||||
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
|
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
|
||||||
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
|
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
|
||||||
%global nodejs_soversion 93
|
%global nodejs_soversion 64
|
||||||
%global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
|
%global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
|
||||||
%global nodejs_release %{baserelease}
|
%global nodejs_release %{baserelease}
|
||||||
|
|
||||||
@ -59,11 +37,11 @@
|
|||||||
# == Bundled Dependency Versions ==
|
# == Bundled Dependency Versions ==
|
||||||
# v8 - from deps/v8/include/v8-version.h
|
# v8 - from deps/v8/include/v8-version.h
|
||||||
# Epoch is set to ensure clean upgrades from the old v8 package
|
# Epoch is set to ensure clean upgrades from the old v8 package
|
||||||
%global v8_epoch 2
|
%global v8_epoch 1
|
||||||
%global v8_major 9
|
%global v8_major 6
|
||||||
%global v8_minor 4
|
%global v8_minor 8
|
||||||
%global v8_build 146
|
%global v8_build 275
|
||||||
%global v8_patch 26
|
%global v8_patch 32
|
||||||
# V8 presently breaks ABI at least every x.y release while never bumping SONAME
|
# V8 presently breaks ABI at least every x.y release while never bumping SONAME
|
||||||
%global v8_abi %{v8_major}.%{v8_minor}
|
%global v8_abi %{v8_major}.%{v8_minor}
|
||||||
%global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch}
|
%global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch}
|
||||||
@ -71,56 +49,38 @@
|
|||||||
|
|
||||||
# c-ares - from deps/cares/include/ares_version.h
|
# c-ares - from deps/cares/include/ares_version.h
|
||||||
# https://github.com/nodejs/node/pull/9332
|
# https://github.com/nodejs/node/pull/9332
|
||||||
%global c_ares_version 1.19.1
|
%global c_ares_major 1
|
||||||
|
%global c_ares_minor 15
|
||||||
|
%global c_ares_patch 0
|
||||||
|
%global c_ares_version %{c_ares_major}.%{c_ares_minor}.%{c_ares_patch}
|
||||||
|
|
||||||
# llhttp - from deps/llhttp/include/llhttp.h
|
# http-parser - from deps/http_parser/http_parser.h
|
||||||
%global llhttp_version 6.0.11
|
%global http_parser_major 2
|
||||||
|
%global http_parser_minor 9
|
||||||
|
%global http_parser_patch 4
|
||||||
|
%global http_parser_version %{http_parser_major}.%{http_parser_minor}.%{http_parser_patch}
|
||||||
|
|
||||||
# libuv - from deps/uv/include/uv/version.h
|
# libuv - from deps/uv/include/uv/version.h
|
||||||
%global libuv_major 1
|
%global libuv_major 1
|
||||||
%global libuv_minor 43
|
%global libuv_minor 34
|
||||||
%global libuv_patch 0
|
%global libuv_patch 2
|
||||||
%global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch}
|
%global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch}
|
||||||
|
|
||||||
# nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
|
# nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
|
||||||
%global nghttp2_major 1
|
%global nghttp2_major 1
|
||||||
%global nghttp2_minor 57
|
%global nghttp2_minor 41
|
||||||
%global nghttp2_patch 0
|
%global nghttp2_patch 0
|
||||||
%global nghttp2_version %{nghttp2_major}.%{nghttp2_minor}.%{nghttp2_patch}
|
%global nghttp2_version %{nghttp2_major}.%{nghttp2_minor}.%{nghttp2_patch}
|
||||||
|
|
||||||
# nghttp3 - from deps/ngtcp2/nghttp3/lib/includes/nghttp3/version.h
|
|
||||||
%global nghttp3_major 0
|
|
||||||
%global nghttp3_minor 7
|
|
||||||
%global nghttp3_patch 0
|
|
||||||
%global nghttp3_version %{nghttp3_major}.%{nghttp3_minor}.%{nghttp3_patch}
|
|
||||||
|
|
||||||
# ngtcp2 from deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h
|
|
||||||
%global ngtcp2_major 0
|
|
||||||
%global ngtcp2_minor 8
|
|
||||||
%global ngtcp2_patch 1
|
|
||||||
%global ngtcp2_version %{ngtcp2_major}.%{ngtcp2_minor}.%{ngtcp2_patch}
|
|
||||||
|
|
||||||
# ICU - from tools/icu/current_ver.dep
|
# ICU - from tools/icu/current_ver.dep
|
||||||
%global icu_major 71
|
%global icu_major 64
|
||||||
%global icu_minor 1
|
%global icu_minor 2
|
||||||
%global icu_version %{icu_major}.%{icu_minor}
|
%global icu_version %{icu_major}.%{icu_minor}
|
||||||
|
|
||||||
%global icudatadir %{nodejs_datadir}/icudata
|
%global icudatadir %{nodejs_datadir}/icudata
|
||||||
%{!?little_endian: %global little_endian %(%{__python3} -c "import sys;print (0 if sys.byteorder=='big' else 1)")}
|
%{!?little_endian: %global little_endian %(%{__python3} -c "import sys;print (0 if sys.byteorder=='big' else 1)")}
|
||||||
# " this line just fixes syntax highlighting for vim that is confused by the above and continues literal
|
# " this line just fixes syntax highlighting for vim that is confused by the above and continues literal
|
||||||
|
|
||||||
%global sys_icu_version %(/usr/bin/icu-config --version)
|
|
||||||
|
|
||||||
%if "%{sys_icu_version}" >= "%{icu_version}"
|
|
||||||
%global bundled_icu 0
|
|
||||||
%global icu_flag system-icu
|
|
||||||
%else
|
|
||||||
%global bundled_icu 1
|
|
||||||
%global icu_flag full-icu
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# OpenSSL minimum version
|
|
||||||
%global openssl_minimum 1:1.1.1
|
|
||||||
|
|
||||||
# punycode - from lib/punycode.js
|
# punycode - from lib/punycode.js
|
||||||
# Note: this was merged into the mainline since 0.6.x
|
# Note: this was merged into the mainline since 0.6.x
|
||||||
@ -132,7 +92,10 @@
|
|||||||
|
|
||||||
# npm - from deps/npm/package.json
|
# npm - from deps/npm/package.json
|
||||||
%global npm_epoch 1
|
%global npm_epoch 1
|
||||||
%global npm_version 8.19.4
|
%global npm_major 6
|
||||||
|
%global npm_minor 14
|
||||||
|
%global npm_patch 11
|
||||||
|
%global npm_version %{npm_major}.%{npm_minor}.%{npm_patch}
|
||||||
|
|
||||||
# In order to avoid needing to keep incrementing the release version for the
|
# 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
|
# main package forever, we will just construct one for npm that is guaranteed
|
||||||
@ -140,18 +103,12 @@
|
|||||||
# base npm version number is increasing.
|
# base npm version number is increasing.
|
||||||
%global npm_release %{nodejs_epoch}.%{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}.%{nodejs_release}
|
%global npm_release %{nodejs_epoch}.%{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}.%{nodejs_release}
|
||||||
|
|
||||||
# uvwasi - from deps/uvwasi/include/uvwasi.h
|
# brotli - from deps/brotli/c/common/version.h
|
||||||
%global uvwasi_major 0
|
# v10.x doesn't have --shared-brotli configure option, so we have to bundle it
|
||||||
%global uvwasi_minor 0
|
%global brotli_major 1
|
||||||
%global uvwasi_patch 13
|
%global brotli_minor 0
|
||||||
%global uvwasi_version %{uvwasi_major}.%{uvwasi_minor}.%{uvwasi_patch}
|
%global brotli_patch 7
|
||||||
|
%global brotli_version %{brotli_major}.%{brotli_minor}.%{brotli_patch}
|
||||||
# histogram_c - assumed from timestamps
|
|
||||||
%global histogram_major 0
|
|
||||||
%global histogram_minor 11
|
|
||||||
%global histogram_patch 2
|
|
||||||
%global histogram_version %{histogram_major}.%{histogram_minor}.%{histogram_patch}
|
|
||||||
|
|
||||||
|
|
||||||
Name: nodejs
|
Name: nodejs
|
||||||
Epoch: %{nodejs_epoch}
|
Epoch: %{nodejs_epoch}
|
||||||
@ -178,76 +135,49 @@ Source100: %{name}-tarball.sh
|
|||||||
# nodejs-packaging SRPM.
|
# nodejs-packaging SRPM.
|
||||||
Source7: nodejs_native.attr
|
Source7: nodejs_native.attr
|
||||||
|
|
||||||
# Configure npm to look into /etc for configuration
|
|
||||||
Source8: npmrc.builtin.in
|
|
||||||
|
|
||||||
# These are full sources for dependencies included as WASM blobs in the source of Node itself.
|
|
||||||
# Note: These sources would also include pre-compiled WASM blobs… so they are adjusted not to.
|
|
||||||
# Recipes for creating these blobs are included in the sources.
|
|
||||||
|
|
||||||
# Version: jq '.version' deps/cjs-module-lexer/package.json
|
|
||||||
# Original: https://github.com/nodejs/cjs-module-lexer/archive/refs/tags/1.2.2.tar.gz
|
|
||||||
# Adjustments: rm -f cjs-module-lexer-1.2.2/lib/lexer.wasm
|
|
||||||
Source101: cjs-module-lexer-1.2.2.tar.gz
|
|
||||||
# The WASM blob was made using wasi-sdk v11; compiler libraries are linked in.
|
|
||||||
# Version source: Makefile
|
|
||||||
Source102: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-11/wasi-sdk-wasi-sdk-11.tar.gz
|
|
||||||
|
|
||||||
# Version: jq '.version' deps/undici/src/package.json
|
|
||||||
# Original: https://github.com/nodejs/undici/archive/refs/tags/v5.20.0.tar.gz
|
|
||||||
# Adjustments: rm -f undici-5.20.0/lib/llhttp/llhttp*.wasm*
|
|
||||||
Source111: undici-5.20.0.tar.gz
|
|
||||||
# The WASM blob was made using wasi-sdk v14; compiler libraries are linked in.
|
|
||||||
# Version source: build/Dockerfile
|
|
||||||
Source112: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-14/wasi-sdk-wasi-sdk-14.tar.gz
|
|
||||||
|
|
||||||
# Disable running gyp on bundled deps we don't use
|
# Disable running gyp on bundled deps we don't use
|
||||||
Patch1: 0001-Disable-running-gyp-on-shared-deps.patch
|
Patch1: 0001-Disable-running-gyp-on-shared-deps.patch
|
||||||
Patch3: 0003-deps-nghttp2-update-to-1.57.0.patch
|
|
||||||
Patch4: nodejs-CVE-2024-22019.patch
|
# Suppress the message from npm to run `npm -g update npm`
|
||||||
|
# This does bad things on an RPM-managed npm.
|
||||||
|
Patch2: 0002-Suppress-NPM-message-to-run-global-update.patch
|
||||||
|
|
||||||
|
# Upstream patch to enable auto-detection of full ICU data
|
||||||
|
# https://github.com/nodejs/node/pull/30825
|
||||||
|
Patch3: 0003-build-auto-load-ICU-data-from-with-icu-default-data-.patch
|
||||||
|
|
||||||
|
# CVE-2020-7774
|
||||||
|
Patch4: 0004-CVE-2020-7774-nodejs-y18n-prototype-pollution-vulnerability.patch
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
|
BuildRequires: python2-devel
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: python3-setuptools
|
|
||||||
BuildRequires: python3-jinja2
|
|
||||||
%if !%{with python3_fixup}
|
|
||||||
BuildRequires: python-unversioned-command
|
|
||||||
%endif
|
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
BuildRequires: brotli-devel
|
BuildRequires: gcc >= 6.3.0
|
||||||
BuildRequires: gcc >= 8.3.0
|
BuildRequires: gcc-c++ >= 6.3.0
|
||||||
BuildRequires: gcc-c++ >= 8.3.0
|
|
||||||
BuildRequires: jq
|
|
||||||
# needed to generate bundled provides for npm dependencies
|
# needed to generate bundled provides for npm dependencies
|
||||||
# https://src.fedoraproject.org/rpms/nodejs/pull-request/2
|
# https://src.fedoraproject.org/rpms/nodejs/pull-request/2
|
||||||
# https://pagure.io/nodejs-packaging/pull-request/10
|
# https://pagure.io/nodejs-packaging/pull-request/10
|
||||||
BuildRequires: nodejs-packaging
|
BuildRequires: nodejs-packaging
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
BuildRequires: libatomic
|
BuildRequires: libatomic
|
||||||
|
|
||||||
|
%if %{with bootstrap}
|
||||||
|
Provides: bundled(http-parser) = %{http_parser_version}
|
||||||
|
Provides: bundled(libuv) = %{libuv_version}
|
||||||
|
Provides: bundled(nghttp2) = %{nghttp2_version}
|
||||||
|
%else
|
||||||
BuildRequires: systemtap-sdt-devel
|
BuildRequires: systemtap-sdt-devel
|
||||||
|
|
||||||
%if %{with bundled}
|
|
||||||
Provides: bundled(libuv) = %{libuv_version}
|
|
||||||
%else
|
|
||||||
BuildRequires: libuv-devel >= 1:%{libuv_version}
|
BuildRequires: libuv-devel >= 1:%{libuv_version}
|
||||||
Requires: libuv >= 1:%{libuv_version}
|
Requires: libuv >= 1:%{libuv_version}
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with bundled} || !(0%{?fedora} || 0%{?rhel} >= 9)
|
|
||||||
Provides: bundled(nghttp2) = %{nghttp2_version}
|
|
||||||
%else
|
|
||||||
BuildRequires: libnghttp2-devel >= %{nghttp2_version}
|
BuildRequires: libnghttp2-devel >= %{nghttp2_version}
|
||||||
Requires: libnghttp2 >= %{nghttp2_version}
|
Requires: libnghttp2 >= %{nghttp2_version}
|
||||||
|
BuildRequires: http-parser-devel >= %{http_parser_version}
|
||||||
|
Requires: http-parser >= %{http_parser_version}
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Temporarily bundle llhttp because the upstream doesn't
|
BuildRequires: openssl-devel
|
||||||
# provide releases for it.
|
|
||||||
Provides: bundled(llhttp) = %{llhttp_version}
|
|
||||||
Provides: bundled(nghttp3) = %{nghttp3_version}
|
|
||||||
Provides: bundled(ngtcp2) = %{ngtcp2_version}
|
|
||||||
|
|
||||||
BuildRequires: openssl-devel >= %{openssl_minimum}
|
|
||||||
Requires: openssl >= %{openssl_minimum}
|
|
||||||
|
|
||||||
# we need the system certificate store
|
# we need the system certificate store
|
||||||
Requires: ca-certificates
|
Requires: ca-certificates
|
||||||
@ -299,13 +229,16 @@ Provides: bundled(v8) = %{v8_version}
|
|||||||
# an ABI-break, so we'll use the bundled copy.
|
# an ABI-break, so we'll use the bundled copy.
|
||||||
Provides: bundled(icu) = %{icu_version}
|
Provides: bundled(icu) = %{icu_version}
|
||||||
|
|
||||||
# Upstream added new dependencies, but so far they are not available in Fedora
|
|
||||||
# or there's no option to built it as a shared dependency, so we bundle them
|
|
||||||
Provides: bundled(uvwasi) = %{uvwasi_version}
|
|
||||||
Provides: bundled(histogram) = %{histogram_version}
|
|
||||||
|
|
||||||
# Make sure we keep NPM up to date when we update Node.js
|
# Make sure we keep NPM up to date when we update Node.js
|
||||||
Recommends: npm >= %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist}
|
%if 0%{?rhel}
|
||||||
|
# EPEL doesn't support Recommends, so make it strict
|
||||||
|
Requires: npm = %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist}
|
||||||
|
%else
|
||||||
|
Recommends: npm = %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Provide bundled brotli until we can build it with system package
|
||||||
|
Provides: bundled(brotli) = %{brotli_version}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Node.js is a platform built on Chrome's JavaScript runtime
|
Node.js is a platform built on Chrome's JavaScript runtime
|
||||||
@ -321,10 +254,12 @@ Group: Development/Languages
|
|||||||
Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
|
Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
|
||||||
Requires: openssl-devel%{?_isa}
|
Requires: openssl-devel%{?_isa}
|
||||||
Requires: zlib-devel%{?_isa}
|
Requires: zlib-devel%{?_isa}
|
||||||
Requires: brotli-devel%{?_isa}
|
|
||||||
Requires: nodejs-packaging
|
Requires: nodejs-packaging
|
||||||
|
|
||||||
%if %{without bundled}
|
%if %{with bootstrap}
|
||||||
|
# deps are bundled
|
||||||
|
%else
|
||||||
|
Requires: http-parser-devel%{?_isa}
|
||||||
Requires: libuv-devel%{?_isa}
|
Requires: libuv-devel%{?_isa}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -353,9 +288,6 @@ Release: %{npm_release}%{?dist}
|
|||||||
Obsoletes: npm < 0:3.5.4-6
|
Obsoletes: npm < 0:3.5.4-6
|
||||||
Provides: npm = %{npm_epoch}:%{npm_version}
|
Provides: npm = %{npm_epoch}:%{npm_version}
|
||||||
Requires: nodejs = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
|
Requires: nodejs = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
|
||||||
Recommends: nodejs-docs = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Do not add epoch to the virtual NPM provides or it will break
|
# Do not add epoch to the virtual NPM provides or it will break
|
||||||
# the automatic dependency-generation script.
|
# the automatic dependency-generation script.
|
||||||
@ -386,35 +318,16 @@ The API documentation for the Node.js JavaScript runtime.
|
|||||||
|
|
||||||
# remove bundled dependencies that we aren't building
|
# remove bundled dependencies that we aren't building
|
||||||
rm -rf deps/zlib
|
rm -rf deps/zlib
|
||||||
rm -rf deps/brotli
|
|
||||||
rm -rf deps/v8/third_party/jinja2
|
|
||||||
rm -rf tools/inspector_protocol/jinja2
|
|
||||||
|
|
||||||
# check for correct versions of dependencies we are bundling
|
# Replace any instances of unversioned python' with python2
|
||||||
check_wasm_dep() {
|
pathfix.py -i %{__python2} -pn $(find -type f ! -name "*.js")
|
||||||
local -r name="$1" source="$2" packagejson="$3"
|
find . -type f -exec sed -i "s~/usr\/bin\/env python~/usr/bin/python2~" {} \;
|
||||||
local -r expected_version="$(jq -r '.version' "${packagejson}")"
|
find . -type f -exec sed -i "s~/usr\/bin\/python\W~/usr/bin/python2~" {} \;
|
||||||
|
sed -i "s~python~python2~" $(find . -type f | grep "gyp$")
|
||||||
if ls "${source}"|grep -q --fixed-strings "${expected_version}"; then
|
|
||||||
printf '%s version matches\n' "${name}" >&2
|
|
||||||
else
|
|
||||||
printf '%s version MISMATCH: %s !~ %s\n' "${name}" "${expected_version}" "${source}" >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
check_wasm_dep cjs-module-lexer '%{SOURCE101}' deps/cjs-module-lexer/package.json
|
|
||||||
check_wasm_dep undici '%{SOURCE111}' deps/undici/src/package.json
|
|
||||||
|
|
||||||
# Replace any instances of unversioned python' with python3
|
|
||||||
%if %{with python3_fixup}
|
|
||||||
pathfix.py -i %{__python3} -pn $(find -type f ! -name "*.js")
|
|
||||||
find . -type f -exec sed -i "s~/usr\/bin\/env python~/usr/bin/python3~" {} \;
|
|
||||||
find . -type f -exec sed -i "s~/usr\/bin\/python\W~/usr/bin/python3~" {} \;
|
|
||||||
sed -i "s~usr\/bin\/python2~usr\/bin\/python3~" ./deps/v8/tools/gen-inlining-tests.py
|
sed -i "s~usr\/bin\/python2~usr\/bin\/python3~" ./deps/v8/tools/gen-inlining-tests.py
|
||||||
sed -i "s~usr\/bin\/python.*$~usr\/bin\/python3~" ./deps/v8/tools/mb/mb_unittest.py
|
sed -i "s~usr\/bin\/python.*$~usr\/bin\/python2~" ./deps/v8/tools/mb/mb_unittest.py
|
||||||
find . -type f -exec sed -i "s~python -c~python3 -c~" {} \;
|
find . -type f -exec sed -i "s~python -c~python2 -c~" {} \;
|
||||||
%endif
|
sed -i "s~which('python')~which('python2')~" configure
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -424,37 +337,51 @@ find . -type f -exec sed -i "s~python -c~python3 -c~" {} \;
|
|||||||
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
|
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
export CC='gcc'
|
export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
|
||||||
export CXX='g++'
|
export CC='%{__cc}'
|
||||||
%{?with_python3_fixup:export NODE_GYP_FORCE_PYTHON=%{__python3}}
|
export CXX='%{__cxx}'
|
||||||
|
|
||||||
# build with debugging symbols and add defines from libuv (#892601)
|
# build with debugging symbols and add defines from libuv (#892601)
|
||||||
# Node's v8 breaks with GCC 6 because of incorrect usage of methods on
|
# Node's v8 breaks with GCC 6 because of incorrect usage of methods on
|
||||||
# NULL objects. We need to pass -fno-delete-null-pointer-checks
|
# NULL objects. We need to pass -fno-delete-null-pointer-checks
|
||||||
|
export CFLAGS='%{optflags} \
|
||||||
|
-D_LARGEFILE_SOURCE \
|
||||||
|
-D_FILE_OFFSET_BITS=64 \
|
||||||
|
-DZLIB_CONST \
|
||||||
|
-fno-delete-null-pointer-checks'
|
||||||
|
export CXXFLAGS='%{optflags} \
|
||||||
|
-D_LARGEFILE_SOURCE \
|
||||||
|
-D_FILE_OFFSET_BITS=64 \
|
||||||
|
-DZLIB_CONST \
|
||||||
|
-fno-delete-null-pointer-checks'
|
||||||
|
|
||||||
|
# Explicit new lines in C(XX)FLAGS can break naive build scripts
|
||||||
|
export CFLAGS="$(echo ${CFLAGS} | tr '\n\\' ' ')"
|
||||||
|
export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' ' ')"
|
||||||
|
|
||||||
extra_cflags=(
|
|
||||||
-D_LARGEFILE_SOURCE
|
|
||||||
-D_FILE_OFFSET_BITS=64
|
|
||||||
-DZLIB_CONST
|
|
||||||
-fno-delete-null-pointer-checks
|
|
||||||
)
|
|
||||||
export CFLAGS="%{optflags} ${extra_cflags[*]}" CXXFLAGS="%{optflags} ${extra_cflags[*]}"
|
|
||||||
export LDFLAGS="%{build_ldflags}"
|
export LDFLAGS="%{build_ldflags}"
|
||||||
|
|
||||||
%{__python3} configure.py --prefix=%{_prefix} \
|
%if %{with bootstrap}
|
||||||
|
./configure --prefix=%{_prefix} \
|
||||||
--shared-openssl \
|
--shared-openssl \
|
||||||
--shared-zlib \
|
--shared-zlib \
|
||||||
--shared-brotli \
|
--without-dtrace \
|
||||||
%{!?with_bundled:--shared-libuv} \
|
--with-intl=small-icu \
|
||||||
%{!?with_bundled:--shared-nghttp2} \
|
--openssl-use-def-ca-store
|
||||||
%{?with_bundled:--without-dtrace}%{!?with_bundled:--with-dtrace} \
|
%else
|
||||||
|
./configure --prefix=%{_prefix} \
|
||||||
|
--shared-openssl \
|
||||||
|
--shared-zlib \
|
||||||
|
--shared-libuv \
|
||||||
|
--shared-http-parser \
|
||||||
|
--shared-nghttp2 \
|
||||||
|
--with-dtrace \
|
||||||
--with-intl=small-icu \
|
--with-intl=small-icu \
|
||||||
--with-icu-default-data-dir=%{icudatadir} \
|
--with-icu-default-data-dir=%{icudatadir} \
|
||||||
--without-corepack \
|
--openssl-use-def-ca-store
|
||||||
--openssl-use-def-ca-store \
|
%endif
|
||||||
--openssl-default-cipher-list=PROFILE=SYSTEM
|
|
||||||
|
|
||||||
%if %{with debug}
|
%if %{?with_debug} == 1
|
||||||
# Setting BUILDTYPE=Debug builds both release and debug binaries
|
# Setting BUILDTYPE=Debug builds both release and debug binaries
|
||||||
make BUILDTYPE=Debug %{?_smp_mflags}
|
make BUILDTYPE=Debug %{?_smp_mflags}
|
||||||
%else
|
%else
|
||||||
@ -492,6 +419,8 @@ popd # deps
|
|||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
|
||||||
|
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
./tools/install.py install %{buildroot} %{_prefix}
|
./tools/install.py install %{buildroot} %{_prefix}
|
||||||
@ -500,7 +429,7 @@ rm -rf %{buildroot}
|
|||||||
chmod 0755 %{buildroot}/%{_bindir}/node
|
chmod 0755 %{buildroot}/%{_bindir}/node
|
||||||
chrpath --delete %{buildroot}%{_bindir}/node
|
chrpath --delete %{buildroot}%{_bindir}/node
|
||||||
|
|
||||||
%if %{with debug}
|
%if %{?with_debug} == 1
|
||||||
# Install the debug binary and set its permissions
|
# Install the debug binary and set its permissions
|
||||||
install -Dpm0755 out/Debug/node %{buildroot}/%{_bindir}/node_g
|
install -Dpm0755 out/Debug/node %{buildroot}/%{_bindir}/node_g
|
||||||
%endif
|
%endif
|
||||||
@ -538,10 +467,9 @@ cp -pr deps/npm/man/* %{buildroot}%{_mandir}/
|
|||||||
rm -rf %{buildroot}%{_prefix}/lib/node_modules/npm/man
|
rm -rf %{buildroot}%{_prefix}/lib/node_modules/npm/man
|
||||||
ln -sf %{_mandir} %{buildroot}%{_prefix}/lib/node_modules/npm/man
|
ln -sf %{_mandir} %{buildroot}%{_prefix}/lib/node_modules/npm/man
|
||||||
|
|
||||||
# Install Gatsby HTML documentation to %%{_pkgdocdir}
|
# Install Gatsby HTML documentation to %{_pkgdocdir}
|
||||||
cp -pr deps/npm/docs %{buildroot}%{_pkgdocdir}/npm/
|
cp -pr deps/npm/docs %{buildroot}%{_pkgdocdir}/npm/
|
||||||
rm -rf %{buildroot}%{_prefix}/lib/node_modules/npm/docs
|
rm -rf %{buildroot}%{_prefix}/lib/node_modules/npm/docs
|
||||||
|
|
||||||
ln -sf %{_pkgdocdir}/npm %{buildroot}%{_prefix}/lib/node_modules/npm/docs
|
ln -sf %{_pkgdocdir}/npm %{buildroot}%{_prefix}/lib/node_modules/npm/docs
|
||||||
|
|
||||||
# Node tries to install some python files into a documentation directory
|
# Node tries to install some python files into a documentation directory
|
||||||
@ -559,17 +487,18 @@ find %{buildroot}%{_prefix}/lib/node_modules/npm \
|
|||||||
-exec chmod -x {} \;
|
-exec chmod -x {} \;
|
||||||
|
|
||||||
# The above command is a little overzealous. Add a few permissions back.
|
# The above command is a little overzealous. Add a few permissions back.
|
||||||
chmod 0755 %{buildroot}%{_prefix}/lib/node_modules/npm/node_modules/@npmcli/run-script/lib/node-gyp-bin/node-gyp
|
chmod 0755 %{buildroot}%{_prefix}/lib/node_modules/npm/node_modules/npm-lifecycle/node-gyp-bin/node-gyp
|
||||||
chmod 0755 %{buildroot}%{_prefix}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js
|
chmod 0755 %{buildroot}%{_prefix}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js
|
||||||
|
|
||||||
# Drop the NPM builtin configuration in place
|
|
||||||
sed -e 's#@SYSCONFDIR@#%{_sysconfdir}#g' \
|
|
||||||
%{SOURCE8} > %{buildroot}%{_prefix}/lib/node_modules/npm/npmrc
|
|
||||||
|
|
||||||
# Drop the NPM default configuration in place
|
# Drop the NPM default configuration in place
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}
|
mkdir -p %{buildroot}%{_sysconfdir}
|
||||||
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/npmrc
|
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/npmrc
|
||||||
|
|
||||||
|
# NPM upstream expects it to be in /usr/etc/npmrc, so we'll put a symlink here
|
||||||
|
# This is done in the interests of keeping /usr read-only.
|
||||||
|
mkdir -p %{buildroot}%{_prefix}/etc
|
||||||
|
ln -s %{_sysconfdir}/npmrc %{buildroot}%{_prefix}/etc/npmrc
|
||||||
|
|
||||||
# Install the full-icu data files
|
# Install the full-icu data files
|
||||||
install -Dpm0644 -t %{buildroot}%{icudatadir} deps/icu/source/converted/*
|
install -Dpm0644 -t %{buildroot}%{icudatadir} deps/icu/source/converted/*
|
||||||
|
|
||||||
@ -584,10 +513,10 @@ install -Dpm0644 -t %{buildroot}%{icudatadir} deps/icu/source/converted/*
|
|||||||
%{buildroot}/%{_bindir}/node -e "require(\"assert\").equal(require(\"punycode\").version, '%{punycode_version}')"
|
%{buildroot}/%{_bindir}/node -e "require(\"assert\").equal(require(\"punycode\").version, '%{punycode_version}')"
|
||||||
|
|
||||||
# Ensure we have npm and that the version matches
|
# Ensure we have npm and that the version matches
|
||||||
NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/node_modules/npm/node_modules %{buildroot}/%{_bindir}/node -e "require(\"assert\").equal(JSON.parse(require(\"fs\").readFileSync(\"%{buildroot}%{_prefix}/lib/node_modules/npm/package.json\")).version, '%{npm_version}')"
|
NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/node_modules/npm/node_modules %{buildroot}/%{_bindir}/node -e "require(\"assert\").equal(require(\"npm\").version, '%{npm_version}')"
|
||||||
|
|
||||||
# Make sure i18n support is working
|
# Make sure i18n support is working
|
||||||
NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/node_modules/npm/node_modules LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}/%{_bindir}/node --icu-data-dir=%{buildroot}%{icudatadir} %{SOURCE2}
|
NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/node_modules/npm/node_modules %{buildroot}/%{_bindir}/node --icu-data-dir=%{buildroot}%{icudatadir} %{SOURCE2}
|
||||||
|
|
||||||
|
|
||||||
%pretrans -n npm -p <lua>
|
%pretrans -n npm -p <lua>
|
||||||
@ -605,38 +534,6 @@ if d_st then
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Replace the npm docs directory with a symlink
|
|
||||||
-- Drop this scriptlet when F31 is EOL
|
|
||||||
path = "%{_prefix}/lib/node_modules/npm/doc"
|
|
||||||
st = posix.stat(path)
|
|
||||||
if st and st.type == "directory" then
|
|
||||||
status = os.rename(path, path .. ".rpmmoved")
|
|
||||||
if not status then
|
|
||||||
suffix = 0
|
|
||||||
while not status do
|
|
||||||
suffix = suffix + 1
|
|
||||||
status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
|
|
||||||
end
|
|
||||||
os.rename(path, path .. ".rpmmoved")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Replace the npm docs directory with a symlink
|
|
||||||
-- Drop this scriptlet when F31 is EOL
|
|
||||||
path = "%{_prefix}/lib/node_modules/npm/html"
|
|
||||||
st = posix.stat(path)
|
|
||||||
if st and st.type == "directory" then
|
|
||||||
status = os.rename(path, path .. ".rpmmoved")
|
|
||||||
if not status then
|
|
||||||
suffix = 0
|
|
||||||
while not status do
|
|
||||||
suffix = suffix + 1
|
|
||||||
status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
|
|
||||||
end
|
|
||||||
os.rename(path, path .. ".rpmmoved")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Replace the npm man directory with a symlink
|
-- Replace the npm man directory with a symlink
|
||||||
-- Drop this scriptlet when F31 is EOL
|
-- Drop this scriptlet when F31 is EOL
|
||||||
path = "%{_prefix}/lib/node_modules/npm/man"
|
path = "%{_prefix}/lib/node_modules/npm/man"
|
||||||
@ -662,7 +559,9 @@ end
|
|||||||
%dir %{_datadir}/systemtap/tapset
|
%dir %{_datadir}/systemtap/tapset
|
||||||
%{_datadir}/systemtap/tapset/node.stp
|
%{_datadir}/systemtap/tapset/node.stp
|
||||||
|
|
||||||
%if %{without bundled}
|
%if %{with bootstrap}
|
||||||
|
# no dtrace
|
||||||
|
%else
|
||||||
%dir %{_usr}/lib/dtrace
|
%dir %{_usr}/lib/dtrace
|
||||||
%{_usr}/lib/dtrace/node.d
|
%{_usr}/lib/dtrace/node.d
|
||||||
%endif
|
%endif
|
||||||
@ -670,12 +569,14 @@ end
|
|||||||
%{_rpmconfigdir}/fileattrs/nodejs_native.attr
|
%{_rpmconfigdir}/fileattrs/nodejs_native.attr
|
||||||
%{_rpmconfigdir}/nodejs_native.req
|
%{_rpmconfigdir}/nodejs_native.req
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%doc AUTHORS CHANGELOG.md onboarding.md GOVERNANCE.md README.md
|
%doc AUTHORS CHANGELOG.md COLLABORATOR_GUIDE.md GOVERNANCE.md README.md
|
||||||
%doc %{_mandir}/man1/node.1*
|
%doc %{_mandir}/man1/node.1*
|
||||||
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{?with_debug:%{_bindir}/node_g}
|
%if %{?with_debug} == 1
|
||||||
|
%{_bindir}/node_g
|
||||||
|
%endif
|
||||||
%{_includedir}/node
|
%{_includedir}/node
|
||||||
%{_datadir}/node/common.gypi
|
%{_datadir}/node/common.gypi
|
||||||
%{_pkgdocdir}/gdbinit
|
%{_pkgdocdir}/gdbinit
|
||||||
@ -691,212 +592,82 @@ end
|
|||||||
%{_bindir}/npx
|
%{_bindir}/npx
|
||||||
%{_prefix}/lib/node_modules/npm
|
%{_prefix}/lib/node_modules/npm
|
||||||
%config(noreplace) %{_sysconfdir}/npmrc
|
%config(noreplace) %{_sysconfdir}/npmrc
|
||||||
|
%{_prefix}/etc/npmrc
|
||||||
%ghost %{_sysconfdir}/npmignore
|
%ghost %{_sysconfdir}/npmignore
|
||||||
%doc %{_mandir}/man1/npm*.1*
|
%doc %{_mandir}/man1/npm*.1*
|
||||||
%doc %{_mandir}/man1/npx.1*
|
%doc %{_mandir}/man1/npx.1*
|
||||||
%doc %{_mandir}/man5/folders.5*
|
%doc %{_mandir}/man5/folders.5*
|
||||||
%doc %{_mandir}/man5/install.5*
|
%doc %{_mandir}/man5/install.5*
|
||||||
%doc %{_mandir}/man5/npm-global.5*
|
|
||||||
%doc %{_mandir}/man5/npm-json.5*
|
|
||||||
%doc %{_mandir}/man5/npm-shrinkwrap-json.5*
|
|
||||||
%doc %{_mandir}/man5/npmrc.5*
|
%doc %{_mandir}/man5/npmrc.5*
|
||||||
%doc %{_mandir}/man5/package-json.5*
|
%doc %{_mandir}/man5/package-json.5*
|
||||||
%doc %{_mandir}/man5/package-lock-json.5*
|
%doc %{_mandir}/man5/package-lock-json.5*
|
||||||
|
%doc %{_mandir}/man5/package-locks.5*
|
||||||
|
%doc %{_mandir}/man5/shrinkwrap-json.5*
|
||||||
%doc %{_mandir}/man7/config.7*
|
%doc %{_mandir}/man7/config.7*
|
||||||
%doc %{_mandir}/man7/dependency-selectors.7*
|
|
||||||
%doc %{_mandir}/man7/developers.7*
|
%doc %{_mandir}/man7/developers.7*
|
||||||
%doc %{_mandir}/man7/logging.7*
|
%doc %{_mandir}/man7/disputes.7*
|
||||||
%doc %{_mandir}/man7/orgs.7*
|
%doc %{_mandir}/man7/orgs.7*
|
||||||
%doc %{_mandir}/man7/package-spec.7*
|
|
||||||
%doc %{_mandir}/man7/registry.7*
|
%doc %{_mandir}/man7/registry.7*
|
||||||
%doc %{_mandir}/man7/removal.7*
|
%doc %{_mandir}/man7/removal.7*
|
||||||
%doc %{_mandir}/man7/scope.7*
|
%doc %{_mandir}/man7/scope.7*
|
||||||
%doc %{_mandir}/man7/scripts.7*
|
%doc %{_mandir}/man7/scripts.7*
|
||||||
%doc %{_mandir}/man7/workspaces.7*
|
%doc %{_mandir}/man7/semver.7*
|
||||||
|
|
||||||
|
|
||||||
%files docs
|
%files docs
|
||||||
%doc doc
|
|
||||||
%dir %{_pkgdocdir}
|
%dir %{_pkgdocdir}
|
||||||
%{_pkgdocdir}/html
|
%{_pkgdocdir}/html
|
||||||
%{_pkgdocdir}/npm/docs
|
%{_pkgdocdir}/npm/docs
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Mar 05 2024 Honza Horak <hhorak@redhat.com> - 1:16.20.2-4
|
* Wed Feb 24 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:10.24.0-1
|
||||||
- Fix CVE-2024-22019
|
- Resolves: RHBZ#1932373, RHBZ#1932426
|
||||||
|
- Resolves CVE-2021-22883 and CVE-2021-22884
|
||||||
|
- remove -debug-nghttp2 flag (1930775)
|
||||||
|
- remove ini patch merged upstream
|
||||||
|
|
||||||
* Thu Oct 12 2023 Jan Staněk <jstanek@redhat.com> - 1:16.20.2-3
|
* Mon Jan 18 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:10.23.1-1
|
||||||
- Update bundled nghttp2 to 1.57.0 (CVE-2023-44487)
|
- January Security release
|
||||||
|
|
||||||
* Wed Sep 06 2023 Masahiro Matsuya <mmatsuya@redhat.com> - 1:16.20.2-2
|
|
||||||
- Bump Release. Need to rebuild with the updated nodejs-packaging
|
|
||||||
Resolves: rhbz#2237393
|
|
||||||
|
|
||||||
* Fri Aug 18 2023 Dominik Rehák <drehak@redhat.com> - 1:16.20.2-1
|
|
||||||
- Rebase to 16.20.2
|
|
||||||
Resolves: rhbz#2231866
|
|
||||||
Resolves: CVE-2023-32002 CVE-2023-32006 CVE-2023-32559
|
|
||||||
|
|
||||||
* Thu Jul 13 2023 Jan Staněk <jstanek@redhat.com> - 1:16.20.1-1
|
|
||||||
- Rebase to 16.20.1
|
|
||||||
Resolves: rhbz#2188289
|
|
||||||
Resolves: CVE-2023-30581 CVE-2023-30588 CVE-2023-30589 CVE-2023-30590
|
|
||||||
- Replace /usr/etc/npmrc symlink with builtin configuration
|
|
||||||
Resolves: rhbz#2222288
|
|
||||||
|
|
||||||
* Wed May 31 2023 Jan Staněk <jstanek@redhat.com> - 1:16.19.1-2
|
|
||||||
- Update bundled c-ares to 1.19.1
|
|
||||||
Resolves: CVE-2023-31124 CVE-2023-31130 CVE-2023-31147 CVE-2023-32067
|
|
||||||
|
|
||||||
* Mon Feb 27 2023 Jan Staněk <jstanek@redhat.com> - 1:16.19.1-1
|
|
||||||
- Rebase to 16.19.1
|
|
||||||
Resolves: rhbz#2153713
|
|
||||||
Resolves: CVE-2023-23918 CVE-2023-23919 CVE-2023-23936 CVE-2023-24807 CVE-2023-23920
|
|
||||||
Resolves: CVE-2022-25881 CVE-2022-4904
|
|
||||||
|
|
||||||
* Wed Dec 07 2022 Jan Staněk <jstanek@redhat.com> - 1:16.18.1-3
|
|
||||||
- Update sources of undici WASM blobs
|
|
||||||
Resolves: rhbz#2151546
|
|
||||||
|
|
||||||
* Fri Dec 02 2022 Jan Staněk <jstanek@redhat.com> - 1:16.18.1-2
|
|
||||||
- Record CVE references already addressed in this or previous upstream versions
|
|
||||||
Resolves: CVE-2021-44531 CVE-2021-44532 CVE-2021-44533 CVE-2022-21824
|
|
||||||
|
|
||||||
* Wed Nov 16 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.18.1-1
|
|
||||||
- Rebase + CVE fixes
|
|
||||||
- Resolves: #2121024
|
|
||||||
- Resolves: #2135490, #2140926
|
|
||||||
|
|
||||||
* Fri Oct 07 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.17.1-1
|
|
||||||
- Rebase to version 16.17.1
|
|
||||||
- Resolves: CVE-2022-35255 CVE-2022-35256
|
|
||||||
|
|
||||||
* Tue Aug 23 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.16.0-1
|
|
||||||
- Resolves: #2104754, #2108057, #2108062, #2108067, #2108072
|
|
||||||
- Resolves CVE-2022-29244, CVE-2022-32212/3/4/5
|
|
||||||
- Resolves: #2106285
|
|
||||||
- Rebase to latest release
|
|
||||||
|
|
||||||
* Mon Apr 25 2022 Jan Staněk <jstanek@redhat.com> - 1:16.14.0-5
|
|
||||||
- Unify configure calls into single command
|
|
||||||
- Refactor bootstrap-related parts
|
|
||||||
- Decouple dependency bundling from bootstrapping
|
|
||||||
|
|
||||||
* Mon Apr 11 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.14.0-4
|
|
||||||
- Apply lock file validation fixes
|
|
||||||
- Resolves: CVE-2021-43616
|
|
||||||
- Resolves: RHBZ#2070013
|
|
||||||
|
|
||||||
* Mon Dec 06 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.13.1-3
|
|
||||||
- Resolves: RHBZ#2026329
|
|
||||||
- Add corepack to spec
|
|
||||||
|
|
||||||
* Mon Dec 06 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.13.1-2
|
|
||||||
- Resolves: RHBZ#2026329
|
|
||||||
- Update npm version test
|
|
||||||
|
|
||||||
* Thu Dec 02 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.13.1-1
|
|
||||||
- Resolves: RHBZ#2014132, RHBZ#2014126, RHBZ#2013828, RHBZ#2024920
|
|
||||||
- Resolves: RHBZ#2026329
|
|
||||||
- Rebase to LTS release and to fix multiple low and medium CVEs
|
|
||||||
|
|
||||||
* Mon Sep 13 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.8.0-1
|
|
||||||
- Resolves CVE-2021-32803, CVE-2021-32804, CVE-2021-37701, CVE-2021-37712
|
|
||||||
- Resolves: RHBZ#1993948, RHBZ#1993941, RHBZ#2000151, RHBZ#2002176
|
|
||||||
|
|
||||||
* Mon Aug 30 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.7.0-2
|
|
||||||
- Resolves CVE-2021-22930, CVE-2021-22931, CVE-2021-22939,
|
|
||||||
- CVE-2021-22940, CVE-2021-32803, CVE-2021-32804, CVE-2021-3672
|
|
||||||
- Resolves: RHBZ#1988608, RHBZ#1993816, RHBZ#1993810
|
|
||||||
- Resolves: RHBZ#1993097, RHBZ#1993948, RHBZ#1993941, RHBZ#1994963
|
|
||||||
- fix python3 in gyp
|
|
||||||
|
|
||||||
* Wed Aug 18 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.7.0-1
|
|
||||||
- Resolves CVE-2021-22930, CVE-2021-22931, CVE-2021-22939,
|
|
||||||
- CVE-2021-22940, CVE-2021-32803, CVE-2021-32804, CVE-2021-3672
|
|
||||||
- Resolves: RHBZ#1988608, RHBZ#1993816, RHBZ#1993810
|
|
||||||
- Resolves: RHBZ#1993097, RHBZ#1993948, RHBZ#1993941, RHBZ#1994963
|
|
||||||
|
|
||||||
* Fri Jul 09 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.4.2-1
|
|
||||||
- Resolves: RHBZ#1979847
|
|
||||||
- Resolves CVE-2021-22918(libuv)
|
|
||||||
- Use system cipher list(1842826, 1952915)
|
|
||||||
|
|
||||||
* Tue May 11 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.1.0-1
|
|
||||||
- Resolves: RHBZ#1953991
|
|
||||||
- Rebase to v16.x
|
|
||||||
- Update version of gcc and gcc-c++ needed
|
|
||||||
- Remove libs conditionals
|
|
||||||
- Remove unused patches
|
|
||||||
- Bundle nghttp3 and ngtcp2
|
|
||||||
|
|
||||||
* Mon Mar 01 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:14.16.0-2
|
|
||||||
- Resolves RHBZ#1930775
|
|
||||||
- remove --debug-nghttp2 option
|
|
||||||
|
|
||||||
* Mon Mar 01 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:14.16.0-1
|
|
||||||
- Resolves CVE-2021-22883 CVE-2021-22884
|
|
||||||
- Resolves: RHBZ#1934566, RHBZ#1934599
|
|
||||||
- Rebase, remove ini patch
|
|
||||||
|
|
||||||
* Tue Jan 26 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:14.15.4-2
|
|
||||||
- Add patch for yarn crash
|
|
||||||
- Resolves: RHBZ#1915296
|
|
||||||
|
|
||||||
* Tue Jan 19 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:14.15.4-1
|
|
||||||
- Security rebase to 14.15.4
|
|
||||||
- https://nodejs.org/en/blog/vulnerability/january-2021-security-releases/
|
- https://nodejs.org/en/blog/vulnerability/january-2021-security-releases/
|
||||||
- Resolves: RHBZ#1913001, RHBZ#1912953
|
- Rebase to 10.23.1
|
||||||
- Resolves: RHBZ#1912636, RHBZ#1898602, RHBZ#1898768, RHBZ#1893987, RHBZ#1893184
|
- Resolves: RHBZ#1916461, RHBZ#1914789
|
||||||
|
- Resolves: RHBZ#1914783, RHBZ#1916462, RHBZ#1916395, RHBZ#1916459
|
||||||
|
- Resolves: RHBZ#1916691, RHBZ#1916689, RHBZ#1916388
|
||||||
|
- Remove dot-prop patch, as it is fixed by npm rebase
|
||||||
|
|
||||||
* Thu Oct 29 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:14.15.0-1
|
* Tue Sep 22 2020 Jan Staněk <jstanek@redhat.com> - 1:10.22.1-1
|
||||||
- Resolves: RHBZ#1858864
|
- Security rebase to 10.22.1
|
||||||
- Update to LTS release
|
|
||||||
|
|
||||||
* Mon Sep 21 2020 Jan Staněk <jstanek@redhat.com> - 1:14.11.0-1
|
* Wed Jun 17 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:10.21.0-3
|
||||||
- Security update to 14.11.0
|
- Resolves: RHBZ#1845307
|
||||||
|
- Remove brotli-devel requires from nodejs-devel
|
||||||
|
|
||||||
* Wed Jun 03 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:14.4.0-1
|
* Tue Jun 16 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:10.21.0-2
|
||||||
- Security update to 14.4.0
|
- Resolves: RHBZ#1845307
|
||||||
- Resolves: RHBZ#1815402
|
- Turn off debug builds
|
||||||
|
|
||||||
* Thu May 21 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:14.3.0-1
|
* Mon Jun 15 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:10.21.0-1
|
||||||
- Update to 14.3.0
|
- Security update to 10.21.0
|
||||||
- Fix optflags to save memory
|
- Resolves: RHBZ#1845307
|
||||||
- Resolves: RHBZ#1815402
|
- Fixes CVE-2020-11080, CVE-2020-8174, CVE-2020-10531
|
||||||
|
- Bundle brotli, because --shared-brotli configure option is missing
|
||||||
|
- Add i18n subpackage
|
||||||
|
|
||||||
* Wed May 06 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:14.2.0-1
|
* Wed Mar 18 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:10.19.0-2
|
||||||
- Update to 14.2.0
|
- Resolves: RHBZ#1811499
|
||||||
- build with python3 only
|
|
||||||
- some clean up
|
|
||||||
|
|
||||||
* Tue Mar 17 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:12.16.1-2
|
* Mon Feb 10 2020 Jan Staněk <jstanek@redhat.com> - 1:10.19.0-1
|
||||||
- Fix CVE-2020-10531
|
- Rebase to 10.19.0 to fix CVE-2019-15604 to CVE-2019-15606
|
||||||
|
|
||||||
* Thu Feb 20 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:12.16.1-1
|
* Tue Sep 10 2019 Jan Staněk <jstanek@redhat.com> - 1:10.16.3-1
|
||||||
- Rebase to 12.16.1
|
- Rebase to 10.16.3 to fix CVE-2019-9511 to CVE-2019-9518
|
||||||
|
|
||||||
* Wed Jan 15 2020 Jan Staněk <jstanek@redhat.com> - 1:12.14.1-1
|
|
||||||
- Rebase to 12.14.1
|
|
||||||
|
|
||||||
* Fri Nov 29 2019 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:12.13.1-1
|
|
||||||
- Resolves: RHBZ# 1773503, update to 12.13.1
|
|
||||||
- minor clean up and sync with Fedora spec
|
|
||||||
- turn off debug builds
|
|
||||||
|
|
||||||
* Thu Aug 01 2019 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:12.4.0-2
|
|
||||||
- Add condition to libs
|
|
||||||
|
|
||||||
* Wed Jun 12 2019 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:12.4.0-1
|
|
||||||
- Update to v12.x
|
|
||||||
- Add v8-devel and libs subpackages from fedora
|
|
||||||
|
|
||||||
* Thu Mar 14 2019 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:10.14.1-2
|
* Thu Mar 14 2019 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:10.14.1-2
|
||||||
- move nodejs-packaging BR out of conditional
|
- move nodejs-packaging BR out of conditional
|
||||||
|
|
||||||
* Tue Dec 11 2018 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:10.14.1-1
|
* Tue Dec 11 2018 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:10.14.1-1
|
||||||
- Resolves RHBZ#1644207
|
- Resolves: RHBZ#1644207
|
||||||
- fixes node-gyp permissions
|
- fixes node-gyp permissions
|
||||||
- rebase
|
- rebase
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user