Commit e46d9e9
deps: updated openssl upgrade instructions
Patching the s390 asm rules is no longer required.
See: openssl/openssl#8351
PR-URL: #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>1 parent e89a39b commit e46d9e9
1 file changed
Lines changed: 3 additions & 37 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -50,49 +50,15 @@ This updates all sources in deps/openssl/openssl by: | |||
| 50 | 50 | $ git commit openssl | |
| 51 | 51 | ``` | |
| 52 | 52 | ||
| 53 | - ### 2. Apply a floating patch | ||
| 54 | - | ||
| 55 | - Currently, one floating patch is needed to build S390 asm files: | ||
| 56 | - ``` | ||
| 57 | - Author: Shigeki Ohtsu <ohtsu@ohtsu.org> | ||
| 58 | - Date: Wed Mar 7 23:52:52 2018 +0900 | ||
| 59 | - | ||
| 60 | - deps: add s390 asm rules for OpenSSL-1.1.0 | ||
| 61 | - | ||
| 62 | - This is a floating patch against OpenSSL-1.1.0 to generate asm files | ||
| 63 | - with Makefile rules and it is to be submitted to the upstream. | ||
| 64 | - | ||
| 65 | - Fixes: https://github.com/nodejs/node/issues/4270 | ||
| 66 | - PR-URL: https://github.com/nodejs/node/pull/19794 | ||
| 67 | - Reviewed-By: James M Snell <jasnell@gmail.com> | ||
| 68 | - Reviewed-By: Rod Vagg <rod@vagg.org> | ||
| 69 | - Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> | ||
| 70 | - | ||
| 71 | - deps/openssl/openssl/crypto/poly1305/build.info | 2 ++ | ||
| 72 | - ``` | ||
| 73 | - | ||
| 74 | - Find the SHA of the previous commit of this patch: | ||
| 75 | - ```sh | ||
| 76 | - $ git log -n1 --oneline -- deps/openssl/openssl/crypto/poly1305/build.info | ||
| 77 | - ``` | ||
| 78 | - | ||
| 79 | - Using the SHA found in the previous step, cherry pick it from the previous | ||
| 80 | - commit (with the openssl version in the commit message set to the relevant | ||
| 81 | - value): | ||
| 82 | - ```sh | ||
| 83 | - $ git cherry-pick 45b9f5df6ff1548f01ed646ebee75e3f0873cefd | ||
| 84 | - ``` | ||
| 85 | - | ||
| 86 | - | ||
| 87 | - ### 3. Execute `make` in `deps/openssl/config` directory | ||
| 53 | + ### 2. Execute `make` in `deps/openssl/config` directory | ||
| 88 | 54 | ||
| 89 | 55 | Use `make` to regenerate all platform dependent files in | |
| 90 | 56 | `deps/openssl/config/archs/`: | |
| 91 | 57 | ```sh | |
| 92 | 58 | $ cd deps/openssl/config; make | |
| 93 | 59 | ``` | |
| 94 | 60 | ||
| 95 | - ### 4. Check diffs | ||
| 61 | + ### 3. Check diffs | ||
| 96 | 62 | ||
| 97 | 63 | Check diffs if updates are right. Even if no updates in openssl | |
| 98 | 64 | 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, | |||
| 109 | 75 | it needs to change these two Makefiles by hand. If you are not sure, | |
| 110 | 76 | please ask @shigeki for details. | |
| 111 | 77 | ||
| 112 | - ### 5. Commit and make test | ||
| 78 | + ### 4. Commit and make test | ||
| 113 | 79 | ||
| 114 | 80 | Update all architecture dependent files. Do not forget to git add or remove | |
| 115 | 81 | files if they are changed before commit: | |
0 commit comments