Closed
Conversation
This comment has been minimized.
This comment has been minimized.
Collaborator
richardlau
approved these changes
Aug 10, 2021
Member
richardlau
left a comment
There was a problem hiding this comment.
LGTM based on c-ares/c-ares@cares-1_17_1...cares-1_17_2.
Collaborator
richardlau
reviewed
Aug 10, 2021
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Collaborator
ab677ab to
0bfb8ec
Compare
Member
Author
|
Coverage actions failure is unrelated (being discussed in #39725). Would appreciate another review or two. |
BethGriggs
added a commit
that referenced
this pull request
Aug 10, 2021
Refs: https://github.com/c-ares/c-ares/releases/tag/cares-1_17_2 PR-URL: #39724 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Member
Author
|
Landed in 3914354 |
felixonmars
added a commit
to felixonmars/node
that referenced
this pull request
Aug 11, 2021
The change in nodejs#39724 breaks building with system c-ares (`--shared-cares`): ``` In file included from ../src/cares_wrap.cc:25: ../src/cares_wrap.h:25:11: fatal error: ares_nameser.h: No such file or directory 25 | # include <ares_nameser.h> | ^~~~~~~~~~~~~~~~ ``` Since `ares_nameser.h` isn't available with a default system c-ares installation, let's add back the include check and use the old `arpa/nameser.h` routine instead. Tested to build fine on Arch Linux with shared c-ares.
felixonmars
added a commit
to felixonmars/node
that referenced
this pull request
Aug 11, 2021
The change in nodejs#39724 breaks building with system c-ares (`--shared-cares`): ``` In file included from ../src/cares_wrap.cc:25: ../src/cares_wrap.h:25:11: fatal error: ares_nameser.h: No such file or directory 25 | # include <ares_nameser.h> | ^~~~~~~~~~~~~~~~ ``` Since `ares_nameser.h` isn't available with a default system c-ares installation, let's add back the include check and use the old `arpa/nameser.h` routine instead. Tested to build fine on Arch Linux with shared c-ares.
felixonmars
added a commit
to felixonmars/node
that referenced
this pull request
Aug 11, 2021
The change in nodejs#39724 breaks building with system c-ares (`--shared-cares`): ``` In file included from ../src/cares_wrap.cc:25: ../src/cares_wrap.h:25:11: fatal error: ares_nameser.h: No such file or directory 25 | # include <ares_nameser.h> | ^~~~~~~~~~~~~~~~ ``` Since `ares_nameser.h` isn't available with a default system c-ares installation, let's add back the include check and use the old `arpa/nameser.h` routine instead. Tested to build fine on Arch Linux with shared c-ares.
felixonmars
added a commit
to felixonmars/node
that referenced
this pull request
Aug 12, 2021
The change in nodejs#39724 breaks building with system c-ares (`--shared-cares`): ``` In file included from ../src/cares_wrap.cc:25: ../src/cares_wrap.h:25:11: fatal error: ares_nameser.h: No such file or directory 25 | # include <ares_nameser.h> | ^~~~~~~~~~~~~~~~ ``` Since `ares_nameser.h` isn't available with a default system c-ares installation, let's copy it as our private header here. Tested to build fine on Arch Linux with shared c-ares.
codebytere
added a commit
to electron/electron
that referenced
this pull request
Aug 16, 2021
codebytere
added a commit
to electron/electron
that referenced
this pull request
Aug 18, 2021
codebytere
added a commit
to electron/electron
that referenced
this pull request
Aug 20, 2021
* chore: bump node in DEPS to v16.6.0 * chore: bump node in DEPS to v16.6.1 * crypto: fix generateKeyPair with encoding 'jwk' nodejs/node#39319 * build: add library_files to gyp variables nodejs/node#39293 * debugger: rename internal module nodejs/node#39378 * chore: fixup patch indices * deps: extract gtest source files to deps/googletest nodejs/node#39386 * crypto: fix generateKeyPair with encoding 'jwk' nodejs/node#39319 * deps: bump HdrHistogram_C to 0.11.2 nodejs/node#39462 * fixup! deps: extract gtest source files to deps/googletest * chore: bump node in DEPS to v16.6.2 * chore: update patches * deps: reflect c-ares source tree nodejs/node#39653 * deps: update c-ares to 1.17.2 nodejs/node#39724 * fix: _ReadBarrier undefined symbol error on WOA arm64 * chore: update patches * chore: bump node in DEPS to v16.7.0 * deps: upgrade to libuv 1.42.0 nodejs/node#39525 * chore: update filenames * src: remove extra semicolons outside fns * chore: fixup patch filenames * chore: sort and alphabetize disabled tests Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
BlackHole1
pushed a commit
to BlackHole1/electron
that referenced
this pull request
Aug 30, 2021
* chore: bump node in DEPS to v16.6.0 * chore: bump node in DEPS to v16.6.1 * crypto: fix generateKeyPair with encoding 'jwk' nodejs/node#39319 * build: add library_files to gyp variables nodejs/node#39293 * debugger: rename internal module nodejs/node#39378 * chore: fixup patch indices * deps: extract gtest source files to deps/googletest nodejs/node#39386 * crypto: fix generateKeyPair with encoding 'jwk' nodejs/node#39319 * deps: bump HdrHistogram_C to 0.11.2 nodejs/node#39462 * fixup! deps: extract gtest source files to deps/googletest * chore: bump node in DEPS to v16.6.2 * chore: update patches * deps: reflect c-ares source tree nodejs/node#39653 * deps: update c-ares to 1.17.2 nodejs/node#39724 * fix: _ReadBarrier undefined symbol error on WOA arm64 * chore: update patches * chore: bump node in DEPS to v16.7.0 * deps: upgrade to libuv 1.42.0 nodejs/node#39525 * chore: update filenames * src: remove extra semicolons outside fns * chore: fixup patch filenames * chore: sort and alphabetize disabled tests Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
foxxyz
pushed a commit
to foxxyz/node
that referenced
this pull request
Oct 18, 2021
Refs: https://github.com/c-ares/c-ares/releases/tag/cares-1_17_2 CVE-ID: CVE-2021-3672, CVE-2021-22931 Refs: https://nvd.nist.gov/vuln/detail/CVE-2021-3672 Refs: https://nvd.nist.gov/vuln/detail/CVE-2021-22931 PR-URL: nodejs#39724 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR was created by downloading content of https://github.com/c-ares/c-ares/releases/tag/cares-1_17_2, and copying modifications to the files we already had in our tree.
nameser.his renamed toares_nameser.h.