From 0ef259aa2549e242802dfb1c60b6ed399b7719c3 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Mon, 26 Sep 2022 14:46:24 +0000 Subject: [PATCH 1/4] - Update to Nodejs 18.9.1: * deps: llhttp updated to 6.0.10 + CVE-2022-32213 bypass via obs-fold mechanic + Incorrect Parsing of Multi-line Transfer-Encoding (CVE-2022-32215) + Incorrect Parsing of Header Fields (CVE-35256) * crypto: fix weak randomness in WebCrypto keygen (CVE-2022-35255) OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs18?expand=0&rev=16 --- SHASUMS256.txt | 64 ++++++++++++++++++++++---------------------- SHASUMS256.txt.sig | Bin 438 -> 438 bytes node-v18.9.1.tar.xz | 3 +++ nodejs18.changes | 12 +++++++++ nodejs18.spec | 60 ++++++++++++++++------------------------- 5 files changed, 70 insertions(+), 69 deletions(-) create mode 100644 node-v18.9.1.tar.xz diff --git a/SHASUMS256.txt b/SHASUMS256.txt index 1c71f63..366b3df 100644 --- a/SHASUMS256.txt +++ b/SHASUMS256.txt @@ -1,34 +1,34 @@ -e4d8d6030efe1e0b103ba7a158996b2ff4ceef0f8fd05af9ea61eb4b17d6fa0c node-v18.9.0-aix-ppc64.tar.gz -60300b40f539fc93005859fcb7ea585bfd111800e90b6ee744a07f2380512bbb node-v18.9.0-darwin-arm64.tar.gz -d20ad4d52c0df79bc2296f78cb5cd7d0757e848263b30822538f31d695d3b0a4 node-v18.9.0-darwin-arm64.tar.xz -dce1144cbfc01e03c2e84582461c3ce83541968b2b52a3d3a6f2bbfb09183fba node-v18.9.0-darwin-x64.tar.gz -aecd44f8799e31ed73fb746d00da28f0a32d0ec45079ee85545881e607ddd4d3 node-v18.9.0-darwin-x64.tar.xz -e7ec2a64fc24cc5c790289df80e4788190ca6760a96b6947ef02452bb520cd00 node-v18.9.0-headers.tar.gz -47ad304159c8c01271f166b8750d82d96b7d7e1586d9a9225fea0f50a5ce4224 node-v18.9.0-headers.tar.xz -0d0e671158e072a63c24714bfc4c19a4bb0a70c89d219b1f23d67cbea9c5ffcf node-v18.9.0-linux-arm64.tar.gz -3ec898c66916ab7e245c34f402c091c50bcaa325617f692a6b62dc8d9c06baa0 node-v18.9.0-linux-arm64.tar.xz -195bea2e5be6c791bc460fdc0939375f25b6246cbb57521374eddc9e77323829 node-v18.9.0-linux-armv7l.tar.gz -730697bcfc5ba1538a3c8380edcf51cfa58c760804fb90bab6cfda34d30c55f8 node-v18.9.0-linux-armv7l.tar.xz -794bb57444e14e3282f8f2416483c385e3ae1d66b8babb025ed2b78e22d8157d node-v18.9.0-linux-ppc64le.tar.gz -1b8fadd2d879d2a8b6ee97fcfc0caaa0e1190026e565c097c898824541cd2d86 node-v18.9.0-linux-ppc64le.tar.xz -1061f5ed96290df7f3e5b1f183fdacfd82bba0d8c2dfb984505110f83e9ac215 node-v18.9.0-linux-s390x.tar.gz -86d55c4f495e74e8a9d03e4e34ef4f2ee6ec6ab187ecedf3e430e93baf9faea0 node-v18.9.0-linux-s390x.tar.xz -7fdbfdb985a48db3d22a2472330db05d94c9aff59192b09d8f9ab5fcedba76d5 node-v18.9.0-linux-x64.tar.gz -0137e43f5492dd97b6ef1f39ea4581975016e5f1e70db461d7292c6853ace066 node-v18.9.0-linux-x64.tar.xz -bae2d3417a9e1c4cc7145801e428c13e9fce006044258194d073207efd1b736b node-v18.9.0-win-x64.7z -d7a9c9e8a36259d1e15052c135fbd11937d0f0485360e402e833522076233a7a node-v18.9.0-win-x64.zip -7b2f1a76c4bbcc464f05b4895dbe5e48047d35cf88b210bdde71034f0aee3146 node-v18.9.0-win-x86.7z -6543f6e72a704bf56170dd874f9edc6ed9468d15008dbb214654d3681221c37e node-v18.9.0-win-x86.zip -38744484707594133d1b9e94d2575d403d132761241de2a6b5a4bf0648946ea0 node-v18.9.0-x64.msi -4c4e9206f652e47371eb52753501280348bb8bfad827d1ac6f782152a00df31b node-v18.9.0-x86.msi -7b469adcc4863e53fdbeb66e0eff3316abdf40d80be51adc6b4c7fe1dd04348e node-v18.9.0.pkg -89af82a3f8df01a24bb61b69a4e9a0482bfa8793a7686c88227bce10ee0c72bc node-v18.9.0.tar.gz -c75cc89afead976791900accde02a7b1e7e762702f0f6fa68eaacb01984d9654 node-v18.9.0.tar.xz -6f4da4ffa06afa4096acb5279e6875ccb5ffcd03a86fbbee382dde4bc96565f5 win-x64/node.exe +6b602994ea7e22d49e1b2406d3d1119133d6bc89e52f70cd61090968b9e5ec93 node-v18.9.1-aix-ppc64.tar.gz +289dca525c5535bddf389b69386ceb12d7c77eeae9aa2f666652877f982f9b5d node-v18.9.1-darwin-arm64.tar.gz +b80c029f945c522d553b70f4a8de14a077983dc36b4481a3051cd7103fb4a04c node-v18.9.1-darwin-arm64.tar.xz +ef7d92bb3b21b50242175483dca6ccd98052d6f4be3ce5b9ae55f0b95c0db25d node-v18.9.1-darwin-x64.tar.gz +dff4fe1259b7801121bf7335cddd742801c8b34a4aba9dc3eb5943c1edb163ee node-v18.9.1-darwin-x64.tar.xz +fb963b1e81110447f6c19dc5211c1bc2f44b53460d10daac8dd920ebff081ffc node-v18.9.1-headers.tar.gz +62f3863047d94f3ce1250f61be20fd697e47e972e636ff3385d469d55e8dd71a node-v18.9.1-headers.tar.xz +a1610d6f75f45fb0dc73164231c63308d653c09a57dd14a989cf4de9b96e965b node-v18.9.1-linux-arm64.tar.gz +d4edf28b695374faafc944f291151bf2fcfcf4b575207eadaee86a2c2aa1cbbe node-v18.9.1-linux-arm64.tar.xz +d488cd0cda2c71d397c69db4088d4bec631c1489e1d58afbf2ed6e7d0ccc2660 node-v18.9.1-linux-armv7l.tar.gz +82502c7fb666b3842491d6244cd1eda72562ebe801dbe5c37bddab28acb91414 node-v18.9.1-linux-armv7l.tar.xz +6a853f4702c41c0da9f625def2db01e24a91e89a2c8dbbeb7b79556572390aa6 node-v18.9.1-linux-ppc64le.tar.gz +3b892a3f3f37d262f344b2cbf0a2aa1deb8534c3674d42a256f5153df409c087 node-v18.9.1-linux-ppc64le.tar.xz +042b5069395cb1f377a6b25203afdb099187ca44c67f848f805ecc7f8d97f412 node-v18.9.1-linux-s390x.tar.gz +eb0cc3db68e17faab8d60ad8e69f0a21eaf14dfd593c4f1b7117d49f51baaf43 node-v18.9.1-linux-s390x.tar.xz +33ecf5f39618f4beb90a9be98880325cb4f06e33b52e315040a54fd0700f2434 node-v18.9.1-linux-x64.tar.gz +0777cf4e281359061a6b5d0afe6750f5efd0e874f489a5ebb53ec8b8f77e8b82 node-v18.9.1-linux-x64.tar.xz +60160570e4d22c1735e74c0e954bcd94621870871a170b6b2cb4089d91204053 node-v18.9.1-win-x64.7z +763e691ed8f51b8664da4dcc5a0f5d428dbd69d4162630a6fcf366e5e9e25e81 node-v18.9.1-win-x64.zip +c9a22fe916685f1178d3ff60bdfc49a0d8d0b17944c640d0a0bfc8e25317bdaf node-v18.9.1-win-x86.7z +860cd7354943eb137715c510b77a7e230666b47998edd6f5ea803db1aaf8999a node-v18.9.1-win-x86.zip +b2886faeaed5a1ddc03325e8c1fca143e0bbfa250ae7a69a8326be364ad28577 node-v18.9.1-x64.msi +af847e88b3a3d0ceb63ffd572ff906d3a60b2a235334b7336f11904cbe7d35bb node-v18.9.1-x86.msi +a3219e92b15afd4baa6a3bc8e3ad25f3036cb07bea08d2622c9a59db8d0a24f9 node-v18.9.1.pkg +50ae12386eb79058ad2d38335e41ca120904900a36b1bcfb10934be9373f737b node-v18.9.1.tar.gz +f381963d43568ba699915c88629dc6da4a1963804dcd37b2e6e1d10d923dd5d9 node-v18.9.1.tar.xz +6d5094f77f1273b8127046d9c528bb800470b178a0b44d271907de5cf19b9dde win-x64/node.exe 3111a04d3ae94921ac20f2afc4e167c59e50c07609ee940d1a8eec46f08310ad win-x64/node.lib -7f5f093c1f612803629218793c5eb72719274faa078a4f63ecbe543b7a00e9e6 win-x64/node_pdb.7z -e750259b9c628578fc2ae463d62fadf6c95c266e1c5f32f252d80c7e716c3418 win-x64/node_pdb.zip -3452040fc8d9e8894e169229d30425f00dfbf0082e00081baa7d550e7b7321d8 win-x86/node.exe +28b6e90a8880b076b46e3f4662d19ea3e020f7b06c12135de31a62a2015019fb win-x64/node_pdb.7z +464771c89a6bd4fd3684e172d2dbd510906c30c4273c6526d26ddc1f7e3bce78 win-x64/node_pdb.zip +f93ea0dbeb0e5326f53c7f1258d5315542c045651e43dae5ce18f7f32977fa3d win-x86/node.exe e0b45a34da85070b41e13169a6ed30ea782d400dd8e8597d665727bac8d621f0 win-x86/node.lib -1bc12a2b9686a08a935fc6e78c9595e44d61df33a342bd98ad89088f75367a7b win-x86/node_pdb.7z -c52111fdd0180eb82d96b376c37ecf1160f57ccb0e12102a5183ece4708d8c70 win-x86/node_pdb.zip +f0a4d77ebccca0909f5532d9c14ac140dbb003075397b086ad4c7ede0b803b7e win-x86/node_pdb.7z +a1b7b350faceec615894e3c1e4a812122ef6f1c652bc3e531a6ea07104cfb155 win-x86/node_pdb.zip diff --git a/SHASUMS256.txt.sig b/SHASUMS256.txt.sig index e095ae92a551867dff859021e3a3fba03a73f6ef..e2a4f9af93d27cbb00d49a45fcb777f25edfbb1a 100644 GIT binary patch delta 413 zcmV;O0b>5P1GWQ@BY!Q}QveDH5R2-x-_KQE^xtm`0G{2$1+b>ppUviu{N~h%yXL|n zFJ!pD(K?GR^bWbkkdTUYxrKB^6lD5z7zx|%Nw~H*PGIV;38+r9^J?*iyVrW+qZ|ti z=i095x+xn`cQhC>nzg*qB}DXi=3B1wy1s+m@M)qZCJ+d9=zpowk$d*D$m7dM5P1GWQ@BYzqHod6065R2-x-_KQE^d5i=0FBWg%YdAZQaL-Iz}^t&3wg#N zNZT*P<*m@Gz+#<>95%O+xQ9k~1w47b?|bfdfq5uNc=iON&t@o>{&CBcW3vpTp2M{P z)%SxE3UC2v_a@d%!3t!{wGoA>@rWew{mU=$WC>*v_A9b=OLbsa={rJx=l0Go~wef;$ANOeyJSwJ1JVeU+b z@;uHof54Y(PF>G`VKU11v>k{&`=F&4tc=C>O}g(>}qGT<3O1z{&hhlWCnOIddgQ!IARa1>XN8oEEfr)O_4-97zGm2h2~}9=Xlu H^FDOcbG6PT diff --git a/node-v18.9.1.tar.xz b/node-v18.9.1.tar.xz new file mode 100644 index 0000000..70877f1 --- /dev/null +++ b/node-v18.9.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f381963d43568ba699915c88629dc6da4a1963804dcd37b2e6e1d10d923dd5d9 +size 38315220 diff --git a/nodejs18.changes b/nodejs18.changes index d050bd6..4a16b91 100644 --- a/nodejs18.changes +++ b/nodejs18.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Sep 26 13:13:39 UTC 2022 - Adam Majer + +- Update to Nodejs 18.9.1: + * deps: llhttp updated to 6.0.10 + + CVE-2022-32213 bypass via obs-fold mechanic + + Incorrect Parsing of Multi-line Transfer-Encoding + (CVE-2022-32215) + + Incorrect Parsing of Header Fields (CVE-35256) + * crypto: fix weak randomness in WebCrypto keygen + (CVE-2022-35255) + ------------------------------------------------------------------- Thu Sep 15 15:00:25 UTC 2022 - Adam Majer diff --git a/nodejs18.spec b/nodejs18.spec index d333904..8c1a55a 100644 --- a/nodejs18.spec +++ b/nodejs18.spec @@ -15,23 +15,13 @@ # 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: nodejs18 -Version: 18.9.0 +Version: 18.9.1 Release: 0 # Double DWZ memory limits @@ -129,12 +119,12 @@ 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 gyp/ | 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 +# Python 3.4 compatible node-gyp +### https://github.com/nodejs/node-gyp.git +### git archive v7.1.2 gyp/ | 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 @@ -145,8 +135,6 @@ Patch5: sle12_python3_compat.patch Patch7: manual_configure.patch Patch13: openssl_binary_detection.patch - - ## Patches specific to SUSE and openSUSE Patch100: linker_lto_jobs.patch # PATCH-FIX-OPENSUSE -- set correct path for dtrace if it is built @@ -173,8 +161,8 @@ Patch200: versioned.patch Patch303: openssl3_fixups.patch Patch304: new_python3.patch -BuildRequires: pkg-config BuildRequires: fdupes +BuildRequires: pkg-config BuildRequires: procps BuildRequires: xz BuildRequires: zlib-devel @@ -194,10 +182,10 @@ BuildRequires: config(netcfg) %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++ +BuildRequires: gcc5-c++ %define forced_gcc_version 5 %else -BuildRequires: gcc48-c++ +BuildRequires: gcc48-c++ %define forced_gcc_version 4.8 %endif %endif @@ -207,15 +195,15 @@ BuildRequires: gcc48-c++ # for SLE-12:Update targets %if 0%{?suse_version} == 1315 %if %node_version_number >= 17 -BuildRequires: gcc12-c++ +BuildRequires: gcc12-c++ %define forced_gcc_version 12 %else %if %node_version_number >= 14 -BuildRequires: gcc9-c++ +BuildRequires: gcc9-c++ %define forced_gcc_version 9 %else %if %node_version_number >= 8 -BuildRequires: gcc7-c++ +BuildRequires: gcc7-c++ %define forced_gcc_version 7 %endif %endif @@ -224,7 +212,7 @@ BuildRequires: gcc7-c++ %if 0%{?suse_version} == 1500 %if %node_version_number >= 17 -BuildRequires: gcc12-c++ +BuildRequires: gcc12-c++ %define forced_gcc_version 12 %endif %endif @@ -235,7 +223,6 @@ BuildRequires: gcc12-c++ BuildRequires: gcc-c++ %endif - # Python dependencies %if %node_version_number >= 16 @@ -260,8 +247,8 @@ BuildRequires: python %endif %if 0%{?suse_version} >= 1500 && %{node_version_number} >= 10 -BuildRequires: user(nobody) BuildRequires: group(nobody) +BuildRequires: user(nobody) %endif %if ! 0%{with intree_openssl} @@ -324,7 +311,7 @@ BuildRequires: valgrind %if %{with libalternatives} Requires: alts %else -Requires(postun): %{_sbindir}/update-alternatives +Requires(postun):%{_sbindir}/update-alternatives %endif # either for update-alternatives, or their removal Requires(post): %{_sbindir}/update-alternatives @@ -363,8 +350,8 @@ ExclusiveArch: not_buildable %endif %endif -Provides: bundled(uvwasi) = 0.0.12 Provides: bundled(libuv) = 1.43.0 +Provides: bundled(uvwasi) = 0.0.12 Provides: bundled(v8) = 10.2.154.15 %if %{with intree_brotli} Provides: bundled(brotli) = 1.0.9 @@ -372,8 +359,7 @@ Provides: bundled(brotli) = 1.0.9 BuildRequires: pkgconfig(libbrotlidec) %endif - -Provides: bundled(llhttp) = 6.0.9 +Provides: bundled(llhttp) = 6.0.10 Provides: bundled(ngtcp2) = 0.1.0-DEV Provides: bundled(node-acorn) = 8.8.0 @@ -391,8 +377,8 @@ provided by npm. Summary: Development headers for NodeJS 18.x Group: Development/Languages/NodeJS Provides: nodejs-devel = %{version} -Requires: npm18 = %{version} Requires: %{name} = %{version} +Requires: npm18 = %{version} %description devel This package provides development headers for Node.js needed for creation @@ -409,12 +395,12 @@ Requires: nodejs-common Requires: nodejs18 = %{version} Provides: nodejs-npm = %{version} Obsoletes: nodejs-npm < 4.0.0 -Provides: npm(npm) = 8.19.1 Provides: npm = %{version} +Provides: npm(npm) = 8.19.1 %if 0%{?suse_version} >= 1500 %if %{node_version_number} >= 10 -Requires: user(nobody) Requires: group(nobody) +Requires: user(nobody) %endif %endif Provides: bundled(node-abbrev) = 1.1.1 @@ -580,8 +566,8 @@ 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.11 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_decoder) = 1.3.0 Provides: bundled(node-strip-ansi) = 6.0.1 Provides: bundled(node-supports-color) = 7.2.0 Provides: bundled(node-tar) = 6.1.11 @@ -688,7 +674,6 @@ mkdir deps/npm/node_modules/node-gyp tar -C deps/npm/node_modules/node-gyp Jxf %{SOURCE5} %endif - %build # normalize shebang %if %{node_version_number} >= 12 @@ -1016,6 +1001,7 @@ 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 From c900d3b684dbd02abb137a5cb854025f9effbe7f Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Wed, 28 Sep 2022 12:09:30 +0000 Subject: [PATCH 2/4] + CVE-2022-32213 bypass via obs-fold mechanic (bsc#1201325) (CVE-2022-32215, bsc#1201327) + Incorrect Parsing of Header Fields (CVE-2022-35256, bsc#1203832) (CVE-2022-35255, bsc#1203831) - Skip test-fs-utimes-y2K38.js on armv6hl as well as armv7hl. OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs18?expand=0&rev=17 --- nodejs18.changes | 13 +++++++++---- test-skip-y2038-on-32bit-time_t.patch | 7 +++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/nodejs18.changes b/nodejs18.changes index 4a16b91..4770b35 100644 --- a/nodejs18.changes +++ b/nodejs18.changes @@ -3,12 +3,17 @@ Mon Sep 26 13:13:39 UTC 2022 - Adam Majer - Update to Nodejs 18.9.1: * deps: llhttp updated to 6.0.10 - + CVE-2022-32213 bypass via obs-fold mechanic + + CVE-2022-32213 bypass via obs-fold mechanic (bsc#1201325) + Incorrect Parsing of Multi-line Transfer-Encoding - (CVE-2022-32215) - + Incorrect Parsing of Header Fields (CVE-35256) + (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) + (CVE-2022-35255, bsc#1203831) + +------------------------------------------------------------------- +Sat Sep 17 10:35:31 UTC 2022 - Bruno Pitrus + +- Skip test-fs-utimes-y2K38.js on armv6hl as well as armv7hl. ------------------------------------------------------------------- Thu Sep 15 15:00:25 UTC 2022 - Adam Majer diff --git a/test-skip-y2038-on-32bit-time_t.patch b/test-skip-y2038-on-32bit-time_t.patch index 418c402..1e3b16b 100644 --- a/test-skip-y2038-on-32bit-time_t.patch +++ b/test-skip-y2038-on-32bit-time_t.patch @@ -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, 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. 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/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)'); } @@ -32,6 +32,9 @@ Index: node-v16.6.2/test/parallel/test-fs-utimes-y2K38.js + 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'); + } From f1ec3c07b3e622b0b4b19fd5f94b72be7831c08c Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 29 Sep 2022 14:02:32 +0000 Subject: [PATCH 3/4] - 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 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs18?expand=0&rev=18 --- SHASUMS256.txt | 64 ++++++++++++++++++------------------ SHASUMS256.txt.sig | Bin 438 -> 438 bytes node-v18.10.0.tar.xz | 3 ++ node-v18.9.1.tar.xz | 3 -- nodejs.keyring | Bin 50123 -> 55415 bytes nodejs18.changes | 10 ++++++ nodejs18.spec | 74 +++++++++++++++++++++++++----------------- openssl3_fixups.patch | 13 -------- 8 files changed, 89 insertions(+), 78 deletions(-) create mode 100644 node-v18.10.0.tar.xz delete mode 100644 node-v18.9.1.tar.xz delete mode 100644 openssl3_fixups.patch diff --git a/SHASUMS256.txt b/SHASUMS256.txt index 366b3df..f98c5e1 100644 --- a/SHASUMS256.txt +++ b/SHASUMS256.txt @@ -1,34 +1,34 @@ -6b602994ea7e22d49e1b2406d3d1119133d6bc89e52f70cd61090968b9e5ec93 node-v18.9.1-aix-ppc64.tar.gz -289dca525c5535bddf389b69386ceb12d7c77eeae9aa2f666652877f982f9b5d node-v18.9.1-darwin-arm64.tar.gz -b80c029f945c522d553b70f4a8de14a077983dc36b4481a3051cd7103fb4a04c node-v18.9.1-darwin-arm64.tar.xz -ef7d92bb3b21b50242175483dca6ccd98052d6f4be3ce5b9ae55f0b95c0db25d node-v18.9.1-darwin-x64.tar.gz -dff4fe1259b7801121bf7335cddd742801c8b34a4aba9dc3eb5943c1edb163ee node-v18.9.1-darwin-x64.tar.xz -fb963b1e81110447f6c19dc5211c1bc2f44b53460d10daac8dd920ebff081ffc node-v18.9.1-headers.tar.gz -62f3863047d94f3ce1250f61be20fd697e47e972e636ff3385d469d55e8dd71a node-v18.9.1-headers.tar.xz -a1610d6f75f45fb0dc73164231c63308d653c09a57dd14a989cf4de9b96e965b node-v18.9.1-linux-arm64.tar.gz -d4edf28b695374faafc944f291151bf2fcfcf4b575207eadaee86a2c2aa1cbbe node-v18.9.1-linux-arm64.tar.xz -d488cd0cda2c71d397c69db4088d4bec631c1489e1d58afbf2ed6e7d0ccc2660 node-v18.9.1-linux-armv7l.tar.gz -82502c7fb666b3842491d6244cd1eda72562ebe801dbe5c37bddab28acb91414 node-v18.9.1-linux-armv7l.tar.xz -6a853f4702c41c0da9f625def2db01e24a91e89a2c8dbbeb7b79556572390aa6 node-v18.9.1-linux-ppc64le.tar.gz -3b892a3f3f37d262f344b2cbf0a2aa1deb8534c3674d42a256f5153df409c087 node-v18.9.1-linux-ppc64le.tar.xz -042b5069395cb1f377a6b25203afdb099187ca44c67f848f805ecc7f8d97f412 node-v18.9.1-linux-s390x.tar.gz -eb0cc3db68e17faab8d60ad8e69f0a21eaf14dfd593c4f1b7117d49f51baaf43 node-v18.9.1-linux-s390x.tar.xz -33ecf5f39618f4beb90a9be98880325cb4f06e33b52e315040a54fd0700f2434 node-v18.9.1-linux-x64.tar.gz -0777cf4e281359061a6b5d0afe6750f5efd0e874f489a5ebb53ec8b8f77e8b82 node-v18.9.1-linux-x64.tar.xz -60160570e4d22c1735e74c0e954bcd94621870871a170b6b2cb4089d91204053 node-v18.9.1-win-x64.7z -763e691ed8f51b8664da4dcc5a0f5d428dbd69d4162630a6fcf366e5e9e25e81 node-v18.9.1-win-x64.zip -c9a22fe916685f1178d3ff60bdfc49a0d8d0b17944c640d0a0bfc8e25317bdaf node-v18.9.1-win-x86.7z -860cd7354943eb137715c510b77a7e230666b47998edd6f5ea803db1aaf8999a node-v18.9.1-win-x86.zip -b2886faeaed5a1ddc03325e8c1fca143e0bbfa250ae7a69a8326be364ad28577 node-v18.9.1-x64.msi -af847e88b3a3d0ceb63ffd572ff906d3a60b2a235334b7336f11904cbe7d35bb node-v18.9.1-x86.msi -a3219e92b15afd4baa6a3bc8e3ad25f3036cb07bea08d2622c9a59db8d0a24f9 node-v18.9.1.pkg -50ae12386eb79058ad2d38335e41ca120904900a36b1bcfb10934be9373f737b node-v18.9.1.tar.gz -f381963d43568ba699915c88629dc6da4a1963804dcd37b2e6e1d10d923dd5d9 node-v18.9.1.tar.xz -6d5094f77f1273b8127046d9c528bb800470b178a0b44d271907de5cf19b9dde win-x64/node.exe +8f4dfa78d823a4c7e4c83bbfebef9ce3d49a6e1ed28408521c706350f8a2aee7 node-v18.10.0-aix-ppc64.tar.gz +0689815cdd69a9a977ee3bab20c6228d03966a1f988464f18ce490678dc5cdc3 node-v18.10.0-darwin-arm64.tar.gz +4822536977efde1f37bfc5f14cddc4f09fd2d77e8547ce54ec847b7ef6914fd8 node-v18.10.0-darwin-arm64.tar.xz +06b1b6381dfa952ae95fc927b740b660bc08f26bcf02cad61f64b36485dab6d4 node-v18.10.0-darwin-x64.tar.gz +146fe4ed98e0ab646380bad6f32303722421d2d98a3204183d9a66ec17eb3aa4 node-v18.10.0-darwin-x64.tar.xz +e1568e86022a9f15ab4fd8fc2451c6c739498b0a67202ae57fd2cfc3342b52f6 node-v18.10.0-headers.tar.gz +487346ba2a67ee66fc0333d803d758b12512979378f3ef037a0dd83cc0c277a3 node-v18.10.0-headers.tar.xz +ad536980cb4944b0d17055937c5d5170c95147765f547ce8469331a808d0c408 node-v18.10.0-linux-arm64.tar.gz +bbe88afe35569780aae8a84d9be8b55e4944d13e9212b0d51883a5dcf6a7de8b node-v18.10.0-linux-arm64.tar.xz +7496428b9a94ee1927eefa43ce2d66aedae9122a8722bbeab3b1e5c6b1933af6 node-v18.10.0-linux-armv7l.tar.gz +694d83c751e1e8e05e77310c76fe87344350cd58e594cfd62df217a65dfbf55d node-v18.10.0-linux-armv7l.tar.xz +6445d5d05707af7b318f4babb6432518e9b3529189e1fac3ed2200d89537fe8c node-v18.10.0-linux-ppc64le.tar.gz +89d8266209f24b82940d2bf9cde14d871f7e6df02a3aef7bc948b8248c749f23 node-v18.10.0-linux-ppc64le.tar.xz +544d9930f1647939a901ef05d3d42ee8d6c7e857602922879c732bf3067a9f06 node-v18.10.0-linux-s390x.tar.gz +5a9c6ffbf03b4006dbbecc30b93234dc11a92d1f6d5c8e3bc45c9be958956a59 node-v18.10.0-linux-s390x.tar.xz +f468b86031cca41ee9aa7a911e70eb624413153c7432754cbe9206c7ef3de090 node-v18.10.0-linux-x64.tar.gz +1aff4537bbb81c29c5c1c7c96379c6a2133b43651812745b524db8e1b65ee12b node-v18.10.0-linux-x64.tar.xz +a41d5d395ca349ab946571e2fa939729707ee8dacc15e88ef420b51635e36f9c node-v18.10.0-win-x64.7z +50934603f0bd46ef9948346f36f8afeae146182a6eafdbc361c7eeec0083c551 node-v18.10.0-win-x64.zip +dfaf933d80c274a8541cce9807ba26177e7f3789ab80a52ef4a5580656a6bb13 node-v18.10.0-win-x86.7z +df3741ce99768668d700a3a5c085d1a5084d86c1e60cca626cf5f0b45525499b node-v18.10.0-win-x86.zip +9a269ecc0530656db078ed03c20cc3e71022026feb9dff02bf0c96e9792f237a node-v18.10.0-x64.msi +7f2c6fa385d7b8864b96510d86ff416c69b2b1dc2c4bd25d2bd8cac7d2e9ac7b node-v18.10.0-x86.msi +0194e47d962d36a0778ffcfcdbedb6520bf3ec9abf8a1f5dd1bc96d776aeb421 node-v18.10.0.pkg +eab3109a6d3deafe049c8f0c461af8de5c6cad535b79c19fa84f0ea496c4ffb6 node-v18.10.0.tar.gz +ad711b54e2be4a7d24f37c73fb2801adeaf6d26d298d431be98d6abc0202e89f node-v18.10.0.tar.xz +0f15043bb13749bf27f0eed2f902db8251dd214891851e1066537a08b97751a1 win-x64/node.exe 3111a04d3ae94921ac20f2afc4e167c59e50c07609ee940d1a8eec46f08310ad win-x64/node.lib -28b6e90a8880b076b46e3f4662d19ea3e020f7b06c12135de31a62a2015019fb win-x64/node_pdb.7z -464771c89a6bd4fd3684e172d2dbd510906c30c4273c6526d26ddc1f7e3bce78 win-x64/node_pdb.zip -f93ea0dbeb0e5326f53c7f1258d5315542c045651e43dae5ce18f7f32977fa3d win-x86/node.exe +ff3c97980c59bebae41f11a720f4a3c4f466b4fd31686a12bc451e939d6966e1 win-x64/node_pdb.7z +0cbaa9327350a936eade80e60c3e986e93a03a5404e3caeda5cea4d3c1ae631c win-x64/node_pdb.zip +0a137d78cacf19a829e0f81ecf3891b5690c95a6845318bc93a325579facb121 win-x86/node.exe e0b45a34da85070b41e13169a6ed30ea782d400dd8e8597d665727bac8d621f0 win-x86/node.lib -f0a4d77ebccca0909f5532d9c14ac140dbb003075397b086ad4c7ede0b803b7e win-x86/node_pdb.7z -a1b7b350faceec615894e3c1e4a812122ef6f1c652bc3e531a6ea07104cfb155 win-x86/node_pdb.zip +250afbbecfaf8a10c610d8a1865e1d1a7293d7e9b47e9b161ab4fa1395bff88b win-x86/node_pdb.7z +70e0aca76b848d4279d2b081d713d4c28bb9dbe5ce2b6090eeb52a542b019f7b win-x86/node_pdb.zip diff --git a/SHASUMS256.txt.sig b/SHASUMS256.txt.sig index e2a4f9af93d27cbb00d49a45fcb777f25edfbb1a..9b90ff248013f2b7feb022eb23f03903b9490cd0 100644 GIT binary patch delta 413 zcmV;O0b>5P1GWQ@BY!l8o&X975R2-x-_KQE^iJXn|571Z(r3{fT>pyi^Tu8^0tBxX zj$V?O`=lFG;viWoB<1q}%@M#r_|3zdq6BMSpswZ8Mc*Lehg!$=eR7<*S2)vIIUGT5 z=)6P9C3=5oPqlqVc|IBZ{?5?yQrmA5E9;>W4q?Tddy0A1F8b1VbH2Q z_J09pT$-)yeBP6vo?2Me`bqBdau>2&m+X~Xmr8Fu&Vt9gE59p$maax3L5{<_B{7wc z`Ibph<4iS4`F|z^KH%$Ul85wNFih*}O|a07krucVTO3&fP%LLQy}}lg7_E~+@1TCV6|K9LR83nGFd0vC8 HN#1a|X9CB% delta 413 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 dN4L%Yh4eV delta 74 zcmV-Q0JZ=3umj771F+6ull5RJvn*jY0+TDECzJ4G7PF^g8UeGqXHNpN5o$jHv!84O gCzHvOAG7w8JOYzCmLaogmQez;9-B!7vu~fEE6bQ4lmGw# diff --git a/nodejs18.changes b/nodejs18.changes index 4770b35..4f6ae59 100644 --- a/nodejs18.changes +++ b/nodejs18.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 29 13:58:09 UTC 2022 - Adam Majer + +- 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 diff --git a/nodejs18.spec b/nodejs18.spec index 8c1a55a..e608761 100644 --- a/nodejs18.spec +++ b/nodejs18.spec @@ -15,13 +15,23 @@ # 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: nodejs18 -Version: 18.9.1 +Version: 18.10.0 Release: 0 # Double DWZ memory limits @@ -119,12 +129,12 @@ 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 gyp/ | 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 +# Python 3.4 compatible node-gyp +### https://github.com/nodejs/node-gyp.git +### git archive v7.1.2 gyp/ | 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 @@ -135,6 +145,8 @@ Patch5: sle12_python3_compat.patch Patch7: manual_configure.patch Patch13: openssl_binary_detection.patch + + ## Patches specific to SUSE and openSUSE Patch100: linker_lto_jobs.patch # PATCH-FIX-OPENSUSE -- set correct path for dtrace if it is built @@ -158,11 +170,10 @@ Patch133: rsa-pss-revert.patch # Use versioned binaries and paths Patch200: versioned.patch -Patch303: openssl3_fixups.patch Patch304: new_python3.patch -BuildRequires: fdupes BuildRequires: pkg-config +BuildRequires: fdupes BuildRequires: procps BuildRequires: xz BuildRequires: zlib-devel @@ -182,10 +193,10 @@ BuildRequires: config(netcfg) %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++ +BuildRequires: gcc5-c++ %define forced_gcc_version 5 %else -BuildRequires: gcc48-c++ +BuildRequires: gcc48-c++ %define forced_gcc_version 4.8 %endif %endif @@ -195,15 +206,15 @@ BuildRequires: gcc48-c++ # for SLE-12:Update targets %if 0%{?suse_version} == 1315 %if %node_version_number >= 17 -BuildRequires: gcc12-c++ +BuildRequires: gcc12-c++ %define forced_gcc_version 12 %else %if %node_version_number >= 14 -BuildRequires: gcc9-c++ +BuildRequires: gcc9-c++ %define forced_gcc_version 9 %else %if %node_version_number >= 8 -BuildRequires: gcc7-c++ +BuildRequires: gcc7-c++ %define forced_gcc_version 7 %endif %endif @@ -212,7 +223,7 @@ BuildRequires: gcc7-c++ %if 0%{?suse_version} == 1500 %if %node_version_number >= 17 -BuildRequires: gcc12-c++ +BuildRequires: gcc12-c++ %define forced_gcc_version 12 %endif %endif @@ -223,6 +234,7 @@ BuildRequires: gcc12-c++ BuildRequires: gcc-c++ %endif + # Python dependencies %if %node_version_number >= 16 @@ -247,8 +259,8 @@ BuildRequires: python %endif %if 0%{?suse_version} >= 1500 && %{node_version_number} >= 10 -BuildRequires: group(nobody) BuildRequires: user(nobody) +BuildRequires: group(nobody) %endif %if ! 0%{with intree_openssl} @@ -311,7 +323,7 @@ BuildRequires: valgrind %if %{with libalternatives} Requires: alts %else -Requires(postun):%{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives %endif # either for update-alternatives, or their removal Requires(post): %{_sbindir}/update-alternatives @@ -350,8 +362,8 @@ ExclusiveArch: not_buildable %endif %endif +Provides: bundled(uvwasi) = 0.0.13 Provides: bundled(libuv) = 1.43.0 -Provides: bundled(uvwasi) = 0.0.12 Provides: bundled(v8) = 10.2.154.15 %if %{with intree_brotli} Provides: bundled(brotli) = 1.0.9 @@ -359,13 +371,14 @@ Provides: bundled(brotli) = 1.0.9 BuildRequires: pkgconfig(libbrotlidec) %endif + Provides: bundled(llhttp) = 6.0.10 -Provides: bundled(ngtcp2) = 0.1.0-DEV +Provides: bundled(ngtcp2) = 0.8.1 Provides: bundled(node-acorn) = 8.8.0 Provides: bundled(node-acorn-walk) = 8.2.0 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 %description @@ -377,8 +390,8 @@ provided by npm. Summary: Development headers for NodeJS 18.x Group: Development/Languages/NodeJS Provides: nodejs-devel = %{version} -Requires: %{name} = %{version} Requires: npm18 = %{version} +Requires: %{name} = %{version} %description devel This package provides development headers for Node.js needed for creation @@ -395,12 +408,12 @@ Requires: nodejs-common Requires: nodejs18 = %{version} Provides: nodejs-npm = %{version} Obsoletes: nodejs-npm < 4.0.0 +Provides: npm(npm) = 8.19.2 Provides: npm = %{version} -Provides: npm(npm) = 8.19.1 %if 0%{?suse_version} >= 1500 %if %{node_version_number} >= 10 -Requires: group(nobody) Requires: user(nobody) +Requires: group(nobody) %endif %endif Provides: bundled(node-abbrev) = 1.1.1 @@ -486,8 +499,8 @@ Provides: bundled(node-just-diff) = 5.1.1 Provides: bundled(node-just-diff-apply) = 5.4.1 Provides: bundled(node-libnpmaccess) = 6.0.4 Provides: bundled(node-libnpmdiff) = 4.0.5 -Provides: bundled(node-libnpmexec) = 4.0.12 -Provides: bundled(node-libnpmfund) = 3.0.3 +Provides: bundled(node-libnpmexec) = 4.0.13 +Provides: bundled(node-libnpmfund) = 3.0.4 Provides: bundled(node-libnpmhook) = 8.0.4 Provides: bundled(node-libnpmorg) = 4.0.4 Provides: bundled(node-libnpmpack) = 4.1.3 @@ -566,8 +579,8 @@ 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.11 Provides: bundled(node-ssri) = 9.0.1 -Provides: bundled(node-string-width) = 4.2.3 Provides: bundled(node-string_decoder) = 1.3.0 +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.11 @@ -652,7 +665,6 @@ tar Jxf %{SOURCE11} %endif %patch200 -p1 -%patch303 -p1 %patch304 -p1 %if %{node_version_number} <= 12 @@ -674,6 +686,7 @@ mkdir deps/npm/node_modules/node-gyp tar -C deps/npm/node_modules/node-gyp Jxf %{SOURCE5} %endif + %build # normalize shebang %if %{node_version_number} >= 12 @@ -884,8 +897,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 # 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 -# rm test/doctool/test-make-doc.js +# 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 @@ -1001,7 +1016,6 @@ 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 diff --git a/openssl3_fixups.patch b/openssl3_fixups.patch deleted file mode 100644 index 957e4e6..0000000 --- a/openssl3_fixups.patch +++ /dev/null @@ -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 - #include -+#if OPENSSL_VERSION_MAJOR >= 3 - #include -+#endif - - namespace { - From b09be45862226cf0c578ab115f593966c7d630e3 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 29 Sep 2022 14:55:28 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs18?expand=0&rev=19 --- nodejs18.spec | 58 ++++++++++++++++-------------------------- versioned.patch | 67 ++++++++++++++++++++++++++++--------------------- 2 files changed, 59 insertions(+), 66 deletions(-) diff --git a/nodejs18.spec b/nodejs18.spec index e608761..ce87f20 100644 --- a/nodejs18.spec +++ b/nodejs18.spec @@ -15,17 +15,7 @@ # 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 @@ -129,12 +119,12 @@ 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 gyp/ | 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 +# Python 3.4 compatible node-gyp +### https://github.com/nodejs/node-gyp.git +### git archive v7.1.2 gyp/ | 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 @@ -145,8 +135,6 @@ Patch5: sle12_python3_compat.patch Patch7: manual_configure.patch Patch13: openssl_binary_detection.patch - - ## Patches specific to SUSE and openSUSE Patch100: linker_lto_jobs.patch # PATCH-FIX-OPENSUSE -- set correct path for dtrace if it is built @@ -172,8 +160,8 @@ Patch200: versioned.patch Patch304: new_python3.patch -BuildRequires: pkg-config BuildRequires: fdupes +BuildRequires: pkg-config BuildRequires: procps BuildRequires: xz BuildRequires: zlib-devel @@ -193,10 +181,10 @@ BuildRequires: config(netcfg) %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++ +BuildRequires: gcc5-c++ %define forced_gcc_version 5 %else -BuildRequires: gcc48-c++ +BuildRequires: gcc48-c++ %define forced_gcc_version 4.8 %endif %endif @@ -206,15 +194,15 @@ BuildRequires: gcc48-c++ # for SLE-12:Update targets %if 0%{?suse_version} == 1315 %if %node_version_number >= 17 -BuildRequires: gcc12-c++ +BuildRequires: gcc12-c++ %define forced_gcc_version 12 %else %if %node_version_number >= 14 -BuildRequires: gcc9-c++ +BuildRequires: gcc9-c++ %define forced_gcc_version 9 %else %if %node_version_number >= 8 -BuildRequires: gcc7-c++ +BuildRequires: gcc7-c++ %define forced_gcc_version 7 %endif %endif @@ -223,7 +211,7 @@ BuildRequires: gcc7-c++ %if 0%{?suse_version} == 1500 %if %node_version_number >= 17 -BuildRequires: gcc12-c++ +BuildRequires: gcc12-c++ %define forced_gcc_version 12 %endif %endif @@ -234,7 +222,6 @@ BuildRequires: gcc12-c++ BuildRequires: gcc-c++ %endif - # Python dependencies %if %node_version_number >= 16 @@ -259,8 +246,8 @@ BuildRequires: python %endif %if 0%{?suse_version} >= 1500 && %{node_version_number} >= 10 -BuildRequires: user(nobody) BuildRequires: group(nobody) +BuildRequires: user(nobody) %endif %if ! 0%{with intree_openssl} @@ -323,7 +310,7 @@ BuildRequires: valgrind %if %{with libalternatives} Requires: alts %else -Requires(postun): %{_sbindir}/update-alternatives +Requires(postun):%{_sbindir}/update-alternatives %endif # either for update-alternatives, or their removal Requires(post): %{_sbindir}/update-alternatives @@ -362,8 +349,8 @@ ExclusiveArch: not_buildable %endif %endif -Provides: bundled(uvwasi) = 0.0.13 Provides: bundled(libuv) = 1.43.0 +Provides: bundled(uvwasi) = 0.0.13 Provides: bundled(v8) = 10.2.154.15 %if %{with intree_brotli} Provides: bundled(brotli) = 1.0.9 @@ -371,7 +358,6 @@ Provides: bundled(brotli) = 1.0.9 BuildRequires: pkgconfig(libbrotlidec) %endif - Provides: bundled(llhttp) = 6.0.10 Provides: bundled(ngtcp2) = 0.8.1 @@ -390,8 +376,8 @@ provided by npm. Summary: Development headers for NodeJS 18.x Group: Development/Languages/NodeJS Provides: nodejs-devel = %{version} -Requires: npm18 = %{version} Requires: %{name} = %{version} +Requires: npm18 = %{version} %description devel This package provides development headers for Node.js needed for creation @@ -408,12 +394,12 @@ Requires: nodejs-common Requires: nodejs18 = %{version} Provides: nodejs-npm = %{version} Obsoletes: nodejs-npm < 4.0.0 -Provides: npm(npm) = 8.19.2 Provides: npm = %{version} +Provides: npm(npm) = 8.19.2 %if 0%{?suse_version} >= 1500 %if %{node_version_number} >= 10 -Requires: user(nobody) Requires: group(nobody) +Requires: user(nobody) %endif %endif Provides: bundled(node-abbrev) = 1.1.1 @@ -579,8 +565,8 @@ 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.11 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_decoder) = 1.3.0 Provides: bundled(node-strip-ansi) = 6.0.1 Provides: bundled(node-supports-color) = 7.2.0 Provides: bundled(node-tar) = 6.1.11 @@ -686,7 +672,6 @@ mkdir deps/npm/node_modules/node-gyp tar -C deps/npm/node_modules/node-gyp Jxf %{SOURCE5} %endif - %build # normalize shebang %if %{node_version_number} >= 12 @@ -996,11 +981,9 @@ make test-ci %files devel %defattr(-, root, root) %{_includedir}/node%{node_version_number} -%if %{node_version_number} < 18 %dir %{_datadir}/systemtap %dir %{_datadir}/systemtap/tapset %{_datadir}/systemtap/tapset/node%{node_version_number}.stp -%endif %files docs %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} %else + %pre # remove files that are no longer owned but provided by update-alternatives if ! [ -L %{_mandir}/man1/node.1%{ext_man} ]; then diff --git a/versioned.patch b/versioned.patch index d099a05..5d56c83 100644 --- a/versioned.patch +++ b/versioned.patch @@ -8,10 +8,10 @@ management via update_alternatives. This is also important for generation of binary 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.9.0/Makefile +--- node-v18.10.0.orig/Makefile ++++ node-v18.10.0/Makefile @@ -55,7 +55,7 @@ BUILDTYPE_LOWER := $(shell echo $(BUILDT EXEEXT := $(shell $(PYTHON) -c \ "import sys; print('.exe' if sys.platform == 'win32' else '')") @@ -21,10 +21,10 @@ Index: node-v18.9.0/Makefile NODE ?= ./$(NODE_EXE) NODE_G_EXE = node_g$(EXEEXT) 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.9.0/tools/install.py +--- node-v18.10.0.orig/tools/install.py ++++ node-v18.10.0/tools/install.py @@ -86,7 +86,7 @@ def uninstall(paths, dst): try_remove(path, dst) @@ -67,7 +67,16 @@ Index: node-v18.9.0/tools/install.py output_prefix = 'out/Release/' 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: action(['doc/node.1'], 'man/man1/') else: @@ -76,7 +85,7 @@ Index: node-v18.9.0/tools/install.py if 'true' == variables.get('node_install_npm'): npm_files(action) -@@ -276,28 +276,28 @@ def headers(action): +@@ -281,28 +281,28 @@ def headers(action): 'src/node_buffer.h', 'src/node_object_wrap.h', 'src/node_version.h', @@ -113,10 +122,10 @@ Index: node-v18.9.0/tools/install.py if sys.platform == 'zos': 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.9.0/doc/node.1 +--- node-v18.10.0.orig/doc/node.1 ++++ node-v18.10.0/doc/node.1 @@ -30,24 +30,24 @@ .Dt NODE 1 . @@ -146,10 +155,10 @@ Index: node-v18.9.0/doc/node.1 .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.9.0/src/node.stp +--- node-v18.10.0.orig/src/node.stp ++++ node-v18.10.0/src/node.stp @@ -19,7 +19,7 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -222,10 +231,10 @@ Index: node-v18.9.0/src/node.stp { scavenge = 1 << 0; 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.9.0/deps/npm/man/man1/npm.1 +--- node-v18.10.0.orig/deps/npm/man/man1/npm.1 ++++ node-v18.10.0/deps/npm/man/man1/npm.1 @@ -1,6 +1,6 @@ .TH "NPM" "1" "September 2022" "" "" .SH "NAME" @@ -297,10 +306,10 @@ Index: node-v18.9.0/deps/npm/man/man1/npm.1 +npm18 help publish .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.9.0/src/node_main.cc +--- node-v18.10.0.orig/src/node_main.cc ++++ node-v18.10.0/src/node_main.cc @@ -122,6 +122,7 @@ int main(int argc, char* argv[]) { #endif // 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(stderr, nullptr, _IONBF, 0); 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.9.0/tools/test.py +--- node-v18.10.0.orig/tools/test.py ++++ node-v18.10.0/tools/test.py @@ -948,7 +948,7 @@ class Context(object): if self.vm is not None: return self.vm @@ -322,10 +331,10 @@ Index: node-v18.9.0/tools/test.py else: 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.9.0/node.gyp +--- node-v18.10.0.orig/node.gyp ++++ node-v18.10.0/node.gyp @@ -24,8 +24,8 @@ 'node_use_openssl%': 'true', 'node_shared_openssl%': 'false', @@ -337,10 +346,10 @@ Index: node-v18.9.0/node.gyp '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 -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.9.0/deps/npm/man/man1/npx.1 +--- node-v18.10.0.orig/deps/npm/man/man1/npx.1 ++++ node-v18.10.0/deps/npm/man/man1/npx.1 @@ -5,10 +5,10 @@ .P .RS 2