nodejs.spec

@@ -1,9 +1,9 @@
-%global baserelease 2
+%global baserelease 1
 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %global nodejs_epoch 1
 %global nodejs_major 20
-%global nodejs_minor 12
-%global nodejs_patch 1
+%global nodejs_minor 10
+%global nodejs_patch 0
 %global nodejs_abi %{nodejs_major}.%{nodejs_minor}
 %global nodejs_soversion 115
 %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
@@ -18,22 +18,22 @@
 %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch}
 %global v8_release %{nodejs_epoch}.%{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}.%{nodejs_release}
 %global c_ares_major 1
-%global c_ares_minor 27
-%global c_ares_patch 0
+%global c_ares_minor 20
+%global c_ares_patch 1
 %global c_ares_version %{c_ares_major}.%{c_ares_minor}.%{c_ares_patch}
 %global llhttp_major 8
 %global llhttp_minor 1
-%global llhttp_patch 2
+%global llhttp_patch 1
 %global llhttp_version %{llhttp_major}.%{llhttp_minor}.%{llhttp_patch}
 %global libuv_major 1
 %global libuv_minor 46
 %global libuv_patch 0
 %global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch}
 %global nghttp2_major 1
-%global nghttp2_minor 60
+%global nghttp2_minor 57
 %global nghttp2_patch 0
 %global nghttp2_version %{nghttp2_major}.%{nghttp2_minor}.%{nghttp2_patch}
-%global icu_major 74
+%global icu_major 73
 %global icu_minor 2
 %global icu_version %{icu_major}.%{icu_minor}
 %global icudatadir %{nodejs_datadir}/icudata
@@ -48,12 +48,12 @@
 %global punycode_version %{punycode_major}.%{punycode_minor}.%{punycode_patch}
 %global npm_epoch 1
 %global npm_major 10
-%global npm_minor 5
-%global npm_patch 0
+%global npm_minor 2
+%global npm_patch 3
 %global npm_version %{npm_major}.%{npm_minor}.%{npm_patch}
 %global uvwasi_major 0
 %global uvwasi_minor 0
-%global uvwasi_patch 20
+%global uvwasi_patch 19
 %global uvwasi_version %{uvwasi_major}.%{uvwasi_minor}.%{uvwasi_patch}
 %global histogram_major 0
 %global histogram_minor 9
@@ -115,7 +115,7 @@ Provides: bundled(v8) = %{v8_version}
 Provides: bundled(icu) = %{icu_version}
 Provides: bundled(uvwasi) = %{uvwasi_version}
 Provides: bundled(histogram) = %{histogram_version}
-Provides: bundled(ada) = 2.7.4
+Provides: bundled(ada) = 1.0.4
 Requires: (nodejs-packaging if rpm-build)
 Recommends: npm >= %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist}
 
@@ -237,15 +237,10 @@ export CXXFLAGS='%{optflags} \
                  -O3 \
                  -fno-ipa-icf'
 
-export CFLAGS="$(echo ${CFLAGS} | tr -s '[:space:]\\' ' ')"
-export CXXFLAGS="$(echo ${CXXFLAGS} | tr -s '[:space:]\\' ' ')"
+export CFLAGS="$(echo ${CFLAGS} | tr '\n\\' '  ')"
+export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' '  ')"
 export LDFLAGS="%{build_ldflags}"
 
-%if "%toolchain" == "clang"
-export CFLAGS="$(echo ${CFLAGS} | sed -e s/-fno-ipa-icf//g)"
-export CXXFLAGS="$(echo ${CXXFLAGS} | sed -e s/-fno-ipa-icf//g)"
-%endif
-
 %{__python3} configure.py --prefix=%{_prefix} \
            --verbose \
            --ninja \
@@ -255,14 +250,12 @@ export CXXFLAGS="$(echo ${CXXFLAGS} | sed -e s/-fno-ipa-icf//g)"
            --shared-zlib \
            --shared-brotli \
            --shared-libuv \
+           --enable-lto \
            %{dtrace_configure} \
            --with-intl=small-icu \
            --with-icu-default-data-dir=%{icudatadir} \
            --without-corepack \
-           --openssl-use-def-ca-store \
-%if "%toolchain" != "clang"
-           --enable-lto
-%endif
+           --openssl-use-def-ca-store
 
 %ninja_build -C out/Release
 
@@ -270,12 +263,7 @@ export CXXFLAGS="$(echo ${CXXFLAGS} | sed -e s/-fno-ipa-icf//g)"
 # The ninja build does not put the shared library in the expected location, so
 # we will move it.
 mv out/Release/lib/libnode.so.%{nodejs_soversion} out/Release/
-
-%if 0%{?nodejs_major} >= 20
-./tools/install.py install --dest-dir %{buildroot} --prefix %{_prefix}
-%else
 ./tools/install.py install %{buildroot} %{_prefix}
-%endif
 
 chmod 0755 %{buildroot}/%{_bindir}/node
 chrpath --delete %{buildroot}%{_bindir}/node
@@ -409,28 +397,6 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod
 %{_pkgdocdir}/npm/docs
 
 %changelog
-* Fri Nov 29 2024 jchzhou <zhoujiacheng@iscas.ac.cn> - 1:20.12.1-2
-- fix building w/ clang: only apply '-fno-ipa-icf' for gcc && disable LTO for clang + ld.bfd
-- improve the handling of trilling whitespaces in C/CXXFLAGS
-
-* Wed Sep 18 2024 yaoxin <yao_xin001@hoperun.com> - 1:20.12.1-1
-- Update to 20.12.1:
-  * CVE-2024-27983 - Assertion failed in node::http2::Http2Session::~Http2Session()
-    leads to HTTP/2 server crash- (High)
-  * CVE-2024-27982 - HTTP Request Smuggling via Content Length Obfuscation - (Medium)
-  * llhttp version 9.2.1
-  * undici version 5.28.4
-
-* Mon May 06 2024 Ge Wang <wang__ge@126.com> - 1:20.11.1-3
-- Fix fd is null when calling clearBuffer
-
-* Mon Mar 18 2024 Eustace <eusteuc@outlook.com> - 1:20.11.1-2
-- Revert some v8 roll
-
-* Mon Feb 19 2024 wangkai <13474090681@163.com> - 1:20.11.1-1
-- Update to 20.11.1
-- Fix CVE-2023-46809 CVE-2024-21896 CVE-2024-22019 CVE-2024-21892 CVE-2024-24758 CVE-2024-22025
-
 * Mon Nov 27 2023 Jingwiw  <wangjingwei@iscas.ac.cn> - 1:20.10.0-1
 - Update to the new LTS version 20.10.0
 - Add CFLAGS "-O3 -fno-ipa-icf"