1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: updated openssl upgrade instructions

Browse Source 
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>
This commit is contained in:
Sam Roberts 2019-06-12 13:51:31 -07:00 committed by Ruben Bridgewater
parent b6326ce0f7
commit 5990c4d453
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
1 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
deps/openssl/config/README.md vendored
View File

@ -50,41 +50,7 @@ This updates all sources in deps/openssl/openssl by:
$ git commit openssl $ git commit openssl
``` ```
### 2. Apply a floating patch ### 2. Execute `make` in `deps/openssl/config` directory
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
Use `make` to regenerate all platform dependent files in Use `make` to regenerate all platform dependent files in
`deps/openssl/config/archs/`: `deps/openssl/config/archs/`:
@ -92,7 +58,7 @@ Use `make` to regenerate all platform dependent files in
$ cd deps/openssl/config; make $ cd deps/openssl/config; make
``` ```
### 4. Check diffs ### 3. Check diffs
Check diffs if updates are right. Even if no updates in openssl Check diffs if updates are right. Even if no updates in openssl
sources, `buildinf.h` files will be updated for they have a timestamp 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, it needs to change these two Makefiles by hand. If you are not sure,
please ask @shigeki for details. 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 Update all architecture dependent files. Do not forget to git add or remove
files if they are changed before commit: files if they are changed before commit: