forked from electron/electron
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: bump node to v18.16.1 (main) (electron#38869)
* chore: bump node in DEPS to v18.16.1 * chore: update patches * deps: update c-ares to 1.19.1 nodejs/node#48115 * chore: fix -Wunreachable-code,-Werror FTBFS in c-ares * chore: disable x509 bssl test new test added in bf3e2c892 * fixup! chore: fix -Wunreachable-code,-Werror FTBFS in c-ares also fix related -Werror,-Wunused-function FTBFS * fixup! chore: fix -Wunreachable-code,-Werror FTBFS in c-ares also fix another related -Werror,-Wunused-function FTBFS * fixup! chore: disable x509 bssl test fix yet another -Werror,-Wunused-function FTBFS --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com>
- Loading branch information
1 parent
58e7d39
commit 11cf718
Showing
8 changed files
with
74 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
patches/node/fix_wunreachable-code_warning_in_ares_init_rand_engine.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Charles Kerr <charles@charleskerr.com> | ||
Date: Thu, 22 Jun 2023 11:59:47 -0500 | ||
Subject: fix: Wunreachable-code warning in ares__init_rand_engine() | ||
|
||
Fix upstream Win32 FTBFS when building with -Werror,-Wunreachable-code. | ||
|
||
This patch can be removed after the fix is picked up in Node.js. | ||
Upstream PR @ https://github.com/c-ares/c-ares/pull/531 | ||
|
||
diff --git a/deps/cares/src/lib/ares_rand.c b/deps/cares/src/lib/ares_rand.c | ||
index 766c1e6ea9bda1784cfb611dbac66424806cd23a..12d943921e3ba61cbf7a2ed3194fcd5a6c61da8a 100644 | ||
--- a/deps/cares/src/lib/ares_rand.c | ||
+++ b/deps/cares/src/lib/ares_rand.c | ||
@@ -55,6 +55,7 @@ BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG RandomBufferLength); | ||
# endif | ||
#endif | ||
|
||
+#if !defined(HAVE_ARC4RANDOM_BUF) && !defined(_WIN32) | ||
|
||
#define ARES_RC4_KEY_LEN 32 /* 256 bits */ | ||
|
||
@@ -129,6 +130,7 @@ static void ares_rc4_init(ares_rand_rc4 *rc4_state) | ||
rc4_state->i = 0; | ||
rc4_state->j = 0; | ||
} | ||
+#endif | ||
|
||
/* Just outputs the key schedule, no need to XOR with any data since we have none */ | ||
static void ares_rc4_prng(ares_rand_rc4 *rc4_state, unsigned char *buf, size_t len) | ||
@@ -166,13 +168,13 @@ static int ares__init_rand_engine(ares_rand_state *state) | ||
return 1; | ||
} | ||
/* Fall-Thru on failure to RC4 */ | ||
-#endif | ||
|
||
state->type = ARES_RAND_RC4; | ||
ares_rc4_init(&state->state.rc4); | ||
|
||
/* Currently cannot fail */ | ||
return 1; | ||
+#endif | ||
} | ||
|
||
|
||
@@ -276,4 +278,3 @@ unsigned short ares__generate_new_id(ares_rand_state *state) | ||
ares__rand_bytes(state, (unsigned char *)&r, sizeof(r)); | ||
return r; | ||
} | ||
- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters