commit 940720b49f32d156788d585e0c6f75eb4ecd308fc2c8d3862b380871b97abe2a Author: Adam Majer Date: Wed Apr 19 13:34:21 2023 +0000 - Package new version 20.0.0 For overview of changes and details since 19.x and earlier see https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V20.md#20.0.0 - imported the following patches from prior patches: + cares_public_headers.patch + fix_ci_tests.patch + flaky_test_rerun.patch + legacy_python.patch + linker_lto_jobs.patch + manual_configure.patch + node-gyp-addon-gypi.patch + node-gyp-config.patch + nodejs-libpath.patch + npm_search_paths.patch + openssl_binary_detection.patch + qemu_timeouts_arches.patch + skip_no_console.patch + sle12_python3_compat.patch + test-skip-y2038-on-32bit-time_t.patch + versioned.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs20?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/SHASUMS256.txt b/SHASUMS256.txt new file mode 100644 index 0000000..16d9d02 --- /dev/null +++ b/SHASUMS256.txt @@ -0,0 +1,41 @@ +5fdc8901c70116d29ed462e234d11485521027dc554962c2d47fe367b61409ed node-v20.0.0-aix-ppc64.tar.gz +8c07d44eef03d98fdfbaee4f263126f940675da52a3b83781b800ecdcde70518 node-v20.0.0-arm64.msi +ee27eea6694a5d8c834b11a12fb85a5dae01a91178be12920a6da12d8c299c43 node-v20.0.0-darwin-arm64.tar.gz +91ef39295f99b1aa7d33332f76268b02fc337da6a9013d981bfbac63e41c3889 node-v20.0.0-darwin-arm64.tar.xz +a26019f8dc6f0b261b1eebabeedb00f478460c36950a99b5c7e161af005e400e node-v20.0.0-darwin-x64.tar.gz +73e86ed2966dda777820fd02eaed7bb188199e0824c7821fc404ab9ecdc5877d node-v20.0.0-darwin-x64.tar.xz +92085685c5280f78ae217f064b0fbb703e67647202ea2ddce48ea353abb6c899 node-v20.0.0-headers.tar.gz +18994f31f1a68111a36f68e615eb52868c55f8e8230e75a6ea1ec23fe97c5679 node-v20.0.0-headers.tar.xz +6eeaf1e93baf82ca95e02590eec65e3187e756ddce6c23bbec1c09d49ebbff2a node-v20.0.0-linux-arm64.tar.gz +34f345e09a4cb13e87672b89cbbefa803be8b91fa6b9f17d73645dfc83778ea9 node-v20.0.0-linux-arm64.tar.xz +3f325a308a4038d5cfbe4064b91383c72e5790f8102cad75071c0a1e17a50c07 node-v20.0.0-linux-armv7l.tar.gz +3c95be4f2627defa65822289d38cff6866b8c73940548525bffe2904cb249218 node-v20.0.0-linux-armv7l.tar.xz +dcaa1bef43687267f78014d76081b7a504aa5bc99cd60bee53586853d460b7c9 node-v20.0.0-linux-ppc64le.tar.gz +23182ad924365caf9225bbedd1f770afcc9301bdccbd244fe485fff0483324a3 node-v20.0.0-linux-ppc64le.tar.xz +5f01a3cf3e1c67587d6c2c1684445d0c04d7305a6152276fa4bfa889e92529b4 node-v20.0.0-linux-s390x.tar.gz +c44aac8a080b1fc057296c0eb3501957a4ea79658b676708a38b01a3acc3f07d node-v20.0.0-linux-s390x.tar.xz +95439a0a836fc858565c7b6a7b1e55d1741901e6f205485e496abbefe973cfce node-v20.0.0-linux-x64.tar.gz +9e512f1f1cadb3a5e37a10aa2d5e632f93aaf9f37165803e2ed981009970a3d7 node-v20.0.0-linux-x64.tar.xz +8b7309315ef71a97d8fc08ba4f5915e85e988377119df76121f04b5e93b2dc96 node-v20.0.0.pkg +c1ee3c5355a5d25426e2fd3508c603e5e7661217194219bc846a12b99b40df15 node-v20.0.0.tar.gz +7450e7579568f7d1cb398185cfce472da2837b2aa36c59620b22ce4b977b5cb5 node-v20.0.0.tar.xz +d3a68cd41eeb773e20a3033e5b1502844fd392818cb64a6cd5febf3193136ad6 node-v20.0.0-win-arm64.7z +c56eb535361233cf3c9ac0fd296c9a8050050bae77343b1f50f0077f6f7a5657 node-v20.0.0-win-arm64.zip +e78b9cdc58b0d9ab6c980180b574b38d91d5939d18b55b8772897e63d9ce4b9c node-v20.0.0-win-x64.7z +a76e2221cdd68467add78f0e7d24f2a968c2521f3fcd6f6964fc722bc9a9a9b4 node-v20.0.0-win-x64.zip +a147b247e19e1324d8f7edef6c1ae4e24e5bdad9867843a2b4b491a0f3d73dd5 node-v20.0.0-win-x86.7z +25382f5cf4cc6ee61f822975fe83e7036bbc25fb9b5acc1f480300dd0c4a1aa4 node-v20.0.0-win-x86.zip +02161c98de3722c10963f7d8bbc1544b43d6af59d091e4b403637b5173010301 node-v20.0.0-x64.msi +abe7ae577393ec031c060255c3667da063ce22a483118047b9d8958139dbe5ed node-v20.0.0-x86.msi +6d69026bfca17c06c392ee1d9577167a80d377faec9f8e153d130a60bda33650 win-arm64/node.exe +821e03fac3b1c6e431758b67d24baac34506fcb6d25fa3b097a21d38be3bcff9 win-arm64/node.lib +f428769f74da4594c7a80de92333f9bbe6d9bd1d564a1c2f1d9069585fc475ad win-arm64/node_pdb.7z +4e92098bb246061e5a4517692d1637536adf2137e764bb96b90b92101d630a91 win-arm64/node_pdb.zip +964d157e4ea07b6df6ce0eb81cc5e866e91dbda78583571ae60de08f132301e5 win-x64/node.exe +bcf7f829c51f67e1f882c83c4627423adedb94d1434a9eb981035ca32261ed5b win-x64/node.lib +6379b8e6607cc499fd542a74b4ac216d1b32290aa969b1162fd38ee4593078b0 win-x64/node_pdb.7z +6eaa6dab25c727b47e9815c88a91186083ade989399bb0c83214202b41416280 win-x64/node_pdb.zip +3952cd4af8b4684727b78cc99c9eda60a30602f2341c6e15be4c415d49c69686 win-x86/node.exe +88789614b10d5457e9a2ffb6db43477cda1f8cedcdfc68c0b51dfbd6cee94cde win-x86/node.lib +0702fb3ee97383c725177ee1443238f0575c6a32128734813767c6c8dcd3eddd win-x86/node_pdb.7z +8c4be69e2d0d01c0aa6dab0ab7788720c8b88072f76bef6f0c202c681315d6db win-x86/node_pdb.zip diff --git a/SHASUMS256.txt.sig b/SHASUMS256.txt.sig new file mode 100644 index 0000000..f49404f Binary files /dev/null and b/SHASUMS256.txt.sig differ diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..3891a8f --- /dev/null +++ b/_constraints @@ -0,0 +1,32 @@ + + + + + 8 + + + 10000 + + + + + aarch64 + + + + asimdrdm + + + + + + armv6l + armv7l + + + + 5 + + + + diff --git a/bash_output_helper.bash b/bash_output_helper.bash new file mode 100644 index 0000000..9b22c82 --- /dev/null +++ b/bash_output_helper.bash @@ -0,0 +1,16 @@ +# +# Node can break stdin/stdout/stderr by setting them O_NONBLOCK +# and then not resetting it back to blocking mode on exit +# This function redirects stdio descriptors via new logging pipe +# + + +function decoupled_cmd +{ + mkfifo _log + ($@) < /dev/null > _log 2>_log & + cat _log + rm _log + wait $! +} + diff --git a/cares_public_headers.patch b/cares_public_headers.patch new file mode 100644 index 0000000..6c9dbdc --- /dev/null +++ b/cares_public_headers.patch @@ -0,0 +1,13 @@ +Index: node-v14.17.5/src/cares_wrap.h +=================================================================== +--- node-v14.17.5.orig/src/cares_wrap.h ++++ node-v14.17.5/src/cares_wrap.h +@@ -22,7 +22,7 @@ + # include + #endif // __POSIX__ + +-# include ++#include + + namespace node { + namespace cares_wrap { diff --git a/fix_ci_tests.patch b/fix_ci_tests.patch new file mode 100644 index 0000000..3e1f225 --- /dev/null +++ b/fix_ci_tests.patch @@ -0,0 +1,103 @@ +Author: Adam Majer +Date: Dec 20 09:18:49 UTC 2017 +Summary: Fix CI unit tests framework for OBS building + +Index: node-v18.9.0/test/parallel/test-module-loading-globalpaths.js +=================================================================== +--- node-v18.9.0.orig/test/parallel/test-module-loading-globalpaths.js ++++ node-v18.9.0/test/parallel/test-module-loading-globalpaths.js +@@ -11,6 +11,9 @@ const { addLibraryPath } = require('../c + + addLibraryPath(process.env); + ++common.skip('hardcoded global paths'); ++return; ++ + if (process.argv[2] === 'child') { + console.log(require(pkgName).string); + } else { +Index: node-v18.9.0/test/parallel/test-tls-passphrase.js +=================================================================== +--- node-v18.9.0.orig/test/parallel/test-tls-passphrase.js ++++ node-v18.9.0/test/parallel/test-tls-passphrase.js +@@ -223,7 +223,7 @@ server.listen(0, common.mustCall(functio + }, onSecureConnect()); + })).unref(); + +-const errMessageDecrypt = /bad decrypt/; ++const errMessageDecrypt = /bad (decrypt|password read)/; + + // Missing passphrase + assert.throws(function() { +Index: node-v18.9.0/test/parallel/test-repl-envvars.js +=================================================================== +--- node-v18.9.0.orig/test/parallel/test-repl-envvars.js ++++ node-v18.9.0/test/parallel/test-repl-envvars.js +@@ -2,7 +2,9 @@ + + // Flags: --expose-internals + +-require('../common'); ++const common = require('../common'); ++common.skip('Not running test in OBS'); ++ + const stream = require('stream'); + const REPL = require('internal/repl'); + const assert = require('assert'); +Index: node-v18.9.0/test/common/index.mjs +=================================================================== +--- node-v18.9.0.orig/test/common/index.mjs ++++ node-v18.9.0/test/common/index.mjs +@@ -45,6 +45,7 @@ const { + expectsError, + skipIfInspectorDisabled, + skipIf32Bits, ++ skipIfWorker, + getArrayBufferViews, + getBufferSources, + getTTYfd, +@@ -94,6 +95,7 @@ export { + expectsError, + skipIfInspectorDisabled, + skipIf32Bits, ++ skipIfWorker, + getArrayBufferViews, + getBufferSources, + getTTYfd, +Index: node-v18.9.0/Makefile +=================================================================== +--- node-v18.9.0.orig/Makefile ++++ node-v18.9.0/Makefile +@@ -524,7 +524,8 @@ test-ci-js: | clear-stalled + .PHONY: test-ci + # Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned + test-ci: LOGLEVEL := info +-test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests doc-only ++test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests ++ strip $(NODE_EXE) + out/Release/cctest --gtest_output=xml:out/junit/cctest.xml + $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ + --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ +@@ -717,7 +718,8 @@ apidocs_json = $(addprefix out/,$(apidoc + apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*))) + + tools/doc/node_modules: tools/doc/package.json +- @if [ "$(shell $(node_use_openssl))" != "true" ]; then \ ++ echo "Skipping tools/doc/node_modules" ++# @if [ "$(shell $(node_use_openssl))" != "true" ]; then \ + echo "Skipping tools/doc/node_modules (no crypto)"; \ + else \ + cd tools/doc && $(call available-node,$(run-npm-ci)) \ +Index: node-v18.9.0/test/parallel/test-crypto-dh.js +=================================================================== +--- node-v18.9.0.orig/test/parallel/test-crypto-dh.js ++++ node-v18.9.0/test/parallel/test-crypto-dh.js +@@ -167,7 +167,7 @@ assert.throws(() => { + dh3.computeSecret(''); + }, { message: common.hasOpenSSL3 ? + 'error:02800080:Diffie-Hellman routines::invalid secret' : +- 'Supplied key is too small' }); ++ /Supplied key is too small|error:05066066:Diffie-Hellman routines:compute_key:invalid public key/ }); + + // Invalid test: curve argument is undefined + assert.throws( diff --git a/flaky_test_rerun.patch b/flaky_test_rerun.patch new file mode 100644 index 0000000..8f8e394 --- /dev/null +++ b/flaky_test_rerun.patch @@ -0,0 +1,21 @@ +Index: node-v16.13.0/tools/test.py +=================================================================== +--- node-v16.13.0.orig/tools/test.py ++++ node-v16.13.0/tools/test.py +@@ -586,6 +586,16 @@ class TestCase(object): + self.context.store_unexpected_output) + + def Run(self): ++ reruns = 0 ++ while (reruns < 5): ++ reruns += 1 ++ result = self.OriginalRun() ++ if (not result.HasFailed()): ++ break ++ print("FLAKY TEST rerun: ", self.GetCommand()) ++ return result ++ ++ def OriginalRun(self): + try: + result = self.RunCommand(self.GetCommand(), { + "TEST_SERIAL_ID": "%d" % self.serial_id, diff --git a/legacy_python.patch b/legacy_python.patch new file mode 100644 index 0000000..062aa79 --- /dev/null +++ b/legacy_python.patch @@ -0,0 +1,26 @@ +Index: node-v18.11.0/tools/utils.py +=================================================================== +--- node-v18.11.0.orig/tools/utils.py ++++ node-v18.11.0/tools/utils.py +@@ -26,10 +26,10 @@ + # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +-import glob + import platform + import re + import sys ++from pathlib import Path + + + # Reads a .list file into an array of strings +@@ -109,7 +109,8 @@ def IsWindows(): + + + def SearchFiles(dir, ext): +- list = glob.glob(dir+ '/**/*.' + ext, recursive=True) ++ list = Path(dir).glob('**/*.' + ext) ++ list = [ str(x) for x in list ] + if sys.platform == 'win32': + list = [ x.replace('\\', '/')for x in list] + return sorted(list) diff --git a/linker_lto_jobs.patch b/linker_lto_jobs.patch new file mode 100644 index 0000000..6903da2 --- /dev/null +++ b/linker_lto_jobs.patch @@ -0,0 +1,25 @@ +Purpose of these dependencies is to make sure that the linker +is run serially over these binaries instead of in parallel. +OBS workers run out of memory as each executable seems to require +upward of 5G RAM + +Index: node-v19.7.0/node.gyp +=================================================================== +--- node-v19.7.0.orig/node.gyp ++++ node-v19.7.0/node.gyp +@@ -951,6 +951,7 @@ + 'deps/uvwasi/uvwasi.gyp:uvwasi', + 'deps/simdutf/simdutf.gyp:simdutf', + 'deps/ada/ada.gyp:ada', ++ 'fuzz_env' + ], + + 'includes': [ +@@ -1047,6 +1048,7 @@ + 'deps/histogram/histogram.gyp:histogram', + 'deps/uvwasi/uvwasi.gyp:uvwasi', + 'deps/ada/ada.gyp:ada', ++ 'cctest' + ], + + 'includes': [ diff --git a/manual_configure.patch b/manual_configure.patch new file mode 100644 index 0000000..5732030 --- /dev/null +++ b/manual_configure.patch @@ -0,0 +1,20 @@ +Author: Adam Majer +Date: Wed May 23 14:13:33 CEST 2018 +Summary: This config.h is defined by hand + +Gyp doesn't run autotools, so this config is not quite correct. +Update to prevent implicit defines to be used. + +Index: node-git.8dae89b396/deps/nghttp2/lib/includes/config.h +=================================================================== +--- node-git.8dae89b396.orig/deps/nghttp2/lib/includes/config.h ++++ node-git.8dae89b396/deps/nghttp2/lib/includes/config.h +@@ -71,7 +71,7 @@ typedef intptr_t ssize_t; + /* #undef HAVE_NETDB_H */ + + /* Define to 1 if you have the header file. */ +-/* #undef HAVE_NETINET_IN_H */ ++#define HAVE_NETINET_IN_H 1 + + /* Define to 1 if you have the header file. */ + /* #undef HAVE_PWD_H */ diff --git a/node-gyp-addon-gypi.patch b/node-gyp-addon-gypi.patch new file mode 100644 index 0000000..8e3e54e --- /dev/null +++ b/node-gyp-addon-gypi.patch @@ -0,0 +1,79 @@ +Index: node-git.b4f0a18b5a/addon-rpm.gypi +=================================================================== +--- /dev/null ++++ node-git.b4f0a18b5a/addon-rpm.gypi +@@ -0,0 +1,35 @@ ++{ ++ 'target_defaults': { ++ 'type': 'loadable_module', ++ 'product_prefix': '', ++ 'include_dirs': [ ++ '/usr/include/node20/', ++ '/usr/include/' ++ ], ++ ++ 'target_conditions': [ ++ ['_type=="loadable_module"', { ++ 'product_extension': 'node', ++ 'defines': [ 'BUILDING_NODE_EXTENSION' ], ++ }] ++ ], ++ ++ 'conditions': [ ++ [ 'OS=="mac"', { ++ 'libraries': [ '-undefined dynamic_lookup' ], ++ 'xcode_settings': { ++ 'DYLIB_INSTALL_NAME_BASE': '@rpath' ++ }, ++ }], ++ [ 'OS=="win"', { ++ 'libraries': [ '-l<(node_root_dir)/$(Configuration)/node.lib' ], ++ # warning C4251: 'node::ObjectWrap::handle_' : class 'v8::Persistent' ++ # needs to have dll-interface to be used by clients of class 'node::ObjectWrap' ++ 'msvs_disabled_warnings': [ 4251 ], ++ }], ++ [ 'OS=="freebsd" or OS=="openbsd" or OS=="solaris" or (OS=="linux" and target_arch!="ia32")', { ++ 'cflags': [ '-fPIC' ], ++ }] ++ ] ++ } ++} +Index: node-git.b4f0a18b5a/deps/npm/node_modules/node-gyp/lib/configure.js +=================================================================== +--- node-git.b4f0a18b5a.orig/deps/npm/node_modules/node-gyp/lib/configure.js ++++ node-git.b4f0a18b5a/deps/npm/node_modules/node-gyp/lib/configure.js +@@ -46,10 +46,6 @@ function configure (gyp, argv, callback) + if ('v' + release.version !== process.version) { + // if --target was given, then determine a target version to compile for + log.verbose('get node dir', 'compiling against --target node version: %s', release.version) +- } else { +- // if no --target was specified then use the current host node version +- log.verbose('get node dir', 'no --target version specified, falling back to host node version: %s', release.version) +- } + + if (!release.semver) { + // could not parse the version string with semver +@@ -68,6 +64,12 @@ function configure (gyp, argv, callback) + nodeDir = path.resolve(gyp.devDir, release.versionDir) + createBuildDir() + }) ++ } else { ++ // if no --target was specified then use RPM-installed headers ++ log.verbose('get node dir', 'no --target version specified, falling back to RPM installed headers') ++ nodeDir = '/usr/include/node20' ++ createBuildDir() ++ } + } + } + +@@ -282,7 +284,9 @@ function configure (gyp, argv, callback) + + // this logic ported from the old `gyp_addon` python file + var gypScript = path.resolve(__dirname, '..', 'gyp', 'gyp_main.py') +- var addonGypi = path.resolve(__dirname, '..', 'addon.gypi') ++ var addon_gypi_file = gyp.opts.target || gyp.opts.nodedir ? 'addon.gypi' : 'addon-rpm.gypi' ++ ++ var addonGypi = path.resolve(__dirname, '..', addon_gypi_file) + var commonGypi = path.resolve(nodeDir, 'include/node/common.gypi') + fs.stat(commonGypi, function (err) { + if (err) { diff --git a/node-gyp-config.patch b/node-gyp-config.patch new file mode 100644 index 0000000..b4257d3 --- /dev/null +++ b/node-gyp-config.patch @@ -0,0 +1,13 @@ +Index: node-v19.1.0/deps/npm/node_modules/node-gyp/lib/configure.js +=================================================================== +--- node-v19.1.0.orig/deps/npm/node_modules/node-gyp/lib/configure.js ++++ node-v19.1.0/deps/npm/node_modules/node-gyp/lib/configure.js +@@ -96,7 +96,7 @@ function configure (gyp, argv, callback) + + log.verbose('build/' + configFilename, 'creating config file') + +- var config = process.config || {} ++ var config = JSON.parse(JSON.stringify(process.config || {})) + var defaults = config.target_defaults + var variables = config.variables + diff --git a/node-v20.0.0.tar.xz b/node-v20.0.0.tar.xz new file mode 100644 index 0000000..7ef3eb6 --- /dev/null +++ b/node-v20.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7450e7579568f7d1cb398185cfce472da2837b2aa36c59620b22ce4b977b5cb5 +size 41279796 diff --git a/node_modules.tar.xz b/node_modules.tar.xz new file mode 100644 index 0000000..5c89f85 --- /dev/null +++ b/node_modules.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7834b0aa267b76199167f8523b90cd61b3d562ecf50259e93723379cd7665977 +size 1071008 diff --git a/nodejs-libpath.patch b/nodejs-libpath.patch new file mode 100644 index 0000000..ed46a24 --- /dev/null +++ b/nodejs-libpath.patch @@ -0,0 +1,54 @@ +Index: node-v18.9.0/tools/install.py +=================================================================== +--- node-v18.9.0.orig/tools/install.py ++++ node-v18.9.0/tools/install.py +@@ -7,6 +7,7 @@ import errno + import os + import shutil + import sys ++from distutils import sysconfig + import re + + # set at init time +@@ -66,6 +67,10 @@ def try_copy(path, dst): + try_unlink(target_path) # prevent ETXTBSY errors + return shutil.copy2(source_path, target_path) + ++def libdir(): ++ libdir_fq = sysconfig.get_config_var("LIBDIR") ++ return re.sub("^" + re.escape(node_prefix + "/"), "", libdir_fq) ++ + def try_remove(path, dst): + source_path, target_path = mkpaths(path, dst) + print('removing %s' % target_path) +@@ -81,7 +86,7 @@ def uninstall(paths, dst): + try_remove(path, dst) + + def package_files(action, name, bins): +- target_path = 'lib/node_modules/' + name + '/' ++ target_path = libdir() + '/node_modules/' + name + '/' + + # don't install npm if the target path is a symlink, it probably means + # that a dev version of npm is installed there +@@ -101,7 +106,7 @@ def package_files(action, name, bins): + if action == uninstall: + action([link_path], 'bin/' + bin_name) + elif action == install: +- try_symlink('../lib/node_modules/' + name + '/' + bin_target, link_path) ++ try_symlink('../' + libdir() + '/node_modules/' + name + '/' + bin_target, link_path) + else: + assert 0 # unhandled action type + +Index: node-v18.9.0/lib/internal/modules/cjs/loader.js +=================================================================== +--- node-v18.9.0.orig/lib/internal/modules/cjs/loader.js ++++ node-v18.9.0/lib/internal/modules/cjs/loader.js +@@ -1254,7 +1254,7 @@ Module._initPaths = function() { + path.resolve(process.execPath, '..') : + path.resolve(process.execPath, '..', '..'); + +- const paths = [path.resolve(prefixDir, 'lib', 'node')]; ++ const paths = ['/usr/lib/node']; + + if (homeDir) { + ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); diff --git a/nodejs.keyring b/nodejs.keyring new file mode 100644 index 0000000..dddabb7 Binary files /dev/null and b/nodejs.keyring differ diff --git a/nodejs20.changes b/nodejs20.changes new file mode 100644 index 0000000..8b170cc --- /dev/null +++ b/nodejs20.changes @@ -0,0 +1,25 @@ +------------------------------------------------------------------- +Wed Apr 19 13:16:54 UTC 2023 - Adam Majer - 20.0.0 + +- Package new version 20.0.0 + For overview of changes and details since 19.x and earlier see + https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V20.md#20.0.0 + +- imported the following patches from prior patches: + + cares_public_headers.patch + + fix_ci_tests.patch + + flaky_test_rerun.patch + + legacy_python.patch + + linker_lto_jobs.patch + + manual_configure.patch + + node-gyp-addon-gypi.patch + + node-gyp-config.patch + + nodejs-libpath.patch + + npm_search_paths.patch + + openssl_binary_detection.patch + + qemu_timeouts_arches.patch + + skip_no_console.patch + + sle12_python3_compat.patch + + test-skip-y2038-on-32bit-time_t.patch + + versioned.patch + diff --git a/nodejs20.spec b/nodejs20.spec new file mode 100644 index 0000000..9c9adb6 --- /dev/null +++ b/nodejs20.spec @@ -0,0 +1,1100 @@ +# +# spec file for package nodejs20 +# +# Copyright (c) 2022 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# 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} +%define ext_man .gz +%endif + +Name: nodejs20 +Version: 20.0.0 +Release: 0 + +# Double DWZ memory limits +%define _dwz_low_mem_die_limit 20000000 +%define _dwz_max_die_limit 100000000 + +%define node_version_number 20 + +# openssl bsc#1192489 - fix released +%bcond_without openssl_RSA_get0_pss_params + +%if 0%{?suse_version} > 1500 || 0%{?fedora_version} +%bcond_without libalternatives +%else +%bcond_with libalternatives +%endif + +%if %node_version_number >= 12 +%define openssl_req_ver 1.1.1 +%else +%if %node_version_number >= 10 +%define openssl_req_ver 1.1.0 +%else +%define openssl_req_ver 1.0.2 +%endif +%endif + +%bcond_with valgrind_tests + +%if %{node_version_number} >= 12 + +# turn on LTO only on non-32bit arches +%ifarch %{ix86} %{arm} +%bcond_with nodejs_lto +%else +%bcond_without nodejs_lto +%endif + +%else +%bcond_with nodejs_lto +%endif + +%if !0%{?with nodejs_lto} +%define _lto_cflags %{nil} +%endif + +%if 0%{?suse_version} == 1110 +%define _libexecdir %{_exec_prefix}/lib +%endif + +%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 120400 || 0%{?fedora_version} >= 35 +%bcond_with intree_openssl +%else +%bcond_without intree_openssl +%endif + +%if 0%{?suse_version} >= 1330 || 0%{?fedora_version} >= 35 +%bcond_with intree_cares +%else +%bcond_without intree_cares +%endif + +%if 0%{?suse_version} >= 1330 || 0%{?fedora_version} >= 35 +%bcond_with intree_icu +%else +%bcond_without intree_icu +%endif + +%if 0%{?suse_version} >= 1550 +%bcond_with intree_nghttp2 +%else +%bcond_without intree_nghttp2 +%endif + +%if 0%{?suse_version} >= 1550 +%bcond_with intree_brotli +%else +%bcond_without intree_brotli +%endif + +%ifnarch x86_64 %{ix86} +%bcond_with gdb +%else +%bcond_without gdb +%endif + +%define git_node 0 + +Summary: Evented I/O for V8 JavaScript +License: MIT +Group: Development/Languages/NodeJS +URL: https://nodejs.org +Source: https://nodejs.org/dist/v%{version}/node-v%{version}.tar.xz +Source1: https://nodejs.org/dist/v%{version}/SHASUMS256.txt +Source2: https://nodejs.org/dist/v%{version}/SHASUMS256.txt.sig +Source3: nodejs.keyring + +# Python 3.4 compatible node-gyp +### https://github.com/nodejs/node-gyp.git +### git archive v7.1.2 | xz > node-gyp_7.1.2.tar.xz +Source5: node-gyp_7.1.2.tar.xz +# Only required to run unit tests in NodeJS 10+ +Source10: update_npm_tarball.sh +Source11: node_modules.tar.xz +Source20: bash_output_helper.bash + +## Patches not distribution specific +Patch3: fix_ci_tests.patch + + + +## Patches specific to SUSE and openSUSE +# PATCH-FIX-OPENSUSE -- set correct path for dtrace if it is built +Patch101: nodejs-libpath.patch +# PATCH-FIX-UPSTREAM -- use custom addon.gypi by default instead of +# downloading node source +Patch102: node-gyp-addon-gypi.patch +# PATCH-FIX-SLE -- configure script uses Python check_output method +# which isn't included in Python 2.6 (used in SLE 11). +# PATCH-FIX-OPENSUSE -- install user global npm packages to /usr/local +# instead of /usr +Patch104: npm_search_paths.patch + +Patch120: flaky_test_rerun.patch + + +# Use versioned binaries and paths +Patch200: versioned.patch + + +BuildRequires: pkg-config +BuildRequires: fdupes +BuildRequires: procps +BuildRequires: xz +BuildRequires: zlib-devel + +%if 0%{?suse_version} +BuildRequires: config(netcfg) +%endif + +# SLE-11 target only +# Node.js 6 requires GCC 4.8.5+. +# +# For Node.js 8.x, upstream requires GCC 4.9.4+, as GCC 4.8 may have +# slightly buggy C++11 support: https://github.com/nodejs/node/pull/13466 +# +# If the default compiler is not supported, use the most recent compiler +# version available. +%if 0%{?suse_version} == 1110 +# GCC 5 is only available in the SUSE:SLE-11:SP4:Update repository (SDK). +%if %node_version_number >= 8 +BuildRequires: gcc5-c++ +%define forced_gcc_version 5 +%else +BuildRequires: gcc48-c++ +%define forced_gcc_version 4.8 +%endif +%endif +# sles == 11 block + +# Pick and stick with "latest" compiler at time of LTS release +# for SLE-12:Update targets +%if 0%{?suse_version} == 1315 +%if %node_version_number >= 17 +BuildRequires: gcc12-c++ +%define forced_gcc_version 12 +%else +%if %node_version_number >= 14 +BuildRequires: gcc9-c++ +%define forced_gcc_version 9 +%else +%if %node_version_number >= 8 +BuildRequires: gcc7-c++ +%define forced_gcc_version 7 +%endif +%endif +%endif +%endif + +%if 0%{?suse_version} == 1500 +%if %node_version_number >= 17 +BuildRequires: gcc12-c++ +%define forced_gcc_version 12 +%endif +%endif +# compiler selection + +# No special version defined, use default. +%if ! 0%{?forced_gcc_version:1} +BuildRequires: gcc-c++ +%endif + + +# Python dependencies +%if %node_version_number >= 14 + +%if 0%{?suse_version} && 0%{?suse_version} < 1500 +BuildRequires: python36 +%define forced_python_version 3.6m +%else +BuildRequires: python3 +%endif + +%else +%if %node_version_number >= 12 +BuildRequires: python3 + +%else +%if 0%{?suse_version} >= 1500 +BuildRequires: python2 +%else +BuildRequires: python +%endif + +%endif +%endif + +%if 0%{?suse_version} >= 1500 && %{node_version_number} >= 10 +BuildRequires: user(nobody) +BuildRequires: group(nobody) +%endif + +# shared openssl +%if ! 0%{with intree_openssl} + +BuildRequires: pkgconfig(openssl) >= %{openssl_req_ver} + +%if 0%{?suse_version} + +%if 0%{?suse_version} >= 1500 +BuildRequires: openssl >= %{openssl_req_ver} +BuildRequires: (libopenssl1_1-hmac if libopenssl-1_1-devel) +BuildRequires: (libopenssl3-hmac if libopenssl-3-devel) +%else +BuildRequires: openssl-1_1 >= %{openssl_req_ver} +BuildRequires: libopenssl1_1-hmac +%endif + + +# /suse_version +%endif + +%if 0%{?fedora_version} +BuildRequires: openssl >= %{openssl_req_ver} +%endif + +%else +# bundled openssl +%if %node_version_number <= 12 && 0%{?suse_version} == 1315 && 0%{?sle_version} < 120400 +Provides: bundled(openssl) = 3.0.8 +%else +BuildRequires: bundled_openssl_should_not_be_required +%endif + +# /bundled openssl +%endif + +%if ! 0%{with intree_cares} +BuildRequires: pkgconfig(libcares) >= 1.17.0 +%else +Provides: bundled(libcares2) = 1.19.0 +%endif + +%if ! 0%{with intree_icu} +BuildRequires: pkgconfig(icu-i18n) >= 71 +%else +Provides: bundled(icu) = 72.1 +%endif + +%if ! 0%{with intree_nghttp2} +BuildRequires: libnghttp2-devel >= 1.41.0 +%else +Provides: bundled(nghttp2) = 1.52.0 +%endif + +%if 0%{with valgrind_tests} +BuildRequires: valgrind +%endif + +%if %{with libalternatives} +Suggests: alts +%else +Requires(postun): %{_sbindir}/update-alternatives +%endif +# either for update-alternatives, or their removal +Requires(post): %{_sbindir}/update-alternatives + +Recommends: npm20 + +#we need ABI virtual provides where SONAMEs aren't enough/not present so deps +#break when binary compatibility is broken +%global nodejs_abi 20.0 +Provides: nodejs(abi) = %{nodejs_abi} + +#this corresponds to the "engine" requirement in package.json +Provides: nodejs(engine) = %{version} + +# Multiple versions of NodeJS can be installed at a time, but +# to properly allow correct version execution from 3rd party +# npm software, `env node` requires further help than only +# update-alternatives can provide. +Provides: nodejs = %{version} +%if %{with libalternatives} +Requires: nodejs-common >= 5.0 +%else +Requires: nodejs-common +%endif + +# For SLE11, to be able to use the certificate store we need to have properly +# symlinked certificates. The compatability symlinks are provided by the +# openssl1 library in the Security Module +%if 0%{?suse_version} == 1110 +Requires: openssl1 +%endif + +%if %node_version_number >= 12 +%ifarch s390 +ExclusiveArch: not_buildable +%endif +%endif + +Provides: bundled(uvwasi) = 0.0.16 +Provides: bundled(libuv) = 1.44.2 +Provides: bundled(v8) = 11.3.244.4 +%if %{with intree_brotli} +Provides: bundled(brotli) = 1.0.9 +%else +BuildRequires: pkgconfig(libbrotlidec) +%endif + + +Provides: bundled(llhttp) = 8.1.0 +Provides: bundled(ngtcp2) = 0.8.1 +Provides: bundled(base64) = 0.5.0 +Provides: bundled(simdutf) = 3.2.7 +# bundled url-ada parser, not ada +Provides: bundled(ada) = 2.0.0 + +Provides: bundled(node-acorn) = 8.8.2 +Provides: bundled(node-acorn-walk) = 8.2.0 +Provides: bundled(node-busboy) = 1.6.0 +Provides: bundled(node-cjs-module-lexer) = 1.2.2 +Provides: bundled(node-corepack) = 0.17.2 +Provides: bundled(node-streamsearch) = 1.1.0 +Provides: bundled(node-undici) = 5.21.0 + +%description +Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js +uses an event-driven, non-blocking I/O model. Node.js has a package ecosystem +provided by npm. + +%package devel +Summary: Development headers for NodeJS 20.x +Group: Development/Languages/NodeJS +Provides: nodejs-devel = %{version} +Requires: npm20 = %{version} +Requires: %{name} = %{version} + +%description devel +This package provides development headers for Node.js needed for creation +of binary modules. + +%package -n npm20 +Summary: Package manager for Node.js +Group: Development/Languages/NodeJS +%if %{with libalternatives} +Requires: nodejs-common >= 5.0 +%else +Requires: nodejs-common +%endif +Requires: nodejs20 = %{version} +Provides: nodejs-npm = %{version} +Obsoletes: nodejs-npm < 4.0.0 +Provides: npm(npm) = 9.6.4 +Provides: npm = %{version} +%if 0%{?suse_version} >= 1500 +%if %{node_version_number} >= 10 +Requires: user(nobody) +Requires: group(nobody) +%endif +%endif +Provides: bundled(node-abbrev) = 1.1.1 +Provides: bundled(node-abbrev) = 2.0.0 +Provides: bundled(node-abort-controller) = 3.0.0 +Provides: bundled(node-agent-base) = 6.0.2 +Provides: bundled(node-agentkeepalive) = 4.3.0 +Provides: bundled(node-aggregate-error) = 3.1.0 +Provides: bundled(node-ansi-regex) = 5.0.1 +Provides: bundled(node-ansi-styles) = 4.3.0 +Provides: bundled(node-aproba) = 2.0.0 +Provides: bundled(node-archy) = 1.0.0 +Provides: bundled(node-are-we-there-yet) = 3.0.1 +Provides: bundled(node-are-we-there-yet) = 4.0.0 +Provides: bundled(node-balanced-match) = 1.0.2 +Provides: bundled(node-base64-js) = 1.5.1 +Provides: bundled(node-bin-links) = 4.0.1 +Provides: bundled(node-binary-extensions) = 2.2.0 +Provides: bundled(node-brace-expansion) = 1.1.11 +Provides: bundled(node-brace-expansion) = 2.0.1 +Provides: bundled(node-buffer) = 6.0.3 +Provides: bundled(node-builtins) = 5.0.1 +Provides: bundled(node-cacache) = 16.1.3 +Provides: bundled(node-cacache) = 17.0.5 +Provides: bundled(node-chalk) = 4.1.2 +Provides: bundled(node-chownr) = 2.0.0 +Provides: bundled(node-ci-info) = 3.8.0 +Provides: bundled(node-cidr-regex) = 3.1.1 +Provides: bundled(node-clean-stack) = 2.2.0 +Provides: bundled(node-cli-columns) = 4.0.0 +Provides: bundled(node-cli-table3) = 0.6.3 +Provides: bundled(node-clone) = 1.0.4 +Provides: bundled(node-cmd-shim) = 6.0.1 +Provides: bundled(node-color-convert) = 2.0.1 +Provides: bundled(node-color-name) = 1.1.4 +Provides: bundled(node-color-support) = 1.1.3 +Provides: bundled(node-columnify) = 1.6.0 +Provides: bundled(node-common-ancestor-path) = 1.0.1 +Provides: bundled(node-concat-map) = 0.0.1 +Provides: bundled(node-console-control-strings) = 1.1.0 +Provides: bundled(node-cssesc) = 3.0.0 +Provides: bundled(node-debug) = 4.3.4 +Provides: bundled(node-defaults) = 1.0.4 +Provides: bundled(node-delegates) = 1.0.0 +Provides: bundled(node-depd) = 2.0.0 +Provides: bundled(node-diff) = 5.1.0 +Provides: bundled(node-emoji-regex) = 8.0.0 +Provides: bundled(node-encoding) = 0.1.13 +Provides: bundled(node-env-paths) = 2.2.1 +Provides: bundled(node-err-code) = 2.0.3 +Provides: bundled(node-event-target-shim) = 5.0.1 +Provides: bundled(node-events) = 3.3.0 +Provides: bundled(node-fastest-levenshtein) = 1.0.16 +Provides: bundled(node-fs-minipass) = 2.1.0 +Provides: bundled(node-fs-minipass) = 3.0.1 +Provides: bundled(node-fs.realpath) = 1.0.0 +Provides: bundled(node-function-bind) = 1.1.1 +Provides: bundled(node-gauge) = 4.0.4 +Provides: bundled(node-gauge) = 5.0.0 +Provides: bundled(node-glob) = 7.2.3 +Provides: bundled(node-glob) = 8.1.0 +Provides: bundled(node-glob) = 9.3.2 +Provides: bundled(node-graceful-fs) = 4.2.11 +Provides: bundled(node-has) = 1.0.3 +Provides: bundled(node-has-flag) = 4.0.0 +Provides: bundled(node-has-unicode) = 2.0.1 +Provides: bundled(node-hosted-git-info) = 6.1.1 +Provides: bundled(node-http-cache-semantics) = 4.1.1 +Provides: bundled(node-http-proxy-agent) = 5.0.0 +Provides: bundled(node-https-proxy-agent) = 5.0.1 +Provides: bundled(node-humanize-ms) = 1.2.1 +Provides: bundled(node-iconv-lite) = 0.6.3 +Provides: bundled(node-ieee754) = 1.2.1 +Provides: bundled(node-ignore-walk) = 6.0.2 +Provides: bundled(node-imurmurhash) = 0.1.4 +Provides: bundled(node-indent-string) = 4.0.0 +Provides: bundled(node-infer-owner) = 1.0.4 +Provides: bundled(node-inflight) = 1.0.6 +Provides: bundled(node-inherits) = 2.0.4 +Provides: bundled(node-ini) = 3.0.1 +Provides: bundled(node-init-package-json) = 5.0.0 +Provides: bundled(node-ip) = 2.0.0 +Provides: bundled(node-ip-regex) = 4.3.0 +Provides: bundled(node-is-cidr) = 4.0.2 +Provides: bundled(node-is-core-module) = 2.11.0 +Provides: bundled(node-is-fullwidth-code-point) = 3.0.0 +Provides: bundled(node-is-lambda) = 1.0.1 +Provides: bundled(node-isexe) = 2.0.0 +Provides: bundled(node-json-parse-even-better-errors) = 3.0.0 +Provides: bundled(node-json-stringify-nice) = 1.1.4 +Provides: bundled(node-jsonparse) = 1.3.1 +Provides: bundled(node-just-diff) = 6.0.2 +Provides: bundled(node-just-diff-apply) = 5.5.0 +Provides: bundled(node-libnpmaccess) = 7.0.2 +Provides: bundled(node-libnpmdiff) = 5.0.15 +Provides: bundled(node-libnpmexec) = 5.0.15 +Provides: bundled(node-libnpmfund) = 4.0.15 +Provides: bundled(node-libnpmhook) = 9.0.3 +Provides: bundled(node-libnpmorg) = 5.0.3 +Provides: bundled(node-libnpmpack) = 5.0.15 +Provides: bundled(node-libnpmpublish) = 7.1.3 +Provides: bundled(node-libnpmsearch) = 6.0.2 +Provides: bundled(node-libnpmteam) = 5.0.3 +Provides: bundled(node-libnpmversion) = 4.0.2 +Provides: bundled(node-lru-cache) = 6.0.0 +Provides: bundled(node-lru-cache) = 7.18.3 +Provides: bundled(node-make-fetch-happen) = 10.2.1 +Provides: bundled(node-make-fetch-happen) = 11.0.3 +Provides: bundled(node-minimatch) = 3.1.2 +Provides: bundled(node-minimatch) = 5.1.6 +Provides: bundled(node-minimatch) = 7.4.3 +Provides: bundled(node-minipass) = 3.3.6 +Provides: bundled(node-minipass) = 4.2.5 +Provides: bundled(node-minipass-collect) = 1.0.2 +Provides: bundled(node-minipass-fetch) = 2.1.2 +Provides: bundled(node-minipass-fetch) = 3.0.1 +Provides: bundled(node-minipass-flush) = 1.0.5 +Provides: bundled(node-minipass-json-stream) = 1.0.1 +Provides: bundled(node-minipass-pipeline) = 1.2.4 +Provides: bundled(node-minipass-sized) = 1.0.3 +Provides: bundled(node-minizlib) = 2.1.2 +Provides: bundled(node-mkdirp) = 1.0.4 +Provides: bundled(node-ms) = 2.1.2 +Provides: bundled(node-ms) = 2.1.3 +Provides: bundled(node-mute-stream) = 1.0.0 +Provides: bundled(node-negotiator) = 0.6.3 +Provides: bundled(node-node-gyp) = 9.3.1 +Provides: bundled(node-nopt) = 6.0.0 +Provides: bundled(node-nopt) = 7.1.0 +Provides: bundled(node-normalize-package-data) = 5.0.0 +Provides: bundled(node-npm-audit-report) = 4.0.0 +Provides: bundled(node-npm-bundled) = 3.0.0 +Provides: bundled(node-npm-install-checks) = 6.1.0 +Provides: bundled(node-npm-normalize-package-bin) = 3.0.0 +Provides: bundled(node-npm-package-arg) = 10.1.0 +Provides: bundled(node-npm-packlist) = 7.0.4 +Provides: bundled(node-npm-pick-manifest) = 8.0.1 +Provides: bundled(node-npm-profile) = 7.0.1 +Provides: bundled(node-npm-registry-fetch) = 14.0.3 +Provides: bundled(node-npm-user-validate) = 2.0.0 +Provides: bundled(node-npmlog) = 6.0.2 +Provides: bundled(node-npmlog) = 7.0.1 +Provides: bundled(node-once) = 1.4.0 +Provides: bundled(node-p-map) = 4.0.0 +Provides: bundled(node-pacote) = 15.1.1 +Provides: bundled(node-parse-conflict-json) = 3.0.1 +Provides: bundled(node-path-is-absolute) = 1.0.1 +Provides: bundled(node-path-scurry) = 1.6.3 +Provides: bundled(node-postcss-selector-parser) = 6.0.11 +Provides: bundled(node-proc-log) = 3.0.0 +Provides: bundled(node-process) = 0.11.10 +Provides: bundled(node-promise-all-reject-late) = 1.0.1 +Provides: bundled(node-promise-call-limit) = 1.0.2 +Provides: bundled(node-promise-inflight) = 1.0.1 +Provides: bundled(node-promise-retry) = 2.0.1 +Provides: bundled(node-promzard) = 1.0.0 +Provides: bundled(node-qrcode-terminal) = 0.12.0 +Provides: bundled(node-read) = 2.0.0 +Provides: bundled(node-read-cmd-shim) = 4.0.0 +Provides: bundled(node-read-package-json) = 6.0.1 +Provides: bundled(node-read-package-json-fast) = 3.0.2 +Provides: bundled(node-readable-stream) = 3.6.2 +Provides: bundled(node-readable-stream) = 4.3.0 +Provides: bundled(node-retry) = 0.12.0 +Provides: bundled(node-rimraf) = 3.0.2 +Provides: bundled(node-safe-buffer) = 5.1.2 +Provides: bundled(node-safer-buffer) = 2.1.2 +Provides: bundled(node-semver) = 7.3.8 +Provides: bundled(node-set-blocking) = 2.0.0 +Provides: bundled(node-signal-exit) = 3.0.7 +Provides: bundled(node-sigstore) = 1.2.0 +Provides: bundled(node-smart-buffer) = 4.2.0 +Provides: bundled(node-socks) = 2.7.1 +Provides: bundled(node-socks-proxy-agent) = 7.0.0 +Provides: bundled(node-spdx-correct) = 3.2.0 +Provides: bundled(node-spdx-exceptions) = 2.3.0 +Provides: bundled(node-spdx-expression-parse) = 3.0.1 +Provides: bundled(node-spdx-license-ids) = 3.0.13 +Provides: bundled(node-ssri) = 10.0.2 +Provides: bundled(node-ssri) = 9.0.1 +Provides: bundled(node-string_decoder) = 1.1.1 +Provides: bundled(node-string-width) = 4.2.3 +Provides: bundled(node-strip-ansi) = 6.0.1 +Provides: bundled(node-supports-color) = 7.2.0 +Provides: bundled(node-tar) = 6.1.13 +Provides: bundled(node-text-table) = 0.2.0 +Provides: bundled(node-tiny-relative-date) = 1.3.0 +Provides: bundled(node-treeverse) = 3.0.0 +Provides: bundled(node-tuf-js) = 1.1.2 +Provides: bundled(node-unique-filename) = 2.0.1 +Provides: bundled(node-unique-filename) = 3.0.0 +Provides: bundled(node-unique-slug) = 3.0.0 +Provides: bundled(node-unique-slug) = 4.0.0 +Provides: bundled(node-util-deprecate) = 1.0.2 +Provides: bundled(node-validate-npm-package-license) = 3.0.4 +Provides: bundled(node-validate-npm-package-name) = 5.0.0 +Provides: bundled(node-walk-up-path) = 1.0.0 +Provides: bundled(node-wcwidth) = 1.0.1 +Provides: bundled(node-which) = 2.0.2 +Provides: bundled(node-which) = 3.0.0 +Provides: bundled(node-wide-align) = 1.1.5 +Provides: bundled(node-wrappy) = 1.0.2 +Provides: bundled(node-write-file-atomic) = 5.0.0 +Provides: bundled(node-yallist) = 4.0.0 + +%description -n npm20 +A package manager for Node.js that allows developers to install and +publish packages to a package registry. + +%package -n corepack20 +Summary: Helper bridge between NodeJS projects and their dependencies +Group: Development/Languages/NodeJS +Requires: nodejs-common >= 5.0 + +%description -n corepack20 +Zero-runtime-dependency package acting as bridge between Node projects +and their package managers. + +%package docs +Summary: Node.js API documentation +Group: Documentation/Other +%if 0%{?suse_version} >= 1200 +# using noarch subpackage seems to break debuginfo on older releases +BuildArch: noarch +%endif + +%description docs +The API documentation for the Node.js JavaScript runtime. + +%prep +%if ! %{git_node} +echo "`grep node-v%{version}.tar.xz %{S:1} | head -n1 | cut -c1-64` %{S:0}" | sha256sum -c +%setup -q -n node-v%{version} +%else +%setup -q -n node-%{version} +%endif + +%if %{node_version_number} <= 10 +rm -r deps/npm/* +pushd deps/npm +tar zxf %{SOURCE9} --strip-components=1 +tar Jxf %{SOURCE90} +popd +%endif + +%if %{node_version_number} >= 10 +tar Jxf %{SOURCE11} +%endif + +# downgrade node-gyp to last version that supports python 3.4 for SLE12 +%if 0%{?suse_version} && 0%{?suse_version} < 1500 && %{node_version_number} >= 16 +rm -r deps/npm/node_modules/node-gyp +mkdir deps/npm/node_modules/node-gyp +pushd deps/npm/node_modules/node-gyp +tar Jxf %{SOURCE5} +popd + +%if %{node_version_number} >= 19 +%endif +%endif + +%patch3 -p1 +%if %{node_version_number} <= 12 && 0%{?suse_version} < 1500 +%endif +%if 0%{with valgrind_tests} +%endif +%patch101 -p1 +%patch102 -p1 +# Add check_output to configure script (not part of Python 2.6 in SLE11). +%if 0%{?suse_version} == 1110 +%endif +%patch104 -p1 +%patch120 -p1 +%if ! 0%{with openssl_RSA_get0_pss_params} +%endif +%patch200 -p1 + + +%if %{node_version_number} == 12 +# minimist security update - patch50 +rm -r deps/npm/node_modules/mkdirp/node_modules/minimist +rmdir ./deps/npm/node_modules/mkdirp/node_modules +%endif + +# remove backup files, if any +find -name \*~ -print0 -delete + +# abnormalities from patching +find \( -name \*.js.orig -or -name \*.md.orig -or -name \*.1.orig \) -delete + + + +%build +# normalize shebang +%if %{node_version_number} >= 12 +find -type f -exec sed -i -e '1 s,^#!\s\?/usr/bin/env python\d*$,#!/usr/bin/python3,' -e '1 s,^#!\s\?/usr/bin/python$,#!/usr/bin/python3,' {} + +%else +find -type f -exec sed -i '1 s,^#!\s\?/usr/bin/env python$,#!/usr/bin/python,' {} + +%endif +find deps/npm -type f -exec sed -i '1 s,^#!\s\?/usr/bin/env node$,#!/usr/bin/node%{node_version_number},' {} + +find deps/npm -type f -exec sed -i '1 s,^#!\s\?/usr/bin/env \(bash\|sh\)\?$,#!/bin/bash,' {} + + +. %{SOURCE20} +# Make sure nothing gets included from bundled deps: +# We only delete the source and header files, because +# the remaining build scripts are still used. +%if ! 0%{with intree_openssl} +find deps/openssl -name *.[ch] -delete +%endif + +%if ! 0%{with intree_icu} +rm -rf deps/icu-small +%endif + +%if ! 0%{with intree_cares} +find deps/cares -name *.[ch] -delete +%endif + +find deps/zlib -name *.[ch] -delete + +cat > spec.build.config <= 8 || 0%{?suse_version} > 1500 || 0%{?fedora_version} >= 35 +export CXXFLAGS="\${CXXFLAGS} -Wno-class-memaccess" +%endif +export LDFLAGS="%{?build_ldflags}" + +%if !0%{?with nodejs_lto} +export LDFLAGS="\${LDFLAGS} -fno-lto" +%endif + +# reduce disk space pressure +export CFLAGS="\${CFLAGS} -g1" +export CXXFLAGS="\${CXXFLAGS} -g1" +export LDFLAGS="\${LDFLAGS} -Wl,--reduce-memory-overhead" + +%if 0%{?forced_gcc_version:1} +export CC=gcc-%{forced_gcc_version} +export CXX=g++-%{forced_gcc_version} +%endif + +EOF + +. ./spec.build.config + +# Node.js 4.x does not include the ICU database in the source tarball. +%define has_small_icu %(test -d "deps/icu-small" && echo 1 || echo 0) + +./configure \ + --prefix=%{_prefix} \ +%if 0%{?with nodejs_lto} + --enable-lto \ +%endif +%if ! 0%{with intree_openssl} + --shared-openssl \ +%endif + --shared-zlib \ +%if ! 0%{with intree_cares} + --shared-cares \ +%endif +%if ! 0%{with intree_icu} + --with-intl=system-icu \ +%else +%if %{has_small_icu} + --with-intl=small-icu \ + --with-icu-source=deps/icu-small \ +%endif +%endif +%if ! 0%{with intree_nghttp2} + --shared-nghttp2 \ +%endif +%if ! 0%{with intree_brotli} + --shared-brotli \ +%endif +%if 0%{with gdb} + --gdb \ +%endif +%if %{node_version_number} < 19 + --without-dtrace \ +%endif +%if %{node_version_number} >= 16 && (0%{?suse_version} > 1550 || 0%{?sle_version} >= 150400) + --openssl-default-cipher-list=PROFILE=SYSTEM \ +%endif + --openssl-use-def-ca-store + +decoupled_cmd make %{?_smp_mflags} + +# Fix documentation permissions +find doc/api -type f -exec chmod 0644 {} + + +%install +. %{SOURCE20} +. ./spec.build.config + +decoupled_cmd %make_install %{?_smp_mflags} +rm %{buildroot}%{_datadir}/doc/node/gdbinit +rm -f %{buildroot}%{_datadir}/doc/node/lldbinit +rm -f %{buildroot}%{_datadir}/doc/node/lldb_commands.py + +# remove .bak files, if any +find %{buildroot} -name \*.bak -print -delete + +# npm/npx man page +install -D -m 644 deps/npm/man/man1/npm.1 %{buildroot}%{_mandir}/man1/npm%{node_version_number}.1 +install -D -m 644 deps/npm/man/man1/npx.1 %{buildroot}%{_mandir}/man1/npx%{node_version_number}.1 + +#node-gyp needs common.gypi too +install -D -m 644 common.gypi \ + %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules/node-gyp/common.gypi +# %%{buildroot}%%{_datadir}/node/common.gypi +# install addon-rpm.gypi +install -D -m 644 addon-rpm.gypi \ + %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules/node-gyp/addon-rpm.gypi + +# clean +# hidden files and directories +find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number} -name ".*" -exec rm -Rf -- {} + +# windows stuff +find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number} -name "*.bat" -delete +find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number} -name "*.cmd" -delete +# build stuff +find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number} -name "Makefile" -delete +rm -rf %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/{test,scripts} +find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules -name "*.sh" -delete +rm -rf %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules/node-gyp/src +# remove examples/tests/benchmark stuff +find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules -name "example*" -exec rm -Rf -- {} + +find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules -name "*_test.*" -delete +find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules -type d -name "benchmark" -exec rm -Rf -- {} + + +# fix permissions +chmod 0755 %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/bin/np*-cli.js +! test -f %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/bin/node-gyp-bin/node-gyp || \ + chmod 0755 %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/bin/node-gyp-bin/node-gyp +chmod 0755 %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules/node-gyp/bin/node-gyp.js +! test -f %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules/npm-lifecycle/node-gyp-bin/node-gyp || \ + chmod 0755 %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules/npm-lifecycle/node-gyp-bin/node-gyp + +# browser.js is useless for npm cli +find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number} -name "browser.js" -delete + +# file duplicates +%fdupes %{buildroot}%{_libdir}/node_modules/npm%{node_version_number} +%fdupes %{buildroot}%{_includedir}/node%{node_version_number} + +# Update alternatives +%if ! %{with libalternatives} +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +ln -s -f node-default %{buildroot}%{_sysconfdir}/alternatives/node-default +ln -s -f node.1%{ext_man} %{buildroot}%{_sysconfdir}/alternatives/node.1%{ext_man} +ln -s -f npm-default %{buildroot}%{_sysconfdir}/alternatives/npm-default +ln -s -f npm.1%{ext_man} %{buildroot}%{_sysconfdir}/alternatives/npm.1%{ext_man} +ln -s %{_sysconfdir}/alternatives/node-default %{buildroot}%{_bindir}/node-default +ln -s %{_sysconfdir}/alternatives/node.1%{ext_man} %{buildroot}%{_mandir}/man1/node.1%{ext_man} +ln -s %{_sysconfdir}/alternatives/npm-default %{buildroot}%{_bindir}/npm-default +ln -s %{_sysconfdir}/alternatives/npm.1%{ext_man} %{buildroot}%{_mandir}/man1/npm.1%{ext_man} +ln -s -f npx-default %{buildroot}%{_sysconfdir}/alternatives/npx-default +ln -s -f npx.1%{ext_man} %{buildroot}%{_sysconfdir}/alternatives/npx.1%{ext_man} +ln -s %{_sysconfdir}/alternatives/npx-default %{buildroot}%{_bindir}/npx-default +ln -s %{_sysconfdir}/alternatives/npx.1%{ext_man} %{buildroot}%{_mandir}/man1/npx.1%{ext_man} +%endif + +# libalternatives - can always ship +mkdir -p %{buildroot}%{_datadir}/libalternatives/{node,npm,npx}; +cat > %{buildroot}%{_datadir}/libalternatives/node/%{node_version_number}.conf < %{buildroot}%{_datadir}/libalternatives/npm/%{node_version_number}.conf < %{buildroot}%{_datadir}/libalternatives/npx/%{node_version_number}.conf <= 12 +find test \( -name \*.out -or -name \*.js \) -exec sed -i 's,Use `node ,Use `node%{node_version_number} ,' {} \; +%endif + +# Update the python3 executable name to point at forced python version +# needed to fix build on SLE12 SP5 +%if 0%{?forced_python_version:1} +sed -i -e "s,'python3','python%{forced_python_version}'," test/parallel/test-child-process-set-blocking.js +%endif + +ln addon-rpm.gypi deps/npm/node_modules/node-gyp/addon-rpm.gypi +# Tarball doesn't have eslint package distributed, so disable some tests +find test -name \*-eslint-\* -print -delete +# No documentation is generated, don't bother checking it, and check broken on older nodejs +%if %{node_version_number} <= 10 +rm test/doctool/test-make-doc.js +%endif +# DNS lookup doesn't work in build root +rm test/parallel/test-dns-cancel-reverse-lookup.js \ + test/parallel/test-dns-resolveany.js +# multicast test fail since no socket? +rm test/parallel/test-dgram-membership.js + +%if %{node_version_number} >= 18 +# OBS broken /etc/hosts -- https://github.com/openSUSE/open-build-service/issues/13104 +rm test/parallel/test-net-socket-connect-without-cb.js test/parallel/test-tcp-wrap-listen.js +%endif + +%if 0%{?fedora_version} +# test/parallel/test-crypto-certificate.js requires OPENSSL_ENABLE_MD5_VERIFY=1 +# as SPKAC required MD5 for verification +# https://src.fedoraproject.org/rpms/openssl/blob/rawhide/f/0006-Disable-signature-verification-with-totally-unsafe-h.patch +export OPENSSL_ENABLE_MD5_VERIFY=1 + +# test failures +# error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake +# failure:ssl/record/rec_layer_s3.c:1543:SSL alert number 40 +rm test/parallel/test-tls-no-sslv3.js +%if %{node_version_number} >= 18 +rm -r test/addons/openssl-providers +rm test/parallel/test-crypto-fips.js +%endif + +%endif +# fedora + +# qemu test failures +%if %{node_version_number} >= 18 && 0%{?qemu_user_space_build} +# sequential/test-debugger-*: timeout hit? +rm -v test/*/test-debugger-*.js +# parallel tests are not parallel under qemu +rm -v test/parallel/test-*.js test/parallel/test-*.mjs +# RuntimeError: memory access out of bounds +rm -v test/wasi/test-*.js +# ESM import hits assertion, timeout error? +rm -v test/es-module/test-esm-*.js +# AssertionError [ERR_ASSERTION]: Missing expected exception +rm -v test/js-native-api/test_constructor/test*.js +# Too slow for performance tests +rm -v test/sequential/test-perf-*.js test/sequential/test-diagnostic-*.js +%endif + +# Run CI tests +%if 0%{with valgrind_tests} +# valgrind may have false positives, so do not fail on these by default +make test-valgrind ||: +%endif +make test-ci + +%files +%defattr(-, root, root) +%license LICENSE +%doc doc/changelogs/CHANGELOG_V%{node_version_number}.md +%doc *.md +%doc deps/v8/tools/gdbinit +%dir %{_libdir}/node_modules +%dir %{_datadir}/libalternatives +%dir %{_datadir}/libalternatives/node +%{_datadir}/libalternatives/node/%{node_version_number}.conf +%{_bindir}/node%{node_version_number} +%{_mandir}/man1/node%{node_version_number}.1%{ext_man} +%if ! 0%{with libalternatives} +%ghost %{_bindir}/node-default +%ghost %{_mandir}/man1/node.1%{ext_man} +%ghost %{_sysconfdir}/alternatives/node-default +%ghost %{_sysconfdir}/alternatives/node.1%{ext_man} +%endif +%exclude %{_libdir}/node_modules/npm%{node_version_number} +# We need to own directory on old versions of SLE +%if 0%{?suse_version} < 1500 +%dir %{_defaultlicensedir} +%endif + +%files -n npm%{node_version_number} +%defattr(-, root, root) +%dir %{_datadir}/libalternatives +%dir %{_datadir}/libalternatives/npm +%dir %{_datadir}/libalternatives/npx +%{_datadir}/libalternatives/npm/%{node_version_number}.conf +%{_datadir}/libalternatives/npx/%{node_version_number}.conf +%{_bindir}/npm%{node_version_number} +%{_libdir}/node_modules/npm%{node_version_number} +%{_mandir}/man1/npm%{node_version_number}.1%{ext_man} +%if ! 0%{with libalternatives} +%ghost %{_bindir}/npm-default +%ghost %{_mandir}/man1/npm.1%{ext_man} +%ghost %{_sysconfdir}/alternatives/npm-default +%ghost %{_sysconfdir}/alternatives/npm.1%{ext_man} +%endif + +%{_bindir}/npx%{node_version_number} +%{_mandir}/man1/npx%{node_version_number}.1%{ext_man} +%if ! %{with libalternatives} +%ghost %{_bindir}/npx-default +%ghost %{_mandir}/man1/npx.1%{ext_man} +%ghost %{_sysconfdir}/alternatives/npx-default +%ghost %{_sysconfdir}/alternatives/npx.1%{ext_man} +%endif + +%if %{node_version_number} >= 14 +%files -n corepack%{node_version_number} +%defattr(-, root, root) +%{_bindir}/corepack%{node_version_number} +%{_libdir}/node_modules/corepack%{node_version_number} +%endif + +%files devel +%defattr(-, root, root) +%{_includedir}/node%{node_version_number} +%if %{node_version_number} < 19 +%dir %{_datadir}/systemtap +%dir %{_datadir}/systemtap/tapset +%{_datadir}/systemtap/tapset/node%{node_version_number}.stp +%endif + +%files docs +%defattr(-,root,root) +%doc doc/api + +%if %{with libalternatives} + +%post +update-alternatives --remove node-default %{_bindir}/node%{node_version_number} + +%post -n npm%{node_version_number} +update-alternatives --remove npm-default %{_bindir}/npm%{node_version_number} +update-alternatives --remove npx-default %{_bindir}/npx%{node_version_number} + +%else +%pre +# remove files that are no longer owned but provided by update-alternatives +if ! [ -L %{_mandir}/man1/node.1%{ext_man} ]; then + rm -f %{_mandir}/man1/node.1%{ext_man} +fi + +%post +update-alternatives \ + --install %{_bindir}/node-default node-default %{_bindir}/node%{node_version_number} %{node_version_number} \ + --slave %{_mandir}/man1/node.1%{ext_man} node.1%{ext_man} %{_mandir}/man1/node%{node_version_number}.1%{ext_man} + +%postun +if [ ! -f %{_bindir}/node%{node_version_number} ] ; then + update-alternatives --remove node-default %{_bindir}/node%{node_version_number} +fi + +%pre -n npm%{node_version_number} +# remove files that are no longer owned but provided by update-alternatives +if ! [ -L %{_mandir}/man1/npm.1%{ext_man} ]; then + rm -f %{_mandir}/man1/npm.1%{ext_man} +fi + +%post -n npm%{node_version_number} +update-alternatives \ + --install %{_bindir}/npm-default npm-default %{_bindir}/npm%{node_version_number} %{node_version_number} \ + --slave %{_mandir}/man1/npm.1%{ext_man} npm.1%{ext_man} %{_mandir}/man1/npm%{node_version_number}.1%{ext_man} +update-alternatives \ + --install %{_bindir}/npx-default npx-default %{_bindir}/npx%{node_version_number} %{node_version_number} \ + --slave %{_mandir}/man1/npx.1%{ext_man} npx.1%{ext_man} %{_mandir}/man1/npx%{node_version_number}.1%{ext_man} + +%postun -n npm%{node_version_number} +if [ ! -f %{_bindir}/npm%{node_version_number} ] ; then + update-alternatives --remove npm-default %{_bindir}/npm%{node_version_number} +fi +if [ ! -f %{_bindir}/npx%{node_version_number} ] ; then + update-alternatives --remove npx-default %{_bindir}/npx%{node_version_number} +fi + +%endif + +%changelog diff --git a/npm_search_paths.patch b/npm_search_paths.patch new file mode 100644 index 0000000..90e3c23 --- /dev/null +++ b/npm_search_paths.patch @@ -0,0 +1,32 @@ +Index: node-v19.9.0/deps/npm/lib/commands/help-search.js +=================================================================== +--- node-v19.9.0.orig/deps/npm/lib/commands/help-search.js ++++ node-v19.9.0/deps/npm/lib/commands/help-search.js +@@ -16,7 +16,7 @@ class HelpSearch extends BaseCommand { + throw this.usageError() + } + +- const docPath = path.resolve(this.npm.npmRoot, 'docs/content') ++ const docPath = '/usr/share/doc/packages/nodejs' + let files = await glob(`${globify(docPath)}/*/*.md`) + // preserve glob@8 behavior + files = files.sort((a, b) => a.localeCompare(b, 'en')) +Index: node-v19.9.0/deps/npm/lib/npm.js +=================================================================== +--- node-v19.9.0.orig/deps/npm/lib/npm.js ++++ node-v19.9.0/deps/npm/lib/npm.js +@@ -408,7 +408,13 @@ class Npm extends EventEmitter { + } + + get globalPrefix () { +- return this.config.globalPrefix ++ let prefix = this.config.globalPrefix ++ ++ // don't poop all over distro territory - use /usr/local instead ++ if (prefix === '/usr') ++ return '/usr/local' ++ ++ return prefix; + } + + set globalPrefix (r) { diff --git a/openssl_binary_detection.patch b/openssl_binary_detection.patch new file mode 100644 index 0000000..2e57067 --- /dev/null +++ b/openssl_binary_detection.patch @@ -0,0 +1,42 @@ +Allow non-standard openssl binary names + +Index: node-v14.15.1/test/common/index.js +=================================================================== +--- node-v14.15.1.orig/test/common/index.js ++++ node-v14.15.1/test/common/index.js +@@ -797,20 +797,28 @@ const common = { + get opensslCli() { + if (opensslCli !== null) return opensslCli; + ++ let cli_candidates = []; ++ + if (process.config.variables.node_shared_openssl) { + // Use external command +- opensslCli = 'openssl'; ++ cli_candidates = cli_candidates.concat(['openssl-1_1', 'openssl']); + } else { + // Use command built from sources included in Node.js repository +- opensslCli = path.join(path.dirname(process.execPath), 'openssl-cli'); ++ cli_candidates.push(path.join(path.dirname(process.execPath), 'openssl-cli')); + } + +- if (exports.isWindows) opensslCli += '.exe'; ++ let checkOpensslCli = function(opensslCli) { ++ if (exports.isWindows) opensslCli += '.exe'; ++ const opensslCmd = spawnSync(opensslCli, ['version']); ++ if (opensslCmd.status !== 0 || opensslCmd.error !== undefined) { ++ // OpenSSL command cannot be executed ++ opensslCli = false; ++ } ++ return opensslCli; ++ }; + +- const opensslCmd = spawnSync(opensslCli, ['version']); +- if (opensslCmd.status !== 0 || opensslCmd.error !== undefined) { +- // OpenSSL command cannot be executed +- opensslCli = false; ++ for (let i=0; i=3.6.0', ++ semverRange: '>=3.4.0', + + // These can be overridden for testing: + execFile: cp.execFile, diff --git a/test-skip-y2038-on-32bit-time_t.patch b/test-skip-y2038-on-32bit-time_t.patch new file mode 100644 index 0000000..fb2c52d --- /dev/null +++ b/test-skip-y2038-on-32bit-time_t.patch @@ -0,0 +1,45 @@ +Skip 'test/parallel/test-fs-utimes-y2K38.js' on some platforms. + +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 +on i586, ppc and arm. Skip the failing last command on those +platforms. + +The failure was seen since coreutils-9.0. + +Remove this patch once nodejs(1) also builds with 64-bit time_t. +--- + test/parallel/test-fs-utimes-y2K38.js | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +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/test/parallel/test-fs-utimes-y2K38.js +@@ -20,6 +20,26 @@ if (!common.isWindows) { + common.skip('File system appears to lack Y2K38 support (touch failed)'); + } + ++ // SUSE: touch-9.0 may succeed on platforms with 32-bit time_t, ++ // but the test would fail. Skip on those platforms for now. ++ const unameResult = spawnSync('uname', ++ ['-m'], ++ { encoding: 'utf8' }); ++ if (unameResult.status === 0) { ++ if (unameResult.stdout.trim() === 'i686') { ++ common.skip('SUSE: test skipped on platforms with 32-bit time_t'); ++ } ++ if (unameResult.stdout.trim() === 'ppc') { ++ 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') { ++ common.skip('SUSE: test skipped on platforms with 32-bit time_t'); ++ } ++ } ++ + // On some file systems that lack Y2K38 support, `touch` will succeed but + // the time will be incorrect. + const dateResult = spawnSync('date', diff --git a/update_npm_tarball.sh b/update_npm_tarball.sh new file mode 100644 index 0000000..6011b0d --- /dev/null +++ b/update_npm_tarball.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# +# Fetch npm module tarball that is required to run unit tests +# which are not provided by upstream tarball +# +set -e + +tar Jxf node-v*.tar.xz +cd node-v.*/tools/doc +npm ci +cd ../.. +exec tar Jcf ../node_modules.tar.xz tools/doc/node_modules diff --git a/versioned.patch b/versioned.patch new file mode 100644 index 0000000..df47e84 --- /dev/null +++ b/versioned.patch @@ -0,0 +1,188 @@ +Author: Adam Majer +Date: Fri May 11 16:10:16 CEST 2018 +Summary: Generate versioned binaries + +Generate versioned binaries and install paths +so we can allow concurrent installations and +management via update_alternatives. + +This is also important for generation of binary +modules for multiple versions of NodeJS +Index: node-v19.8.1/Makefile +=================================================================== +--- node-v19.8.1.orig/Makefile ++++ node-v19.8.1/Makefile +@@ -76,7 +76,7 @@ BUILDTYPE_LOWER := $(shell echo $(BUILDT + EXEEXT := $(shell $(PYTHON) -c \ + "import sys; print('.exe' if sys.platform == 'win32' else '')") + +-NODE_EXE = node$(EXEEXT) ++NODE_EXE = node20$(EXEEXT) + NODE ?= ./$(NODE_EXE) + NODE_G_EXE = node_g$(EXEEXT) + NPM ?= ./deps/npm/bin/npm-cli.js +Index: node-v19.8.1/tools/install.py +=================================================================== +--- node-v19.8.1.orig/tools/install.py ++++ node-v19.8.1/tools/install.py +@@ -86,7 +86,7 @@ def uninstall(paths, dst): + try_remove(path, dst) + + def package_files(action, name, bins): +- target_path = libdir() + '/node_modules/' + name + '/' ++ target_path = libdir() + '/node_modules/' + name + '20/' + + # don't install npm if the target path is a symlink, it probably means + # that a dev version of npm is installed there +@@ -106,19 +106,19 @@ def package_files(action, name, bins): + if action == uninstall: + action([link_path], 'bin/' + bin_name) + elif action == install: +- try_symlink('../' + libdir() + '/node_modules/' + name + '/' + bin_target, link_path) ++ try_symlink('../' + libdir() + '/node_modules/' + name + '20/' + bin_target, link_path) + else: + assert 0 # unhandled action type + + def npm_files(action): + package_files(action, 'npm', { +- 'npm': 'bin/npm-cli.js', +- 'npx': 'bin/npx-cli.js', ++ 'npx20': 'bin/npm-cli.js', ++ 'npx20': 'bin/npx-cli.js', + }) + + def corepack_files(action): + package_files(action, 'corepack', { +- 'corepack': 'dist/corepack.js', ++ 'corepack20': 'dist/corepack.js', + # Not the default just yet: + # 'yarn': 'dist/yarn.js', + # 'yarnpkg': 'dist/yarn.js', +@@ -147,7 +147,7 @@ def subdir_files(path, dest, action): + + def files(action): + is_windows = sys.platform == 'win32' +- output_file = 'node' ++ output_file = 'node20' + output_prefix = 'out/Release/' + + if is_windows: +@@ -189,7 +189,7 @@ def files(action): + if 'freebsd' in sys.platform or 'openbsd' in sys.platform: + action(['doc/node.1'], 'man/man1/') + else: +- action(['doc/node.1'], 'share/man/man1/') ++ action(['doc/node.1'], 'share/man/man1/node20.1') + + if 'true' == variables.get('node_install_npm'): + npm_files(action) +@@ -276,28 +276,28 @@ def headers(action): + 'src/node_buffer.h', + 'src/node_object_wrap.h', + 'src/node_version.h', +- ], 'include/node/') ++ ], 'include/node20/') + + # Add the expfile that is created on AIX + if sys.platform.startswith('aix') or sys.platform == "os400": +- action(['out/Release/node.exp'], 'include/node/') ++ action(['out/Release/node.exp'], 'include/node20/') + +- subdir_files('deps/v8/include', 'include/node/', wanted_v8_headers) ++ subdir_files('deps/v8/include', 'include/node20/', wanted_v8_headers) + + if 'false' == variables.get('node_shared_libuv'): +- subdir_files('deps/uv/include', 'include/node/', action) ++ subdir_files('deps/uv/include', 'include/node20/', action) + + if 'true' == variables.get('node_use_openssl') and \ + 'false' == variables.get('node_shared_openssl'): +- subdir_files('deps/openssl/openssl/include/openssl', 'include/node/openssl/', action) +- subdir_files('deps/openssl/config/archs', 'include/node/openssl/archs', action) +- subdir_files('deps/openssl/config', 'include/node/openssl', action) ++ subdir_files('deps/openssl/openssl/include/openssl', 'include/node20/openssl/', action) ++ subdir_files('deps/openssl/config/archs', 'include/node20/openssl/archs', action) ++ subdir_files('deps/openssl/config', 'include/node20/openssl', action) + + if 'false' == variables.get('node_shared_zlib'): + action([ + 'deps/zlib/zconf.h', + 'deps/zlib/zlib.h', +- ], 'include/node/') ++ ], 'include/node20/') + + if sys.platform == 'zos': + zoslibinc = os.environ.get('ZOSLIB_INCLUDES') +Index: node-v19.8.1/doc/node.1 +=================================================================== +--- node-v19.8.1.orig/doc/node.1 ++++ node-v19.8.1/doc/node.1 +@@ -31,24 +31,24 @@ + .Dt NODE 1 + . + .Sh NAME +-.Nm node ++.Nm node20 + .Nd server-side JavaScript runtime + . + .\"====================================================================== + .Sh SYNOPSIS +-.Nm node ++.Nm node20 + .Op Ar options + .Op Ar v8-options + .Op Fl e Ar string | Ar script.js | Fl + .Op Fl - + .Op Ar arguments ... + . +-.Nm node ++.Nm node20 + .Cm inspect + .Op Fl e Ar string | Ar script.js | Fl | Ar : + .Ar ... + . +-.Nm node ++.Nm node20 + .Op Fl -v8-options + . + .\"====================================================================== +Index: node-v19.8.1/src/node_main.cc +=================================================================== +--- node-v19.8.1.orig/src/node_main.cc ++++ node-v19.8.1/src/node_main.cc +@@ -94,6 +94,7 @@ int wmain(int argc, wchar_t* wargv[]) { + // UNIX + + int main(int argc, char* argv[]) { ++ setenv("NODE_VERSION", "20", 0); + return node::Start(argc, argv); + } + #endif +Index: node-v19.8.1/tools/test.py +=================================================================== +--- node-v19.8.1.orig/tools/test.py ++++ node-v19.8.1/tools/test.py +@@ -954,7 +954,7 @@ class Context(object): + if self.vm is not None: + return self.vm + if arch == 'none': +- name = 'out/Debug/node' if mode == 'debug' else 'out/Release/node' ++ name = 'out/Debug/node' if mode == 'debug' else 'out/Release/node20' + else: + name = 'out/%s.%s/node' % (arch, mode) + +Index: node-v19.8.1/node.gyp +=================================================================== +--- node-v19.8.1.orig/node.gyp ++++ node-v19.8.1/node.gyp +@@ -23,8 +23,8 @@ + 'node_shared_openssl%': 'false', + 'node_v8_options%': '', + 'node_enable_v8_vtunejit%': 'false', +- 'node_core_target_name%': 'node', +- 'node_lib_target_name%': 'libnode', ++ 'node_core_target_name%': 'node20', ++ 'node_lib_target_name%': 'libnode20', + 'node_intermediate_lib_type%': 'static_library', + 'node_builtin_modules_path%': '', + # We list the deps/ files out instead of globbing them in js2c.py since we