gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nodejs_18: 18.20.7 -> 18.20.8 (#393755)

Browse Source
This commit is contained in:
0x4A6F
2025-03-29 17:42:28 +01:00
committed by GitHub
parent 2623da195a 869672a118
commit 0342bb0a17
2 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/web/nodejs/openssl-3.4-v18.patch
-15
View File
@@ -1,15 +0,0 @@
diff --git a/test/parallel/test-tls-psk-circuit.js b/test/parallel/test-tls-psk-circuit.js
index 2b49161df8..8071c6dd18 100644
--- a/test/parallel/test-tls-psk-circuit.js
+++ b/test/parallel/test-tls-psk-circuit.js
@@ -66,7 +66,8 @@ const expectedHandshakeErr = common.hasOpenSSL32 ?
'ERR_SSL_SSL/TLS_ALERT_HANDSHAKE_FAILURE' : 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE';
test({ psk: USERS.UserB, identity: 'UserC' }, {}, expectedHandshakeErr);
// Recognized user but incorrect secret should fail handshake
-const expectedIllegalParameterErr = common.hasOpenSSL32 ?
- 'ERR_SSL_SSL/TLS_ALERT_ILLEGAL_PARAMETER' : 'ERR_SSL_SSLV3_ALERT_ILLEGAL_PARAMETER';
+const expectedIllegalParameterErr = common.hasOpenSSL(3, 4) ? 'ERR_SSL_TLSV1_ALERT_DECRYPT_ERROR' :
+ common.hasOpenSSL(3, 2) ?
+ 'ERR_SSL_SSL/TLS_ALERT_ILLEGAL_PARAMETER' : 'ERR_SSL_SSLV3_ALERT_ILLEGAL_PARAMETER';
test({ psk: USERS.UserA, identity: 'UserB' }, {}, expectedIllegalParameterErr);
test({ psk: USERS.UserB, identity: 'UserB' });
pkgs/development/web/nodejs/v18.nix
+2 -7
View File
@@ -21,8 +21,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "18.20.7";
sha256 = "9a89659fad80c1b6da33d29f43f5865483ccb1952ddad434ee22f8193607277f";
version = "18.20.8";
sha256 = "36a7bf1a76d62ce4badd881ee5974a323c70e1d8d19165732684e145632460d9";
patches = [
./configure-emulator-node18.patch
./configure-armv6-vfpv2.patch
@@ -77,10 +77,5 @@ buildNodejs {
url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1";
hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU=";
})
# Fix tests on OpenSSL 3.4
# Manual backport of https://github.com/nodejs/node/commit/7895b8eae9e4f2919028fe81e38790af07b4cc92
# FIXME: remove after a minor point release
./openssl-3.4-v18.patch
] ++ gypPatches;
}