diff options
| author | Sam Roberts <vieuxtech@gmail.com> | 2018-11-20 10:16:05 -0800 |
|---|---|---|
| committer | Sam Roberts <vieuxtech@gmail.com> | 2018-11-22 09:06:09 -0800 |
| commit | 160ac0f32513337214dc5a4cdb1fa8de3c2ed14c (patch) | |
| tree | 9fa21dbe54cc891931bb24407d4651edf3276a4a /deps/openssl/config | |
| parent | 910dd58a7eb43113780d2c813dc3cafeb463b920 (diff) | |
| download | android-node-v8-160ac0f32513337214dc5a4cdb1fa8de3c2ed14c.tar.gz android-node-v8-160ac0f32513337214dc5a4cdb1fa8de3c2ed14c.tar.bz2 android-node-v8-160ac0f32513337214dc5a4cdb1fa8de3c2ed14c.zip | |
deps: update openssl 1.1.0 upgrade docs
PR-URL: https://github.com/nodejs/node/pull/24523
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'deps/openssl/config')
| -rw-r--r-- | deps/openssl/config/README.md | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/deps/openssl/config/README.md b/deps/openssl/config/README.md index 1453622844..45ca72b797 100644 --- a/deps/openssl/config/README.md +++ b/deps/openssl/config/README.md @@ -59,7 +59,7 @@ Currently, one floating patch is needed to build S390 asm files. Cherry pick it from the previous commit. ```sh -$ git cherry-pick 094465362758ebf967b33c84d5c96230b46a34b3 +$ git cherry-pick 45b9f5df6ff1548f01ed646ebee75e3f0873cefd ``` ### 3. Execute `make` in `deps/openssl/config` directory @@ -70,16 +70,6 @@ Just type `make` then it generates all platform dependent files into $ cd deps/openssl/config; make ``` -The commit message can be -``` - commit 8cb1de45c60f2d520551166610115531db673518 - Author: Shigeki Ohtsu <ohtsu@ohtsu.org> - Date: Thu Mar 29 16:46:11 2018 +0900 - - deps: update archs files for OpenSSL-1.1.0 - - `cd deps/openssl/config; make` updates all archs dependant files. -``` ### 4. Check diffs Check diffs if updates are right. Even if no updates in openssl @@ -96,14 +86,18 @@ used for `nmake` command. The `make` command in the step 2 above uses 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 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: ```sh -$ cd deps/openssl/openssl/config -$ git add archs -$ git commit archs +$ git add deps/openssl/config/archs +$ git add deps/openssl/openssl/crypto/include/internal/bn_conf.h +$ git add deps/openssl/openssl/crypto/include/internal/dso_conf.h +$ git add deps/openssl/openssl/include/openssl/opensslconf.h +$ git add deps/openssl/openssl/.gitignore +$ git commit ``` The commit message can be @@ -113,6 +107,8 @@ The commit message can be Date: Thu Mar 29 16:46:11 2018 +0900 deps: update archs files for OpenSSL-1.1.0 + + `cd deps/openssl/config; make` updates all archs dependant files. ``` Finally, build Node and run tests. |