Skip to content

Commit cdb69ca

Browse files
iamstolisiamstolis
committed
Merge tag '51beaf460444f82050c317cc3bac01e3b99172e8' into update-node-to-14.17.2
2021-08-11 Node.js v14.17.5 'Fermium' (LTS) Release Git-EVTag-v0-SHA512: 5c653e1b76c0fbbecf79dc9196ddf51dcb6d5023e233cf5751b9f7635b4f507397df90c00333609367fffcc40790c523725eb92e0b341731f63070f04aff8376
2 parents a52f130 + db159ab commit cdb69ca

File tree

99 files changed

+1095
-703
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+1095
-703
lines changed

‎graal-nodejs/CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ release.
3030
</tr>
3131
<tr>
3232
<td valign="top">
33-
<b><a href="doc/changelogs/CHANGELOG_V14.md#14.17.4">14.17.4</a></b><br/>
33+
<b><a href="doc/changelogs/CHANGELOG_V14.md#14.17.5">14.17.5</a></b><br/>
34+
<a href="doc/changelogs/CHANGELOG_V14.md#14.17.4">14.17.4</a><br/>
3435
<a href="doc/changelogs/CHANGELOG_V14.md#14.17.3">14.17.3</a><br/>
3536
<a href="doc/changelogs/CHANGELOG_V14.md#14.17.2">14.17.2</a><br/>
3637
<a href="doc/changelogs/CHANGELOG_V14.md#14.17.1">14.17.1</a><br/>

‎graal-nodejs/deps/cares/src/AUTHORS renamed to ‎graal-nodejs/deps/cares/AUTHORS

File renamed without changes.

‎graal-nodejs/deps/cares/src/NEWS renamed to ‎graal-nodejs/deps/cares/NEWS

File renamed without changes.

‎graal-nodejs/deps/cares/src/README.cares renamed to ‎graal-nodejs/deps/cares/README.cares

File renamed without changes.

‎graal-nodejs/deps/cares/src/README.md renamed to ‎graal-nodejs/deps/cares/README.md

File renamed without changes.

‎graal-nodejs/deps/cares/src/README.msvc renamed to ‎graal-nodejs/deps/cares/README.msvc

+2-42
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
___ __ _ _ __ ___ ___
3+
___ __ _ _ __ ___ ___
44
/ __| ___ / _` | '__/ _ \/ __|
55
| (_ |___| (_| | | | __/\__ \
66
\___| \__,_|_| \___||___/
@@ -64,46 +64,6 @@
6464
to c-ares source folder where Makefile.msvc file is located.
6565

6666

67-
How to build using Visual Studio 6 IDE
68-
--------------------------------------
69-
70-
A VC++ 6.0 reference workspace (vc6aws.dsw) is available within the 'vc'
71-
folder to allow proper building of the library and sample programs.
72-
73-
1) Open the vc6aws.dsw workspace with MSVC6's IDE.
74-
2) Select 'Build' from top menu.
75-
3) Select 'Batch Build' from dropdown menu.
76-
4) Make sure that the sixteen project configurations are 'checked'.
77-
5) Click on the 'Build' button.
78-
6) Once the sixteen project configurations are built you are done.
79-
80-
Dynamic and static c-ares libraries are built in debug and release flavours,
81-
and can be located each one in its own subdirectory, dll-debug, dll-release,
82-
lib-debug and lib-release, all of them below the 'vc\cares' subdirectory.
83-
84-
In the same way four executable versions of each sample program are built,
85-
each using its respective library. The resulting sample executables are
86-
located in its own subdirectory, dll-debug, dll-release, lib-debug and
87-
lib-release, below the 'vc\acountry', 'vc\adig' and 'vc\ahost'folders.
88-
89-
These reference VC++ 6.0 configurations are generated using the dynamic CRT.
90-
91-
92-
How to build using Visual Studio 2003 or newer IDE
93-
--------------------------------------------------
94-
95-
First you have to convert the VC++ 6.0 reference workspace and project files
96-
to the Visual Studio IDE version you are using, following next steps:
97-
98-
1) Open vc\vc6aws.dsw with VS20XX.
99-
2) Allow VS20XX to update all projects and workspaces.
100-
3) Save ALL and close VS20XX.
101-
4) Open vc\vc6aws.sln with VS20XX.
102-
5) Select batch build, check 'all' projects and click 'build' button.
103-
104-
Same comments relative to generated files and folders as done above for
105-
Visual Studio 6 IDE apply here.
106-
10767

10868
Relationship between c-ares library file names and versions
10969
-----------------------------------------------------------
@@ -139,4 +99,4 @@
13999

140100

141101
Have Fun!
142-
102+

‎graal-nodejs/deps/cares/RELEASE-NOTES

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
c-ares version 1.17.2
2+
3+
This is a security and bugfix release. It addresses a few security related
4+
issues along with various bugfixes mostly related to portability.
5+
6+
Security:
7+
o NodeJS passes NULL for addr and 0 for addrlen to ares_parse_ptr_reply() on
8+
systems where malloc(0) returns NULL. This would cause a crash. [8]
9+
o When building c-ares with CMake, the RANDOM_FILE would not be set and
10+
therefore downgrade to the less secure random number generator [12]
11+
o If ares_getaddrinfo() was terminated by an ares_destroy(), it would cause
12+
a crash [13]
13+
o Crash in sortaddrinfo() if the list size equals 0 due to an unexpected
14+
DNS response [14]
15+
o Expand number of escaped characters in DNS replies as per RFC1035 5.1 to
16+
prevent spoofing [16], [17]
17+
o Perform validation on hostnames to prevent possible XSS due to applications
18+
not performing valiation themselves [18]
19+
20+
Changes:
21+
o Use non-blocking /dev/urandom for random data to prevent early startup
22+
performance issues [5]
23+
o z/OS port [6]
24+
o ares_malloc(0) is now defined behavior (returns NULL) rather than
25+
system-specific to catch edge cases [7]
26+
27+
Bug fixes:
28+
o Fuzz testing files were not distributed with official archives [1]
29+
o Building tests should not force building of static libraries except on
30+
Windows [2]
31+
o Windows builds of the tools would fail if built as static due to a missing
32+
CARES_STATICLIB definition [3]
33+
o Relative headers must use double quotes to prevent pulling in a system
34+
library [4]
35+
o Fix OpenBSD building by implementing portability updates for including
36+
arpa/nameser.h [9]
37+
o Fix building out-of-tree for autotools [10]
38+
o Make install on MacOS/iOS with CMake was missing the bundle destination so
39+
libraries weren't actually installed [11]
40+
o Fix retrieving DNS server configuration on MacOS and iOS if the configuration
41+
did not include search domains [15]
42+
o ares_parse_a_reply and ares_parse_aaa_reply were erroneously using strdup()
43+
instead of ares_strdup() [19]
44+
45+
46+
Thanks go to these friendly people for their efforts and contributions:
47+
Anton Danielsson (@anton-danielsson)
48+
Brad House (@bradh352)
49+
Daniel Stenberg (@bagder)
50+
Dhrumil Rana (@dhrumilrana)
51+
František Dvořák (@valtri)
52+
@halx99
53+
Jay Freeman (@saurik)
54+
Jean-pierre Cartal (@jeanpierrecartal)
55+
Michael Kourlas
56+
Philipp Jeitner
57+
@vburdo
58+
(11 contributors)
59+
60+
References to bug reports and discussions on issues:
61+
[1] = https://github.com/c-ares/c-ares/issues/379
62+
[2] = https://github.com/c-ares/c-ares/issues/380
63+
[3] = https://github.com/c-ares/c-ares/issues/384
64+
[4] = https://github.com/c-ares/c-ares/pull/386
65+
[5] = https://github.com/c-ares/c-ares/pull/391
66+
[6] = https://github.com/c-ares/c-ares/pull/390
67+
[7] = https://github.com/c-ares/c-ares/commit/485fb66
68+
[8] = https://github.com/c-ares/c-ares/issues/392
69+
[9] = https://github.com/c-ares/c-ares/issues/388
70+
[10] = https://github.com/c-ares/c-ares/pull/394
71+
[11] = https://github.com/c-ares/c-ares/pull/395
72+
[12] = https://github.com/c-ares/c-ares/pull/397
73+
[13] = https://github.com/c-ares/c-ares/commit/df94703
74+
[14] = https://github.com/c-ares/c-ares/pull/400
75+
[15] = https://github.com/c-ares/c-ares/pull/401
76+
[16] = https://github.com/c-ares/c-ares/commit/362f91d
77+
[17] = https://github.com/c-ares/c-ares/commit/44c009b
78+
[18] = https://github.com/c-ares/c-ares/commit/c9b6c60
79+
[19] = https://github.com/c-ares/c-ares/pull/408

‎graal-nodejs/deps/cares/src/TODO renamed to ‎graal-nodejs/deps/cares/TODO

File renamed without changes.

‎graal-nodejs/deps/cares/cares.gyp

+79-79
Original file line numberDiff line numberDiff line change
@@ -30,86 +30,86 @@
3030
{
3131
'target_name': 'cares',
3232
'type': '<(library)',
33-
'include_dirs': [ 'include', 'src' ],
33+
'include_dirs': [ 'include', 'src/lib' ],
3434
'direct_dependent_settings': {
35-
'include_dirs': [ 'include' ]
35+
'include_dirs': [ 'include', 'src/lib' ]
3636
},
3737
'sources': [
3838
'include/ares.h',
39+
'include/ares_dns.h',
3940
'include/ares_rules.h',
4041
'include/ares_version.h',
41-
'include/nameser.h',
42-
'src/ares_android.c',
43-
'src/ares_cancel.c',
44-
'src/ares__close_sockets.c',
45-
'src/ares_create_query.c',
46-
'src/ares_data.c',
47-
'src/ares_data.h',
48-
'src/ares_destroy.c',
49-
'src/ares_dns.h',
50-
'src/ares_expand_name.c',
51-
'src/ares_expand_string.c',
52-
'src/ares_fds.c',
53-
'src/ares_free_hostent.c',
54-
'src/ares_free_string.c',
55-
'src/ares_freeaddrinfo.c',
56-
'src/ares_getenv.h',
57-
'src/ares_getaddrinfo.c',
58-
'src/ares_gethostbyaddr.c',
59-
'src/ares_gethostbyname.c',
60-
'src/ares__get_hostent.c',
61-
'src/ares_getnameinfo.c',
62-
'src/ares_getopt.c',
63-
'src/ares_getopt.h',
64-
'src/ares_getsock.c',
65-
'src/ares_init.c',
66-
'src/ares_ipv6.h',
67-
'src/ares_library_init.c',
68-
'src/ares_library_init.h',
69-
'src/ares_llist.c',
70-
'src/ares_llist.h',
71-
'src/ares_mkquery.c',
72-
'src/ares_nowarn.c',
73-
'src/ares_nowarn.h',
74-
'src/ares_options.c',
75-
'src/ares__parse_into_addrinfo.c',
76-
'src/ares_parse_aaaa_reply.c',
77-
'src/ares_parse_a_reply.c',
78-
'src/ares_parse_caa_reply.c',
79-
'src/ares_parse_mx_reply.c',
80-
'src/ares_parse_naptr_reply.c',
81-
'src/ares_parse_ns_reply.c',
82-
'src/ares_parse_ptr_reply.c',
83-
'src/ares_parse_soa_reply.c',
84-
'src/ares_parse_srv_reply.c',
85-
'src/ares_parse_txt_reply.c',
86-
'src/ares_platform.h',
87-
'src/ares_private.h',
88-
'src/ares_process.c',
89-
'src/ares_query.c',
90-
'src/ares__read_line.c',
91-
'src/ares__readaddrinfo.c',
92-
'src/ares_search.c',
93-
'src/ares_send.c',
94-
'src/ares_setup.h',
95-
'src/ares__sortaddrinfo.c',
96-
'src/ares_strcasecmp.c',
97-
'src/ares_strcasecmp.h',
98-
'src/ares_strdup.c',
99-
'src/ares_strdup.h',
100-
'src/ares_strerror.c',
101-
'src/ares_strsplit.c',
102-
'src/ares_timeout.c',
103-
'src/ares__timeval.c',
104-
'src/ares_version.c',
105-
'src/ares_writev.c',
106-
'src/ares_writev.h',
107-
'src/bitncmp.c',
108-
'src/bitncmp.h',
109-
'src/inet_net_pton.c',
110-
'src/inet_ntop.c',
111-
'src/ares_inet_net_pton.h',
112-
'src/setup_once.h',
42+
'src/lib/ares_android.c',
43+
'src/lib/ares_cancel.c',
44+
'src/lib/ares__close_sockets.c',
45+
'src/lib/ares_create_query.c',
46+
'src/lib/ares_data.c',
47+
'src/lib/ares_data.h',
48+
'src/lib/ares_destroy.c',
49+
'src/lib/ares_expand_name.c',
50+
'src/lib/ares_expand_string.c',
51+
'src/lib/ares_fds.c',
52+
'src/lib/ares_free_hostent.c',
53+
'src/lib/ares_free_string.c',
54+
'src/lib/ares_freeaddrinfo.c',
55+
'src/lib/ares_getenv.h',
56+
'src/lib/ares_getaddrinfo.c',
57+
'src/lib/ares_gethostbyaddr.c',
58+
'src/lib/ares_gethostbyname.c',
59+
'src/lib/ares__get_hostent.c',
60+
'src/lib/ares_getnameinfo.c',
61+
'src/lib/ares_getsock.c',
62+
'src/lib/ares_init.c',
63+
'src/lib/ares_ipv6.h',
64+
'src/lib/ares_library_init.c',
65+
'src/lib/ares_library_init.h',
66+
'src/lib/ares_llist.c',
67+
'src/lib/ares_llist.h',
68+
'src/lib/ares_mkquery.c',
69+
'src/lib/ares_nameser.h',
70+
'src/lib/ares_nowarn.c',
71+
'src/lib/ares_nowarn.h',
72+
'src/lib/ares_options.c',
73+
'src/lib/ares__parse_into_addrinfo.c',
74+
'src/lib/ares_parse_aaaa_reply.c',
75+
'src/lib/ares_parse_a_reply.c',
76+
'src/lib/ares_parse_caa_reply.c',
77+
'src/lib/ares_parse_mx_reply.c',
78+
'src/lib/ares_parse_naptr_reply.c',
79+
'src/lib/ares_parse_ns_reply.c',
80+
'src/lib/ares_parse_ptr_reply.c',
81+
'src/lib/ares_parse_soa_reply.c',
82+
'src/lib/ares_parse_srv_reply.c',
83+
'src/lib/ares_parse_txt_reply.c',
84+
'src/lib/ares_platform.h',
85+
'src/lib/ares_private.h',
86+
'src/lib/ares_process.c',
87+
'src/lib/ares_query.c',
88+
'src/lib/ares__read_line.c',
89+
'src/lib/ares__readaddrinfo.c',
90+
'src/lib/ares_search.c',
91+
'src/lib/ares_send.c',
92+
'src/lib/ares_setup.h',
93+
'src/lib/ares__sortaddrinfo.c',
94+
'src/lib/ares_strcasecmp.c',
95+
'src/lib/ares_strcasecmp.h',
96+
'src/lib/ares_strdup.c',
97+
'src/lib/ares_strdup.h',
98+
'src/lib/ares_strerror.c',
99+
'src/lib/ares_strsplit.c',
100+
'src/lib/ares_timeout.c',
101+
'src/lib/ares__timeval.c',
102+
'src/lib/ares_version.c',
103+
'src/lib/ares_writev.c',
104+
'src/lib/ares_writev.h',
105+
'src/lib/bitncmp.c',
106+
'src/lib/bitncmp.h',
107+
'src/lib/inet_net_pton.c',
108+
'src/lib/inet_ntop.c',
109+
'src/lib/ares_inet_net_pton.h',
110+
'src/lib/setup_once.h',
111+
'src/tools/ares_getopt.c',
112+
'src/tools/ares_getopt.h',
113113
],
114114
'conditions': [
115115
[ 'library=="static_library"', {
@@ -124,11 +124,11 @@
124124
],
125125
'include_dirs': [ 'config/win32' ],
126126
'sources': [
127-
'src/config-win32.h',
128-
'src/windows_port.c',
129-
'src/ares_getenv.c',
130-
'src/ares_iphlpapi.h',
131-
'src/ares_platform.c'
127+
'src/lib/config-win32.h',
128+
'src/lib/windows_port.c',
129+
'src/lib/ares_getenv.c',
130+
'src/lib/ares_iphlpapi.h',
131+
'src/lib/ares_platform.c'
132132
],
133133
'libraries': [
134134
'-lws2_32.lib',

‎graal-nodejs/deps/cares/include/ares.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
4040
defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
4141
defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
42-
defined(__QNXNTO__)
42+
defined(__QNXNTO__) || defined(__MVS__)
4343
#include <sys/select.h>
4444
#endif
4545
#if (defined(NETWARE) && !defined(__NOVELL_LIBC__))

‎graal-nodejs/deps/cares/src/ares_dns.h renamed to ‎graal-nodejs/deps/cares/include/ares_dns.h

+9
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@
1616
* without express or implied warranty.
1717
*/
1818

19+
/*
20+
* NOTE TO INTEGRATORS:
21+
*
22+
* This header is made public due to legacy projects relying on it.
23+
* Please do not use the macros within this header, or include this
24+
* header in your project as it may be removed in the future.
25+
*/
26+
27+
1928
/*
2029
* Macro DNS__16BIT reads a network short (16 bit) given in network
2130
* byte order, and returns its value as an unsigned short.

‎graal-nodejs/deps/cares/include/ares_version.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
#define ARES_VERSION_MAJOR 1
99
#define ARES_VERSION_MINOR 17
10-
#define ARES_VERSION_PATCH 1
10+
#define ARES_VERSION_PATCH 2
1111
#define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
1212
(ARES_VERSION_MINOR<<8)|\
1313
(ARES_VERSION_PATCH))
14-
#define ARES_VERSION_STR "1.17.1"
14+
#define ARES_VERSION_STR "1.17.2"
1515

1616
#if (ARES_VERSION >= 0x010700)
1717
# define CARES_HAVE_ARES_LIBRARY_INIT 1

0 commit comments

Comments
 (0)