doc: update instructions for openssl updates #42353
Closed
Conversation
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
Update to reflect additional PRs needed as some branches now use OpenSSL 3.x Signed-off-by: Michael Dawson <[email protected]>
|
Review requested:
|
aduh95
reviewed
Mar 15, 2022
aduh95
reviewed
Mar 15, 2022
mhdawson
commented
Mar 15, 2022
richardlau
approved these changes
Mar 15, 2022
Co-authored-by: Antoine du Hamel <[email protected]>
Co-authored-by: Antoine du Hamel <[email protected]>
mhdawson
commented
Mar 16, 2022
| ```console | ||
| $ make -C deps/openssl/config | ||
| $ git add deps/openssl/config/archs | ||
| $ git add deps/openssl/openssl |
There was a problem hiding this comment.
@richard this matches what is in the commit comments below and looks like what we have done. It is probably also related to #42081 as git add deps/openssl/openssl adds all of the headers under openssl/openssl/include versus the selective ones that were added for OpenSSL 1.1.1.
I don't think we want to change right now as we get releases out, but worth looking to see if possibly we can revert to adding just those three, find out why more were needed and possibly ask @danbev when he gets back.
There was a problem hiding this comment.
Actually I take that back since I guess the the examples were only showing the git adds that were necessary for a particular commit as opposed to what needs to be done in general. Therefore, it likely is not related to #42081 after all.
There was a problem hiding this comment.
FWIW AFAICT the big difference between OpenSSL 1.1.1 and 3.0.x in Node.js is the deps/openssl/config/archs -- there's many more files in OpenSSL 3.0.x under there (see description in #42081) and a preliminary glance suggested a lot of duplication between the archs.
mhdawson
commented
Mar 16, 2022
done |
aduh95
reviewed
Mar 16, 2022
Co-authored-by: Antoine du Hamel <[email protected]>
mhdawson
commented
Mar 16, 2022
lpinca
approved these changes
Mar 16, 2022
aduh95
approved these changes
Mar 17, 2022
aduh95
added
commit-queue
|
Added https://github.com/nodejs/node/labels/backport-requested-v16%2Ex as we probably want to address #42353 (comment). |
nodejs-github-bot
added
commit-queue-failed
Commit Queue failed- Loading data for nodejs/node/pull/42353 ✔ Done loading data for nodejs/node/pull/42353 ----------------------------------- PR info ------------------------------------ Title doc: update instructions for openssl updates (#42353) Author Michael Dawson (@mhdawson) Branch mhdawson:update-openssl-instructions -> nodejs:master Labels doc, backport-requested-v16.x, commit-queue-squash Commits 9 - doc: update instructions for openssl updates - Update doc/contributing/maintaining-openssl.md - Update doc/contributing/maintaining-openssl.md - Update doc/contributing/maintaining-openssl.md - squash address comments - squash:fixup - Update doc/contributing/maintaining-openssl.md - Update doc/contributing/maintaining-openssl.md - Update doc/contributing/maintaining-openssl.md Committers 2 - Michael Dawson - GitHub PR-URL: https://github.com/nodejs/node/pull/42353 Reviewed-By: Richard Lau Reviewed-By: Luigi Pinca Reviewed-By: Antoine du Hamel ------------------------------ Generated metadata ------------------------------ PR-URL: https://github.com/nodejs/node/pull/42353 Reviewed-By: Richard Lau Reviewed-By: Luigi Pinca Reviewed-By: Antoine du Hamel -------------------------------------------------------------------------------- ℹ This PR was created on Tue, 15 Mar 2022 21:24:08 GMT ✔ Approvals: 3 ✔ - Richard Lau (@richardlau) (TSC): https://github.com/nodejs/node/pull/42353#pullrequestreview-910851918 ✔ - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/42353#pullrequestreview-912180819 ✔ - Antoine du Hamel (@aduh95) (TSC): https://github.com/nodejs/node/pull/42353#pullrequestreview-912906182 ✖ This PR needs to wait 11 more hours to land ✔ Last GitHub CI successful ℹ Green GitHub CI is sufficient -------------------------------------------------------------------------------- ✔ Aborted `git node land` session in /home/runner/work/node/node/.ncuhttps://github.com/nodejs/node/actions/runs/1997890318 |
RaisinTen
approved these changes
Mar 17, 2022
mhdawson
added a commit
that referenced
this pull request
Mar 18, 2022
Update to reflect additional PRs needed as some branches now use OpenSSL 3.x Signed-off-by: Michael Dawson <[email protected]> PR-URL: #42353 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Darshan Sen <[email protected]>
|
Landed in cc64c93 |
bengl
pushed a commit
that referenced
this pull request
Mar 21, 2022
Update to reflect additional PRs needed as some branches now use OpenSSL 3.x Signed-off-by: Michael Dawson <[email protected]> PR-URL: #42353 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Darshan Sen <[email protected]>
Merged
xtx1130
pushed a commit
to xtx1130/node
that referenced
this pull request
Apr 25, 2022
Update to reflect additional PRs needed as some branches now use OpenSSL 3.x Signed-off-by: Michael Dawson <[email protected]> PR-URL: nodejs#42353 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Darshan Sen <[email protected]>
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.
Update to reflect additional PRs needed as some
branches now use OpenSSL 3.x
Signed-off-by: Michael Dawson [email protected]