import UBI nodejs-22.15.0-1.module+el8.10.0+23068+28ff2340
This commit is contained in:
parent
268f30610f
commit
d2683ec3f0
6
.gitignore
vendored
6
.gitignore
vendored
@ -1,7 +1,7 @@
|
||||
SOURCES/cjs-module-lexer-1.4.1.tar.gz
|
||||
SOURCES/cjs-module-lexer-2.1.0.tar.gz
|
||||
SOURCES/icu4c-76_1-data-bin-b.zip
|
||||
SOURCES/icu4c-76_1-data-bin-l.zip
|
||||
SOURCES/node-v22.13.1-stripped.tar.gz
|
||||
SOURCES/undici-6.21.1.tar.gz
|
||||
SOURCES/node-v22.15.0-stripped.tar.gz
|
||||
SOURCES/undici-6.21.2.tar.gz
|
||||
SOURCES/wasi-sdk-wasi-sdk-12.tar.gz
|
||||
SOURCES/wasi-sdk-wasi-sdk-20.tar.gz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
ee05ddd8abd0b77a04fb6655e89e223364c2a58c SOURCES/cjs-module-lexer-1.4.1.tar.gz
|
||||
aecfb2810d05c3cef0e65a512dd980d6ba751076 SOURCES/cjs-module-lexer-2.1.0.tar.gz
|
||||
d1c5586e6733b5c4790d05a76d47ad159ff31e9b SOURCES/icu4c-76_1-data-bin-b.zip
|
||||
547c6ffcb7833b1a14abd6114e0a1722144d410a SOURCES/icu4c-76_1-data-bin-l.zip
|
||||
0fe25f1d0a7694ff8a30e6eb5d3ddc5c8236b7f1 SOURCES/node-v22.13.1-stripped.tar.gz
|
||||
177f681b644cd32885dd7bf124292f97a043eafe SOURCES/undici-6.21.1.tar.gz
|
||||
8244f4969653a2f2f29747240fcc3ab216fcdb82 SOURCES/node-v22.15.0-stripped.tar.gz
|
||||
6d6793d539b3ffcfb2924f3f5ad328240031361a SOURCES/undici-6.21.2.tar.gz
|
||||
5ea3a1deb65a52a36ceb41324da690f54b2a4805 SOURCES/wasi-sdk-wasi-sdk-12.tar.gz
|
||||
da40abcb73a6dddafced6174d24ed49e414cda3c SOURCES/wasi-sdk-wasi-sdk-20.tar.gz
|
||||
|
||||
60
SOURCES/test-runner.sh
Executable file
60
SOURCES/test-runner.sh
Executable file
@ -0,0 +1,60 @@
|
||||
#!/bin/bash
|
||||
|
||||
NODE_BIN="$1"
|
||||
PARENT_TEST_FOLDER="$2"
|
||||
TEST_LIST_FILE="$3"
|
||||
|
||||
# At most 10 min per test
|
||||
TIMEOUT_DURATION=600
|
||||
# Exit code
|
||||
FINAL_RESULT=0
|
||||
ARCH=$(uname -m)
|
||||
|
||||
echo "Started test run:"
|
||||
# Run the list of test
|
||||
while IFS= read -r test_line; do
|
||||
# ignore commented lines
|
||||
if [[ "$test_line" =~ ^# ]]; then
|
||||
continue
|
||||
fi
|
||||
# If test has specified ARCH which it should be skipped
|
||||
# Extract it
|
||||
TEST_PATH=$(echo "$test_line" | awk '{print $1}')
|
||||
IGNORE_ARCHES=$(echo "$test_line" |\
|
||||
awk '{for (i=2; i<=NF; i++) printf "%s ", $i; print ""}')
|
||||
|
||||
# Skip test for specified ARCH
|
||||
for ARCH_IGNORE in $IGNORE_ARCHES; do
|
||||
if [[ "$ARCH_IGNORE" == "$ARCH" ]]; then
|
||||
continue 2
|
||||
fi
|
||||
done
|
||||
|
||||
# Construct test path
|
||||
TEST_SCRIPT="$PARENT_TEST_FOLDER/$TEST_PATH"
|
||||
|
||||
if [ ! -f "$TEST_SCRIPT" ]; then
|
||||
echo "Test script not found: $TEST_SCRIPT"
|
||||
continue
|
||||
fi
|
||||
|
||||
TEST_OUTPUT=$(timeout "$TIMEOUT_DURATION" "$NODE_BIN" "$TEST_SCRIPT" 2>&1)
|
||||
TEST_RESULT=$?
|
||||
|
||||
# Handle test result
|
||||
if [ $TEST_RESULT -ne 0 ]; then
|
||||
FINAL_RESULT=1
|
||||
if [ $TEST_RESULT -eq 124 ]; then
|
||||
echo "Test timed out: $TEST_SCRIPT"
|
||||
else
|
||||
echo "Test failed: $TEST_SCRIPT"
|
||||
fi
|
||||
echo "Test failure message:"
|
||||
echo "$TEST_OUTPUT"
|
||||
fi
|
||||
done < "$TEST_LIST_FILE"
|
||||
|
||||
if [ $FINAL_RESULT -eq 0 ]; then
|
||||
echo "All tests succesfully passed."
|
||||
fi
|
||||
exit $FINAL_RESULT
|
||||
3837
SOURCES/test-should-pass.txt
Normal file
3837
SOURCES/test-should-pass.txt
Normal file
File diff suppressed because it is too large
Load Diff
@ -67,7 +67,7 @@
|
||||
# This is used by both the nodejs package and the npm subpackage that
|
||||
# has a separate version - the name is special so that rpmdev-bumpspec
|
||||
# will bump this rather than adding .1 to the end.
|
||||
%global baserelease 2
|
||||
%global baserelease 1
|
||||
|
||||
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||
|
||||
@ -78,8 +78,8 @@
|
||||
# than a Fedora release lifecycle.
|
||||
%global nodejs_epoch 1
|
||||
%global nodejs_major 22
|
||||
%global nodejs_minor 13
|
||||
%global nodejs_patch 1
|
||||
%global nodejs_minor 15
|
||||
%global nodejs_patch 0
|
||||
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
|
||||
%global nodejs_soversion 127
|
||||
%global nodejs_abi %{nodejs_soversion}
|
||||
@ -106,7 +106,7 @@
|
||||
|
||||
# c-ares - from deps/cares/include/ares_version.h
|
||||
# https://github.com/nodejs/node/pull/9332
|
||||
%global c_ares_version 1.34.4
|
||||
%global c_ares_version 1.34.5
|
||||
|
||||
# llhttp - from deps/llhttp/include/llhttp.h
|
||||
%global llhttp_version 9.2.1
|
||||
@ -121,7 +121,7 @@
|
||||
%global nghttp3_version 1.6.0
|
||||
|
||||
# ngtcp2 from deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h
|
||||
%global ngtcp2_version 1.9.1
|
||||
%global ngtcp2_version 1.11.0
|
||||
|
||||
# ICU - from tools/icu/current_ver.dep
|
||||
%global icu_major 76
|
||||
@ -133,7 +133,7 @@
|
||||
# " this line just fixes syntax highlighting for vim that is confused by the above and continues literal
|
||||
|
||||
# simdutf from deps/simdutf/simdutf.h
|
||||
%global simdutf_version 5.6.4
|
||||
%global simdutf_version 6.0.3
|
||||
|
||||
# OpenSSL minimum version
|
||||
%global openssl11_minimum 1:1.1.1
|
||||
@ -163,7 +163,7 @@
|
||||
%global histogram_version 0.11.8
|
||||
|
||||
# sqlite - from deps/sqlite/sqlite3.h
|
||||
%global sqlite_version 3.47.2
|
||||
%global sqlite_version 3.49.1
|
||||
|
||||
|
||||
Name: nodejs
|
||||
@ -200,22 +200,23 @@ Source103: v8.pc.in
|
||||
# Recipes for creating these blobs are included in the sources.
|
||||
|
||||
# Version: jq '.version' deps/cjs-module-lexer/package.json
|
||||
# Original: https://github.com/nodejs/cjs-module-lexer/archive/refs/tags/1.4.1.tar.gz
|
||||
# Adjustments: rm -f cjs-module-lexer-1.4.1/lib/lexer.wasm
|
||||
Source201: cjs-module-lexer-1.4.1.tar.gz
|
||||
# Original: https://github.com/nodejs/cjs-module-lexer/archive/refs/tags/2.1.0.tar.gz
|
||||
# Adjustments: rm -f cjs-module-lexer-2.1.0/lib/lexer.wasm
|
||||
Source201: cjs-module-lexer-2.1.0.tar.gz
|
||||
# The WASM blob was made using wasi-sdk v11; compiler libraries are linked in.
|
||||
# Version source (cjs-module-lexer tarball): Makefile
|
||||
Source202: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-12/wasi-sdk-wasi-sdk-12.tar.gz
|
||||
|
||||
# Version: jq '.version' deps/undici/src/package.json
|
||||
# Original: https://github.com/nodejs/undici/archive/refs/tags/v6.21.1.tar.gz
|
||||
# Adjustments: rm -f undici-6.21.1/lib/llhttp/llhttp*wasm*
|
||||
Source211: undici-6.21.1.tar.gz
|
||||
# Original: https://github.com/nodejs/undici/archive/refs/tags/v6.21.2.tar.gz
|
||||
# Adjustments: rm -f undici-6.21.2/lib/llhttp/llhttp*wasm*
|
||||
Source211: undici-6.21.2.tar.gz
|
||||
# The WASM blob was made using wasi-sdk v16; compiler libraries are linked in.
|
||||
# Version source: deps/undici/src/lib/llhttp/wasm_build_env.txt
|
||||
# Also check (undici tarball): lib/llhttp/wasm_build_env.txt
|
||||
Source212: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-20/wasi-sdk-wasi-sdk-20.tar.gz
|
||||
|
||||
Source300: test-runner.sh
|
||||
Source301: test-should-pass.txt
|
||||
Patch1: 0001-Remove-unused-OpenSSL-config.patch
|
||||
|
||||
%global pkgname nodejs
|
||||
@ -365,7 +366,7 @@ Provides: bundled(simdutf) = %{simdutf_version}
|
||||
|
||||
# Upstream has added a new URL parser that has no option to build as a shared
|
||||
# library (19.7.0+)
|
||||
Provides: bundled(ada) = 2.8.0
|
||||
Provides: bundled(ada) = 2.9.2
|
||||
|
||||
|
||||
# undici and cjs-module-lexer ship with pre-built WASM binaries.
|
||||
@ -820,6 +821,13 @@ sed -e 's#@PREFIX@#%{_prefix}#g' \
|
||||
|
||||
|
||||
%check
|
||||
#run unit test that should pass from list
|
||||
LD_LIBRARY_PATH=%{buildroot}%{_libdir} \
|
||||
bash %{SOURCE300} \
|
||||
%{buildroot}/%{_bindir}/node-%{nodejs_pkg_major} \
|
||||
%{_builddir}/node-v%{nodejs_version}/test/ \
|
||||
%{SOURCE301}
|
||||
|
||||
# Fail the build if the versions don't match
|
||||
LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}/%{_bindir}/node-%{nodejs_pkg_major} -e "require('assert').equal(process.versions.node, '%{nodejs_version}')"
|
||||
LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}/%{_bindir}/node-%{nodejs_pkg_major} -e "require('assert').equal(process.versions.v8.replace(/-node\.\d+$/, ''), '%{v8_version}')"
|
||||
@ -940,6 +948,18 @@ end
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Apr 24 2025 Tomas Juhasz <tjuhasz@redhat.com> - 1:22.15.0-1
|
||||
- Update to 22.15.0
|
||||
- Drop upstream patches
|
||||
|
||||
* Tue Apr 22 2025 Tomas Juhasz <tjuhasz@redhat.com> - 1:22.13.1-4
|
||||
- Patch fix for sqlite CVE-2025-31498
|
||||
Resolves: RHEL-87300
|
||||
|
||||
* Mon Apr 14 2025 Tomas Juhasz <tjuhasz@redhat.com> - 1:22.13.1-3
|
||||
- Update c-ares to newest version with fix for CVE-2025-31498
|
||||
Resolves: RHEL-86581
|
||||
|
||||
* Tue Mar 04 2025 Andrei Radchenko <aradchen@redhat.com> - 1:22.13.1-2
|
||||
- Remove obsolete lua pretransaction script from spec file
|
||||
Resolves: RHEL-81117 RHEL-71410
|
||||
|
||||
Loading…
Reference in New Issue
Block a user