pool/nodejs18
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 1006992 from devel:languages:nodejs

Browse Source 
- Update to NodeJS 18.10.0:
  * deps: upgrade npm to 8.19.2
  * http: throw error on content-length mismatch
  * stream: add ReadableByteStream.tee()
- openssl3_fixups.patch: upstreamed and removed

- Update to Nodejs 18.9.1:
  * deps: llhttp updated to 6.0.10
    + CVE-2022-32213 bypass via obs-fold mechanic (bsc#1201325)
    + Incorrect Parsing of Multi-line Transfer-Encoding
      (CVE-2022-32215, bsc#1201327)
    + Incorrect Parsing of Header Fields (CVE-2022-35256, bsc#1203832)
  * crypto: fix weak randomness in WebCrypto keygen
    (CVE-2022-35255, bsc#1203831)

- Skip test-fs-utimes-y2K38.js on armv6hl as well as armv7hl.

OBS-URL: https://build.opensuse.org/request/show/1006992
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nodejs18?expand=0&rev=2
This commit is contained in:
Richard Brown 2022-09-30 15:57:11 +00:00 committed by Git OBS Bridge
commit 4a8325d254
10 changed files with 136 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
SHASUMS256.txt
View File

@ -1,34 +1,34 @@
e4d8d6030efe1e0b103ba7a158996b2ff4ceef0f8fd05af9ea61eb4b17d6fa0c node-v18.9.0-aix-ppc64.tar.gz 8f4dfa78d823a4c7e4c83bbfebef9ce3d49a6e1ed28408521c706350f8a2aee7 node-v18.10.0-aix-ppc64.tar.gz
60300b40f539fc93005859fcb7ea585bfd111800e90b6ee744a07f2380512bbb node-v18.9.0-darwin-arm64.tar.gz 0689815cdd69a9a977ee3bab20c6228d03966a1f988464f18ce490678dc5cdc3 node-v18.10.0-darwin-arm64.tar.gz
d20ad4d52c0df79bc2296f78cb5cd7d0757e848263b30822538f31d695d3b0a4 node-v18.9.0-darwin-arm64.tar.xz 4822536977efde1f37bfc5f14cddc4f09fd2d77e8547ce54ec847b7ef6914fd8 node-v18.10.0-darwin-arm64.tar.xz
dce1144cbfc01e03c2e84582461c3ce83541968b2b52a3d3a6f2bbfb09183fba node-v18.9.0-darwin-x64.tar.gz 06b1b6381dfa952ae95fc927b740b660bc08f26bcf02cad61f64b36485dab6d4 node-v18.10.0-darwin-x64.tar.gz
aecd44f8799e31ed73fb746d00da28f0a32d0ec45079ee85545881e607ddd4d3 node-v18.9.0-darwin-x64.tar.xz 146fe4ed98e0ab646380bad6f32303722421d2d98a3204183d9a66ec17eb3aa4 node-v18.10.0-darwin-x64.tar.xz
e7ec2a64fc24cc5c790289df80e4788190ca6760a96b6947ef02452bb520cd00 node-v18.9.0-headers.tar.gz e1568e86022a9f15ab4fd8fc2451c6c739498b0a67202ae57fd2cfc3342b52f6 node-v18.10.0-headers.tar.gz
47ad304159c8c01271f166b8750d82d96b7d7e1586d9a9225fea0f50a5ce4224 node-v18.9.0-headers.tar.xz 487346ba2a67ee66fc0333d803d758b12512979378f3ef037a0dd83cc0c277a3 node-v18.10.0-headers.tar.xz
0d0e671158e072a63c24714bfc4c19a4bb0a70c89d219b1f23d67cbea9c5ffcf node-v18.9.0-linux-arm64.tar.gz ad536980cb4944b0d17055937c5d5170c95147765f547ce8469331a808d0c408 node-v18.10.0-linux-arm64.tar.gz
3ec898c66916ab7e245c34f402c091c50bcaa325617f692a6b62dc8d9c06baa0 node-v18.9.0-linux-arm64.tar.xz bbe88afe35569780aae8a84d9be8b55e4944d13e9212b0d51883a5dcf6a7de8b node-v18.10.0-linux-arm64.tar.xz
195bea2e5be6c791bc460fdc0939375f25b6246cbb57521374eddc9e77323829 node-v18.9.0-linux-armv7l.tar.gz 7496428b9a94ee1927eefa43ce2d66aedae9122a8722bbeab3b1e5c6b1933af6 node-v18.10.0-linux-armv7l.tar.gz
730697bcfc5ba1538a3c8380edcf51cfa58c760804fb90bab6cfda34d30c55f8 node-v18.9.0-linux-armv7l.tar.xz 694d83c751e1e8e05e77310c76fe87344350cd58e594cfd62df217a65dfbf55d node-v18.10.0-linux-armv7l.tar.xz
794bb57444e14e3282f8f2416483c385e3ae1d66b8babb025ed2b78e22d8157d node-v18.9.0-linux-ppc64le.tar.gz 6445d5d05707af7b318f4babb6432518e9b3529189e1fac3ed2200d89537fe8c node-v18.10.0-linux-ppc64le.tar.gz
1b8fadd2d879d2a8b6ee97fcfc0caaa0e1190026e565c097c898824541cd2d86 node-v18.9.0-linux-ppc64le.tar.xz 89d8266209f24b82940d2bf9cde14d871f7e6df02a3aef7bc948b8248c749f23 node-v18.10.0-linux-ppc64le.tar.xz
1061f5ed96290df7f3e5b1f183fdacfd82bba0d8c2dfb984505110f83e9ac215 node-v18.9.0-linux-s390x.tar.gz 544d9930f1647939a901ef05d3d42ee8d6c7e857602922879c732bf3067a9f06 node-v18.10.0-linux-s390x.tar.gz
86d55c4f495e74e8a9d03e4e34ef4f2ee6ec6ab187ecedf3e430e93baf9faea0 node-v18.9.0-linux-s390x.tar.xz 5a9c6ffbf03b4006dbbecc30b93234dc11a92d1f6d5c8e3bc45c9be958956a59 node-v18.10.0-linux-s390x.tar.xz
7fdbfdb985a48db3d22a2472330db05d94c9aff59192b09d8f9ab5fcedba76d5 node-v18.9.0-linux-x64.tar.gz f468b86031cca41ee9aa7a911e70eb624413153c7432754cbe9206c7ef3de090 node-v18.10.0-linux-x64.tar.gz
0137e43f5492dd97b6ef1f39ea4581975016e5f1e70db461d7292c6853ace066 node-v18.9.0-linux-x64.tar.xz 1aff4537bbb81c29c5c1c7c96379c6a2133b43651812745b524db8e1b65ee12b node-v18.10.0-linux-x64.tar.xz
bae2d3417a9e1c4cc7145801e428c13e9fce006044258194d073207efd1b736b node-v18.9.0-win-x64.7z a41d5d395ca349ab946571e2fa939729707ee8dacc15e88ef420b51635e36f9c node-v18.10.0-win-x64.7z
d7a9c9e8a36259d1e15052c135fbd11937d0f0485360e402e833522076233a7a node-v18.9.0-win-x64.zip 50934603f0bd46ef9948346f36f8afeae146182a6eafdbc361c7eeec0083c551 node-v18.10.0-win-x64.zip
7b2f1a76c4bbcc464f05b4895dbe5e48047d35cf88b210bdde71034f0aee3146 node-v18.9.0-win-x86.7z dfaf933d80c274a8541cce9807ba26177e7f3789ab80a52ef4a5580656a6bb13 node-v18.10.0-win-x86.7z
6543f6e72a704bf56170dd874f9edc6ed9468d15008dbb214654d3681221c37e node-v18.9.0-win-x86.zip df3741ce99768668d700a3a5c085d1a5084d86c1e60cca626cf5f0b45525499b node-v18.10.0-win-x86.zip
38744484707594133d1b9e94d2575d403d132761241de2a6b5a4bf0648946ea0 node-v18.9.0-x64.msi 9a269ecc0530656db078ed03c20cc3e71022026feb9dff02bf0c96e9792f237a node-v18.10.0-x64.msi
4c4e9206f652e47371eb52753501280348bb8bfad827d1ac6f782152a00df31b node-v18.9.0-x86.msi 7f2c6fa385d7b8864b96510d86ff416c69b2b1dc2c4bd25d2bd8cac7d2e9ac7b node-v18.10.0-x86.msi
7b469adcc4863e53fdbeb66e0eff3316abdf40d80be51adc6b4c7fe1dd04348e node-v18.9.0.pkg 0194e47d962d36a0778ffcfcdbedb6520bf3ec9abf8a1f5dd1bc96d776aeb421 node-v18.10.0.pkg
89af82a3f8df01a24bb61b69a4e9a0482bfa8793a7686c88227bce10ee0c72bc node-v18.9.0.tar.gz eab3109a6d3deafe049c8f0c461af8de5c6cad535b79c19fa84f0ea496c4ffb6 node-v18.10.0.tar.gz
c75cc89afead976791900accde02a7b1e7e762702f0f6fa68eaacb01984d9654 node-v18.9.0.tar.xz ad711b54e2be4a7d24f37c73fb2801adeaf6d26d298d431be98d6abc0202e89f node-v18.10.0.tar.xz
6f4da4ffa06afa4096acb5279e6875ccb5ffcd03a86fbbee382dde4bc96565f5 win-x64/node.exe 0f15043bb13749bf27f0eed2f902db8251dd214891851e1066537a08b97751a1 win-x64/node.exe
3111a04d3ae94921ac20f2afc4e167c59e50c07609ee940d1a8eec46f08310ad win-x64/node.lib 3111a04d3ae94921ac20f2afc4e167c59e50c07609ee940d1a8eec46f08310ad win-x64/node.lib
7f5f093c1f612803629218793c5eb72719274faa078a4f63ecbe543b7a00e9e6 win-x64/node_pdb.7z ff3c97980c59bebae41f11a720f4a3c4f466b4fd31686a12bc451e939d6966e1 win-x64/node_pdb.7z
e750259b9c628578fc2ae463d62fadf6c95c266e1c5f32f252d80c7e716c3418 win-x64/node_pdb.zip 0cbaa9327350a936eade80e60c3e986e93a03a5404e3caeda5cea4d3c1ae631c win-x64/node_pdb.zip
3452040fc8d9e8894e169229d30425f00dfbf0082e00081baa7d550e7b7321d8 win-x86/node.exe 0a137d78cacf19a829e0f81ecf3891b5690c95a6845318bc93a325579facb121 win-x86/node.exe
e0b45a34da85070b41e13169a6ed30ea782d400dd8e8597d665727bac8d621f0 win-x86/node.lib e0b45a34da85070b41e13169a6ed30ea782d400dd8e8597d665727bac8d621f0 win-x86/node.lib
1bc12a2b9686a08a935fc6e78c9595e44d61df33a342bd98ad89088f75367a7b win-x86/node_pdb.7z 250afbbecfaf8a10c610d8a1865e1d1a7293d7e9b47e9b161ab4fa1395bff88b win-x86/node_pdb.7z
c52111fdd0180eb82d96b376c37ecf1160f57ccb0e12102a5183ece4708d8c70 win-x86/node_pdb.zip 70e0aca76b848d4279d2b081d713d4c28bb9dbe5ce2b6090eeb52a542b019f7b win-x86/node_pdb.zip

BIN
SHASUMS256.txt.sig
View File

Binary file not shown.

3
node-v18.10.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ad711b54e2be4a7d24f37c73fb2801adeaf6d26d298d431be98d6abc0202e89f
size 38364672

3
node-v18.9.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c75cc89afead976791900accde02a7b1e7e762702f0f6fa68eaacb01984d9654
size 38309908

BIN
nodejs.keyring
View File

Binary file not shown.

27
nodejs18.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Thu Sep 29 13:58:09 UTC 2022 - Adam Majer <adam.majer@suse.de>
- Update to NodeJS 18.10.0:
* deps: upgrade npm to 8.19.2
* http: throw error on content-length mismatch
* stream: add ReadableByteStream.tee()
- openssl3_fixups.patch: upstreamed and removed
-------------------------------------------------------------------
Mon Sep 26 13:13:39 UTC 2022 - Adam Majer <adam.majer@suse.de>
- Update to Nodejs 18.9.1:
* deps: llhttp updated to 6.0.10
+ CVE-2022-32213 bypass via obs-fold mechanic (bsc#1201325)
+ Incorrect Parsing of Multi-line Transfer-Encoding
(CVE-2022-32215, bsc#1201327)
+ Incorrect Parsing of Header Fields (CVE-2022-35256, bsc#1203832)
* crypto: fix weak randomness in WebCrypto keygen
(CVE-2022-35255, bsc#1203831)
-------------------------------------------------------------------
Sat Sep 17 10:35:31 UTC 2022 - Bruno Pitrus <brunopitrus@hotmail.com>
- Skip test-fs-utimes-y2K38.js on armv6hl as well as armv7hl.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 15 15:00:25 UTC 2022 - Adam Majer <adam.majer@suse.de> Thu Sep 15 15:00:25 UTC 2022 - Adam Majer <adam.majer@suse.de>

52
nodejs18.spec
View File

@ -15,23 +15,13 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
###########################################################
#
# WARNING! WARNING! WARNING! WARNING! WARNING! WARNING!
#
# This spec file is generated from a template hosted at
# https://github.com/AdamMajer/nodejs-packaging
#
###########################################################
# Fedora doesn't have rpm-config-SUSE which provides
# ext_man in /usr/lib/rpm/macros.d/macros.obs
%if 0%{?fedora_version} %if 0%{?fedora_version}
%define ext_man .gz %define ext_man .gz
%endif %endif
Name: nodejs18 Name: nodejs18
Version: 18.9.0 Version: 18.10.0
Release: 0 Release: 0
# Double DWZ memory limits # Double DWZ memory limits
@ -145,8 +135,6 @@ Patch5: sle12_python3_compat.patch
Patch7: manual_configure.patch Patch7: manual_configure.patch
Patch13: openssl_binary_detection.patch Patch13: openssl_binary_detection.patch
## Patches specific to SUSE and openSUSE ## Patches specific to SUSE and openSUSE
Patch100: linker_lto_jobs.patch Patch100: linker_lto_jobs.patch
# PATCH-FIX-OPENSUSE -- set correct path for dtrace if it is built # PATCH-FIX-OPENSUSE -- set correct path for dtrace if it is built
@ -170,11 +158,10 @@ Patch133: rsa-pss-revert.patch
# Use versioned binaries and paths # Use versioned binaries and paths
Patch200: versioned.patch Patch200: versioned.patch
Patch303: openssl3_fixups.patch
Patch304: new_python3.patch Patch304: new_python3.patch
BuildRequires: pkg-config
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: pkg-config
BuildRequires: procps BuildRequires: procps
BuildRequires: xz BuildRequires: xz
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -235,7 +222,6 @@ BuildRequires: gcc12-c++
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%endif %endif
# Python dependencies # Python dependencies
%if %node_version_number >= 16 %if %node_version_number >= 16
@ -260,8 +246,8 @@ BuildRequires: python
%endif %endif
%if 0%{?suse_version} >= 1500 && %{node_version_number} >= 10 %if 0%{?suse_version} >= 1500 && %{node_version_number} >= 10
BuildRequires: user(nobody)
BuildRequires: group(nobody) BuildRequires: group(nobody)
BuildRequires: user(nobody)
%endif %endif
%if ! 0%{with intree_openssl} %if ! 0%{with intree_openssl}
@ -363,8 +349,8 @@ ExclusiveArch: not_buildable
%endif %endif
%endif %endif
Provides: bundled(uvwasi) = 0.0.12
Provides: bundled(libuv) = 1.43.0 Provides: bundled(libuv) = 1.43.0
Provides: bundled(uvwasi) = 0.0.13
Provides: bundled(v8) = 10.2.154.15 Provides: bundled(v8) = 10.2.154.15
%if %{with intree_brotli} %if %{with intree_brotli}
Provides: bundled(brotli) = 1.0.9 Provides: bundled(brotli) = 1.0.9
@ -372,14 +358,13 @@ Provides: bundled(brotli) = 1.0.9
BuildRequires: pkgconfig(libbrotlidec) BuildRequires: pkgconfig(libbrotlidec)
%endif %endif
Provides: bundled(llhttp) = 6.0.10
Provides: bundled(llhttp) = 6.0.9 Provides: bundled(ngtcp2) = 0.8.1
Provides: bundled(ngtcp2) = 0.1.0-DEV
Provides: bundled(node-acorn) = 8.8.0 Provides: bundled(node-acorn) = 8.8.0
Provides: bundled(node-acorn-walk) = 8.2.0 Provides: bundled(node-acorn-walk) = 8.2.0
Provides: bundled(node-cjs-module-lexer) = 1.2.2 Provides: bundled(node-cjs-module-lexer) = 1.2.2
Provides: bundled(node-corepack) = 0.14.0 Provides: bundled(node-corepack) = 0.14.1
Provides: bundled(node-undici) = 5.10.0 Provides: bundled(node-undici) = 5.10.0
%description %description
@ -391,8 +376,8 @@ provided by npm.
Summary: Development headers for NodeJS 18.x Summary: Development headers for NodeJS 18.x
Group: Development/Languages/NodeJS Group: Development/Languages/NodeJS
Provides: nodejs-devel = %{version} Provides: nodejs-devel = %{version}
Requires: npm18 = %{version}
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: npm18 = %{version}
%description devel %description devel
This package provides development headers for Node.js needed for creation This package provides development headers for Node.js needed for creation
@ -409,12 +394,12 @@ Requires: nodejs-common
Requires: nodejs18 = %{version} Requires: nodejs18 = %{version}
Provides: nodejs-npm = %{version} Provides: nodejs-npm = %{version}
Obsoletes: nodejs-npm < 4.0.0 Obsoletes: nodejs-npm < 4.0.0
Provides: npm(npm) = 8.19.1
Provides: npm = %{version} Provides: npm = %{version}
Provides: npm(npm) = 8.19.2
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
%if %{node_version_number} >= 10 %if %{node_version_number} >= 10
Requires: user(nobody)
Requires: group(nobody) Requires: group(nobody)
Requires: user(nobody)
%endif %endif
%endif %endif
Provides: bundled(node-abbrev) = 1.1.1 Provides: bundled(node-abbrev) = 1.1.1
@ -500,8 +485,8 @@ Provides: bundled(node-just-diff) = 5.1.1
Provides: bundled(node-just-diff-apply) = 5.4.1 Provides: bundled(node-just-diff-apply) = 5.4.1
Provides: bundled(node-libnpmaccess) = 6.0.4 Provides: bundled(node-libnpmaccess) = 6.0.4
Provides: bundled(node-libnpmdiff) = 4.0.5 Provides: bundled(node-libnpmdiff) = 4.0.5
Provides: bundled(node-libnpmexec) = 4.0.12 Provides: bundled(node-libnpmexec) = 4.0.13
Provides: bundled(node-libnpmfund) = 3.0.3 Provides: bundled(node-libnpmfund) = 3.0.4
Provides: bundled(node-libnpmhook) = 8.0.4 Provides: bundled(node-libnpmhook) = 8.0.4
Provides: bundled(node-libnpmorg) = 4.0.4 Provides: bundled(node-libnpmorg) = 4.0.4
Provides: bundled(node-libnpmpack) = 4.1.3 Provides: bundled(node-libnpmpack) = 4.1.3
@ -580,8 +565,8 @@ Provides: bundled(node-spdx-exceptions) = 2.3.0
Provides: bundled(node-spdx-expression-parse) = 3.0.1 Provides: bundled(node-spdx-expression-parse) = 3.0.1
Provides: bundled(node-spdx-license-ids) = 3.0.11 Provides: bundled(node-spdx-license-ids) = 3.0.11
Provides: bundled(node-ssri) = 9.0.1 Provides: bundled(node-ssri) = 9.0.1
Provides: bundled(node-string_decoder) = 1.3.0
Provides: bundled(node-string-width) = 4.2.3 Provides: bundled(node-string-width) = 4.2.3
Provides: bundled(node-string_decoder) = 1.3.0
Provides: bundled(node-strip-ansi) = 6.0.1 Provides: bundled(node-strip-ansi) = 6.0.1
Provides: bundled(node-supports-color) = 7.2.0 Provides: bundled(node-supports-color) = 7.2.0
Provides: bundled(node-tar) = 6.1.11 Provides: bundled(node-tar) = 6.1.11
@ -666,7 +651,6 @@ tar Jxf %{SOURCE11}
%endif %endif
%patch200 -p1 %patch200 -p1
%patch303 -p1
%patch304 -p1 %patch304 -p1
%if %{node_version_number} <= 12 %if %{node_version_number} <= 12
@ -688,7 +672,6 @@ mkdir deps/npm/node_modules/node-gyp
tar -C deps/npm/node_modules/node-gyp Jxf %{SOURCE5} tar -C deps/npm/node_modules/node-gyp Jxf %{SOURCE5}
%endif %endif
%build %build
# normalize shebang # normalize shebang
%if %{node_version_number} >= 12 %if %{node_version_number} >= 12
@ -899,8 +882,10 @@ find test \( -name \*.out -or -name \*.js \) -exec sed -i 's,Use `node ,Use `nod
ln addon-rpm.gypi deps/npm/node_modules/node-gyp/addon-rpm.gypi ln addon-rpm.gypi deps/npm/node_modules/node-gyp/addon-rpm.gypi
# Tarball doesn't have eslint package distributed, so disable some tests # Tarball doesn't have eslint package distributed, so disable some tests
find test -name \*-eslint-\* -print -delete find test -name \*-eslint-\* -print -delete
# No documentation is generated, don't bother checking it # No documentation is generated, don't bother checking it, and check broken on older nodejs
# rm test/doctool/test-make-doc.js %if %{node_version_number} <= 10
rm test/doctool/test-make-doc.js
%endif
# DNS lookup doesn't work in build root # DNS lookup doesn't work in build root
rm test/parallel/test-dns-cancel-reverse-lookup.js \ rm test/parallel/test-dns-cancel-reverse-lookup.js \
test/parallel/test-dns-resolveany.js test/parallel/test-dns-resolveany.js
@ -996,11 +981,9 @@ make test-ci
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)
%{_includedir}/node%{node_version_number} %{_includedir}/node%{node_version_number}
%if %{node_version_number} < 18
%dir %{_datadir}/systemtap %dir %{_datadir}/systemtap
%dir %{_datadir}/systemtap/tapset %dir %{_datadir}/systemtap/tapset
%{_datadir}/systemtap/tapset/node%{node_version_number}.stp %{_datadir}/systemtap/tapset/node%{node_version_number}.stp
%endif
%files docs %files docs
%defattr(-,root,root) %defattr(-,root,root)
@ -1016,6 +999,7 @@ update-alternatives --remove npm-default %{_bindir}/npm%{node_version_number}
update-alternatives --remove npx-default %{_bindir}/npx%{node_version_number} update-alternatives --remove npx-default %{_bindir}/npx%{node_version_number}
%else %else
%pre %pre
# remove files that are no longer owned but provided by update-alternatives # remove files that are no longer owned but provided by update-alternatives
if ! [ -L %{_mandir}/man1/node.1%{ext_man} ]; then if ! [ -L %{_mandir}/man1/node.1%{ext_man} ]; then

13
openssl3_fixups.patch
View File

@ -1,13 +0,0 @@
Index: node-v18.9.0/test/addons/openssl-providers/binding.cc
===================================================================
--- node-v18.9.0.orig/test/addons/openssl-providers/binding.cc
+++ node-v18.9.0/test/addons/openssl-providers/binding.cc
@@ -1,6 +1,8 @@
#include <assert.h>
#include <node.h>
+#if OPENSSL_VERSION_MAJOR >= 3
#include <openssl/provider.h>
+#endif
namespace {

7
test-skip-y2038-on-32bit-time_t.patch
View File

@ -2,7 +2,7 @@ Skip 'test/parallel/test-fs-utimes-y2K38.js' on some platforms.
This test fails if coreutils' touch was built with 64-bit time_t, This test fails if coreutils' touch was built with 64-bit time_t,
while nodejs was built with 32-bit time_t. This is currently the case while nodejs was built with 32-bit time_t. This is currently the case
on i586, ppc and armv7l. Skip the failing last command on those on i586, ppc and arm. Skip the failing last command on those
platforms. platforms.
The failure was seen since coreutils-9.0. The failure was seen since coreutils-9.0.
@ -16,7 +16,7 @@ Index: node-v16.6.2/test/parallel/test-fs-utimes-y2K38.js
=================================================================== ===================================================================
--- node-v16.6.2.orig/test/parallel/test-fs-utimes-y2K38.js --- node-v16.6.2.orig/test/parallel/test-fs-utimes-y2K38.js
+++ node-v16.6.2/test/parallel/test-fs-utimes-y2K38.js +++ node-v16.6.2/test/parallel/test-fs-utimes-y2K38.js
@@ -20,6 +20,23 @@ if (!common.isWindows) { @@ -20,6 +20,26 @@ if (!common.isWindows) {
common.skip('File system appears to lack Y2K38 support (touch failed)'); common.skip('File system appears to lack Y2K38 support (touch failed)');
} }
@ -32,6 +32,9 @@ Index: node-v16.6.2/test/parallel/test-fs-utimes-y2K38.js
+ if (unameResult.stdout.trim() === 'ppc') { + if (unameResult.stdout.trim() === 'ppc') {
+ common.skip('SUSE: test skipped on platforms with 32-bit time_t'); + common.skip('SUSE: test skipped on platforms with 32-bit time_t');
+ } + }
+ if (unameResult.stdout.trim() === 'armv6l') {
+ common.skip('SUSE: test skipped on platforms with 32-bit time_t');
+ }
+ if (unameResult.stdout.trim() === 'armv7l') { + if (unameResult.stdout.trim() === 'armv7l') {
+ common.skip('SUSE: test skipped on platforms with 32-bit time_t'); + common.skip('SUSE: test skipped on platforms with 32-bit time_t');
+ } + }

67
versioned.patch
View File

@ -8,10 +8,10 @@ management via update_alternatives.
This is also important for generation of binary This is also important for generation of binary
modules for multiple versions of NodeJS modules for multiple versions of NodeJS
Index: node-v18.9.0/Makefile Index: node-v18.10.0/Makefile
=================================================================== ===================================================================
--- node-v18.9.0.orig/Makefile --- node-v18.10.0.orig/Makefile
+++ node-v18.9.0/Makefile +++ node-v18.10.0/Makefile
@@ -55,7 +55,7 @@ BUILDTYPE_LOWER := $(shell echo $(BUILDT @@ -55,7 +55,7 @@ BUILDTYPE_LOWER := $(shell echo $(BUILDT
EXEEXT := $(shell $(PYTHON) -c \ EXEEXT := $(shell $(PYTHON) -c \
"import sys; print('.exe' if sys.platform == 'win32' else '')") "import sys; print('.exe' if sys.platform == 'win32' else '')")
@ -21,10 +21,10 @@ Index: node-v18.9.0/Makefile
NODE ?= ./$(NODE_EXE) NODE ?= ./$(NODE_EXE)
NODE_G_EXE = node_g$(EXEEXT) NODE_G_EXE = node_g$(EXEEXT)
NPM ?= ./deps/npm/bin/npm-cli.js NPM ?= ./deps/npm/bin/npm-cli.js
Index: node-v18.9.0/tools/install.py Index: node-v18.10.0/tools/install.py
=================================================================== ===================================================================
--- node-v18.9.0.orig/tools/install.py --- node-v18.10.0.orig/tools/install.py
+++ node-v18.9.0/tools/install.py +++ node-v18.10.0/tools/install.py
@@ -86,7 +86,7 @@ def uninstall(paths, dst): @@ -86,7 +86,7 @@ def uninstall(paths, dst):
try_remove(path, dst) try_remove(path, dst)
@ -67,7 +67,16 @@ Index: node-v18.9.0/tools/install.py
output_prefix = 'out/Release/' output_prefix = 'out/Release/'
if is_windows: if is_windows:
@@ -189,7 +189,7 @@ def files(action): @@ -186,7 +186,7 @@ def files(action):
action(['out/Release/node.d'], 'lib/dtrace/node.d')
# behave similarly for systemtap
- action(['src/node.stp'], 'share/systemtap/tapset/')
+ action(['src/node.stp'], 'share/systemtap/tapset/node18.stp')
action(['deps/v8/tools/gdbinit'], 'share/doc/node/')
action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/')
@@ -194,7 +194,7 @@ def files(action):
if 'freebsd' in sys.platform or 'openbsd' in sys.platform: if 'freebsd' in sys.platform or 'openbsd' in sys.platform:
action(['doc/node.1'], 'man/man1/') action(['doc/node.1'], 'man/man1/')
else: else:
@ -76,7 +85,7 @@ Index: node-v18.9.0/tools/install.py
if 'true' == variables.get('node_install_npm'): if 'true' == variables.get('node_install_npm'):
npm_files(action) npm_files(action)
@@ -276,28 +276,28 @@ def headers(action): @@ -281,28 +281,28 @@ def headers(action):
'src/node_buffer.h', 'src/node_buffer.h',
'src/node_object_wrap.h', 'src/node_object_wrap.h',
'src/node_version.h', 'src/node_version.h',
@ -113,10 +122,10 @@ Index: node-v18.9.0/tools/install.py
if sys.platform == 'zos': if sys.platform == 'zos':
zoslibinc = os.environ.get('ZOSLIB_INCLUDES') zoslibinc = os.environ.get('ZOSLIB_INCLUDES')
Index: node-v18.9.0/doc/node.1 Index: node-v18.10.0/doc/node.1
=================================================================== ===================================================================
--- node-v18.9.0.orig/doc/node.1 --- node-v18.10.0.orig/doc/node.1
+++ node-v18.9.0/doc/node.1 +++ node-v18.10.0/doc/node.1
@@ -30,24 +30,24 @@ @@ -30,24 +30,24 @@
.Dt NODE 1 .Dt NODE 1
. .
@ -146,10 +155,10 @@ Index: node-v18.9.0/doc/node.1
.Op Fl -v8-options .Op Fl -v8-options
. .
.\"====================================================================== .\"======================================================================
Index: node-v18.9.0/src/node.stp Index: node-v18.10.0/src/node.stp
=================================================================== ===================================================================
--- node-v18.9.0.orig/src/node.stp --- node-v18.10.0.orig/src/node.stp
+++ node-v18.9.0/src/node.stp +++ node-v18.10.0/src/node.stp
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
@ -222,10 +231,10 @@ Index: node-v18.9.0/src/node.stp
{ {
scavenge = 1 << 0; scavenge = 1 << 0;
compact = 1 << 1; compact = 1 << 1;
Index: node-v18.9.0/deps/npm/man/man1/npm.1 Index: node-v18.10.0/deps/npm/man/man1/npm.1
=================================================================== ===================================================================
--- node-v18.9.0.orig/deps/npm/man/man1/npm.1 --- node-v18.10.0.orig/deps/npm/man/man1/npm.1
+++ node-v18.9.0/deps/npm/man/man1/npm.1 +++ node-v18.10.0/deps/npm/man/man1/npm.1
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
.TH "NPM" "1" "September 2022" "" "" .TH "NPM" "1" "September 2022" "" ""
.SH "NAME" .SH "NAME"
@ -297,10 +306,10 @@ Index: node-v18.9.0/deps/npm/man/man1/npm.1
+npm18 help publish +npm18 help publish
.RE .RE
Index: node-v18.9.0/src/node_main.cc Index: node-v18.10.0/src/node_main.cc
=================================================================== ===================================================================
--- node-v18.9.0.orig/src/node_main.cc --- node-v18.10.0.orig/src/node_main.cc
+++ node-v18.9.0/src/node_main.cc +++ node-v18.10.0/src/node_main.cc
@@ -122,6 +122,7 @@ int main(int argc, char* argv[]) { @@ -122,6 +122,7 @@ int main(int argc, char* argv[]) {
#endif #endif
// Disable stdio buffering, it interacts poorly with printf() // Disable stdio buffering, it interacts poorly with printf()
@ -309,10 +318,10 @@ Index: node-v18.9.0/src/node_main.cc
setvbuf(stdout, nullptr, _IONBF, 0); setvbuf(stdout, nullptr, _IONBF, 0);
setvbuf(stderr, nullptr, _IONBF, 0); setvbuf(stderr, nullptr, _IONBF, 0);
return node::Start(argc, argv); return node::Start(argc, argv);
Index: node-v18.9.0/tools/test.py Index: node-v18.10.0/tools/test.py
=================================================================== ===================================================================
--- node-v18.9.0.orig/tools/test.py --- node-v18.10.0.orig/tools/test.py
+++ node-v18.9.0/tools/test.py +++ node-v18.10.0/tools/test.py
@@ -948,7 +948,7 @@ class Context(object): @@ -948,7 +948,7 @@ class Context(object):
if self.vm is not None: if self.vm is not None:
return self.vm return self.vm
@ -322,10 +331,10 @@ Index: node-v18.9.0/tools/test.py
else: else:
name = 'out/%s.%s/node' % (arch, mode) name = 'out/%s.%s/node' % (arch, mode)
Index: node-v18.9.0/node.gyp Index: node-v18.10.0/node.gyp
=================================================================== ===================================================================
--- node-v18.9.0.orig/node.gyp --- node-v18.10.0.orig/node.gyp
+++ node-v18.9.0/node.gyp +++ node-v18.10.0/node.gyp
@@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
'node_use_openssl%': 'true', 'node_use_openssl%': 'true',
'node_shared_openssl%': 'false', 'node_shared_openssl%': 'false',
@ -337,10 +346,10 @@ Index: node-v18.9.0/node.gyp
'node_intermediate_lib_type%': 'static_library', 'node_intermediate_lib_type%': 'static_library',
'node_builtin_modules_path%': '', 'node_builtin_modules_path%': '',
# We list the deps/ files out instead of globbing them in js2c.py since we # We list the deps/ files out instead of globbing them in js2c.py since we
Index: node-v18.9.0/deps/npm/man/man1/npx.1 Index: node-v18.10.0/deps/npm/man/man1/npx.1
=================================================================== ===================================================================
--- node-v18.9.0.orig/deps/npm/man/man1/npx.1 --- node-v18.10.0.orig/deps/npm/man/man1/npx.1
+++ node-v18.9.0/deps/npm/man/man1/npx.1 +++ node-v18.10.0/deps/npm/man/man1/npx.1
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
.P .P
.RS 2 .RS 2