Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nodejs16 for openSUSE:Factory checked in at 2021-11-20 02:38:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs16 (Old) and /work/SRC/openSUSE:Factory/.nodejs16.new.1895 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs16" Sat Nov 20 02:38:17 2021 rev:12 rq:930406 version:16.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs16/nodejs16.changes 2021-11-03 17:27:00.449361558 +0100 +++ /work/SRC/openSUSE:Factory/.nodejs16.new.1895/nodejs16.changes 2021-11-20 02:38:53.336829896 +0100 @@ -1,0 +2,51 @@ +Tue Nov 9 10:43:16 UTC 2021 - Adam Majer <[email protected]> + +- BR python 3.6+ + +------------------------------------------------------------------- +Sat Nov 6 14:13:02 UTC 2021 - Adam Majer <[email protected]> + +- Update to 16.13.0: + * Experimental ESM Loader Hooks API + https://github.com/nodejs/node/pull/37468 + * deps: upgrade npm to 8.1.0 (npm team) + * vm: add support for import assertions in dynamic imports + +- Changes in 16.11.1: + * deps: update llhttp to 6.0.4 + - HTTP Request Smuggling due to spaced in headers + (bsc#1191601, CVE-2021-22959) + - HTTP Request Smuggling when parsing the body + (bsc#1191602, CVE-2021-22960) + +- Changes in 16.11.0: + * deps: update nghttp2 to v1.45.1 + +- Changes in 16.10.0: + * crypto: add rsa-pss keygen parameters + * fs: make open and close stream override optional when unused + * http: limit requests per connection + The maximum number of requests a socket can handle before closing + keep alive connection can be set with server.maxRequestsPerSocket. + * src: add --no-global-search-paths cli option + * stream: add signal support to pipeline generators + +- Changes in 16.9.0: + * Added support for corepack + * crypto: add RSA-PSS params to asymmetricKeyDetails + * module: support pattern trailers + * stream: add stream.compose + +- Changes in 16.8.0: + * doc: deprecate type coercion for dns.lookup options + * stream: add stream.Duplex.from utility and isDisturbed helper + * util: expose toUSVString + +- Changes in 16.7.0: + * fs: experimental: add recursive cp method + +- refreshed: fix_ci_tests.patch, flaky_test_rerun.patch, + nodejs-libpath.patch, sle12_python3_compat.patch, + versioned.patch, node_modules.tar.xz + +------------------------------------------------------------------- Old: ---- node-gyp_7.1.2.tar.xz node-v16.6.2.tar.xz New: ---- node-v16.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs16.spec ++++++ --- /var/tmp/diff_new_pack.MGXLSt/_old 2021-11-20 02:38:54.180827112 +0100 +++ /var/tmp/diff_new_pack.MGXLSt/_new 2021-11-20 02:38:54.180827112 +0100 @@ -32,7 +32,7 @@ %endif Name: nodejs16 -Version: 16.6.2 +Version: 16.13.0 Release: 0 # Double DWZ memory limits @@ -47,6 +47,12 @@ %bcond_with libalternatives %endif +%if %node_version_number >= 16 +%bcond_without corepack +%else +%bcond_with corepath +%endif + %if %node_version_number >= 12 %define openssl_req_ver 1.1.1 %else @@ -121,17 +127,12 @@ 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 Source11: node_modules.tar.xz Source20: bash_output_helper.bash ## Patches not distribution specific -Patch0: https://patch-diff.githubusercontent.com/raw/nodejs/node/pull/40670.patch Patch1: cares_public_headers.patch Patch3: fix_ci_tests.patch Patch5: sle12_python3_compat.patch @@ -155,12 +156,12 @@ Patch120: flaky_test_rerun.patch +Patch131: 40670.patch +Patch132: test-skip-y2038-on-32bit-time_t.patch + # Use versioned binaries and paths Patch200: versioned.patch -# Skip year 2038 test on platforms with 32-bit time_t. -Patch210: test-skip-y2038-on-32bit-time_t.patch - BuildRequires: pkg-config %if 0%{?suse_version} BuildRequires: config(netcfg) @@ -217,7 +218,11 @@ # Python dependencies %if %node_version_number >= 12 -BuildRequires: python3 +%if 0%{?suse_version} && 0%{?suse_version} < 1500 +BuildRequires: python36 +%else +BuildRequires: python3 > 3.6.0 +%endif %if 0%{?suse_version} BuildRequires: netcfg @@ -249,7 +254,7 @@ %else %if %node_version_number <= 12 && 0%{?suse_version} == 1315 && 0%{?sle_version} < 120400 -Provides: bundled(openssl) = 1.1.1k +Provides: bundled(openssl) = 1.1.1l %else BuildRequires: bundled_openssl_should_not_be_required %endif @@ -270,7 +275,7 @@ %if ! 0%{with intree_nghttp2} BuildRequires: libnghttp2-devel >= 1.41.0 %else -Provides: bundled(nghttp2) = 1.42.0 +Provides: bundled(nghttp2) = 1.45.1 %endif %if 0%{with valgrind_tests} @@ -280,7 +285,7 @@ %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 @@ -320,16 +325,17 @@ %endif Provides: bundled(brotli) = 1.0.9 -Provides: bundled(libuv) = 1.41.0 +Provides: bundled(libuv) = 1.42.0 Provides: bundled(uvwasi) = 0.0.11 -Provides: bundled(v8) = 9.2.230.21 +Provides: bundled(v8) = 9.4.146.19 -Provides: bundled(llhttp) = 6.0.2 +Provides: bundled(llhttp) = 6.0.4 Provides: bundled(ngtcp2) = 0.1.0-DEV -Provides: bundled(node-acorn) = 8.4.1 -Provides: bundled(node-acorn-walk) = 8.1.0 +Provides: bundled(node-acorn) = 8.5.0 +Provides: bundled(node-acorn-walk) = 8.2.0 Provides: bundled(node-cjs-module-lexer) = 1.2.2 +Provides: bundled(node-corepack) = 0.10.0 %description Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js @@ -359,7 +365,7 @@ Provides: nodejs-npm = %{version} Obsoletes: nodejs-npm < 4.0.0 Provides: npm = %{version} -Provides: npm(npm) = 7.20.3 +Provides: npm(npm) = 8.1.0 %if 0%{?suse_version} >= 1500 %if %{node_version_number} >= 10 Requires: group(nobody) @@ -370,139 +376,111 @@ Provides: bundled(node-agent-base) = 6.0.2 Provides: bundled(node-agentkeepalive) = 4.1.4 Provides: bundled(node-aggregate-error) = 3.1.0 -Provides: bundled(node-ajv) = 6.12.6 Provides: bundled(node-ansi-regex) = 2.1.1 Provides: bundled(node-ansi-regex) = 3.0.0 Provides: bundled(node-ansi-regex) = 5.0.0 +Provides: bundled(node-ansi-regex) = 5.0.1 Provides: bundled(node-ansi-styles) = 4.3.0 Provides: bundled(node-ansicolors) = 0.3.2 Provides: bundled(node-ansistyles) = 0.1.3 Provides: bundled(node-aproba) = 1.2.0 Provides: bundled(node-aproba) = 2.0.0 Provides: bundled(node-archy) = 1.0.0 -Provides: bundled(node-are-we-there-yet) = 1.1.5 +Provides: bundled(node-are-we-there-yet) = 1.1.6 +Provides: bundled(node-are-we-there-yet) = 2.0.0 Provides: bundled(node-asap) = 2.0.6 -Provides: bundled(node-asn1) = 0.2.4 -Provides: bundled(node-assert-plus) = 1.0.0 -Provides: bundled(node-asynckit) = 0.4.0 -Provides: bundled(node-aws-sign2) = 0.7.0 -Provides: bundled(node-aws4) = 1.11.0 Provides: bundled(node-balanced-match) = 1.0.2 -Provides: bundled(node-bcrypt-pbkdf) = 1.0.2 -Provides: bundled(node-bin-links) = 2.2.1 +Provides: bundled(node-bin-links) = 2.3.0 Provides: bundled(node-binary-extensions) = 2.2.0 Provides: bundled(node-brace-expansion) = 1.1.11 Provides: bundled(node-builtins) = 1.0.3 -Provides: bundled(node-byte-size) = 7.0.1 -Provides: bundled(node-cacache) = 15.2.0 -Provides: bundled(node-caseless) = 0.12.0 -Provides: bundled(node-chalk) = 4.1.1 +Provides: bundled(node-cacache) = 15.3.0 +Provides: bundled(node-chalk) = 4.1.2 Provides: bundled(node-chownr) = 2.0.0 Provides: bundled(node-cidr-regex) = 3.1.1 Provides: bundled(node-clean-stack) = 2.2.0 -Provides: bundled(node-cli-columns) = 3.1.2 +Provides: bundled(node-cli-columns) = 4.0.0 Provides: bundled(node-cli-table3) = 0.6.0 Provides: bundled(node-clone) = 1.0.4 Provides: bundled(node-cmd-shim) = 4.1.0 Provides: bundled(node-code-point-at) = 1.1.0 Provides: bundled(node-color-convert) = 2.0.1 Provides: bundled(node-color-name) = 1.1.4 +Provides: bundled(node-color-support) = 1.1.3 Provides: bundled(node-colors) = 1.4.0 Provides: bundled(node-columnify) = 1.5.4 -Provides: bundled(node-combined-stream) = 1.0.8 Provides: bundled(node-common-ancestor-path) = 1.0.1 Provides: bundled(node-concat-map) = 0.0.1 Provides: bundled(node-console-control-strings) = 1.1.0 -Provides: bundled(node-core-util-is) = 1.0.2 -Provides: bundled(node-dashdash) = 1.14.1 -Provides: bundled(node-debug) = 4.3.1 +Provides: bundled(node-debug) = 4.3.2 Provides: bundled(node-debuglog) = 1.0.1 Provides: bundled(node-defaults) = 1.0.3 -Provides: bundled(node-delayed-stream) = 1.0.0 Provides: bundled(node-delegates) = 1.0.0 Provides: bundled(node-depd) = 1.1.2 Provides: bundled(node-dezalgo) = 1.0.3 Provides: bundled(node-diff) = 5.0.0 -Provides: bundled(node-ecc-jsbn) = 0.1.2 Provides: bundled(node-emoji-regex) = 8.0.0 Provides: bundled(node-encoding) = 0.1.13 Provides: bundled(node-env-paths) = 2.2.1 Provides: bundled(node-err-code) = 2.0.3 -Provides: bundled(node-extend) = 3.0.2 -Provides: bundled(node-extsprintf) = 1.3.0 -Provides: bundled(node-fast-deep-equal) = 3.1.3 -Provides: bundled(node-fast-json-stable-stringify) = 2.1.0 -Provides: bundled(node-forever-agent) = 0.6.1 -Provides: bundled(node-form-data) = 2.3.3 +Provides: bundled(node-fastest-levenshtein) = 1.0.12 Provides: bundled(node-fs-minipass) = 2.1.0 Provides: bundled(node-fs.realpath) = 1.0.0 Provides: bundled(node-function-bind) = 1.1.1 Provides: bundled(node-gauge) = 2.7.4 -Provides: bundled(node-getpass) = 0.1.7 -Provides: bundled(node-glob) = 7.1.7 -Provides: bundled(node-graceful-fs) = 4.2.6 -Provides: bundled(node-har-schema) = 2.0.0 -Provides: bundled(node-har-validator) = 5.1.5 +Provides: bundled(node-gauge) = 3.0.1 +Provides: bundled(node-glob) = 7.2.0 +Provides: bundled(node-graceful-fs) = 4.2.8 Provides: bundled(node-has) = 1.0.3 Provides: bundled(node-has-flag) = 4.0.0 Provides: bundled(node-has-unicode) = 2.0.1 Provides: bundled(node-hosted-git-info) = 4.0.2 Provides: bundled(node-http-cache-semantics) = 4.1.0 Provides: bundled(node-http-proxy-agent) = 4.0.1 -Provides: bundled(node-http-signature) = 1.2.0 Provides: bundled(node-https-proxy-agent) = 5.0.0 Provides: bundled(node-humanize-ms) = 1.2.1 Provides: bundled(node-iconv-lite) = 0.6.3 -Provides: bundled(node-ignore-walk) = 3.0.4 +Provides: bundled(node-ignore-walk) = 4.0.1 Provides: bundled(node-imurmurhash) = 0.1.4 Provides: bundled(node-indent-string) = 4.0.0 Provides: bundled(node-infer-owner) = 1.0.4 Provides: bundled(node-inflight) = 1.0.6 Provides: bundled(node-inherits) = 2.0.4 Provides: bundled(node-ini) = 2.0.0 -Provides: bundled(node-init-package-json) = 2.0.3 +Provides: bundled(node-init-package-json) = 2.0.5 Provides: bundled(node-ip) = 1.1.5 Provides: bundled(node-ip-regex) = 4.3.0 Provides: bundled(node-is-cidr) = 4.0.2 -Provides: bundled(node-is-core-module) = 2.4.0 +Provides: bundled(node-is-core-module) = 2.7.0 Provides: bundled(node-is-fullwidth-code-point) = 1.0.0 Provides: bundled(node-is-fullwidth-code-point) = 2.0.0 Provides: bundled(node-is-fullwidth-code-point) = 3.0.0 Provides: bundled(node-is-lambda) = 1.0.1 Provides: bundled(node-is-typedarray) = 1.0.0 -Provides: bundled(node-isarray) = 1.0.0 Provides: bundled(node-isexe) = 2.0.0 -Provides: bundled(node-isstream) = 0.1.2 -Provides: bundled(node-jsbn) = 0.1.1 Provides: bundled(node-json-parse-even-better-errors) = 2.3.1 -Provides: bundled(node-json-schema) = 0.2.3 -Provides: bundled(node-json-schema-traverse) = 0.4.1 Provides: bundled(node-json-stringify-nice) = 1.1.4 -Provides: bundled(node-json-stringify-safe) = 5.0.1 Provides: bundled(node-jsonparse) = 1.3.1 -Provides: bundled(node-jsprim) = 1.4.1 Provides: bundled(node-just-diff) = 3.1.1 Provides: bundled(node-just-diff-apply) = 3.0.0 -Provides: bundled(node-leven) = 3.1.0 Provides: bundled(node-libnpmaccess) = 4.0.3 Provides: bundled(node-libnpmdiff) = 2.0.4 -Provides: bundled(node-libnpmexec) = 2.0.0 -Provides: bundled(node-libnpmfund) = 1.1.0 +Provides: bundled(node-libnpmexec) = 3.0.1 +Provides: bundled(node-libnpmfund) = 2.0.1 Provides: bundled(node-libnpmhook) = 6.0.3 Provides: bundled(node-libnpmorg) = 2.0.3 -Provides: bundled(node-libnpmpack) = 2.0.1 +Provides: bundled(node-libnpmpack) = 3.0.0 Provides: bundled(node-libnpmpublish) = 4.0.2 Provides: bundled(node-libnpmsearch) = 3.1.2 Provides: bundled(node-libnpmteam) = 2.0.4 -Provides: bundled(node-libnpmversion) = 1.2.1 +Provides: bundled(node-libnpmversion) = 2.0.1 Provides: bundled(node-lru-cache) = 6.0.0 -Provides: bundled(node-make-fetch-happen) = 9.0.4 -Provides: bundled(node-mime-db) = 1.49.0 -Provides: bundled(node-mime-types) = 2.1.32 +Provides: bundled(node-make-fetch-happen) = 8.0.14 +Provides: bundled(node-make-fetch-happen) = 9.1.0 Provides: bundled(node-minimatch) = 3.0.4 -Provides: bundled(node-minipass) = 3.1.3 +Provides: bundled(node-minipass) = 3.1.5 Provides: bundled(node-minipass-collect) = 1.0.2 -Provides: bundled(node-minipass-fetch) = 1.3.4 +Provides: bundled(node-minipass-fetch) = 1.4.1 Provides: bundled(node-minipass-flush) = 1.0.5 Provides: bundled(node-minipass-json-stream) = 1.0.1 Provides: bundled(node-minipass-pipeline) = 1.2.4 @@ -514,91 +492,79 @@ Provides: bundled(node-ms) = 2.1.3 Provides: bundled(node-mute-stream) = 0.0.8 Provides: bundled(node-negotiator) = 0.6.2 -Provides: bundled(node-node-gyp) = 7.1.2 +Provides: bundled(node-node-gyp) = 8.2.0 Provides: bundled(node-nopt) = 5.0.0 -Provides: bundled(node-normalize-package-data) = 3.0.2 +Provides: bundled(node-normalize-package-data) = 3.0.3 Provides: bundled(node-npm-audit-report) = 2.1.5 Provides: bundled(node-npm-bundled) = 1.1.2 Provides: bundled(node-npm-install-checks) = 4.0.0 Provides: bundled(node-npm-normalize-package-bin) = 1.0.1 Provides: bundled(node-npm-package-arg) = 8.1.5 -Provides: bundled(node-npm-packlist) = 2.2.2 +Provides: bundled(node-npm-packlist) = 3.0.0 Provides: bundled(node-npm-pick-manifest) = 6.1.1 Provides: bundled(node-npm-profile) = 5.0.4 Provides: bundled(node-npm-registry-fetch) = 11.0.0 Provides: bundled(node-npm-user-validate) = 1.0.1 Provides: bundled(node-npmlog) = 4.1.2 +Provides: bundled(node-npmlog) = 5.0.1 Provides: bundled(node-number-is-nan) = 1.0.1 -Provides: bundled(node-oauth-sign) = 0.9.0 Provides: bundled(node-object-assign) = 4.1.1 Provides: bundled(node-once) = 1.4.0 Provides: bundled(node-opener) = 1.5.2 Provides: bundled(node-p-map) = 4.0.0 -Provides: bundled(node-pacote) = 11.3.5 +Provides: bundled(node-pacote) = 12.0.2 Provides: bundled(node-parse-conflict-json) = 1.1.1 Provides: bundled(node-path-is-absolute) = 1.0.1 -Provides: bundled(node-path-parse) = 1.0.7 -Provides: bundled(node-performance-now) = 2.1.0 Provides: bundled(node-proc-log) = 1.0.0 -Provides: bundled(node-process-nextick-args) = 2.0.1 Provides: bundled(node-promise-all-reject-late) = 1.0.1 Provides: bundled(node-promise-call-limit) = 1.0.1 Provides: bundled(node-promise-inflight) = 1.0.1 Provides: bundled(node-promise-retry) = 2.0.1 Provides: bundled(node-promzard) = 0.3.0 -Provides: bundled(node-psl) = 1.8.0 -Provides: bundled(node-punycode) = 2.1.1 Provides: bundled(node-qrcode-terminal) = 0.12.0 -Provides: bundled(node-qs) = 6.5.2 Provides: bundled(node-read) = 1.0.7 Provides: bundled(node-read-cmd-shim) = 2.0.0 -Provides: bundled(node-read-package-json) = 3.0.1 -Provides: bundled(node-read-package-json-fast) = 2.0.2 -Provides: bundled(node-readable-stream) = 2.3.7 +Provides: bundled(node-read-package-json) = 4.1.1 +Provides: bundled(node-read-package-json-fast) = 2.0.3 +Provides: bundled(node-readable-stream) = 3.6.0 Provides: bundled(node-readdir-scoped-modules) = 1.1.0 -Provides: bundled(node-request) = 2.88.2 -Provides: bundled(node-resolve) = 1.20.0 Provides: bundled(node-retry) = 0.12.0 Provides: bundled(node-rimraf) = 3.0.2 -Provides: bundled(node-safe-buffer) = 5.1.2 +Provides: bundled(node-safe-buffer) = 5.2.1 Provides: bundled(node-safer-buffer) = 2.1.2 Provides: bundled(node-semver) = 7.3.5 Provides: bundled(node-set-blocking) = 2.0.0 Provides: bundled(node-signal-exit) = 3.0.3 -Provides: bundled(node-smart-buffer) = 4.1.0 +Provides: bundled(node-smart-buffer) = 4.2.0 Provides: bundled(node-socks) = 2.6.1 -Provides: bundled(node-socks-proxy-agent) = 5.0.0 +Provides: bundled(node-socks-proxy-agent) = 5.0.1 +Provides: bundled(node-socks-proxy-agent) = 6.1.0 Provides: bundled(node-spdx-correct) = 3.1.1 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.9 -Provides: bundled(node-sshpk) = 1.16.1 +Provides: bundled(node-spdx-license-ids) = 3.0.10 Provides: bundled(node-ssri) = 8.0.1 Provides: bundled(node-string-width) = 1.0.2 Provides: bundled(node-string-width) = 2.1.1 Provides: bundled(node-string-width) = 4.2.2 -Provides: bundled(node-string_decoder) = 1.1.1 +Provides: bundled(node-string-width) = 4.2.3 +Provides: bundled(node-string_decoder) = 1.3.0 Provides: bundled(node-stringify-package) = 1.0.1 Provides: bundled(node-strip-ansi) = 3.0.1 Provides: bundled(node-strip-ansi) = 4.0.0 Provides: bundled(node-strip-ansi) = 6.0.0 +Provides: bundled(node-strip-ansi) = 6.0.1 Provides: bundled(node-supports-color) = 7.2.0 -Provides: bundled(node-tar) = 6.1.0 +Provides: bundled(node-tar) = 6.1.11 Provides: bundled(node-text-table) = 0.2.0 Provides: bundled(node-tiny-relative-date) = 1.3.0 -Provides: bundled(node-tough-cookie) = 2.5.0 Provides: bundled(node-treeverse) = 1.0.4 -Provides: bundled(node-tunnel-agent) = 0.6.0 -Provides: bundled(node-tweetnacl) = 0.14.5 Provides: bundled(node-typedarray-to-buffer) = 3.1.5 Provides: bundled(node-unique-filename) = 1.1.1 Provides: bundled(node-unique-slug) = 2.0.2 -Provides: bundled(node-uri-js) = 4.4.1 Provides: bundled(node-util-deprecate) = 1.0.2 -Provides: bundled(node-uuid) = 3.4.0 Provides: bundled(node-validate-npm-package-license) = 3.0.4 Provides: bundled(node-validate-npm-package-name) = 3.0.0 -Provides: bundled(node-verror) = 1.10.0 Provides: bundled(node-walk-up-path) = 1.0.0 Provides: bundled(node-wcwidth) = 1.0.1 Provides: bundled(node-which) = 2.0.2 @@ -611,6 +577,15 @@ A package manager for Node.js that allows developers to install and publish packages to a package registry. +%package -n corepack16 +Summary: Helper bridge between NodeJS projects and their dependencies +Group: Development/Languages/NodeJS +Requires: nodejs-common >= 5.0 + +%description -n corepack16 +Zero-runtime-dependency package acting as bridge between Node projects +and their package managers. + %package docs Summary: Node.js API documentation Group: Documentation/Other @@ -640,11 +615,6 @@ tar Jxf %{SOURCE11} %endif -%if %{node_version_number} >= 16 && 0%{?suse_version} > 0 && 0%{?suse_version} < 1500 -tar Jxf %{SOURCE5} --directory=tools/gyp --strip-components=1 -%endif - -%patch0 -p1 %patch1 -p1 %patch3 -p1 %patch5 -p1 @@ -662,8 +632,9 @@ %patch106 -p1 %patch110 -p1 %patch120 -p1 +%patch131 -p1 +%patch132 -p1 %patch200 -p1 -%patch210 -p1 # remove backup files, if any find -name \*~ -print0 -delete @@ -704,10 +675,11 @@ find deps/zlib -name *.[ch] -delete cat > spec.build.config <<EOF +export PREFIX=/usr export CFLAGS="%{?build_cflags:%build_cflags}%{?!build_cflags:%optflags} -fno-strict-aliasing" # -Wno-class-memaccess is not available in gcc < 8 (= system compiler on Leap until at least 15.3 is gcc7) export CXXFLAGS="%{?build_cxxflags:%build_cxxflags}%{?!build_cxxflags:%optflags} -Wno-error=return-type -fno-strict-aliasing" -%if 0%{?sle_version} > 150300 +%if 0%{?sle_version} > 150300 || 0%{?suse_version} > 1500 export CXXFLAGS="${CXXFLAGS} -Wno-class-memaccess" %endif export LDFLAGS="%{?build_ldflags}" @@ -941,6 +913,13 @@ %ghost %{_sysconfdir}/alternatives/npx.1%{ext_man} %endif +%if %{node_version_number} >= 16 +%files -n corepack%{node_version_number} +%defattr(-, root, root) +%{_bindir}/corepack%{node_version_number} +%{_libdir}/node_modules/corepack%{node_version_number} +%endif + %files devel %defattr(-, root, root) %{_includedir}/node%{node_version_number} @@ -962,7 +941,6 @@ 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 ++++++ SHASUMS256.txt ++++++ --- /var/tmp/diff_new_pack.MGXLSt/_old 2021-11-20 02:38:54.220826980 +0100 +++ /var/tmp/diff_new_pack.MGXLSt/_new 2021-11-20 02:38:54.224826966 +0100 @@ -1,34 +1,34 @@ -2a51635501451a88f6addc192a79b6d36cc40dcf3a198a54037ab26fa6305043 node-v16.6.2-aix-ppc64.tar.gz -29e46e83f6837ff1c815c49f590c25fa51b0811a6590c62120a9d464ba431fc6 node-v16.6.2-darwin-arm64.tar.gz -befbfdec7c2118689544ef596e990aae2fcd1227707c6a8475056be14ce2ee8d node-v16.6.2-darwin-arm64.tar.xz -74e95aca0ea88ed2d9270dccc1e3e62500912be5fef1528bb11f178c468f312c node-v16.6.2-darwin-x64.tar.gz -21c9417c38d9bee140c659f7cf11806ec866af3f7053bd17ec45757a902c9956 node-v16.6.2-darwin-x64.tar.xz -7764da71e22d57746d65eb408dc80cbd7f6eed7f38b558684fa60571d1c69b26 node-v16.6.2-headers.tar.gz -e4bf9c8db91d149d9f3cebd79621571079ffb9d92dca10e7d260120ff99b428e node-v16.6.2-headers.tar.xz -c51a94f28a29c390d20445d9b334a9808d3166bd244ebc03852d23c0b17a93ca node-v16.6.2-linux-arm64.tar.gz -d885ffcef367a010e2b21a283ec96721e92b29f222de5d943bc7188e48f30349 node-v16.6.2-linux-arm64.tar.xz -1ba5287c941cef2da53c0d80db7db7124971b1c933f222ca7f2eb833e1817f35 node-v16.6.2-linux-armv7l.tar.gz -9756e763910ab7277346307fb5c4d34370ab3bb7d957129f58a65bf69f2af93b node-v16.6.2-linux-armv7l.tar.xz -a966ea0d258c0e4a2c23b77f49f85bd7a4a4ff674fcd0d625a7fa48370d14d15 node-v16.6.2-linux-ppc64le.tar.gz -c2ee7961f1f217b0cc57a15efc3372b0495f6e1775a3e7f50b153b9db7c46be9 node-v16.6.2-linux-ppc64le.tar.xz -31e27413ff29607af54fcf842105a5290f2556add1b009b8e28240f96f742638 node-v16.6.2-linux-s390x.tar.gz -c3d6b4f7bf055f257abc07862743b614bdba00fd096a863eaadc700ae0939c98 node-v16.6.2-linux-s390x.tar.xz -913913f62416b96dee5f463b54e1adebaf669dd2ff3b047d6290deadc3003d97 node-v16.6.2-linux-x64.tar.gz -90c88cf6ca06dcd6d20c2b6dba5ff84d1f831446c25ef650f86e86bb94239353 node-v16.6.2-linux-x64.tar.xz -5bb14dafbac87efb74d3e050a90de68eb407ecadd52f12a1b4e937ec59884792 node-v16.6.2.pkg -e8df4a0084c379a37c11b315b7d068760a38598119d7ca9262977adcbbb58933 node-v16.6.2.tar.gz -8794cba1f971e4200a38690c76d7cc0a3bd1cba96fbf4305dfbe21fc459d79eb node-v16.6.2.tar.xz -152e36fe0493f37d3be939c7f9c3a975c9f39a3346d66787b59e2db28ed2eeb6 node-v16.6.2-win-x64.7z -e7e05eb133fce48b76b4db6714d80aea90872afec176599585bc1aa457fb41b9 node-v16.6.2-win-x64.zip -b40c0f3bf401ff56c558de3a24b33101273c622e664e1e5df4d08444aa4ae7df node-v16.6.2-win-x86.7z -b7324b70ed37e14878cde39cd69099368513068495b25d97f1423591c0206685 node-v16.6.2-win-x86.zip -6cb05e722749c98cc9d0d1b2ef0c3a4c5c05da83a00b4ef04cee0bd4a3cfbbc7 node-v16.6.2-x64.msi -22b21336d6ae8d16a1e45d38bd198831aa27ddf8a61d52831cfbd3ba5d2866e0 node-v16.6.2-x86.msi -9c99a5255dabc044bd262df07ec8e6ba3351e38d003121ed8739906bf5f0eb42 win-x64/node.exe -e7484e4552df7e992e5d409e518aa467555769dc85917da408d41f85c4f2823d win-x64/node.lib -a44ba1e9c42f84d80a9c29871a22c687e7f35ae358a898813d50b02866b8d6e9 win-x64/node_pdb.7z -bfdfedc1829855dcb1545661963dcb98d72ea517a4be3926a8c35f5120a72637 win-x64/node_pdb.zip -5dc410d110cb86a0e9fd58f30b5c1208915e733e3ab222e71fbdb0aa1a3755f3 win-x86/node.exe -7821ab6af3cef68eee042ef6b7fb2185eafff8bd4e4c988c8fc6c1d0242d2bcd win-x86/node.lib -cee7fe2c53d99e9c7bca0e7485a35c49d0f01ad131a790199cdb68e1383b946d win-x86/node_pdb.7z -32f1c9673025980c1563bf173c02bf3ae81a0a8c0e30673a3e906b3adff0519a win-x86/node_pdb.zip +eadf10e991a690c2af98b6df8a118336ded513d6b13a83721bb28bec290df908 node-v16.13.0-aix-ppc64.tar.gz +46d83fc0bd971db5050ef1b15afc44a6665dee40bd6c1cbaec23e1b40fa49e6d node-v16.13.0-darwin-arm64.tar.gz +ca8d79ceecfa8b7d74651fba648c9034f6108070b7cd02437ecb2b7f103842d4 node-v16.13.0-darwin-arm64.tar.xz +37e09a8cf2352f340d1204c6154058d81362fef4ec488b0197b2ce36b3f0367a node-v16.13.0-darwin-x64.tar.gz +8dc70eb0965896a4d1755e719be2b5efeff7cb8a54e1f3b8dccc5a2864965504 node-v16.13.0-darwin-x64.tar.xz +9abfc6dcd32bce3b9a978b8c23b8bb48a562c94919feba489f9bb9d4bbeeae66 node-v16.13.0-headers.tar.gz +9f38e4e1702dde08937125d618c0de119bd77da4665e584aaffc332691af7ef1 node-v16.13.0-headers.tar.xz +46e3857f5552abd36d9548380d795b043a3ceec2504e69fe1a754fa76012daaf node-v16.13.0-linux-arm64.tar.gz +93a0d03f9f802353cb7052bc97a02cd9642b49fa985671cdc16c99936c86d7d2 node-v16.13.0-linux-arm64.tar.xz +3d22bc15b47c26129d56745cd587ead7e240a36968ceb3c4105bebc5c6a0be16 node-v16.13.0-linux-armv7l.tar.gz +c2c548387ec6b08291b746423bfdf6475948561884985cad16a95983e4913ee4 node-v16.13.0-linux-armv7l.tar.xz +3ed1d82ecd6eee3549e9b7f4e65c8a42cbc77f1c6e4da35cf7e496d540fa1760 node-v16.13.0-linux-ppc64le.tar.gz +46ae5cd3b4c554a600d1b3df5ead1567f6f223a7d4d4667a2be92a67ae70aea7 node-v16.13.0-linux-ppc64le.tar.xz +8883af58d2e7c8f8c8311a9504ba1d6ce77c6badc7120165823a516049378042 node-v16.13.0-linux-s390x.tar.gz +49e972bf3e969d621157df4c8f2fa18ff748c167d5ebd0efc87e1b9f0c6541cc node-v16.13.0-linux-s390x.tar.xz +589b7e7eb22f8358797a2c14a0bd865459d0b44458b8f05d2721294dacc7f734 node-v16.13.0-linux-x64.tar.gz +a876ce787133149abd1696afa54b0b5bc5ce3d5ae359081d407ff776e39b7ba8 node-v16.13.0-linux-x64.tar.xz +33c3b6eba6b7f82413545b3789b35bf9b9a187f92c984d6c5555934c773ce4fc node-v16.13.0.pkg +9c00e5b6024cfcbc9105f9c58cf160762e78659a345d100c5bd80a7fb38c684f node-v16.13.0.tar.gz +32114b3dc3945ed0f95f8bc33b42c68e0ef18c408cb56122572a163d907ecbcc node-v16.13.0.tar.xz +f4402bebb34339d9b6f1814df17eed278ec79ec6f0f7501203b2681b284c644d node-v16.13.0-win-x64.7z +5a39ec5d4786c2814a6c04488bebac6423c2aaa12832b24f0882456f2e4674e1 node-v16.13.0-win-x64.zip +d93bceda06924a46c7035d74e99dd58802960f4ce9dc6c3aa8c55118612c4106 node-v16.13.0-win-x86.7z +dd2e7fccf073ac356878e541dd4e165f05ff145fe9722feb52613f58f88ded7b node-v16.13.0-win-x86.zip +bf55b68293b163423ea4856c1d330be23158e78aea18a8756cfdff6fb6ffcd88 node-v16.13.0-x64.msi +53443f9147d86d538ee24ef9897ae0ff0be740c18fd0e3c17058dbafe343364f node-v16.13.0-x86.msi +7fca04f83b0e2169e41b2e1845e8da0f07d66cf9c3a1b4150767bf3ffddccf62 win-x64/node.exe +7c94657df6918a77dc8edefaf3b5415dbfb9eb83a88c17d216a48c8c36fcc58d win-x64/node.lib +1009402493f1eba91c587486033fd46d8006cb7d9c41b84abc19fa3ba18b0d55 win-x64/node_pdb.7z +72d08ea9e7a7b10d8d1da92a0261e60f71e1f0cf1e14443db8477cad9fcd511e win-x64/node_pdb.zip +0414fdd69004885755cb6782100970e62814d6f1f66ce1d6ba0d7bf89c2522f6 win-x86/node.exe +8090f51a19ff2d5e765920262a4367203be2e69e64ac3725e4e14dd034c98443 win-x86/node.lib +90759e7c7aa604f25ba3454618834d3a31a30bd8c500a8625d4dd270a8127614 win-x86/node_pdb.7z +703b18c4ffcd5f082254a4885cd58f3924352dc7c2287749b0087cdfc1b7f2ce win-x86/node_pdb.zip ++++++ SHASUMS256.txt.sig ++++++ Binary files /var/tmp/diff_new_pack.MGXLSt/_old and /var/tmp/diff_new_pack.MGXLSt/_new differ ++++++ fix_ci_tests.patch ++++++ --- /var/tmp/diff_new_pack.MGXLSt/_old 2021-11-20 02:38:54.264826835 +0100 +++ /var/tmp/diff_new_pack.MGXLSt/_new 2021-11-20 02:38:54.268826821 +0100 @@ -2,10 +2,10 @@ Date: Dec 20 09:18:49 UTC 2017 Summary: Fix CI unit tests framework for OBS building -Index: node-v16.5.0/test/parallel/test-module-loading-globalpaths.js +Index: node-v16.13.0/test/parallel/test-module-loading-globalpaths.js =================================================================== ---- node-v16.5.0.orig/test/parallel/test-module-loading-globalpaths.js -+++ node-v16.5.0/test/parallel/test-module-loading-globalpaths.js +--- node-v16.13.0.orig/test/parallel/test-module-loading-globalpaths.js ++++ node-v16.13.0/test/parallel/test-module-loading-globalpaths.js @@ -11,6 +11,9 @@ const { addLibraryPath } = require('../c addLibraryPath(process.env); @@ -16,23 +16,10 @@ if (process.argv[2] === 'child') { console.log(require(pkgName).string); } else { -Index: node-v16.5.0/test/parallel/test-tls-env-bad-extra-ca.js +Index: node-v16.13.0/test/parallel/test-tls-passphrase.js =================================================================== ---- node-v16.5.0.orig/test/parallel/test-tls-env-bad-extra-ca.js -+++ node-v16.5.0/test/parallel/test-tls-env-bad-extra-ca.js -@@ -37,7 +37,7 @@ fork(__filename, opts) - // TODO(addaleax): Make `SafeGetenv` work like `process.env` - // encoding-wise - if (!common.isWindows) { -- const re = /Warning: Ignoring extra certs from.*no-such-file-exists-????.* load failed:.*No such file or directory/; -+ const re = /Warning: Ignoring extra certs from.*no-such-file-exists-.* load failed:.*/; - assert(re.test(stderr), stderr); - } - })) -Index: node-v16.5.0/test/parallel/test-tls-passphrase.js -=================================================================== ---- node-v16.5.0.orig/test/parallel/test-tls-passphrase.js -+++ node-v16.5.0/test/parallel/test-tls-passphrase.js +--- node-v16.13.0.orig/test/parallel/test-tls-passphrase.js ++++ node-v16.13.0/test/parallel/test-tls-passphrase.js @@ -224,7 +224,7 @@ server.listen(0, common.mustCall(functio })).unref(); @@ -51,10 +38,10 @@ // Invalid passphrase assert.throws(function() { -Index: node-v16.5.0/test/parallel/test-repl-envvars.js +Index: node-v16.13.0/test/parallel/test-repl-envvars.js =================================================================== ---- node-v16.5.0.orig/test/parallel/test-repl-envvars.js -+++ node-v16.5.0/test/parallel/test-repl-envvars.js +--- node-v16.13.0.orig/test/parallel/test-repl-envvars.js ++++ node-v16.13.0/test/parallel/test-repl-envvars.js @@ -2,7 +2,9 @@ // Flags: --expose-internals @@ -66,11 +53,11 @@ const stream = require('stream'); const REPL = require('internal/repl'); const assert = require('assert'); -Index: node-v16.5.0/test/common/index.mjs +Index: node-v16.13.0/test/common/index.mjs =================================================================== ---- node-v16.5.0.orig/test/common/index.mjs -+++ node-v16.5.0/test/common/index.mjs -@@ -44,6 +44,7 @@ const { +--- node-v16.13.0.orig/test/common/index.mjs ++++ node-v16.13.0/test/common/index.mjs +@@ -42,6 +42,7 @@ const { expectsError, skipIfInspectorDisabled, skipIf32Bits, @@ -78,7 +65,7 @@ getArrayBufferViews, getBufferSources, getTTYfd, -@@ -89,6 +90,7 @@ export { +@@ -87,6 +88,7 @@ export { expectsError, skipIfInspectorDisabled, skipIf32Bits, @@ -86,11 +73,11 @@ getArrayBufferViews, getBufferSources, getTTYfd, -Index: node-v16.5.0/Makefile +Index: node-v16.13.0/Makefile =================================================================== ---- node-v16.5.0.orig/Makefile -+++ node-v16.5.0/Makefile -@@ -509,7 +509,8 @@ test-ci-js: | clear-stalled +--- node-v16.13.0.orig/Makefile ++++ node-v16.13.0/Makefile +@@ -508,7 +508,8 @@ test-ci-js: | clear-stalled .PHONY: test-ci # Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned test-ci: LOGLEVEL := info @@ -100,7 +87,7 @@ out/Release/cctest --gtest_output=xml:out/junit/cctest.xml $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ -@@ -687,7 +688,8 @@ apidocs_json = $(addprefix out/,$(apidoc +@@ -684,7 +685,8 @@ apidocs_json = $(addprefix out/,$(apidoc apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*))) tools/doc/node_modules: tools/doc/package.json @@ -110,10 +97,10 @@ echo "Skipping tools/doc/node_modules (no crypto)"; \ else \ cd tools/doc && $(call available-node,$(run-npm-ci)) \ -Index: node-v16.5.0/test/parallel/test-crypto-dh.js +Index: node-v16.13.0/test/parallel/test-crypto-dh.js =================================================================== ---- node-v16.5.0.orig/test/parallel/test-crypto-dh.js -+++ node-v16.5.0/test/parallel/test-crypto-dh.js +--- node-v16.13.0.orig/test/parallel/test-crypto-dh.js ++++ node-v16.13.0/test/parallel/test-crypto-dh.js @@ -189,7 +189,7 @@ assert.throws(() => { dh3.computeSecret(''); }, { message: common.hasOpenSSL3 ? ++++++ flaky_test_rerun.patch ++++++ --- /var/tmp/diff_new_pack.MGXLSt/_old 2021-11-20 02:38:54.276826795 +0100 +++ /var/tmp/diff_new_pack.MGXLSt/_new 2021-11-20 02:38:54.276826795 +0100 @@ -1,8 +1,8 @@ -Index: node-git.b4f0a18b5a/tools/test.py +Index: node-v16.13.0/tools/test.py =================================================================== ---- node-git.b4f0a18b5a.orig/tools/test.py -+++ node-git.b4f0a18b5a/tools/test.py -@@ -537,6 +537,16 @@ class TestCase(object): +--- node-v16.13.0.orig/tools/test.py ++++ node-v16.13.0/tools/test.py +@@ -586,6 +586,16 @@ class TestCase(object): self.context.store_unexpected_output) def Run(self): ++++++ node-v16.6.2.tar.xz -> node-v16.13.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/nodejs16/node-v16.6.2.tar.xz /work/SRC/openSUSE:Factory/.nodejs16.new.1895/node-v16.13.0.tar.xz differ: char 26, line 1 ++++++ node_modules.tar.xz ++++++ ++++ 227628 lines of diff (skipped) ++++++ nodejs-libpath.patch ++++++ --- /var/tmp/diff_new_pack.MGXLSt/_old 2021-11-20 02:38:54.928824644 +0100 +++ /var/tmp/diff_new_pack.MGXLSt/_new 2021-11-20 02:38:54.928824644 +0100 @@ -1,56 +1,59 @@ -Index: node-git.4cc76457d9/tools/install.py +Index: node-v16.13.0/tools/install.py =================================================================== ---- node-git.4cc76457d9.orig/tools/install.py -+++ node-git.4cc76457d9/tools/install.py -@@ -7,6 +7,7 @@ import errno +--- node-v16.13.0.orig/tools/install.py ++++ node-v16.13.0/tools/install.py +@@ -7,6 +7,8 @@ import errno import os import shutil import sys +from distutils import sysconfig ++import re # set at init time node_prefix = '/usr/local' # PREFIX variable from Makefile -@@ -80,7 +81,7 @@ def uninstall(paths, dst): +@@ -65,6 +67,10 @@ def try_copy(path, dst): + try_unlink(target_path) # prevent ETXTBSY errors + return shutil.copy2(source_path, target_path) + ++def libdir(): ++ libdir_fq = sysconfig.get_config_var("LIBDIR") ++ return re.sub("^" + re.escape(node_prefix + "/"), "", libdir_fq) ++ + def try_remove(path, dst): + source_path, target_path = mkpaths(path, dst) + print('removing %s' % target_path) +@@ -80,7 +86,7 @@ def uninstall(paths, dst): try_remove(path, dst) - def npm_files(action): -- target_path = 'lib/node_modules/npm/' -+ target_path = sysconfig.get_config_var("LIB") + '/node_modules/npm/' + def package_files(action, name, bins): +- target_path = 'lib/node_modules/' + name + '/' ++ target_path = libdir() + '/node_modules/' + name + '/' # don't install npm if the target path is a symlink, it probably means # that a dev version of npm is installed there -@@ -98,7 +99,7 @@ def npm_files(action): - if action == uninstall: - action([link_path], 'bin/npm') - elif action == install: -- try_symlink('../lib/node_modules/npm/bin/npm-cli.js', link_path) -+ try_symlink("../" + sysconfig.get_config_var("LIB") + '/node_modules/npm/bin/npm-cli.js',link_path) - else: - assert 0 # unhandled action type - -@@ -107,7 +108,7 @@ def npm_files(action): - if action == uninstall: - action([link_path], 'bin/npx') - elif action == install: -- try_symlink('../lib/node_modules/npm/bin/npx-cli.js', link_path) -+ try_symlink('../' + sysconfig.get_config_var("LIB") + '/node_modules/npm/bin/npx-cli.js', link_path) - else: - assert 0 # unhandled action type +@@ -100,7 +106,7 @@ def package_files(action, name, bins): + if action == uninstall: + action([link_path], 'bin/' + bin_name) + elif action == install: +- try_symlink('../lib/node_modules/' + name + '/' + bin_target, link_path) ++ try_symlink('../' + libdir() + '/node_modules/' + name + '/' + bin_target, link_path) + else: + assert 0 # unhandled action type -@@ -139,7 +140,7 @@ def files(action): +@@ -148,7 +154,7 @@ def files(action): action([output_prefix + output_file], 'lib/' + output_file) if 'true' == variables.get('node_use_dtrace'): - action(['out/Release/node.d'], 'lib/dtrace/node.d') -+ action(['out/Release/node.d'], sysconfig.get_config_var("LIB") + '/dtrace/node.d') ++ action(['out/Release/node.d'], libdir() + '/dtrace/node.d') # behave similarly for systemtap action(['src/node.stp'], 'share/systemtap/tapset/') -Index: node-git.4cc76457d9/lib/internal/modules/cjs/loader.js +Index: node-v16.13.0/lib/internal/modules/cjs/loader.js =================================================================== ---- node-git.4cc76457d9.orig/lib/internal/modules/cjs/loader.js -+++ node-git.4cc76457d9/lib/internal/modules/cjs/loader.js -@@ -1209,7 +1209,7 @@ Module._initPaths = function() { +--- node-v16.13.0.orig/lib/internal/modules/cjs/loader.js ++++ node-v16.13.0/lib/internal/modules/cjs/loader.js +@@ -1234,7 +1234,7 @@ Module._initPaths = function() { path.resolve(process.execPath, '..') : path.resolve(process.execPath, '..', '..'); ++++++ sle12_python3_compat.patch ++++++ --- /var/tmp/diff_new_pack.MGXLSt/_old 2021-11-20 02:38:54.956824551 +0100 +++ /var/tmp/diff_new_pack.MGXLSt/_new 2021-11-20 02:38:54.956824551 +0100 @@ -1,26 +1,35 @@ -Index: node-v16.2.0/configure +Index: node-v16.13.0/configure =================================================================== ---- node-v16.2.0.orig/configure -+++ node-v16.2.0/configure -@@ -21,7 +21,7 @@ except ImportError: +--- node-v16.13.0.orig/configure ++++ node-v16.13.0/configure +@@ -22,7 +22,7 @@ except ImportError: from distutils.spawn import find_executable as which print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info)) --acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6)) -+acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6), (3, 4)) +-acceptable_pythons = ((3, 10), (3, 9), (3, 8), (3, 7), (3, 6)) ++acceptable_pythons = ((3, 10), (3, 9), (3, 8), (3, 7), (3, 6), (3, 4)) if sys.version_info[:2] in acceptable_pythons: import configure else: -Index: node-v16.2.0/deps/npm/node_modules/node-gyp/lib/find-python.js +Index: node-v16.13.0/deps/npm/node_modules/node-gyp/lib/find-python.js =================================================================== ---- node-v16.2.0.orig/deps/npm/node_modules/node-gyp/lib/find-python.js -+++ node-v16.2.0/deps/npm/node_modules/node-gyp/lib/find-python.js -@@ -18,7 +18,7 @@ PythonFinder.prototype = { +--- node-v16.13.0.orig/deps/npm/node_modules/node-gyp/lib/find-python.js ++++ node-v16.13.0/deps/npm/node_modules/node-gyp/lib/find-python.js +@@ -15,7 +15,7 @@ const programFiles = process.env.Program + const programFilesX86 = process.env['ProgramFiles(x86)'] || `${programFiles} (x86)` + + const winDefaultLocationsArray = [] +-for (const majorMinor of ['39', '38', '37', '36']) { ++for (const majorMinor of ['39', '38', '37', '36', '34']) { + if (foundLocalAppData) { + winDefaultLocationsArray.push( + `${localAppData}\\Programs\\Python\\Python${majorMinor}\\python.exe`, +@@ -49,7 +49,7 @@ PythonFinder.prototype = { log: logWithPrefix(log, 'find Python'), argsExecutable: ['-c', 'import sys; print(sys.executable);'], argsVersion: ['-c', 'import sys; print("%s.%s.%s" % sys.version_info[:3]);'], -- semverRange: '2.7.x || >=3.5.0', -+ semverRange: '2.7.x || >=3.4.0', +- semverRange: '>=3.6.0', ++ semverRange: '>=3.4.0', // These can be overridden for testing: execFile: cp.execFile, ++++++ versioned.patch ++++++ --- /var/tmp/diff_new_pack.MGXLSt/_old 2021-11-20 02:38:54.972824498 +0100 +++ /var/tmp/diff_new_pack.MGXLSt/_new 2021-11-20 02:38:54.972824498 +0100 @@ -8,10 +8,10 @@ This is also important for generation of binary modules for multiple versions of NodeJS -Index: node-v16.5.0/Makefile +Index: node-v16.13.0/Makefile =================================================================== ---- node-v16.5.0.orig/Makefile -+++ node-v16.5.0/Makefile +--- node-v16.13.0.orig/Makefile ++++ node-v16.13.0/Makefile @@ -52,7 +52,7 @@ BUILDTYPE_LOWER := $(shell echo $(BUILDT EXEEXT := $(shell $(PYTHON) -c \ "import sys; print('.exe' if sys.platform == 'win32' else '')") @@ -21,55 +21,44 @@ NODE ?= ./$(NODE_EXE) NODE_G_EXE = node_g$(EXEEXT) NPM ?= ./deps/npm/bin/npm-cli.js -Index: node-v16.5.0/tools/install.py +Index: node-v16.13.0/tools/install.py =================================================================== ---- node-v16.5.0.orig/tools/install.py -+++ node-v16.5.0/tools/install.py -@@ -81,34 +81,34 @@ def uninstall(paths, dst): +--- node-v16.13.0.orig/tools/install.py ++++ node-v16.13.0/tools/install.py +@@ -86,7 +86,7 @@ def uninstall(paths, dst): try_remove(path, dst) - def npm_files(action): -- target_path = sysconfig.get_config_var("LIB") + '/node_modules/npm/' -+ target_path = sysconfig.get_config_var("LIBDIR") + '/node_modules/npm16/' + def package_files(action, name, bins): +- target_path = libdir() + '/node_modules/' + name + '/' ++ target_path = libdir() + '/node_modules/' + name + '16/' # don't install npm if the target path is a symlink, it probably means # that a dev version of npm is installed there -- if os.path.islink(abspath(install_path, target_path)): return -+ if os.path.islink(abspath(install_path, '..', target_path)): return - - # npm has a *lot* of files and it'd be a pain to maintain a fixed list here - # so we walk its source directory instead... - for dirname, subdirs, basenames in os.walk('deps/npm', topdown=True): - subdirs[:] = [subdir for subdir in subdirs if subdir != 'test'] - paths = [os.path.join(dirname, basename) for basename in basenames] -- action(paths, target_path + dirname[9:] + '/') -+ action(paths, install_path + '/..' + target_path + dirname[9:] + '/') - - # create/remove symlink -- link_path = abspath(install_path, 'bin/npm') -+ link_path = abspath(install_path, 'bin/npm16') - if action == uninstall: -- action([link_path], 'bin/npm') -+ action([link_path], 'bin/npm16') - elif action == install: -- try_symlink("../" + sysconfig.get_config_var("LIB") + '/node_modules/npm/bin/npm-cli.js',link_path) -+ try_symlink("../../" + sysconfig.get_config_var("LIBDIR") + '/node_modules/npm16/bin/npm-cli.js',link_path) - else: - assert 0 # unhandled action type - - # create/remove symlink -- link_path = abspath(install_path, 'bin/npx') -+ link_path = abspath(install_path, 'bin/npx16') - if action == uninstall: -- action([link_path], 'bin/npx') -+ action([link_path], 'bin/npx16') - elif action == install: -- try_symlink('../' + sysconfig.get_config_var("LIB") + '/node_modules/npm/bin/npx-cli.js', link_path) -+ try_symlink('../../' + sysconfig.get_config_var("LIBDIR") + '/node_modules/npm16/bin/npx-cli.js', link_path) - else: - assert 0 # unhandled action type +@@ -106,19 +106,19 @@ def package_files(action, name, bins): + if action == uninstall: + action([link_path], 'bin/' + bin_name) + elif action == install: +- try_symlink('../' + libdir() + '/node_modules/' + name + '/' + bin_target, link_path) ++ try_symlink('../' + libdir() + '/node_modules/' + name + '16/' + bin_target, link_path) + else: + assert 0 # unhandled action type -@@ -122,7 +122,7 @@ def subdir_files(path, dest, action): + def npm_files(action): + package_files(action, 'npm', { +- 'npm': 'bin/npm-cli.js', +- 'npx': 'bin/npx-cli.js', ++ 'npm16': 'bin/npm-cli.js', ++ 'npx16': 'bin/npx-cli.js', + }) + + def corepack_files(action): + package_files(action, 'corepack', { +- 'corepack': 'dist/corepack.js', ++ 'corepack16': 'dist/corepack.js', + # Not the default just yet: + # 'yarn': 'dist/yarn.js', + # 'yarnpkg': 'dist/yarn.js', +@@ -136,7 +136,7 @@ def subdir_files(path, dest, action): def files(action): is_windows = sys.platform == 'win32' @@ -78,12 +67,8 @@ output_prefix = 'out/Release/' if 'false' == variables.get('node_shared'): -@@ -140,10 +140,10 @@ def files(action): - action([output_prefix + output_file], 'lib/' + output_file) - - if 'true' == variables.get('node_use_dtrace'): -- action(['out/Release/node.d'], sysconfig.get_config_var("LIB") + '/dtrace/node.d') -+ action(['out/Release/node.d'], ".." + sysconfig.get_config_var("LIBDIR") + '/dtrace/node.d') +@@ -157,7 +157,7 @@ def files(action): + action(['out/Release/node.d'], libdir() + '/dtrace/node.d') # behave similarly for systemtap - action(['src/node.stp'], 'share/systemtap/tapset/') @@ -91,16 +76,16 @@ action(['deps/v8/tools/gdbinit'], 'share/doc/node/') action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/') -@@ -151,7 +151,7 @@ def files(action): +@@ -165,7 +165,7 @@ def files(action): if 'freebsd' in sys.platform or 'openbsd' in sys.platform: action(['doc/node.1'], 'man/man1/') else: - action(['doc/node.1'], 'share/man/man1/') + action(['doc/node.1'], 'share/man/man1/node16.1') - if 'true' == variables.get('node_install_npm'): npm_files(action) - -@@ -185,28 +185,28 @@ def headers(action): + if 'true' == variables.get('node_install_npm'): + npm_files(action) +@@ -201,28 +201,28 @@ def headers(action): 'src/node_buffer.h', 'src/node_object_wrap.h', 'src/node_version.h', @@ -137,10 +122,10 @@ def run(args): global node_prefix, install_path, target_defaults, variables -Index: node-v16.5.0/doc/node.1 +Index: node-v16.13.0/doc/node.1 =================================================================== ---- node-v16.5.0.orig/doc/node.1 -+++ node-v16.5.0/doc/node.1 +--- node-v16.13.0.orig/doc/node.1 ++++ node-v16.13.0/doc/node.1 @@ -30,24 +30,24 @@ .Dt NODE 1 . @@ -170,10 +155,10 @@ .Op Fl -v8-options . .\"====================================================================== -Index: node-v16.5.0/src/node.stp +Index: node-v16.13.0/src/node.stp =================================================================== ---- node-v16.5.0.orig/src/node.stp -+++ node-v16.5.0/src/node.stp +--- node-v16.13.0.orig/src/node.stp ++++ node-v16.13.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. @@ -246,12 +231,12 @@ { scavenge = 1 << 0; compact = 1 << 1; -Index: node-v16.5.0/deps/npm/man/man1/npm.1 +Index: node-v16.13.0/deps/npm/man/man1/npm.1 =================================================================== ---- node-v16.5.0.orig/deps/npm/man/man1/npm.1 -+++ node-v16.5.0/deps/npm/man/man1/npm.1 +--- node-v16.13.0.orig/deps/npm/man/man1/npm.1 ++++ node-v16.13.0/deps/npm/man/man1/npm.1 @@ -1,6 +1,6 @@ - .TH "NPM" "1" "July 2021" "" "" + .TH "NPM" "1" "October 2021" "" "" .SH "NAME" -\fBnpm\fR \- javascript package manager +\fBnpm16\fR \- javascript package manager @@ -321,10 +306,10 @@ +npm16 help publish .RE -Index: node-v16.5.0/src/node_main.cc +Index: node-v16.13.0/src/node_main.cc =================================================================== ---- node-v16.5.0.orig/src/node_main.cc -+++ node-v16.5.0/src/node_main.cc +--- node-v16.13.0.orig/src/node_main.cc ++++ node-v16.13.0/src/node_main.cc @@ -122,6 +122,7 @@ int main(int argc, char* argv[]) { #endif // Disable stdio buffering, it interacts poorly with printf() @@ -333,10 +318,10 @@ setvbuf(stdout, nullptr, _IONBF, 0); setvbuf(stderr, nullptr, _IONBF, 0); return node::Start(argc, argv); -Index: node-v16.5.0/tools/test.py +Index: node-v16.13.0/tools/test.py =================================================================== ---- node-v16.5.0.orig/tools/test.py -+++ node-v16.5.0/tools/test.py +--- node-v16.13.0.orig/tools/test.py ++++ node-v16.13.0/tools/test.py @@ -935,7 +935,7 @@ class Context(object): if self.vm is not None: return self.vm @@ -346,10 +331,10 @@ else: name = 'out/%s.%s/node' % (arch, mode) -Index: node-v16.5.0/node.gyp +Index: node-v16.13.0/node.gyp =================================================================== ---- node-v16.5.0.orig/node.gyp -+++ node-v16.5.0/node.gyp +--- node-v16.13.0.orig/node.gyp ++++ node-v16.13.0/node.gyp @@ -23,8 +23,8 @@ 'node_use_openssl%': 'true', 'node_shared_openssl%': 'false', @@ -361,10 +346,10 @@ '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-v16.5.0/deps/npm/man/man1/npx.1 +Index: node-v16.13.0/deps/npm/man/man1/npx.1 =================================================================== ---- node-v16.5.0.orig/deps/npm/man/man1/npx.1 -+++ node-v16.5.0/deps/npm/man/man1/npx.1 +--- node-v16.13.0.orig/deps/npm/man/man1/npx.1 ++++ node-v16.13.0/deps/npm/man/man1/npx.1 @@ -5,15 +5,15 @@ .P .RS 2
