From 1a421322c1cc310caedd7efa1694e6ff653808e4 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Thu, 17 Dec 2020 13:08:37 -0500 Subject: [PATCH 1/2] doc: expand openssl instructions Refs: https://github.com/nodejs/node/pull/36541 Expand the instructions to cover what is needed when updates are required across all active release lines --- doc/guides/maintaining-openssl.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/guides/maintaining-openssl.md b/doc/guides/maintaining-openssl.md index 1b59c24f8c32d4..025c8d51392628 100644 --- a/doc/guides/maintaining-openssl.md +++ b/doc/guides/maintaining-openssl.md @@ -2,6 +2,18 @@ This document describes how to update `deps/openssl/`. +If you need to provide updates across all active release lines you will +currently need to generate two PRs as follows: + +* a PR following the instruction below based on the main branch. + This PR should cherry pick back to the active release lines + except for the 10.x line. +* a PR which uses the same commit from the first PR to apply the + updates to the openssl source code, with a new commit generated + by following steps 2 onwards on the 10.x line. This is + necessary because differences in 10.x requires that the + configuration files be regenerated specifically for 10.x. + ## Requirements * Linux environment. * `perl` Only Perl version 5 is tested. From 33c49768cb92eb347318b270618ab637e5d86844 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Fri, 18 Dec 2020 15:37:41 -0500 Subject: [PATCH 2/2] squash: address comments --- doc/guides/maintaining-openssl.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/guides/maintaining-openssl.md b/doc/guides/maintaining-openssl.md index 025c8d51392628..1e75831482a260 100644 --- a/doc/guides/maintaining-openssl.md +++ b/doc/guides/maintaining-openssl.md @@ -3,12 +3,15 @@ This document describes how to update `deps/openssl/`. If you need to provide updates across all active release lines you will -currently need to generate two PRs as follows: +currently need to generate three PRs as follows: -* a PR following the instruction below based on the main branch. +* a PR for master which is generated following the instructions + below which include the QUIC patch. +* a PR for 14.x following the instruction below based on the + 14,x branch but skipping the step to apply the QUICK patch. This PR should cherry pick back to the active release lines except for the 10.x line. -* a PR which uses the same commit from the first PR to apply the +* a PR which uses the same commit from the second PR to apply the updates to the openssl source code, with a new commit generated by following steps 2 onwards on the 10.x line. This is necessary because differences in 10.x requires that the