diff --git a/0001-Disable-running-gyp-on-shared-deps.patch b/0001-Disable-running-gyp-on-shared-deps.patch deleted file mode 100644 index 97eddab..0000000 --- a/0001-Disable-running-gyp-on-shared-deps.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dd952f69bcbf0a9947a0629e44c49003dcb9f77f Mon Sep 17 00:00:00 2001 -From: Zuzana Svetlikova -Date: Fri, 17 Apr 2020 12:59:44 +0200 -Subject: [PATCH 1/2] Disable running gyp on shared deps - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 688ebc550e9d6677f468bb791b5d06d5507d3ab5..b34b49db53a4b0cb4a3867921f5c6fb71ae34bf1 100644 ---- a/Makefile -+++ b/Makefile -@@ -145,11 +145,11 @@ endif - .PHONY: test-code-cache - with-code-cache test-code-cache: - $(warning '$@' target is a noop) - - out/Makefile: config.gypi common.gypi node.gyp \ -- deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \ -+ deps/llhttp/llhttp.gyp \ - tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ - tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp - $(PYTHON) tools/gyp_node.py -f make - - # node_version.h is listed because the N-API version is taken from there --- -2.34.1 - diff --git a/0001-Use-system-uv-zlib.patch b/0001-Use-system-uv-zlib.patch new file mode 100644 index 0000000..4872187 --- /dev/null +++ b/0001-Use-system-uv-zlib.patch @@ -0,0 +1,25 @@ +From 114ef2bb6ce7712a9b6be0593d38e6a8874f8b67 Mon Sep 17 00:00:00 2001 +From: misaka00251 +Date: Mon, 22 May 2023 21:44:32 +0800 +Subject: [PATCH] Use system uv & zlib + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 0be0659d..3c442014 100644 +--- a/Makefile ++++ b/Makefile +@@ -169,7 +169,7 @@ with-code-cache test-code-cache: + $(warning '$@' target is a noop) + + out/Makefile: config.gypi common.gypi node.gyp \ +- deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \ ++ deps/llhttp/llhttp.gyp \ + deps/simdutf/simdutf.gyp deps/ada/ada.gyp \ + tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ + tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp +-- +2.39.2 (Apple Git-143) + diff --git a/0002-Install-both-binaries-and-use-libdir.patch b/0002-Install-both-binaries-and-use-libdir.patch deleted file mode 100644 index 7536349..0000000 --- a/0002-Install-both-binaries-and-use-libdir.patch +++ /dev/null @@ -1,91 +0,0 @@ -From a1c35106e7e9ab3d4a01779079cf9788a2fe777a Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Tue, 19 Mar 2019 23:22:40 -0400 -Subject: [PATCH 2/2] Install both binaries and use libdir. - -This allows us to build with a shared library for other users while -still providing the normal executable. - -Signed-off-by: Elliott Sales de Andrade -Signed-off-by: Stephen Gallagher ---- - configure.py | 7 +++++++ - tools/install.py | 21 +++++++++------------ - 2 files changed, 16 insertions(+), 12 deletions(-) - -diff --git a/configure.py b/configure.py -index 47137d8912dd1439962127a3c1f417eb78572021..c59037a39fcefdfe173d16a7aa9622a32a3c29e7 100755 ---- a/configure.py -+++ b/configure.py -@@ -731,10 +731,16 @@ parser.add_argument('--shared', - dest='shared', - default=None, - help='compile shared library for embedding node in another project. ' + - '(This mode is not officially supported for regular applications)') - -+parser.add_argument('--libdir', -+ action='store', -+ dest='libdir', -+ default='lib', -+ help='a directory to install the shared library into') -+ - parser.add_argument('--without-v8-platform', - action='store_true', - dest='without_v8_platform', - default=False, - help='do not initialize v8 platform during node.js startup. ' + -@@ -1332,10 +1338,11 @@ def configure_node(o): - o['variables']['debug_nghttp2'] = 'false' - - o['variables']['node_no_browser_globals'] = b(options.no_browser_globals) - - o['variables']['node_shared'] = b(options.shared) -+ o['variables']['libdir'] = options.libdir - node_module_version = getmoduleversion.get_version() - - if options.dest_os == 'android': - shlib_suffix = 'so' - elif sys.platform == 'darwin': -diff --git a/tools/install.py b/tools/install.py -index eafcb19bf8b29f87c39b0fe7d3c3fd2d175a7b7b..71b5371578711fcc9a1b80069850f0b61bdfebe2 100755 ---- a/tools/install.py -+++ b/tools/install.py -@@ -128,26 +128,23 @@ def subdir_files(path, dest, action): - for subdir, files_in_path in ret.items(): - action(files_in_path, subdir + '/') - - def files(action): - is_windows = sys.platform == 'win32' -- output_file = 'node' - output_prefix = 'out/Release/' -+ output_libprefix = output_prefix - -- if 'false' == variables.get('node_shared'): -- if is_windows: -- output_file += '.exe' -+ if is_windows: -+ output_bin = 'node.exe' -+ output_lib = 'node.dll' - else: -- if is_windows: -- output_file += '.dll' -- else: -- output_file = 'lib' + output_file + '.' + variables.get('shlib_suffix') -+ output_bin = 'node' -+ output_lib = 'libnode.' + variables.get('shlib_suffix') - -- if 'false' == variables.get('node_shared'): -- action([output_prefix + output_file], 'bin/' + output_file) -- else: -- action([output_prefix + output_file], 'lib/' + output_file) -+ action([output_prefix + output_bin], 'bin/' + output_bin) -+ if 'true' == variables.get('node_shared'): -+ action([output_libprefix + output_lib], variables.get('libdir') + '/' + output_lib) - - if 'true' == variables.get('node_use_dtrace'): - action(['out/Release/node.d'], 'lib/dtrace/node.d') - - # behave similarly for systemtap --- -2.34.1 - diff --git a/0003-Make-AARCH64-compile-on-64KB-physical-pages.patch b/0003-Make-AARCH64-compile-on-64KB-physical-pages.patch deleted file mode 100644 index 64086ef..0000000 --- a/0003-Make-AARCH64-compile-on-64KB-physical-pages.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5505740fae0a3fae384d8dec817ecd8c43c6dd23 Mon Sep 17 00:00:00 2001 -From: hht8 -Date: Mon, 4 Jan 2021 09:14:35 +0800 -Subject: [PATCH] Make AARCH64 compile on 64KB physical pages - ---- - deps/v8/src/base/build_config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/deps/v8/src/base/build_config.h b/deps/v8/src/base/build_config.h -index d7a0c9f3..1625cfe5 100644 ---- a/deps/v8/src/base/build_config.h -+++ b/deps/v8/src/base/build_config.h -@@ -227,7 +227,7 @@ constexpr int kReturnAddressStackSlotCount = - V8_TARGET_ARCH_STORES_RETURN_ADDRESS_ON_STACK ? 1 : 0; - - // Number of bits to represent the page size for paged spaces. --#if defined(V8_TARGET_ARCH_PPC) || defined(V8_TARGET_ARCH_PPC64) -+#if defined(V8_TARGET_ARCH_PPC) || defined(V8_TARGET_ARCH_PPC64) || defined(V8_TARGET_ARCH_ARM64) - // PPC has large (64KB) physical pages. - const int kPageSizeBits = 19; - #elif defined(ENABLE_HUGEPAGE) --- -2.31.1 - diff --git a/0004-Support-openssl3.patch b/0004-Support-openssl3.patch deleted file mode 100644 index 12dd0f9..0000000 --- a/0004-Support-openssl3.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 219e4f9e635a3cba0650f9f985b645c67f83d332 Mon Sep 17 00:00:00 2001 -From: Daniel Bevenius -Date: Sat, 16 Oct 2021 08:50:16 +0200 -Subject: [PATCH] src: add --openssl-legacy-provider option -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This commit adds an option to Node.js named --openssl-legacy-provider -and if specified will load OpenSSL 3.0 Legacy provider when dynamically -linking Node.js v16.x with OpenSSL 3.0. - -Building: -$ ./configure --shared-openssl \ - --shared-openssl-libpath=/path/openssl_quic-3.0/lib64 \ - --shared-openssl-includes=/path/openssl_quic-3.0/include \ - --shared-openssl-libname=crypto,ssl -$ make -j8 - -Verify options is available: -$ ./node --help -... ---openssl-legacy-provider enable OpenSSL 3.0 legacy provider - -Usage: -$ export LD_LIBRARY_PATH=/path/openssl_quic-3.0/lib64 -$ export OPENSSL_MODULES=/path/openssl_quic-3.0/lib64/ossl-modules/ -$ export OPENSSL_CONF=/path/openssl_quic-3.0/ssl/openssl.cnf -$ ./node --openssl-legacy-provider -p 'crypto.createHash("md4")' -Hash { - _options: undefined, - [Symbol(kHandle)]: Hash {}, - [Symbol(kState)]: { [Symbol(kFinalized)]: false } -} - -Fixes: https://github.com/nodejs/node/issues/40948 - -Refs: https://github.com/nodejs/node/issues/40455 -PR-URL: https://github.com/nodejs/node/pull/40478 -Reviewed-By: Richard Lau -Reviewed-By: Tobias Nießen ---- - doc/api/cli.md | 11 +++++++++++ - src/crypto/crypto_util.cc | 10 ++++++++++ - src/node_options.cc | 3 +++ - src/node_options.h | 7 +++++++ - .../test-process-env-allowed-flags-are-documented.js | 5 +++++ - 5 files changed, 36 insertions(+) - -diff --git a/doc/api/cli.md b/doc/api/cli.md -index 475894d7c0e4..380a220b7cf8 100644 ---- a/doc/api/cli.md -+++ b/doc/api/cli.md -@@ -732,6 +732,15 @@ Load an OpenSSL configuration file on startup. Among other uses, this can be - used to enable FIPS-compliant crypto if Node.js is built - against FIPS-enabled OpenSSL. - -+### `--openssl-legacy-provider` -+ -+ -+ -+Enable OpenSSL 3.0 legacy provider when dynamically linking to OpenSSL 3.x. -+For more information please see [OSSL\_PROVIDER-legacy][OSSL_PROVIDER-legacy]. -+ - ### `--pending-deprecation` - -