Rebase to version 18.19.0
Resolves: RHEL-21439
This commit is contained in:
parent
5d5a5b9467
commit
1eccc90b88
4
.gitignore
vendored
4
.gitignore
vendored
@ -48,3 +48,7 @@
|
||||
/undici-5.22.1.tar.gz
|
||||
wasi-sdk-11.0-linux.tar.gz
|
||||
wasi-sdk-14.0-linux.tar.gz
|
||||
/node-v18.19.0-stripped.tar.gz
|
||||
/icu4c-73_2-src.zip
|
||||
/icu4c-73_2-src.tgz
|
||||
/undici-5.26.4.tar.gz
|
||||
|
@ -120,10 +120,10 @@ rm -rf node-v${version}/deps/openssl
|
||||
tar -zcf node-v${version}-stripped.tar.gz node-v${version}
|
||||
|
||||
# Download the matching version of ICU
|
||||
rm -f icu4c*-src.zip icu.md5
|
||||
rm -f icu4c*-src.tgz icu.md5
|
||||
ICUMD5=$(cat node-v${version}/tools/icu/current_ver.dep |jq -r '.[0].md5')
|
||||
wget $(cat node-v${version}/tools/icu/current_ver.dep |jq -r '.[0].url')
|
||||
ICUTARBALL=$(ls -1 icu4c*-src.zip)
|
||||
ICUTARBALL=$(ls -1 icu4c*-src.tgz)
|
||||
echo "$ICUMD5 $ICUTARBALL" > icu.md5
|
||||
md5sum -c icu.md5
|
||||
rm -f icu.md5 SHASUMS256.txt
|
||||
|
33
nodejs.spec
33
nodejs.spec
@ -41,8 +41,8 @@
|
||||
# than a Fedora release lifecycle.
|
||||
%global nodejs_epoch 1
|
||||
%global nodejs_major 18
|
||||
%global nodejs_minor 17
|
||||
%global nodejs_patch 1
|
||||
%global nodejs_minor 19
|
||||
%global nodejs_patch 0
|
||||
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
|
||||
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
|
||||
%global nodejs_soversion 108
|
||||
@ -65,8 +65,7 @@
|
||||
%global v8_release %{nodejs_epoch}.%{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}.%{nodejs_release}
|
||||
|
||||
# c-ares - from deps/cares/include/ares_version.h
|
||||
# https://github.com/nodejs/node/pull/9332
|
||||
%global c_ares_version 1.19.1
|
||||
%global c_ares_version 1.20.1
|
||||
|
||||
# llhttp - from deps/llhttp/include/llhttp.h
|
||||
%global llhttp_version 6.0.11
|
||||
@ -78,7 +77,7 @@
|
||||
%global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch}
|
||||
|
||||
# nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
|
||||
%global nghttp2_version 1.52.0
|
||||
%global nghttp2_version 1.57.0
|
||||
|
||||
# nghttp3 - from deps/ngtcp2/nghttp3/lib/includes/nghttp3/version.h
|
||||
%global nghttp3_major 0
|
||||
@ -94,7 +93,7 @@
|
||||
|
||||
# ICU - from tools/icu/current_ver.dep
|
||||
%global icu_major 73
|
||||
%global icu_minor 1
|
||||
%global icu_minor 2
|
||||
%global icu_version %{icu_major}.%{icu_minor}
|
||||
|
||||
%global icudatadir %{nodejs_datadir}/icudata
|
||||
@ -114,11 +113,11 @@
|
||||
# simduft from deps/simdutf/simdutf.h
|
||||
%global simduft_major 3
|
||||
%global simduft_minor 2
|
||||
%global simduft_patch 12
|
||||
%global simduft_patch 18
|
||||
%global simduft_version %{simduft_major}.%{simduft_minor}.%{simduft_patch}
|
||||
|
||||
# ada from deps/ada/ada.h
|
||||
%global ada_version 2.5.0
|
||||
%global ada_version 2.7.2
|
||||
|
||||
# OpenSSL minimum version
|
||||
%global openssl_minimum 1:1.1.1
|
||||
@ -133,7 +132,7 @@
|
||||
|
||||
# npm - from deps/npm/package.json
|
||||
%global npm_epoch 1
|
||||
%global npm_version 9.6.7
|
||||
%global npm_version 10.2.3
|
||||
|
||||
# In order to avoid needing to keep incrementing the release version for the
|
||||
# main package forever, we will just construct one for npm that is guaranteed
|
||||
@ -145,7 +144,7 @@
|
||||
%global corepack_version 0.10.0
|
||||
|
||||
# uvwasi - from deps/uvwasi/include/uvwasi.h
|
||||
%global uvwasi_version 0.0.18
|
||||
%global uvwasi_version 0.0.19
|
||||
|
||||
# histogram_c - assumed from timestamps
|
||||
%global histogram_version 0.11.2
|
||||
@ -167,7 +166,7 @@ ExclusiveArch: %{nodejs_arches}
|
||||
Source0: node-v%{nodejs_version}-stripped.tar.gz
|
||||
Source1: npmrc
|
||||
Source2: btest402.js
|
||||
Source3: https://github.com/unicode-org/icu/releases/download/release-%{icu_major}-%{icu_minor}/icu4c-%{icu_major}_%{icu_minor}-src.zip
|
||||
Source3: https://github.com/unicode-org/icu/releases/download/release-%{icu_major}-%{icu_minor}/icu4c-%{icu_major}_%{icu_minor}-src.tgz
|
||||
Source100: %{name}-tarball.sh
|
||||
|
||||
# The native module Requires generator remains in the nodejs SRPM, so it knows
|
||||
@ -191,10 +190,10 @@ Source101: cjs-module-lexer-1.2.2.tar.gz
|
||||
Source102: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-11/wasi-sdk-11.0-linux.tar.gz
|
||||
|
||||
# Version: jq '.version' deps/undici/src/package.json
|
||||
# Original: https://github.com/nodejs/undici/archive/refs/tags/v5.22.1.tar.gz
|
||||
# Adjustments: rm -f undici-5.22.1/lib/llhttp/llhttp*.wasm
|
||||
# Original: https://github.com/nodejs/undici/archive/refs/tags/v5.26.4.tar.gz
|
||||
# Adjustments: rm -f undici-5.26.4/lib/llhttp/llhttp*.wasm
|
||||
# Build uses alpine image, see alpine for sources for wasi-sdk
|
||||
Source111: undici-5.22.1.tar.gz
|
||||
Source111: undici-5.26.4.tar.gz
|
||||
|
||||
# Disable running gyp on bundled deps we don't use
|
||||
Patch1: 0001-Disable-running-gyp-on-shared-deps.patch
|
||||
@ -462,7 +461,7 @@ make BUILDTYPE=Release %{?_smp_mflags}
|
||||
|
||||
# Extract the ICU data and convert it to the appropriate endianness
|
||||
pushd deps/
|
||||
unzip -a %{SOURCE3}
|
||||
tar xfz %{SOURCE3}
|
||||
|
||||
pushd icu/source
|
||||
|
||||
@ -732,6 +731,10 @@ end
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jan 19 2024 Lukas Javorsky <ljavorsk@redhat.com> - 1:18.19.0-1
|
||||
- Rebase to version 18.19.0
|
||||
- Resolves: RHEL-21439
|
||||
|
||||
* Wed Aug 23 2023 Jan Staněk <jstanek@redhat.com> - 1:18.17.1-1
|
||||
- Rebase to version 18.17.1
|
||||
Resolves: rhbz#2228939
|
||||
|
8
sources
8
sources
@ -1,5 +1,5 @@
|
||||
SHA512 (node-v18.17.1-stripped.tar.gz) = cdb879e3a9b5ac7a942092528ef63cddbbbfedde65f0228c8fdd15f5a18c96161db821dc2294447137ec9dd2c91fe5523d385ec35d6f9e7052b86aa92c411f46
|
||||
SHA512 (icu4c-73_1-src.zip) = 8f429cf0779742e20236a824d37151d57c94e0c9513a6d78dde30c09d1d45fce689355dfad9bd8429949b86979871efa8dfaefa3f43db46df521658a3b611595
|
||||
SHA512 (undici-5.22.1.tar.gz) = 07c9d76390ef5b986b312d313421e27fb0f25f2cea83ba8f1dfa56dd8a6f839b4f34440dc983922a97b1382c2a1aabbe9b1261cd0172d1676d341a0a5dd35f7d
|
||||
SHA512 (cjs-module-lexer-1.2.2.tar.gz) = 2c8e9caf2231ca7d61e71936305389774859aca9b5c86c63489c9a62a81f4736f99477c3f0cbb41077bb7924fdd23e0f24b7bce858e42fb0f87e7c0ffc87afeb
|
||||
SHA512 (node-v18.19.0-stripped.tar.gz) = 9ba7cfea5cecf8ca1e66eda5866a729155c6fb2776f4e809959f15947a439846c784a0b230bca131c609431a995baa043a43b7a87f77c39dbc714bc6bde6dd29
|
||||
SHA512 (icu4c-73_2-src.tgz) = 76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62
|
||||
SHA512 (undici-5.26.4.tar.gz) = 4f072b9ca2f18b0533788bb953686af1bba36212d8bc3b165062ac065476dab7a33b3eb07896b9e054520148bc64733eb7d522604da698e83a88e8fcc7507acc
|
||||
SHA512 (cjs-module-lexer-1.2.2.tar.gz) = 0437378a087a43044b64e6b2e66426e429d87ed3f24a225d20ddc8fedda25917ba7db04a9d41207c59d20f0e6764837dad09393e5b8f92e361941a60ac5edd80
|
||||
SHA512 (wasi-sdk-11.0-linux.tar.gz) = e3ed4597f7f2290967eef6238e9046f60abbcb8633a4a2a51525d00e7393df8df637a98a5b668217d332dd44fcbf2442ec7efd5e65724e888d90611164451e20
|
||||
|
Loading…
Reference in New Issue
Block a user