From c59e0c256d3a2f8d40d1a2ce7c96efeb8c898872 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 12 Jun 2019 13:51:31 -0700 Subject: [PATCH] deps: updated openssl upgrade instructions Patching the s390 asm rules is no longer required. See: https://github.com/openssl/openssl/pull/8351 PR-URL: https://github.com/nodejs/node/pull/28212 Reviewed-By: Beth Griggs --- deps/openssl/config/README.md | 40 +++-------------------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/deps/openssl/config/README.md b/deps/openssl/config/README.md index 1ad23be276d18c..1adb6fa83cf729 100644 --- a/deps/openssl/config/README.md +++ b/deps/openssl/config/README.md @@ -50,41 +50,7 @@ This updates all sources in deps/openssl/openssl by: $ git commit openssl ``` -### 2. Apply a floating patch - -Currently, one floating patch is needed to build S390 asm files: -``` -Author: Shigeki Ohtsu -Date: Wed Mar 7 23:52:52 2018 +0900 - - deps: add s390 asm rules for OpenSSL-1.1.0 - - This is a floating patch against OpenSSL-1.1.0 to generate asm files - with Makefile rules and it is to be submitted to the upstream. - - Fixes: https://github.com/nodejs/node/issues/4270 - PR-URL: https://github.com/nodejs/node/pull/19794 - Reviewed-By: James M Snell - Reviewed-By: Rod Vagg - Reviewed-By: Michael Dawson - - deps/openssl/openssl/crypto/poly1305/build.info | 2 ++ -``` - -Find the SHA of the previous commit of this patch: -```sh -$ git log -n1 --oneline -- deps/openssl/openssl/crypto/poly1305/build.info -``` - -Using the SHA found in the previous step, cherry pick it from the previous -commit (with the openssl version in the commit message set to the relevant -value): -```sh -$ git cherry-pick 45b9f5df6ff1548f01ed646ebee75e3f0873cefd -``` - - -### 3. Execute `make` in `deps/openssl/config` directory +### 2. Execute `make` in `deps/openssl/config` directory Use `make` to regenerate all platform dependent files in `deps/openssl/config/archs/`: @@ -92,7 +58,7 @@ Use `make` to regenerate all platform dependent files in $ cd deps/openssl/config; make ``` -### 4. Check diffs +### 3. Check diffs Check diffs if updates are right. Even if no updates in openssl sources, `buildinf.h` files will be updated for they have a timestamp @@ -109,7 +75,7 @@ created. When source files or build options are updated in Windows, it needs to change these two Makefiles by hand. If you are not sure, please ask @shigeki for details. -### 5. Commit and make test +### 4. Commit and make test Update all architecture dependent files. Do not forget to git add or remove files if they are changed before commit: