Skip to content
This repository was archived by the owner on Jan 3, 2024. It is now read-only.

patches: bump to 18.2.0 #250

Merged
merged 1 commit into from
Jun 6, 2022
Merged

patches: bump to 18.2.0 #250

merged 1 commit into from
Jun 6, 2022

Conversation

baparham
Copy link
Contributor

Local build seemed to work by just keeping the patch the same from 18.1.0, so I'll propose this change and await feedback if it needs more work or changes in other areas.

Thanks for any guidance!

Fixes #249

@baparham
Copy link
Contributor Author

@jesec Is this patch missing anything? Let me know if you think there is something else you think I should do here.

@jesec
Copy link
Contributor

jesec commented May 23, 2022

There is a bunch of applied with delta. We want the patch to have no such divergence.

@baparham
Copy link
Contributor Author

I don't see applied with delta but perhaps that's just a difference in our toolchains. I see this for the patching portion:

> Applying patches
patching file common.gypi
patching file deps/v8/include/v8-initialization.h
patching file deps/v8/src/api/api.cc
patching file deps/v8/src/codegen/compiler.cc
patching file deps/v8/src/objects/js-function.cc
patching file deps/v8/src/objects/shared-function-info-inl.h
patching file deps/v8/src/parsing/parsing.cc
patching file deps/v8/src/snapshot/code-serializer.cc
patching file lib/child_process.js
patching file lib/internal/bootstrap/pkg.js
patching file lib/internal/bootstrap/pre_execution.js
Hunk #1 succeeded at 29 (offset -3 lines).
Hunk #2 succeeded at 124 (offset -3 lines).
Hunk #3 succeeded at 580 (offset -41 lines).
patching file lib/internal/modules/cjs/loader.js
patching file lib/internal/modules/package_json_reader.js
patching file lib/vm.js
patching file src/inspector_agent.cc
patching file src/node.cc
Hunk #1 succeeded at 482 (offset -1 lines).
Hunk #2 succeeded at 602 (offset -1 lines).
Hunk #3 succeeded at 617 (offset -1 lines).
patching file src/node_contextify.cc
Hunk #2 succeeded at 702 (offset -8 lines).
Hunk #3 succeeded at 726 (offset -8 lines).
Hunk #4 succeeded at 779 (offset -8 lines).
Hunk #5 succeeded at 799 (offset -8 lines).
Hunk #6 succeeded at 832 (offset -8 lines).
patching file src/node_main.cc
patching file src/node_options.cc
patching file tools/icu/icu-generic.gyp

Are you referring to the offset N lines comments? my goal is to adjust the patch so that they successfully apply without such an offset, correct?

@baparham baparham force-pushed the update-to-18.2.0 branch from c9dbf6f to 5550906 Compare May 25, 2022 10:05
@baparham
Copy link
Contributor Author

I've reworked the patch file to apply without the offsets. Please let me know if this is what you meant @jesec

Thanks for the help!

@baparham baparham force-pushed the update-to-18.2.0 branch from 5550906 to a9f9604 Compare May 25, 2022 10:35
baparham
baparham commented May 25, 2022
View reviewed changes
@jesec jesec merged commit a9f9604 into vercel:main Jun 6, 2022
@baparham baparham deleted the update-to-18.2.0 branch June 8, 2022 19:40
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
1 more reviewer

@jesec jesec jesec approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update to node 18.2.0 to resolve openssl vulnerabilities
2 participants
@baparham @jesec