From e1d05d0d693bca75d1642bf2c45988382bb41c4529d52d93c5260ea79d2de1d9 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Mon, 12 Feb 2024 15:19:46 +0000 Subject: [PATCH 1/2] - Update to 21.6.1: * Revert "stream: fix cloned webstreams not being unref'd" - Changes in 21.6.0: * New connection attempt events * --allow-addons to enable addon usage when using the Permission Model. * Support configurable snapshot through --build-snapshot-config flag - fix_ci_tests.patch: refreshed OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs21?expand=0&rev=16 --- SHASUMS256.txt | 82 ++++++++++++++++++++++---------------------- SHASUMS256.txt.sig | Bin 438 -> 438 bytes fix_ci_tests.patch | 75 ++++++++++++---------------------------- node-v21.5.0.tar.xz | 3 -- node-v21.6.1.tar.xz | 3 ++ nodejs21.changes | 13 +++++++ nodejs21.spec | 72 +++++++++++++++----------------------- 7 files changed, 106 insertions(+), 142 deletions(-) delete mode 100644 node-v21.5.0.tar.xz create mode 100644 node-v21.6.1.tar.xz diff --git a/SHASUMS256.txt b/SHASUMS256.txt index e9990d6..a659e98 100644 --- a/SHASUMS256.txt +++ b/SHASUMS256.txt @@ -1,41 +1,41 @@ -e4b4c3214a8dc59f511f50cb949b4ef5c05a59bc15c6376c1b98bcfd43dcbb4c node-v21.5.0-aix-ppc64.tar.gz -aaf26bd76a2c771d623bf2aa68f8fa4b440382ddc5b3d6e26bc4a21ab63271da node-v21.5.0-arm64.msi -66af9055dcceacc2fcd01ccbb47a565a1dd8f4314300a0f37f13771059490a09 node-v21.5.0-darwin-arm64.tar.gz -64f7eb52c9eb325326cc33c3b11ce90b00859616209bbd436c0acb1e612ef389 node-v21.5.0-darwin-arm64.tar.xz -de858cb5257f101dc0681cd65493b589a35ac61f69f46b62cbc1cdaf7cb51a1b node-v21.5.0-darwin-x64.tar.gz -e396e2bf2e999215bfd5cf50b8050dd5072a7d74a63d4047a6a9e71f0a9fc553 node-v21.5.0-darwin-x64.tar.xz -eeb9270798f488e58a38f7637b69c6557d1da17573b79b96f50e0f01911053bb node-v21.5.0-headers.tar.gz -37344fac0560e0e985acba054356c1287b302ba767671233b5633e7674d50d9f node-v21.5.0-headers.tar.xz -ed8d7c80f301af4546d60bb0d25930ade432a45560d2eecf17c23818c05ce12f node-v21.5.0-linux-arm64.tar.gz -05183535f1dafe13e456b767de426719f26228e2a08ec19f9b24232876065b4d node-v21.5.0-linux-arm64.tar.xz -104f1ac9c2799c7fb0467cb19fe1a8f5b2ddd79d3fcd852547940d1cc7e0ca48 node-v21.5.0-linux-armv7l.tar.gz -20a69cbd0ba3ef8fd7fead40fa57971590d7765a66cb3f26fa0b2542ad70ed8a node-v21.5.0-linux-armv7l.tar.xz -05d954d0072c0583f0745773db7947249567f0a1250056269be7110dde359bcc node-v21.5.0-linux-ppc64le.tar.gz -6ec7bb999533a3f70ffc4ddf0283d85a8cbba79205e77b080ee4c7f90cd4bc8c node-v21.5.0-linux-ppc64le.tar.xz -a80587110aa12063eea520df8e1925e715aa7a96ee323745e349be76d976e791 node-v21.5.0-linux-s390x.tar.gz -2c22a05d0f264f00e7a5432f752c4070aded2a3c490beb4b94137e6750addd69 node-v21.5.0-linux-s390x.tar.xz -6e61f81fe1759892fb1f84f62fe470c8d4d6dfc07969af5700f06b4672a9e8d3 node-v21.5.0-linux-x64.tar.gz -7ba86504afb7d865e037a776be114f250710646378313dad02c0885f127af59b node-v21.5.0-linux-x64.tar.xz -8153e6fed4b7d871bc9ce8be579379ec7535c820d9622a0ac2e2d40601be0b8f node-v21.5.0.pkg -64f9a761b11be7e55325b029d1e3f1d41795e0e535e770a4b2a2a83c0f4c16da node-v21.5.0.tar.gz -afd7d4713573cd814f7e4df320de8d5c8e147b4101bc9fbbe2a6d52eb5f8b072 node-v21.5.0.tar.xz -b2cf94d6297b7b71d1a5dfea115025e23eb07629447867a252857387b3bf167c node-v21.5.0-win-arm64.7z -ac492a4beaeb92367220f68a760e6976c917239074b623b7b8dc6c7411f17097 node-v21.5.0-win-arm64.zip -209c771e3d1b86f6edee19682142999cc1a28664459f6c5258ad2361525525b1 node-v21.5.0-win-x64.7z -25dc31215fb705f8c4c03d0f0f57e248d62313cd5d4651bcc16d832a1b1ebb01 node-v21.5.0-win-x64.zip -0605d26eca7ed6ba6b6030e779c94a99e6c41850fb4a6b9105af67268478f722 node-v21.5.0-win-x86.7z -45a2d47b6b6afc7cd2e0db6da4d3de35d19efe230b943fc84d3b3577bd31d900 node-v21.5.0-win-x86.zip -2e2583deb489fec8b17e8b90145c6bc327531b75544e7f6f8eaa8ee97c6c0853 node-v21.5.0-x64.msi -4b502d084c965bdcb1acc61695cb62a71a468f7f3703c6df52da878ffdf3649a node-v21.5.0-x86.msi -12a77f8ea5a8f9113f96ad00d43a73616a5fe1de7a474f7e13f30404325e08ad win-arm64/node.exe -c4fc3b1a81c71efbcc224e8f1cbc007d2be208a673614acda7b0166df199cfcb win-arm64/node.lib -05b05eaa1ca603ed2c107b41bd7be837d21bff91c5a31350f3f1fd7d71e1e785 win-arm64/node_pdb.7z -bb420b368326da35eedaa0ccab5e8608ab698727b4e51c1f852097d127285909 win-arm64/node_pdb.zip -3384bb0174ee8e90f1d9619d5eda9a549df9b93fdc6ac81b04efd40eec77d0de win-x64/node.exe -3ad4bbb2e42888da6974e1e9e5e1cfe995255c9b6ea0ec34f4a7d492eb402efa win-x64/node.lib -0ad3c905d75aee6c52061297669c92c2b3cd02619e36b78a835f65bd701d9cf4 win-x64/node_pdb.7z -029d7068b1181c660873b18eabab197a7609f0df5b2de12524bb99774a52f2b8 win-x64/node_pdb.zip -28823b730743ad7feefc0bd0952dfa40fefc64761398a29f6127f117c9496eae win-x86/node.exe -191e8a964f21e5ce045ff7d63ee12db5f782a516e888c1a3f4c8da8f0552c22e win-x86/node.lib -c13d2e35595c779ec9ca165198d1cbea25cd12fe905f32c19ceac90f4ab42dd0 win-x86/node_pdb.7z -353ca4eb8489b65fba11d39c76c864e59b7551c6f27a7cd0f8a6392f7c445eab win-x86/node_pdb.zip +0dbffde04695933f508e964a103657d6ef55ddadf3d8e9c39e0191c6ee2b4ead node-v21.6.1-aix-ppc64.tar.gz +88f1d4e8982d0cc439137c9b95405622489d1573051a7a13d618ef0ef2896e76 node-v21.6.1-arm64.msi +94c280bba809fa66867e363ec9e990217aedf893116660b8c75a1c4fda3baea5 node-v21.6.1-darwin-arm64.tar.gz +a1edec87af235b55443cb87d38f523d86cefa3426b9b9fe52328430124ae48ed node-v21.6.1-darwin-arm64.tar.xz +5c4821c62a1f61cf3219bc244d30a5b1cdec197c8acabc1ee7cd9ff17bbba947 node-v21.6.1-darwin-x64.tar.gz +35b0000723ab93ae3110fbdb2833947bc206da761d36da15ed2ef2f3b7f9b3b6 node-v21.6.1-darwin-x64.tar.xz +d0bc7a37a7a16301565119c472cfa3c00a4122891bec792d83f2992e3eefb62e node-v21.6.1-headers.tar.gz +7b217de8af0d2c05fffd0fb8b5cb2136c93e312bccd5cf454f039196777e4762 node-v21.6.1-headers.tar.xz +e19a4364cf27c9c0cdc1472faf4eece6313b590f1e9c55852d8ec3efa89fe097 node-v21.6.1-linux-arm64.tar.gz +19900c1a0a9d7e2ea781b46c7d498ffdf3e37e34f46b96e7344bd7bb8f27be66 node-v21.6.1-linux-arm64.tar.xz +b899fcb09400b255e6264dabca907e7a567debae98a4cce248fcdea2f2ebaf1c node-v21.6.1-linux-armv7l.tar.gz +ee63708a84ad27268a62dc04f697016f762c6c8a4261d0e1680d45829f9fa06f node-v21.6.1-linux-armv7l.tar.xz +859654218d795ab60c213d29af492904d74fd0a7a1cebc3790b1cb61838fc5eb node-v21.6.1-linux-ppc64le.tar.gz +0f22931238d96d931e8ad788326f4db92860e83105c493ee9b29a4b378b18f18 node-v21.6.1-linux-ppc64le.tar.xz +a4c885443eb92199253fe6efb48c2211ae09b003edf3af8220532a4a6fc77c86 node-v21.6.1-linux-s390x.tar.gz +efa9496c3c1e1691dfabea45e2839b592675a571880b9d25b35d3565e16f3d66 node-v21.6.1-linux-s390x.tar.xz +d2ac105754e5fc657a6a25ea7d31f19dd63d3ec845dce0aef0232533d52bc125 node-v21.6.1-linux-x64.tar.gz +c65cbf7342260df8e59dd2fe2e06dc1f36ac46c9d433a64cd84521fd4915c291 node-v21.6.1-linux-x64.tar.xz +da16368922e7da397df62c9f7571880a5d7bb8506c43097b71edf4001bc9c628 node-v21.6.1.pkg +7e284d0d64c2edcec84ecfd5bda1d9e7b82a8a3fe401f8b7023c5bc1d9fdd4d5 node-v21.6.1.tar.gz +7a82f356d1dcba5d766f0e1d4c750e2e18d6290b710b7d19a8725241e7af1f60 node-v21.6.1.tar.xz +b368ed9585ace23d145569ec670fbcbe29d2014c4fa9383705edfba9e12ec432 node-v21.6.1-win-arm64.7z +043d147e0fd55dd044ef304d4d87303f69bdf3bd1a6fd715871eee3df7f153dd node-v21.6.1-win-arm64.zip +c09bf7f09eb3aab90b1d1a6daae9f2b99704333fe6bb83a757bd2de8d2f849a1 node-v21.6.1-win-x64.7z +a74b3933e73982553c1fdea3a3a27b09488ac09845e230c7532d4387c0f9c8fe node-v21.6.1-win-x64.zip +8d936365d2473e5f11452d60a61b041ce3a95e93686cef8fb1248516f56407de node-v21.6.1-win-x86.7z +1d0cdad8b691fc1a92cf1d301ea24c905d36d36f9134a7a7e4c60ce12eef6393 node-v21.6.1-win-x86.zip +6ced3da3d4689a150452a2a6bce30d4c61067e9ec37cb89f56cc930a7ae468a4 node-v21.6.1-x64.msi +bcf13ea38a038fa4c156f6795d8f7d05b1c4a7dc3804c99717cbd0321199bb2b node-v21.6.1-x86.msi +292c6e750a066c7306b42375874eadca1a7e1e7351022f8bcc75083223c82bd1 win-arm64/node.exe +7bf3d6ec7d4f20a33ec4bc6140a196da9bae6ea7ade0bfc312bde82fcf1e341e win-arm64/node.lib +e36f9a1579efc8e4951dbaa54be610a968b039d41bcdab5fe971214f4d720061 win-arm64/node_pdb.7z +b50ca588dcdbe6c8e922b0ed3875e700e027349754b36f5c2e4078298cb8deff win-arm64/node_pdb.zip +18888b1cb13e581cba0eae3444bd37aa1946c0eb7ddb4cb2352cc7213501b219 win-x64/node.exe +062c4519e957aac29ee4e03ca5ff80212d72cd5f075e5d6e58f98fdd01d8b244 win-x64/node.lib +ac048ae771d7bb4c35307dd8a3df384d947737ef25f804f442c08dd4f4eedf2b win-x64/node_pdb.7z +7a753ffdde2ea70324cd4d21d34cc7719f0a9772a93e6cf0dd8975101896a11b win-x64/node_pdb.zip +4a7b36ebdb5a8f42e87a5c8b7e2b2dacf73c3f74fd2d060618138d8ee8a60e69 win-x86/node.exe +ca3fefa67c54bf9b18913b4b0e95d1b61a82b9a3f09acb8feea8fb96f56bc3b8 win-x86/node.lib +c33858a9294444e08c1dfd1634c25f31ed0142c6a0e0d8c0ce58ed63f39840ae win-x86/node_pdb.7z +28dbc65626661a4510daf469a0da43a5166510dc6e26661a732533df648cdbc6 win-x86/node_pdb.zip diff --git a/SHASUMS256.txt.sig b/SHASUMS256.txt.sig index 585b5d5fdeb60f856e1b23995e41465bb35ce87ee88f8ef0fae5a34308491731..4524362f185aa996d243f4c704953b87ec703a2a7c6da8cccfccf2003f6688bc 100644 GIT binary patch delta 413 zcmV;O0b>5P1GWQ@BY&>I#{dcm5R2-x-_KQE^i?km0GdjVU?6u2@y$o-qyw0dfBj}x zC<~3Zf#OaECFlWd1ixJx70br0Ax$sUx=I=V`F)w$iQe-x$-I*tc=2sT7;31#K$mhy z=|^@nC86c@0%C7QC|m|#SD#$4liBj0zVZqKW!BG(Lf!A8-G5oR)Wj!1csHZ^+XRt0 z{k3{M3K(rgrPRF}g@dn6m?LUft8t$#NE=$Er96AFddKU(HJzD6*P4R@<=@)dQEC1% z7!&N{L+@cH*Zy1^Bs>t=S6S|U@J|GE4*;%s8C!1KyNaI6f=|%Sl^H$;`|bjvpH83^ zARfaxkoifRbbmD7&pR~1ERod8S%a3f0o@bqg+} z=jrhu=GW3FoA|9Rqz}}ZrJrwJs#$qb)Xaj8vAFLaVDp%u_*amj)ZdKKrEKJq)i@b5 zNHV&Y-w|JRh)pt!1G^M&@N%MbWobKwf-jlktumf;*A~jcg(_OtYnL`Y1o{^gQfb1= Hz{5P1GWQ@BY%PFAOH#p5R2-x-_KQE^h<>c|8+&h?;R&E-8w@%)x!-u{T8b; zK@5*8I=LtqtjQyQuMe|7@puNrOmJ~t@d^zrQ~bQZYCAr>dYj>=8Tb{k$kZOhOzZ59 z{Sm)PiNBn0P(nv%(nYpzdV&xF+#_Cs9z52@Q}&t2aTX%@{C~3hJ_UdCNZ!Xh(3;e* z;P_M4#MMLb0|%W>{-61NT4FAV;3QIJH{+SVDOY3GXIu(UVHL6|AfAbU5LJ?|o-?|> zGQOk4KumUOgkC~)c`Q_v3dDKY3esg3)xKNxDdoo3@AeJ`3(d8R^JvhL+18D%x=n{( z@@rbjCs^j@Du3=7S)8h~^50bN52YHuJP*cp;wy`^Zh1#IMboB_QYlS1I8@rmP?t^= zksHy~$=PBN77`g9hFFRR-xh=mp4rwG=G-#7`|U||DY8$A7{i*lYo;kDLNF7q-MRZV z9fKC`Uakzd4?ybSaN3)UBgGcoc2Sr#8O0`5u(4fk85VobB}5p63a85xI7D3)ZZPvD Hxrq^k``5;9 diff --git a/fix_ci_tests.patch b/fix_ci_tests.patch index 1dca194..3e502d9 100644 --- a/fix_ci_tests.patch +++ b/fix_ci_tests.patch @@ -2,10 +2,10 @@ Author: Adam Majer Date: Dec 20 09:18:49 UTC 2017 Summary: Fix CI unit tests framework for OBS building -Index: node-v21.4.0/test/parallel/test-node-output-v8-warning.mjs +Index: node-v21.6.1/test/parallel/test-node-output-v8-warning.mjs =================================================================== ---- node-v21.4.0.orig/test/parallel/test-node-output-v8-warning.mjs -+++ node-v21.4.0/test/parallel/test-node-output-v8-warning.mjs +--- node-v21.6.1.orig/test/parallel/test-node-output-v8-warning.mjs ++++ node-v21.6.1/test/parallel/test-node-output-v8-warning.mjs @@ -15,7 +15,7 @@ describe('v8 output', { concurrency: tru .replaceAll('*test*', '*') .replaceAll(/.*?\*fixtures\*v8\*/g, '(node:*) V8: *') // Replace entire path before fixtures/v8 @@ -15,10 +15,10 @@ Index: node-v21.4.0/test/parallel/test-node-output-v8-warning.mjs } const common = snapshot .transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths, replaceNodeVersion); -Index: node-v21.4.0/test/parallel/test-module-loading-globalpaths.js +Index: node-v21.6.1/test/parallel/test-module-loading-globalpaths.js =================================================================== ---- node-v21.4.0.orig/test/parallel/test-module-loading-globalpaths.js -+++ node-v21.4.0/test/parallel/test-module-loading-globalpaths.js +--- node-v21.6.1.orig/test/parallel/test-module-loading-globalpaths.js ++++ node-v21.6.1/test/parallel/test-module-loading-globalpaths.js @@ -11,6 +11,9 @@ const { addLibraryPath } = require('../c addLibraryPath(process.env); @@ -29,10 +29,10 @@ Index: node-v21.4.0/test/parallel/test-module-loading-globalpaths.js if (process.argv[2] === 'child') { console.log(require(pkgName).string); } else { -Index: node-v21.4.0/test/parallel/test-tls-passphrase.js +Index: node-v21.6.1/test/parallel/test-tls-passphrase.js =================================================================== ---- node-v21.4.0.orig/test/parallel/test-tls-passphrase.js -+++ node-v21.4.0/test/parallel/test-tls-passphrase.js +--- node-v21.6.1.orig/test/parallel/test-tls-passphrase.js ++++ node-v21.6.1/test/parallel/test-tls-passphrase.js @@ -223,7 +223,7 @@ server.listen(0, common.mustCall(functio }, onSecureConnect()); })).unref(); @@ -42,10 +42,10 @@ Index: node-v21.4.0/test/parallel/test-tls-passphrase.js // Missing passphrase assert.throws(function() { -Index: node-v21.4.0/test/parallel/test-repl-envvars.js +Index: node-v21.6.1/test/parallel/test-repl-envvars.js =================================================================== ---- node-v21.4.0.orig/test/parallel/test-repl-envvars.js -+++ node-v21.4.0/test/parallel/test-repl-envvars.js +--- node-v21.6.1.orig/test/parallel/test-repl-envvars.js ++++ node-v21.6.1/test/parallel/test-repl-envvars.js @@ -2,7 +2,9 @@ // Flags: --expose-internals @@ -57,10 +57,10 @@ Index: node-v21.4.0/test/parallel/test-repl-envvars.js const stream = require('stream'); const { describe, test } = require('node:test'); const REPL = require('internal/repl'); -Index: node-v21.4.0/Makefile +Index: node-v21.6.1/Makefile =================================================================== ---- node-v21.4.0.orig/Makefile -+++ node-v21.4.0/Makefile +--- node-v21.6.1.orig/Makefile ++++ node-v21.6.1/Makefile @@ -545,7 +545,8 @@ test-ci-js: | clear-stalled .PHONY: test-ci # Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned @@ -81,10 +81,10 @@ Index: node-v21.4.0/Makefile echo "Skipping tools/doc/node_modules (no crypto)"; \ else \ cd tools/doc && $(call available-node,$(run-npm-ci)) \ -Index: node-v21.4.0/tools/test.py +Index: node-v21.6.1/tools/test.py =================================================================== ---- node-v21.4.0.orig/tools/test.py -+++ node-v21.4.0/tools/test.py +--- node-v21.6.1.orig/tools/test.py ++++ node-v21.6.1/tools/test.py @@ -1362,7 +1362,7 @@ def BuildOptions(): result.add_option("-s", "--suite", help="A test suite", default=[], action="append") @@ -94,10 +94,10 @@ Index: node-v21.4.0/tools/test.py result.add_option("--arch", help='The architecture to run tests for', default='none') result.add_option("--snapshot", help="Run the tests with snapshot turned on", -Index: node-v21.4.0/test/parallel/test-crypto-dh.js +Index: node-v21.6.1/test/parallel/test-crypto-dh.js =================================================================== ---- node-v21.4.0.orig/test/parallel/test-crypto-dh.js -+++ node-v21.4.0/test/parallel/test-crypto-dh.js +--- node-v21.6.1.orig/test/parallel/test-crypto-dh.js ++++ node-v21.6.1/test/parallel/test-crypto-dh.js @@ -92,7 +92,7 @@ const crypto = require('crypto'); dh3.computeSecret(''); }, { message: common.hasOpenSSL3 && !hasOpenSSL3WithNewErrorMessage ? @@ -107,36 +107,3 @@ Index: node-v21.4.0/test/parallel/test-crypto-dh.js } } -Index: node-v21.4.0/benchmark/misc/startup-cli-version.js -=================================================================== ---- node-v21.4.0.orig/benchmark/misc/startup-cli-version.js -+++ node-v21.4.0/benchmark/misc/startup-cli-version.js -@@ -1,6 +1,7 @@ - 'use strict'; - const common = require('../common.js'); - const { spawnSync } = require('child_process'); -+const { existsSync } = require('fs'); - const path = require('path'); - - // This benchmarks the startup of various CLI tools that are already -@@ -10,7 +11,8 @@ const path = require('path'); - // indispensible part of the CLI. - const bench = common.createBenchmark(main, { - cli: [ -- 'tools/node_modules/eslint/bin/eslint.js', -+ 'deps/npm/bin/npx-cli.js', -+ 'deps/npm/bin/npx-cli.js', - 'deps/npm/bin/npm-cli.js', - 'deps/corepack/dist/corepack.js', - ], -@@ -45,6 +47,10 @@ function spawnProcess(cli, bench, state) - - function main({ count, cli }) { - cli = path.resolve(__dirname, '../../', cli); -+ if (!existsSync(cli)) { -+ return; -+ } -+ - const warmup = 3; - const state = { count, finished: -warmup }; - spawnProcess(cli, bench, state); diff --git a/node-v21.5.0.tar.xz b/node-v21.5.0.tar.xz deleted file mode 100644 index 2fa6a9b..0000000 --- a/node-v21.5.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:afd7d4713573cd814f7e4df320de8d5c8e147b4101bc9fbbe2a6d52eb5f8b072 -size 42530332 diff --git a/node-v21.6.1.tar.xz b/node-v21.6.1.tar.xz new file mode 100644 index 0000000..e74bafd --- /dev/null +++ b/node-v21.6.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a82f356d1dcba5d766f0e1d4c750e2e18d6290b710b7d19a8725241e7af1f60 +size 42656664 diff --git a/nodejs21.changes b/nodejs21.changes index 068576a..7584415 100644 --- a/nodejs21.changes +++ b/nodejs21.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Feb 12 14:51:32 UTC 2024 - Adam Majer + +- Update to 21.6.1: + * Revert "stream: fix cloned webstreams not being unref'd" + +- Changes in 21.6.0: + * New connection attempt events + * --allow-addons to enable addon usage when using the Permission Model. + * Support configurable snapshot through --build-snapshot-config flag + +- fix_ci_tests.patch: refreshed + ------------------------------------------------------------------- Mon Jan 8 15:02:53 UTC 2024 - Adam Majer diff --git a/nodejs21.spec b/nodejs21.spec index 6ddc03c..6afa6d7 100644 --- a/nodejs21.spec +++ b/nodejs21.spec @@ -1,7 +1,7 @@ # # spec file for package nodejs21 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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: nodejs21 -Version: 21.5.0 +Version: 21.6.1 Release: 0 # Double DWZ memory limits @@ -134,12 +124,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 | 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 | 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 @@ -150,8 +140,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 @@ -179,8 +167,8 @@ Patch308: node-gyp-config.patch Patch309: gcc13.patch Patch311: c-ares-fixes.patch -BuildRequires: pkg-config BuildRequires: fdupes +BuildRequires: pkg-config BuildRequires: procps BuildRequires: xz BuildRequires: zlib-devel @@ -200,10 +188,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 @@ -213,15 +201,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 @@ -230,7 +218,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 @@ -241,7 +229,6 @@ BuildRequires: gcc12-c++ BuildRequires: gcc-c++ %endif - # Python dependencies %if %node_version_number >= 14 @@ -267,8 +254,8 @@ BuildRequires: python %endif %if 0%{?suse_version} >= 1500 && %{node_version_number} >= 10 -BuildRequires: user(nobody) BuildRequires: group(nobody) +BuildRequires: user(nobody) %endif # shared openssl @@ -283,11 +270,10 @@ 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 +BuildRequires: openssl-1_1 >= %{openssl_req_ver} %endif - # /suse_version %endif @@ -370,8 +356,8 @@ ExclusiveArch: not_buildable %endif %endif -Provides: bundled(uvwasi) = 0.0.19 Provides: bundled(libuv) = 1.47.0 +Provides: bundled(uvwasi) = 0.0.19 Provides: bundled(v8) = 11.8.172.17 %if %{with intree_brotli} Provides: bundled(brotli) = 1.0.9 @@ -379,20 +365,19 @@ Provides: bundled(brotli) = 1.0.9 BuildRequires: pkgconfig(libbrotlidec) %endif - +Provides: bundled(base64) = 0.5.1 Provides: bundled(llhttp) = 9.1.3 Provides: bundled(ngtcp2) = 0.8.1 -Provides: bundled(base64) = 0.5.1 -Provides: bundled(simdutf) = 4.0.4 Provides: bundled(simdjson) = 3.6.2 +Provides: bundled(simdutf) = 4.0.4 # bundled url-ada parser, not ada Provides: bundled(ada) = 2.7.4 Provides: bundled(node-@fastify/busboy) = 2.1.0 -Provides: bundled(node-acorn) = 8.11.2 -Provides: bundled(node-acorn-walk) = 8.2.0 +Provides: bundled(node-acorn) = 8.11.3 +Provides: bundled(node-acorn-walk) = 8.3.1 Provides: bundled(node-cjs-module-lexer) = 1.2.2 -Provides: bundled(node-corepack) = 0.23.0 +Provides: bundled(node-corepack) = 0.24.0 Provides: bundled(node-minimatch) = 9.0.3 Provides: bundled(node-undici) = 5.28.2 @@ -405,8 +390,8 @@ provided by npm. Summary: Development headers for NodeJS 21.x Group: Development/Languages/NodeJS Provides: nodejs-devel = %{version} -Requires: npm21 = %{version} Requires: %{name} = %{version} +Requires: npm21 = %{version} %description devel This package provides development headers for Node.js needed for creation @@ -423,12 +408,12 @@ Requires: nodejs-common Requires: nodejs21 = %{version} Provides: nodejs-npm = %{version} Obsoletes: nodejs-npm < 4.0.0 -Provides: npm(npm) = 10.2.4 Provides: npm = %{version} +Provides: npm(npm) = 10.2.4 %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) = 2.0.0 @@ -595,9 +580,9 @@ 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.16 Provides: bundled(node-ssri) = 10.0.5 -Provides: bundled(node-string_decoder) = 1.3.0 Provides: bundled(node-string-width) = 4.2.3 Provides: bundled(node-string-width) = 5.1.2 +Provides: bundled(node-string_decoder) = 1.3.0 Provides: bundled(node-strip-ansi) = 6.0.1 Provides: bundled(node-strip-ansi) = 7.1.0 Provides: bundled(node-supports-color) = 9.4.0 @@ -725,8 +710,6 @@ 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 @@ -1086,6 +1069,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 77c8365d40bad11bb0212a9de4aa6fb1b6fc066989b6a80508433f592cc3924e Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 13 Feb 2024 12:35:48 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs21?expand=0&rev=17 --- fix_ci_tests.patch | 16 ++++++++++++ nodejs21.spec | 62 +++++++++++++++++++++++++++++----------------- 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/fix_ci_tests.patch b/fix_ci_tests.patch index 3e502d9..60fad66 100644 --- a/fix_ci_tests.patch +++ b/fix_ci_tests.patch @@ -107,3 +107,19 @@ Index: node-v21.6.1/test/parallel/test-crypto-dh.js } } +Index: node-v21.6.1/benchmark/misc/startup-cli-version.js +=================================================================== +--- node-v21.6.1.orig/benchmark/misc/startup-cli-version.js ++++ node-v21.6.1/benchmark/misc/startup-cli-version.js +@@ -11,10 +11,10 @@ const path = require('path'); + // indispensible part of the CLI. + const bench = common.createBenchmark(main, { + cli: [ +- 'tools/node_modules/eslint/bin/eslint.js', + 'deps/npm/bin/npx-cli.js', + 'deps/npm/bin/npm-cli.js', + 'deps/corepack/dist/corepack.js', ++ 'tools/node_modules/eslint/bin/eslint.js', + ], + count: [30], + }); diff --git a/nodejs21.spec b/nodejs21.spec index 6afa6d7..6cc68e3 100644 --- a/nodejs21.spec +++ b/nodejs21.spec @@ -15,7 +15,17 @@ # 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 @@ -124,12 +134,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 | 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 | 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 @@ -140,6 +150,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 @@ -167,8 +179,8 @@ Patch308: node-gyp-config.patch Patch309: gcc13.patch Patch311: c-ares-fixes.patch -BuildRequires: fdupes BuildRequires: pkg-config +BuildRequires: fdupes BuildRequires: procps BuildRequires: xz BuildRequires: zlib-devel @@ -188,10 +200,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 @@ -201,15 +213,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 @@ -218,7 +230,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 @@ -229,6 +241,7 @@ BuildRequires: gcc12-c++ BuildRequires: gcc-c++ %endif + # Python dependencies %if %node_version_number >= 14 @@ -254,8 +267,8 @@ BuildRequires: python %endif %if 0%{?suse_version} >= 1500 && %{node_version_number} >= 10 -BuildRequires: group(nobody) BuildRequires: user(nobody) +BuildRequires: group(nobody) %endif # shared openssl @@ -270,10 +283,11 @@ BuildRequires: openssl >= %{openssl_req_ver} BuildRequires: (libopenssl1_1-hmac if libopenssl-1_1-devel) BuildRequires: (libopenssl3-hmac if libopenssl-3-devel) %else -BuildRequires: libopenssl1_1-hmac BuildRequires: openssl-1_1 >= %{openssl_req_ver} +BuildRequires: libopenssl1_1-hmac %endif + # /suse_version %endif @@ -356,8 +370,8 @@ ExclusiveArch: not_buildable %endif %endif -Provides: bundled(libuv) = 1.47.0 Provides: bundled(uvwasi) = 0.0.19 +Provides: bundled(libuv) = 1.47.0 Provides: bundled(v8) = 11.8.172.17 %if %{with intree_brotli} Provides: bundled(brotli) = 1.0.9 @@ -365,11 +379,12 @@ Provides: bundled(brotli) = 1.0.9 BuildRequires: pkgconfig(libbrotlidec) %endif -Provides: bundled(base64) = 0.5.1 + Provides: bundled(llhttp) = 9.1.3 Provides: bundled(ngtcp2) = 0.8.1 -Provides: bundled(simdjson) = 3.6.2 +Provides: bundled(base64) = 0.5.1 Provides: bundled(simdutf) = 4.0.4 +Provides: bundled(simdjson) = 3.6.2 # bundled url-ada parser, not ada Provides: bundled(ada) = 2.7.4 @@ -390,8 +405,8 @@ provided by npm. Summary: Development headers for NodeJS 21.x Group: Development/Languages/NodeJS Provides: nodejs-devel = %{version} -Requires: %{name} = %{version} Requires: npm21 = %{version} +Requires: %{name} = %{version} %description devel This package provides development headers for Node.js needed for creation @@ -408,12 +423,12 @@ Requires: nodejs-common Requires: nodejs21 = %{version} Provides: nodejs-npm = %{version} Obsoletes: nodejs-npm < 4.0.0 -Provides: npm = %{version} Provides: npm(npm) = 10.2.4 +Provides: npm = %{version} %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) = 2.0.0 @@ -580,9 +595,9 @@ 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.16 Provides: bundled(node-ssri) = 10.0.5 +Provides: bundled(node-string_decoder) = 1.3.0 Provides: bundled(node-string-width) = 4.2.3 Provides: bundled(node-string-width) = 5.1.2 -Provides: bundled(node-string_decoder) = 1.3.0 Provides: bundled(node-strip-ansi) = 6.0.1 Provides: bundled(node-strip-ansi) = 7.1.0 Provides: bundled(node-supports-color) = 9.4.0 @@ -710,6 +725,8 @@ 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 @@ -1069,7 +1086,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