Skip to content

Commit d059a51

Browse files
richardlautargos
authored andcommitted
doc: update maintaining openssl guide
Update the maintaining openssl guide to mention following the instructions in the v14.x-staging version of the guide for the v14.x-staging branch as the instructions for the quic fork use a git clone/checkout of the forked repository while the previous instructions for the non-forked openssl use the release tarball. Remove references to End-of-Life Node.js 10 and update for Node.js 12 as it is necessary to regenerate the configution files. PR-URL: #39878 Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 00529b0 commit d059a51

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

doc/guides/maintaining-openssl.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ currently need to generate three PRs as follows:
77

88
* a PR for master which is generated following the instructions
99
below.
10-
* a PR for 14.x following the instruction below based on the
11-
14,x branch. This PR should cherry pick back to the active release
12-
lines except for the 10.x line.
10+
* a PR for 14.x following the instructions in the v14.x-staging version
11+
of this guide.
1312
* a PR which uses the same commit from the second PR to apply the
1413
updates to the openssl source code, with a new commit generated
15-
by following steps 2 onwards on the 10.x line. This is
16-
necessary because differences in 10.x requires that the
17-
configuration files be regenerated specifically for 10.x.
14+
by following steps 2 onwards on the 12.x line. This is
15+
necessary because the configuration files have embedded timestamps
16+
which lead to merge conflicts if cherry-picked from the second PR.
1817

1918
## Use of the quictls/openssl fork
2019

0 commit comments

Comments
 (0)