Update to version 22.11.0 (LTS) (rhbz#2313003)

2024-10-30 14:58:34 +01:00 · 2024-10-30 14:58:34 +01:00 · 73ae3d67ad
commit 73ae3d67ad
parent 03812ccd22
7 changed files with 185 additions and 18 deletions
--- a/0001-Remove-unused-OpenSSL-config.patch
+++ b/0001-Remove-unused-OpenSSL-config.patch
@ -1,4 +1,4 @@
-From f2b1edf30f86834746dc96133af05d51da8d243d Mon Sep 17 00:00:00 2001
+From e93d9b5fdcd8e5744de629461c03a07de2252f8f Mon Sep 17 00:00:00 2001
 From: Stephen Gallagher <sgallagh@redhat.com>
 Date: Fri, 17 Apr 2020 12:59:44 +0200
 Subject: [PATCH] Remove unused OpenSSL config
@ -14,10 +14,10 @@ Signed-off-by: rpm-build <rpm-build>
 1 file changed, 17 deletions(-)

 diff --git a/node.gyp b/node.gyp
-index a2ba04a..68f5c73 100644
+index 1147495..da6ea50 100644
 --- a/node.gyp
 +++ b/node.gyp
-@@ -824,23 +824,6 @@
+@@ -822,23 +822,6 @@
               ],
             },
           ],
@ -42,5 +42,5 @@ index a2ba04a..68f5c73 100644
       ],
     }, # node_core_target_name
 -- 
-2.46.0
+2.47.0

--- a/0002-build-conditionally-compile-bundled-sqlite.patch
+++ b/0002-build-conditionally-compile-bundled-sqlite.patch
@ -0,0 +1,128 @@
+From fb3c0082f561d3e656b1b73c6176a04bc203cacb Mon Sep 17 00:00:00 2001
+From: Richard Lau <rlau@redhat.com>
+Date: Wed, 16 Oct 2024 17:26:42 +0000
+Subject: [PATCH] build: conditionally compile bundled sqlite
+
+Only compile the bundled sqlite in `deps/sqlite` if Node.js was not
+configured with `--shared-sqlite`.
+
+`node.gypi` is already correctly adding the sqlite dependency if
+`node_shared_sqlite=="false"` so the unconditional entries in `node.gyp`
+are not necessary.
+
+Signed-off-by: rpm-build <rpm-build>
+---
+ node.gyp | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/node.gyp b/node.gyp
+index da6ea50..9f24b1c 100644
+--- a/node.gyp
+++ b/node.gyp
+@@ -840,7 +840,6 @@
+       'dependencies': [
+         'deps/googletest/googletest.gyp:gtest_prod',
+         'deps/histogram/histogram.gyp:histogram',
+-        'deps/sqlite/sqlite.gyp:sqlite',
+         'deps/simdjson/simdjson.gyp:simdjson',
+         'deps/simdutf/simdutf.gyp:simdutf',
+         'deps/ada/ada.gyp:ada',
+@@ -1030,7 +1029,6 @@
+       'dependencies': [
+         '<(node_lib_target_name)',
+         'deps/histogram/histogram.gyp:histogram',
+-        'deps/sqlite/sqlite.gyp:sqlite',
+       ],
+ 
+       'includes': [
+@@ -1042,7 +1040,6 @@
+         'deps/v8/include',
+         'deps/cares/include',
+         'deps/uv/include',
+-        'deps/sqlite',
+         'test/cctest',
+       ],
+ 
+@@ -1075,7 +1072,6 @@
+       'dependencies': [
+         '<(node_lib_target_name)',
+         'deps/histogram/histogram.gyp:histogram',
+-        'deps/sqlite/sqlite.gyp:sqlite',
+         'deps/uvwasi/uvwasi.gyp:uvwasi',
+       ],
+       'includes': [
+@@ -1086,7 +1082,6 @@
+         'tools/msvs/genfiles',
+         'deps/v8/include',
+         'deps/cares/include',
+-        'deps/sqlite',
+         'deps/uv/include',
+         'deps/uvwasi/include',
+         'test/cctest',
+@@ -1121,7 +1116,6 @@
+         '<(node_lib_target_name)',
+         'deps/googletest/googletest.gyp:gtest_prod',
+         'deps/histogram/histogram.gyp:histogram',
+-        'deps/sqlite/sqlite.gyp:sqlite',
+         'deps/uvwasi/uvwasi.gyp:uvwasi',
+         'deps/ada/ada.gyp:ada',
+         'deps/nbytes/nbytes.gyp:nbytes',
+@@ -1134,7 +1128,6 @@
+         'tools/msvs/genfiles',
+         'deps/v8/include',
+         'deps/cares/include',
+-        'deps/sqlite',
+         'deps/uv/include',
+         'deps/uvwasi/include',
+         'test/cctest',
+@@ -1171,7 +1164,6 @@
+         'deps/googletest/googletest.gyp:gtest',
+         'deps/googletest/googletest.gyp:gtest_main',
+         'deps/histogram/histogram.gyp:histogram',
+-        'deps/sqlite/sqlite.gyp:sqlite',
+         'deps/simdjson/simdjson.gyp:simdjson',
+         'deps/simdutf/simdutf.gyp:simdutf',
+         'deps/ada/ada.gyp:ada',
+@@ -1188,7 +1180,6 @@
+         'deps/v8/include',
+         'deps/cares/include',
+         'deps/uv/include',
+-        'deps/sqlite',
+         'test/cctest',
+       ],
+ 
+@@ -1253,7 +1244,6 @@
+       'dependencies': [
+         '<(node_lib_target_name)',
+         'deps/histogram/histogram.gyp:histogram',
+-        'deps/sqlite/sqlite.gyp:sqlite',
+         'deps/ada/ada.gyp:ada',
+         'deps/nbytes/nbytes.gyp:nbytes',
+       ],
+@@ -1269,7 +1259,6 @@
+         'deps/v8/include',
+         'deps/cares/include',
+         'deps/uv/include',
+-        'deps/sqlite',
+         'test/embedding',
+       ],
+ 
+@@ -1369,7 +1358,6 @@
+       'dependencies': [
+         '<(node_lib_target_name)',
+         'deps/histogram/histogram.gyp:histogram',
+-        'deps/sqlite/sqlite.gyp:sqlite',
+         'deps/ada/ada.gyp:ada',
+         'deps/nbytes/nbytes.gyp:nbytes',
+         'deps/simdjson/simdjson.gyp:simdjson',
+@@ -1386,7 +1374,6 @@
+         'deps/v8/include',
+         'deps/cares/include',
+         'deps/uv/include',
+-        'deps/sqlite',
+       ],
+ 
+       'defines': [ 'NODE_WANT_INTERNALS=1' ],
+-- 
+2.47.0
+
--- a/0002-deps-ncrypto-include-missing-headers.patch
+++ b/0002-deps-ncrypto-include-missing-headers.patch
@ -1,7 +1,7 @@
-From 3157abef6205083a04523e0fd3b5d412805918bb Mon Sep 17 00:00:00 2001
+From e79552fdbebb411b8a6f7bc323525f463c1ee7ad Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
-Date: Mon, 19 Aug 2024 13:03:51 +0200
-Subject: [PATCH] deps(ncrypto): include missing headers
+Date: Wed, 30 Oct 2024 15:48:59 +0100
+Subject: [PATCH] deps(ncrypto): include <openssl/rand.h>

 Signed-off-by: rpm-build <rpm-build>
 ---
@ -9,17 +9,17 @@ Signed-off-by: rpm-build <rpm-build>
 1 file changed, 1 insertion(+)

 diff --git a/deps/ncrypto/ncrypto.cc b/deps/ncrypto/ncrypto.cc
-index 2a02ae7..1b783cf 100644
+index 457bd2f..a38b4a2 100644
 --- a/deps/ncrypto/ncrypto.cc
 +++ b/deps/ncrypto/ncrypto.cc
@@ -5,6 +5,7 @@
 #include <openssl/bn.h>
 #include <openssl/evp.h>
- #include <openssl/pkcs12.h>
+ #include <openssl/hmac.h>
 +#include <openssl/rand.h>
+ #include <openssl/pkcs12.h>
 #include <openssl/x509v3.h>
 #if OPENSSL_VERSION_MAJOR >= 3
- #include <openssl/provider.h>
 -- 
-2.46.0
+2.47.0

--- a/nodejs-sources.sh
+++ b/nodejs-sources.sh
@ -295,6 +295,11 @@ ADA_VERSION=$(grep -osP '(?<=#define ADA_VERSION ).*\"' node-v${version}/deps/ad
 ADA_VERSION=${ADA_VERSION:-0}
 echo "${ADA_VERSION}"
 echo
+echo "sqlite"
+echo "========================="
+SQLITE_VERSION="$(grep -osP '(?<=#define SQLITE_VERSION ).*\"' node-v${version}/deps/sqlite/sqlite3.h |sed -e 's/^\s*"//' -e 's/"\s*$//')"
+echo "${SQLITE_VERSION}"
+echo
 echo "Applying versions to spec template"

 # Get the list of patches we need to add to the specfile
@ -331,6 +336,7 @@ IFS='' read -r -d '' template_json <<EOF
    "LEXER_VERSION": $LEXER_VERSION,
    "UNDICI_VERSION": $UNDICI_VERSION,
    "ADA_VERSION": $ADA_VERSION,
+    "SQLITE_VERSION": $SQLITE_VERSION,
 	"PATCHES": $json_patchlist
 }
 EOF
--- a/nodejs22.spec
+++ b/nodejs22.spec
@ -28,6 +28,8 @@
 %bcond_with bundled_zlib
 %endif

+%bcond bundled_sqlite %{with bootstrap}
+
 # LTO is currently broken on Node.js builds
 %define _lto_cflags %{nil}

@ -50,7 +52,7 @@
 # than a Fedora release lifecycle.
 %global nodejs_epoch 1
 %global nodejs_major 22
-%global nodejs_minor 8
+%global nodejs_minor 11
 %global nodejs_patch 0
 # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
 %global nodejs_soversion 127
@ -105,7 +107,7 @@
 # " this line just fixes syntax highlighting for vim that is confused by the above and continues literal

 # simdutf from deps/simdutf/simdutf.h
-%global simdutf_version 5.3.4
+%global simdutf_version 5.5.0

 # OpenSSL minimum version
 %global openssl11_minimum 1:1.1.1
@ -118,7 +120,7 @@

 # npm - from deps/npm/package.json
 %global npm_epoch 1
-%global npm_version 10.8.2
+%global npm_version 10.9.0

 # In order to avoid needing to keep incrementing the release version for the
 # main package forever, we will just construct one for npm that is guaranteed
@ -134,6 +136,9 @@
 # histogram_c - assumed from timestamps
 %global histogram_version 0.9.7

+# sqlite – from deps/sqlite/sqlite3.h
+%global sqlite_version 3.46.1
+

 Name: nodejs%{nodejs_pkg_major}
 Epoch: %{nodejs_epoch}
@ -162,7 +167,8 @@ Source202: nodejs.pc.in
 Source203: v8.pc.in

 Patch: 0001-Remove-unused-OpenSSL-config.patch
-Patch: 0002-deps-ncrypto-include-missing-headers.patch
+Patch: 0002-build-conditionally-compile-bundled-sqlite.patch
+Patch: 0003-deps-ncrypto-include-openssl-rand.h.patch

 %if 0%{?nodejs_default}
 %global pkgname nodejs
@ -206,6 +212,12 @@ BuildRequires: libatomic
 BuildRequires: ninja-build
 BuildRequires: unzip

+%if %{with bundled_sqlite}
+Provides: bundled(sqlite) = %{sqlite_version}
+%else
+BuildRequires: pkgconfig(sqlite3)
+%endif
+


 %if 0%{?nodejs_default}
@ -333,14 +345,14 @@ Provides: bundled(ada) = 2.9.0

 # undici and cjs-module-lexer ship with pre-built WASM binaries.
 %if %{with bundled_cjs_module_lexer}
-Provides: bundled(nodejs-cjs-module-lexer) = 1.2.2
+Provides: bundled(nodejs-cjs-module-lexer) = 1.4.1
 %else
 BuildRequires: nodejs-cjs-module-lexer
 Requires: nodejs-cjs-module-lexer
 %endif

 %if %{with bundled_undici}
-Provides: bundled(nodejs-undici) = 6.19.8
+Provides: bundled(nodejs-undici) = 6.20.0
 %else
 BuildRequires: nodejs-undici
 Requires: nodejs-undici
@ -523,6 +535,10 @@ rm -rf deps/cjs-module-lexer
 rm -rf deps/undici
 %endif

+%if %{without bundled_sqlite}
+rm -rf deps/sqlite
+%endif
+
 # Replace any instances of unversioned python with python3
 pfiles=( $(grep -rl python) )
 %py3_shebang_fix ${pfiles[@]}
@ -584,6 +600,7 @@ export PATH="${cwd}/.bin:$PATH"
           %{!?with_bundled_cjs_module_lexer:--shared-builtin-cjs_module_lexer/lexer-path %{nodejs_private_sitelib}/cjs-module-lexer/lexer.js} \
           %{!?with_bundled_cjs_module_lexer:--shared-builtin-cjs_module_lexer/dist/lexer-path %{nodejs_private_sitelib}/cjs-module-lexer/dist/lexer.js} \
           %{!?with_bundled_undici:--shared-builtin-undici/undici-path %{nodejs_private_sitelib}/undici/loader.js} \
+           %{!?with_bundled_sqlite:--shared-sqlite} \
           --shared-brotli \
           --shared-libuv \
           --with-intl=small-icu \
--- a/packaging/nodejs.spec.j2
+++ b/packaging/nodejs.spec.j2
@ -28,6 +28,8 @@
 %bcond_with bundled_zlib
 %endif

+%bcond bundled_sqlite %{with bootstrap}
+
 # LTO is currently broken on Node.js builds
 %define _lto_cflags %{nil}

@ -134,6 +136,9 @@
 # histogram_c - assumed from timestamps
 %global histogram_version 0.9.7

+# sqlite – from deps/sqlite/sqlite3.h
+%global sqlite_version {{ SQLITE_VERSION }}
+

 Name: nodejs%{nodejs_pkg_major}
 Epoch: %{nodejs_epoch}
@ -207,6 +212,12 @@ BuildRequires: libatomic
 BuildRequires: ninja-build
 BuildRequires: unzip

+%if %{with bundled_sqlite}
+Provides: bundled(sqlite) = %{sqlite_version}
+%else
+BuildRequires: pkgconfig(sqlite3)
+%endif
+
 {% if NODE_MAJOR < 19 -%}
 BuildRequires: systemtap-sdt-devel
 {% endif %}
@ -534,6 +545,10 @@ rm -rf deps/cjs-module-lexer
 rm -rf deps/undici
 %endif

+%if %{without bundled_sqlite}
+rm -rf deps/sqlite
+%endif
+
 # Replace any instances of unversioned python with python3
 pfiles=( $(grep -rl python) )
 %py3_shebang_fix ${pfiles[@]}
@ -595,6 +610,7 @@ export PATH="${cwd}/.bin:$PATH"
           %{!?with_bundled_cjs_module_lexer:--shared-builtin-cjs_module_lexer/lexer-path %{nodejs_private_sitelib}/cjs-module-lexer/lexer.js} \
           %{!?with_bundled_cjs_module_lexer:--shared-builtin-cjs_module_lexer/dist/lexer-path %{nodejs_private_sitelib}/cjs-module-lexer/dist/lexer.js} \
           %{!?with_bundled_undici:--shared-builtin-undici/undici-path %{nodejs_private_sitelib}/undici/loader.js} \
+           %{!?with_bundled_sqlite:--shared-sqlite} \
           --shared-brotli \
           --shared-libuv \
           --with-intl=small-icu \
--- a/2
+++ b/2
@ -1,3 +1,3 @@
-SHA512 (node-v22.8.0-stripped.tar.gz) = 961565a74f66477b2f9a3d55ab891c8ba8cafd4950eccb1b4ec3f597fbdbf32a3a9152bcb2a674978fc47ab6ecca29a40c2aa036e8aa3ddabea266864e6604c3
+SHA512 (node-v22.11.0-stripped.tar.gz) = c113ba85a1722fdea1bb91d67fc2ef6f5b732ba76cfb7f25450d9011a0089f88aa29d617b3716d4fdbafceda59ca0588b2e170797f7974dc51d88502509a2dea
 SHA512 (icu4c-75_1-data-bin-b.zip) = ffec0355c5e0bd210aa7da6e91845979a5f5d893c7703dba4afccfbc80613b728689fbe91d0327542faaae718940f7eb0f842b3cc7c57dddeb22b15c5f79ba2a
 SHA512 (icu4c-75_1-data-bin-l.zip) = b4dbc0986c241e43d66a90c6cf723dd8fd66281416d7d28010c952a895e8f166d980f918754b191a1e2ab468484b7d2ba2d4f6308880ef7f8bc2eecbc94844b9