diff options
| author | Sam Roberts <vieuxtech@gmail.com> | 2019-06-12 13:51:31 -0700 |
|---|---|---|
| committer | Ruben Bridgewater <ruben@bridgewater.de> | 2019-06-17 11:55:43 +0200 |
| commit | 5990c4d453b8fc8453a26566bb7ac680a76bd83f (patch) | |
| tree | 45e03099786ebc57043eacddbd1594cc6deb76c4 /deps/openssl | |
| parent | b6326ce0f7317ea92313de5acff221deced9eb51 (diff) | |
| download | android-node-v8-5990c4d453b8fc8453a26566bb7ac680a76bd83f.tar.gz android-node-v8-5990c4d453b8fc8453a26566bb7ac680a76bd83f.tar.bz2 android-node-v8-5990c4d453b8fc8453a26566bb7ac680a76bd83f.zip | |
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/28211
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Diffstat (limited to 'deps/openssl')
| -rw-r--r-- | deps/openssl/config/README.md | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/deps/openssl/config/README.md b/deps/openssl/config/README.md index 1ad23be276..1adb6fa83c 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 <ohtsu@ohtsu.org> -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 <jasnell@gmail.com> - Reviewed-By: Rod Vagg <rod@vagg.org> - Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> - - 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: |