forked from pool/nodejs22
Compare commits
1 Commits
factory
...
fix_tls_te
| Author | SHA256 | Date | |
|---|---|---|---|
| 20a026cda3 |
@@ -1,41 +1,41 @@
|
||||
2fe635ed920633a890fd594860e5fe35f5ca1ef6da3cda62c6692c39cfefb894 node-v22.15.1-aix-ppc64.tar.gz
|
||||
3242884a544d8d7e4c1e7ee04ee82e48ae9820723b46589284e86441610f04fa node-v22.15.1-arm64.msi
|
||||
d2689b86b17e1b51e76f801ffe2d9acca4225e76eda4b843c3d8438d4a7cd6fe node-v22.15.1-darwin-arm64.tar.gz
|
||||
da2ce4f4616f5adae82de433481e00af86c7e6624a07e5a3c3fdaa1d8a6028fa node-v22.15.1-darwin-arm64.tar.xz
|
||||
1c722d0dd6d3f60e8b0be014ea01b8a59f5088f4419197a1b37544854d61cc6f node-v22.15.1-darwin-x64.tar.gz
|
||||
4f7f6dd674ffa4935dba358fe503a396347d918603e3c9657ce586280c702f61 node-v22.15.1-darwin-x64.tar.xz
|
||||
7410efd260c92faa736cfa56f5cbc41cbb672e20d007d19353992ef9a96c2449 node-v22.15.1-headers.tar.gz
|
||||
4b625fb4a7c7da9f04f9e897c7ec87a3d9c170504506f184e66d93f4604d2a5b node-v22.15.1-headers.tar.xz
|
||||
eb3f232b83dfe83397b98395ec77a973e888e8959c978b3e4eeb551b8845b74f node-v22.15.1-linux-arm64.tar.gz
|
||||
f4ae8ddf7487dfaf7da92fef463ee55cc29d8772d62891361dc3fc8b8e469205 node-v22.15.1-linux-arm64.tar.xz
|
||||
346426e2bca62c98fb12213c39e80b0e349d7620238f74b7208d12e18fde87fd node-v22.15.1-linux-armv7l.tar.gz
|
||||
6947386b4c8373b625c6a49b5571bf2226dac7c7b560a9a561a1f81bf71a25ef node-v22.15.1-linux-armv7l.tar.xz
|
||||
156518af6901fb134ddde5f4b7ee39e047c4154480c3dd93030912a5d3f87097 node-v22.15.1-linux-ppc64le.tar.gz
|
||||
da07858c6404dbe7c627bd7baea33c7825640652ad24468a6feb23c770cf7ce4 node-v22.15.1-linux-ppc64le.tar.xz
|
||||
6b5a9615b66e553189578a4be33099f70add96c3b00bf38b7dcd91825ea1672f node-v22.15.1-linux-s390x.tar.gz
|
||||
7a6206af04399c090aaa7b3d568b1540e127b50931f5022ff2eaf680fc32a9c6 node-v22.15.1-linux-s390x.tar.xz
|
||||
f4b8eec683708acb1a2a73c7182ba2de5466a5dd5f705934a0830903df28821c node-v22.15.1-linux-x64.tar.gz
|
||||
7dca2ab34ec817aa4781e2e99dfd34d349eff9be86e5d5fbaa7e96cae8ee3179 node-v22.15.1-linux-x64.tar.xz
|
||||
2cafb8c5ee545d387409b6dab34b3552c90e247b7d2bd3964a68f42b26b3e8bf node-v22.15.1-win-arm64.7z
|
||||
dec85d230d45a6319130cbc844e8ecf8767b150bfeddd340f6b7c4a2e8c3ccb8 node-v22.15.1-win-arm64.zip
|
||||
3abcca34447dace08cecd2bfd7b6521b22bfa89cff7bd70e7cde777218c84d6a node-v22.15.1-win-x64.7z
|
||||
7c7997d6ef2efd9525a54b033fc0be6f22549a5905f5da6573a41e61a436a1b5 node-v22.15.1-win-x64.zip
|
||||
7b9999b5da0933f677ffff2a9ab211aebdcf23b1ed0f2e1db573cea757944103 node-v22.15.1-win-x86.7z
|
||||
dd432043e8c90b7f221bd3ba8e6443fb69e7b8273049fad0669a3a7d66939985 node-v22.15.1-win-x86.zip
|
||||
facb02bdf67cb9a7519c192b504fbfdbf47d8a67f36696d7d91a069b69904398 node-v22.15.1-x64.msi
|
||||
89ef1c6181749a7739f6df58a73aa2127d0c7d6afe0236f5998d69ec98ec2154 node-v22.15.1-x86.msi
|
||||
839f599498d36fabc3f7c940cabbaf14844e6380ba97a91299f7378b69e675c6 node-v22.15.1.pkg
|
||||
38aea029f8818f7783f273fbc70dcf930f9ef54bdd49c5f90c0152caec7a57be node-v22.15.1.tar.gz
|
||||
c19f0177d21c621746625e5f37590bd0d79a72043b77b53784cba5f145e7263e node-v22.15.1.tar.xz
|
||||
e9e669cf7e9772406e3a59cb4b9b606e75eb1d9f454b675e1c78a6aaa542b31d win-arm64/node.exe
|
||||
6c43922c747e0c07fcc4ceb64f08e98854a5c1b31665764076f5783556973d16 win-arm64/node.lib
|
||||
957076a2623c6f9355a21aba2031a7248d411a6f40950e7b710fbf76a666f5e9 win-arm64/node_pdb.7z
|
||||
5ac29419b5aaa475ba0606a021ed5cea77b18df74b5e42d57a706011004f6be4 win-arm64/node_pdb.zip
|
||||
b3191cc083480282f1edaa3324002c320704a00d7564cf1f7c48b610d1c060b6 win-x64/node.exe
|
||||
e731ad9af05eabe6bd941442b19dd6037f559a19a2fa8df2a8297ccb46ed7577 win-x64/node.lib
|
||||
84eec3bf646e04287fef10dc110a7aa82a4304ddcbd0b148aa90c0d44b08ea1d win-x64/node_pdb.7z
|
||||
b8b3364ad0735d45c25fb19c8b49f4c5e0c72a94f5d8fa44abddd80c15715538 win-x64/node_pdb.zip
|
||||
ddd0ef952950dcaa7f705bdde5f4fd0c8a78a7c6db6dad32f8e13e3b120ad5e4 win-x86/node.exe
|
||||
5f66397542e27adb288e1742720cedbeaba8a2034ebd58397306b2905f4acd2d win-x86/node.lib
|
||||
e5bd0ae9dc388aa4fd72067e3239333537c42329746124437c32b81ff2291ef4 win-x86/node_pdb.7z
|
||||
b5e39e2168abe7c9418f2cebcd813db9c1a0841274b1405aeffe13ffef74c264 win-x86/node_pdb.zip
|
||||
ddec69aded8f826efbef8b4af09baa451f5ed8b057e84d836accf33de04d2d7a node-v22.14.0-aix-ppc64.tar.gz
|
||||
d733bc14c2da6b69af4d89117b39d33cc1a7c7a75a21cf9fa4bfe81884db70e5 node-v22.14.0-arm64.msi
|
||||
e9404633bc02a5162c5c573b1e2490f5fb44648345d64a958b17e325729a5e42 node-v22.14.0-darwin-arm64.tar.gz
|
||||
4e845cb71b4e897289312743b2e31c405a8a48720655404d82a4dce23fc43527 node-v22.14.0-darwin-arm64.tar.xz
|
||||
6698587713ab565a94a360e091df9f6d91c8fadda6d00f0cf6526e9b40bed250 node-v22.14.0-darwin-x64.tar.gz
|
||||
deb5b211c25f3f803cd49c1c3fc3964e6c3725546d7d9608d994270388dcbf02 node-v22.14.0-darwin-x64.tar.xz
|
||||
715aedf641a024efdeeccd545ce4acdc4759155e08c32efdfe9069921fcfa86b node-v22.14.0-headers.tar.gz
|
||||
63406b4329c080a8ff3e5c8794cae82ad9ef1ebb8b8d8c73f82d2077810e0eaf node-v22.14.0-headers.tar.xz
|
||||
8cf30ff7250f9463b53c18f89c6c606dfda70378215b2c905d0a9a8b08bd45e0 node-v22.14.0-linux-arm64.tar.gz
|
||||
08bfbf538bad0e8cbb0269f0173cca28d705874a67a22f60b57d99dc99e30050 node-v22.14.0-linux-arm64.tar.xz
|
||||
1cadf5aee7d71b6f0921235faec05e42d908ba5e8a76959f0697968fe0741204 node-v22.14.0-linux-armv7l.tar.gz
|
||||
32804b6d7fca03e668765e91ea892dd329ff928d02e6c61d4b3b3c4afac178c6 node-v22.14.0-linux-armv7l.tar.xz
|
||||
a0818ece898175db71a1df81dc4fdc3794a14b03a3901894a88e465e745ea429 node-v22.14.0-linux-ppc64le.tar.gz
|
||||
70aeb7b16dabce5395b1ed383f60416c8d8ed693927003f948c0b5390a35ce5f node-v22.14.0-linux-ppc64le.tar.xz
|
||||
0e4232e4b3c0312a391bb9c0c36524623b3b616cac5d0338d743ae4228f984d1 node-v22.14.0-linux-s390x.tar.gz
|
||||
a666b8ce5e442dbdbb5a2280f29caad603a723017aac5acf5baff5b16e648981 node-v22.14.0-linux-s390x.tar.xz
|
||||
9d942932535988091034dc94cc5f42b6dc8784d6366df3a36c4c9ccb3996f0c2 node-v22.14.0-linux-x64.tar.gz
|
||||
69b09dba5c8dcb05c4e4273a4340db1005abeafe3927efda2bc5b249e80437ec node-v22.14.0-linux-x64.tar.xz
|
||||
06113f553199227be915d80c191031283622d6363c57c83aad137ff33f9ac9e4 node-v22.14.0-win-arm64.7z
|
||||
2d71f5f9b2fffa33baa108c07d74b0d24e0c3dd8f441d567772ae0e3dd4b1a22 node-v22.14.0-win-arm64.zip
|
||||
4c6018bd170ca46bfc7112bc4ca0f43cf55759a0c2bb9fccd50d8f8c3f7bdb14 node-v22.14.0-win-x64.7z
|
||||
55b639295920b219bb2acbcfa00f90393a2789095b7323f79475c9f34795f217 node-v22.14.0-win-x64.zip
|
||||
5f7514392d0330c1b0c76e0dd299ac44786139b59231bf3d115f85c9c763bd4f node-v22.14.0-win-x86.7z
|
||||
4bf00caba7b0f3c7a4e8ee6a5b73049db19b5ee5510473219ae5fb649c2017b6 node-v22.14.0-win-x86.zip
|
||||
2c0cc97ec64c1e4111362e1e32e0547fd870e4d9c79ec844c117da583f21b386 node-v22.14.0-x64.msi
|
||||
5e91ec1da6c7de32406f3f7fdd2b8de163e871ecd2ebb466bf1b526e6379755c node-v22.14.0-x86.msi
|
||||
3931585e6af0785f01af897d31d67b7318e724af07845ffb04d432ab1a4532b4 node-v22.14.0.pkg
|
||||
6c4e31ed5702dc45cfd8c435af56a36a474427e1bd7afe74c346136060beba8a node-v22.14.0.tar.gz
|
||||
c609946bf793b55c7954c26582760808d54c16185d79cb2fb88065e52de21914 node-v22.14.0.tar.xz
|
||||
b37c6950508f266d066deb91abe2050fcd3f19e34c86ca89eed72efb40090b57 win-arm64/node.exe
|
||||
988eb8c60a5ade17e652dbdb60d56d3c6ad5e599a99ce04932b8c4c86583cdaf win-arm64/node.lib
|
||||
37bf09d40005ba618a49aec998c275c56e390df501c824ed73c87520834de4b3 win-arm64/node_pdb.7z
|
||||
6d51bdae6ec86490338d22eb133ae34c00be9052455f94cb44d08062097ed02c win-arm64/node_pdb.zip
|
||||
33b1bc1a8aca11fd5a4f2699e51019c63c0af30cf437701d07af69be7706771b win-x64/node.exe
|
||||
65e45757c026c93a170743a811ef1b921ae12d6d9dd62d258bbbca0626687626 win-x64/node.lib
|
||||
652acb96f8c81f6fb27517f729465a5644c02efd27d60925389323b11cb44ee8 win-x64/node_pdb.7z
|
||||
b4722c573f3a387de9e259b116cefd36870516947c1048fda425f1641d72a7b9 win-x64/node_pdb.zip
|
||||
d52f9f1b03eca305dbaa23e251fe612efbb48a99aaeab6ffa073ee1c111b28e0 win-x86/node.exe
|
||||
79bae10059e833ce7fa4de05e5601034461327e2e7cb75c2144b87d4ab5ac547 win-x86/node.lib
|
||||
2f2313b969b715af1c59aa7d7a84c36f7d09cc5e0c6c6dc9365bad6341e06ae2 win-x86/node_pdb.7z
|
||||
45edff3492d39ffee520881ab1050afc2b515cb6817285a153291af04af2c668 win-x86/node_pdb.zip
|
||||
|
||||
Binary file not shown.
@@ -1,73 +0,0 @@
|
||||
23c23
|
||||
< "hi": "25/7/1980, पू 1:35:33",
|
||||
---
|
||||
> "hi": "25/7/1980, 1:35:33 am",
|
||||
26c26
|
||||
< "ar": "25/7/1980، 1:35:33 ص",
|
||||
---
|
||||
> "ar": "٢٥/٧/١٩٨٠، ١:٣٥:٣٣ ص",
|
||||
30c30
|
||||
< "ur": "25/7/1980، 1:35:33 ق.د.",
|
||||
---
|
||||
> "ur": "25/7/1980، 1:35:33 AM",
|
||||
44c44
|
||||
< "ar": "25/7/1980",
|
||||
---
|
||||
> "ar": "٢٥/٧/١٩٨٠",
|
||||
80c80
|
||||
< "ar": "275,760.913",
|
||||
---
|
||||
> "ar": "٢٧٥٬٧٦٠٫٩١٣",
|
||||
116c116
|
||||
< "ar": "قبل 586,920.617 ساعة",
|
||||
---
|
||||
> "ar": "قبل ٥٨٦٬٩٢٠٫٦١٧ ساعة",
|
||||
Index: node-v22.15.1/test/fixtures/icu/localizationData-v74.2.json
|
||||
===================================================================
|
||||
--- node-v22.15.1.orig/test/fixtures/icu/localizationData-v74.2.json
|
||||
+++ node-v22.15.1/test/fixtures/icu/localizationData-v74.2.json
|
||||
@@ -20,14 +20,14 @@
|
||||
"dateTimeFormats": {
|
||||
"en": "7/25/1980, 1:35:33 AM",
|
||||
"zh": "1980/7/25 01:35:33",
|
||||
- "hi": "25/7/1980, पू 1:35:33",
|
||||
+ "hi": "25/7/1980, 1:35:33 am",
|
||||
"es": "25/7/1980, 1:35:33",
|
||||
"fr": "25/07/1980 01:35:33",
|
||||
- "ar": "25/7/1980، 1:35:33 ص",
|
||||
+ "ar": "٢٥/٧/١٩٨٠، ١:٣٥:٣٣ ص",
|
||||
"bn": "২৫/৭/১৯৮০, ১:৩৫:৩৩ AM",
|
||||
"ru": "25.07.1980, 01:35:33",
|
||||
"pt": "25/07/1980, 01:35:33",
|
||||
- "ur": "25/7/1980، 1:35:33 ق.د.",
|
||||
+ "ur": "25/7/1980، 1:35:33 AM",
|
||||
"id": "25/7/1980, 01.35.33",
|
||||
"de": "25.7.1980, 01:35:33",
|
||||
"ja": "1980/7/25 1:35:33",
|
||||
@@ -41,7 +41,7 @@
|
||||
"hi": "25/7/1980",
|
||||
"es": "25/7/1980",
|
||||
"fr": "25/07/1980",
|
||||
- "ar": "25/7/1980",
|
||||
+ "ar": "٢٥/٧/١٩٨٠",
|
||||
"bn": "২৫/৭/১৯৮০",
|
||||
"ru": "25.07.1980",
|
||||
"pt": "25/07/1980",
|
||||
@@ -77,7 +77,7 @@
|
||||
"hi": "2,75,760.913",
|
||||
"es": "275.760,913",
|
||||
"fr": "275 760,913",
|
||||
- "ar": "275,760.913",
|
||||
+ "ar": "٢٧٥٬٧٦٠٫٩١٣",
|
||||
"bn": "২,৭৫,৭৬০.৯১৩",
|
||||
"ru": "275 760,913",
|
||||
"pt": "275.760,913",
|
||||
@@ -113,7 +113,7 @@
|
||||
"hi": "5,86,920.617 घंटे पहले",
|
||||
"es": "hace 586.920,617 horas",
|
||||
"fr": "il y a 586 920,617 heures",
|
||||
- "ar": "قبل 586,920.617 ساعة",
|
||||
+ "ar": "قبل ٥٨٦٬٩٢٠٫٦١٧ ساعة",
|
||||
"bn": "৫,৮৬,৯২০.৬১৭ ঘন্টা আগে",
|
||||
"ru": "586 920,617 часа назад",
|
||||
"pt": "há 586.920,617 horas",
|
||||
BIN
node-v22.14.0.tar.xz
(Stored with Git LFS)
Normal file
BIN
node-v22.14.0.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
node-v22.15.1.tar.xz
(Stored with Git LFS)
BIN
node-v22.15.1.tar.xz
(Stored with Git LFS)
Binary file not shown.
@@ -1,32 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 5 15:58:24 UTC 2025 - Adam Majer <adam.majer@suse.de>
|
||||
Mon Apr 14 09:19:08 UTC 2025 - Angel Yankov <angel.yankov@suse.com>
|
||||
|
||||
- Update to 22.15.1
|
||||
* fix error handling on async crypto operation (bsc#1243218, CVE-2025-23166)
|
||||
* add missing call to uv_fs_req_cleanup (bsc#1243217, CVE-2025-23165)
|
||||
|
||||
- changes since 22.15.0:
|
||||
* dns: add TLSA record query and parsing
|
||||
* assert: improve partialDeepStrictEqual
|
||||
* process: add execve
|
||||
* tls: implement tls.getCACertificates()
|
||||
* v8: add v8.getCppHeapStatistics() method
|
||||
|
||||
- old_cares.patch: dropped in favour of bundling until we can update SLE15 cares
|
||||
- icu_732.patch: handle our ICU version in SLE15
|
||||
- fab6906c5d1c16b046187485a7cb136b3659d42b.patch: dropped, upstreamed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 23 14:46:18 UTC 2025 - Adam Majer <adam.majer@suse.de>
|
||||
|
||||
- drop http2 priority checks as new nghttp2 dropped this
|
||||
unused feature
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 14 09:14:51 UTC 2025 - Adam Majer <adam.majer@suse.de>
|
||||
|
||||
- fab6906c5d1c16b046187485a7cb136b3659d42b.patch: fix build with
|
||||
OpenSSL 3.5.0 (bsc#1241050)
|
||||
- test: update parallel/test-tls-dhe for OpenSSL 3.5
|
||||
* The output of the s_client command invoked by the test has changed in the OpenSSL 3.5.0
|
||||
* Add openssl-test-tls-dhe.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 10 09:47:03 UTC 2025 - Adam Majer <adam.majer@suse.de>
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
%endif
|
||||
|
||||
Name: nodejs22
|
||||
Version: 22.15.1
|
||||
Version: 22.14.0
|
||||
Release: 0
|
||||
|
||||
# Double DWZ memory limits
|
||||
@@ -93,7 +93,7 @@ ExclusiveArch do_not_build
|
||||
%bcond_without intree_openssl
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} >= 1550 || 0%{?fedora_version} >= 35
|
||||
%if 0%{?suse_version} >= 1330 || 0%{?fedora_version} >= 35
|
||||
%bcond_with intree_cares
|
||||
%else
|
||||
%bcond_without intree_cares
|
||||
@@ -170,9 +170,10 @@ Patch132: test-skip-y2038-on-32bit-time_t.patch
|
||||
Patch200: versioned.patch
|
||||
|
||||
Patch305: qemu_timeouts_arches.patch
|
||||
Patch306: icu_732.patch
|
||||
Patch307: v8-i586.patch
|
||||
Patch309: gcc13.patch
|
||||
Patch311: old_cares.patch
|
||||
Patch312: openssl-test-tls-dhe.patch
|
||||
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: fdupes
|
||||
@@ -314,7 +315,7 @@ BuildRequires: bundled_openssl_should_not_be_required
|
||||
%if ! 0%{with intree_cares}
|
||||
BuildRequires: pkgconfig(libcares) >= 1.17.0
|
||||
%else
|
||||
Provides: bundled(libcares2) = 1.34.5
|
||||
Provides: bundled(libcares2) = 1.34.4
|
||||
%endif
|
||||
|
||||
%if %node_version_number >= 22 && 0%{?suse_version} > 1500
|
||||
@@ -397,13 +398,13 @@ Provides: bundled(simdjson) = 3.10.1
|
||||
# bundled url-ada parser, not ada
|
||||
Provides: bundled(ada) = 2.9.2
|
||||
|
||||
Provides: bundled(node-acorn) = 8.14.1
|
||||
Provides: bundled(node-acorn) = 8.14.0
|
||||
Provides: bundled(node-acorn-walk) = 8.3.4
|
||||
Provides: bundled(node-amaro) = 0.4.1
|
||||
Provides: bundled(node-cjs-module-lexer) = 2.1.0
|
||||
Provides: bundled(node-corepack) = 0.32.0
|
||||
Provides: bundled(node-amaro) = 0.3.0
|
||||
Provides: bundled(node-cjs-module-lexer) = 1.4.1
|
||||
Provides: bundled(node-corepack) = 0.31.0
|
||||
Provides: bundled(node-minimatch) = 10.0.1
|
||||
Provides: bundled(node-undici) = 6.21.2
|
||||
Provides: bundled(node-undici) = 6.21.1
|
||||
|
||||
%description
|
||||
Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js
|
||||
@@ -700,9 +701,10 @@ popd
|
||||
%patch -P 200 -p1
|
||||
|
||||
%patch -P 305 -p1
|
||||
%patch -P 306 -p1
|
||||
%patch -P 307 -p1
|
||||
%patch -P 309 -p1
|
||||
%patch -P 311 -p1
|
||||
%patch -P 312 -p1
|
||||
|
||||
%if %{node_version_number} == 12
|
||||
# minimist security update - patch50
|
||||
@@ -937,10 +939,6 @@ find test \( -name \*.out -or -name \*.js -or -name \*.snapshot \) -exec sed -i
|
||||
|
||||
%if %{node_version_number} >= 20
|
||||
rm test/parallel/test-strace-openat-openssl.js
|
||||
|
||||
# https://github.com/nodejs/node/pull/57269 -- nghttp2 dropped priority support
|
||||
rm test/parallel/test-http2-client-set-priority.js
|
||||
rm test/parallel/test-http2-priority-event.js
|
||||
%endif
|
||||
|
||||
# Update the python3 executable name to point at forced python version
|
||||
|
||||
155
old_cares.patch
Normal file
155
old_cares.patch
Normal file
@@ -0,0 +1,155 @@
|
||||
temporary revert changes until we can upgrade c-ares in SLE-15:Update
|
||||
|
||||
commit bf68733e7f61bf4ff51a456e27123f44a526aebc
|
||||
Author: Aviv Keller <redyetidev@gmail.com>
|
||||
Date: Wed Oct 30 10:10:28 2024 -0400
|
||||
|
||||
dns: stop using deprecated `ares_query`
|
||||
|
||||
PR-URL: https://github.com/nodejs/node/pull/55430
|
||||
Refs: https://github.com/nodejs/node/issues/52464
|
||||
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
|
||||
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
|
||||
|
||||
|
||||
Index: node-v22.12.0/src/cares_wrap.cc
|
||||
===================================================================
|
||||
--- node-v22.12.0.orig/src/cares_wrap.cc
|
||||
+++ node-v22.12.0/src/cares_wrap.cc
|
||||
@@ -825,62 +825,62 @@ void ChannelWrap::EnsureServers() {
|
||||
}
|
||||
|
||||
int AnyTraits::Send(QueryWrap<AnyTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_ANY);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_any);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int ATraits::Send(QueryWrap<ATraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_A);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_a);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int AaaaTraits::Send(QueryWrap<AaaaTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_AAAA);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_aaaa);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int CaaTraits::Send(QueryWrap<CaaTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_CAA);
|
||||
+ wrap->AresQuery(name, ns_c_in, T_CAA);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int CnameTraits::Send(QueryWrap<CnameTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_CNAME);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_cname);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int MxTraits::Send(QueryWrap<MxTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_MX);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_mx);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int NsTraits::Send(QueryWrap<NsTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_NS);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_ns);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int TxtTraits::Send(QueryWrap<TxtTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_TXT);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_txt);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int SrvTraits::Send(QueryWrap<SrvTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_SRV);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_srv);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int PtrTraits::Send(QueryWrap<PtrTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_PTR);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_ptr);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int NaptrTraits::Send(QueryWrap<NaptrTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_NAPTR);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_naptr);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
int SoaTraits::Send(QueryWrap<SoaTraits>* wrap, const char* name) {
|
||||
- wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_SOA);
|
||||
+ wrap->AresQuery(name, ns_c_in, ns_t_soa);
|
||||
return ARES_SUCCESS;
|
||||
}
|
||||
|
||||
Index: node-v22.12.0/src/cares_wrap.h
|
||||
===================================================================
|
||||
--- node-v22.12.0.orig/src/cares_wrap.h
|
||||
+++ node-v22.12.0/src/cares_wrap.h
|
||||
@@ -246,20 +246,18 @@ class QueryWrap final : public AsyncWrap
|
||||
return Traits::Send(this, name);
|
||||
}
|
||||
|
||||
- void AresQuery(const char* name,
|
||||
- ares_dns_class_t dnsclass,
|
||||
- ares_dns_rec_type_t type) {
|
||||
+ void AresQuery(const char* name, int dnsclass, int type) {
|
||||
channel_->EnsureServers();
|
||||
TRACE_EVENT_NESTABLE_ASYNC_BEGIN1(
|
||||
TRACING_CATEGORY_NODE2(dns, native), trace_name_, this,
|
||||
"name", TRACE_STR_COPY(name));
|
||||
- ares_query_dnsrec(channel_->cares_channel(),
|
||||
- name,
|
||||
- dnsclass,
|
||||
- type,
|
||||
- Callback,
|
||||
- MakeCallbackPointer(),
|
||||
- nullptr);
|
||||
+ ares_query(
|
||||
+ channel_->cares_channel(),
|
||||
+ name,
|
||||
+ dnsclass,
|
||||
+ type,
|
||||
+ Callback,
|
||||
+ MakeCallbackPointer());
|
||||
}
|
||||
|
||||
void ParseError(int status) {
|
||||
@@ -306,20 +304,19 @@ class QueryWrap final : public AsyncWrap
|
||||
return wrap;
|
||||
}
|
||||
|
||||
- static void Callback(void* arg,
|
||||
- ares_status_t status,
|
||||
- size_t timeouts,
|
||||
- const ares_dns_record_t* dnsrec) {
|
||||
+ static void Callback(
|
||||
+ void* arg,
|
||||
+ int status,
|
||||
+ int timeouts,
|
||||
+ unsigned char* answer_buf,
|
||||
+ int answer_len) {
|
||||
QueryWrap<Traits>* wrap = FromCallbackPointer(arg);
|
||||
if (wrap == nullptr) return;
|
||||
|
||||
unsigned char* buf_copy = nullptr;
|
||||
- size_t answer_len = 0;
|
||||
if (status == ARES_SUCCESS) {
|
||||
- // No need to explicitly call ares_free_string here,
|
||||
- // as it is a wrapper around free, which is already
|
||||
- // invoked when MallocedBuffer is destructed.
|
||||
- ares_dns_write(dnsrec, &buf_copy, &answer_len);
|
||||
+ buf_copy = node::Malloc<unsigned char>(answer_len);
|
||||
+ memcpy(buf_copy, answer_buf, answer_len);
|
||||
}
|
||||
|
||||
wrap->response_data_ = std::make_unique<ResponseData>();
|
||||
30
openssl-test-tls-dhe.patch
Normal file
30
openssl-test-tls-dhe.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
From a75d6b52cf92595879ab644ddbe17b0d3598ccd6 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Lau <rlau@redhat.com>
|
||||
Date: Sat, 15 Mar 2025 03:18:23 +0000
|
||||
Subject: [PATCH] test: update parallel/test-tls-dhe for OpenSSL 3.5
|
||||
|
||||
The output of the `s_client` command invoked by the test has changed
|
||||
in the OpenSSL 3.5.0 version of `s_client`. Update the test so that
|
||||
it works with both the old and new output -- the `s_client` binary
|
||||
being run may not be at the exact same version of OpenSSL as used
|
||||
by Node.js so the updated test allows either output.
|
||||
---
|
||||
test/parallel/test-tls-dhe.js | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/parallel/test-tls-dhe.js b/test/parallel/test-tls-dhe.js
|
||||
index b4f0337c43fa57..89cda5f52a6b31 100644
|
||||
--- a/test/parallel/test-tls-dhe.js
|
||||
+++ b/test/parallel/test-tls-dhe.js
|
||||
@@ -85,7 +85,10 @@ function test(dhparam, keylen, expectedCipher) {
|
||||
|
||||
execFile(opensslCli, args, common.mustSucceed((stdout) => {
|
||||
assert(keylen === null ||
|
||||
- stdout.includes(`Server Temp Key: DH, ${keylen} bits`));
|
||||
+ // s_client < OpenSSL 3.5
|
||||
+ stdout.includes(`Server Temp Key: DH, ${keylen} bits`) ||
|
||||
+ // s_client >= OpenSSL 3.5
|
||||
+ stdout.includes(`Peer Temp Key: DH, ${keylen} bits`));
|
||||
assert(stdout.includes(`Cipher : ${expectedCipher}`));
|
||||
server.close();
|
||||
}));
|
||||
Reference in New Issue
Block a user