Skip to content

Commit 8f191f3

Browse files
sam-githubrvagg
authored andcommittedNov 25, 2018
deps: update openssl 1.1.0 upgrade docs
PR-URL: #24523 Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Rod Vagg <rod@vagg.org>
1 parent f20ac47 commit 8f191f3

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed
 

‎deps/openssl/config/README.md

+11-15
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Currently, one floating patch is needed to build S390 asm files.
5959
6060
Cherry pick it from the previous commit.
6161
```sh
62-
$ git cherry-pick 094465362758ebf967b33c84d5c96230b46a34b3
62+
$ git cherry-pick 45b9f5df6ff1548f01ed646ebee75e3f0873cefd
6363
```
6464
### 3. Execute `make` in `deps/openssl/config` directory
6565

@@ -70,16 +70,6 @@ Just type `make` then it generates all platform dependent files into
7070
$ cd deps/openssl/config; make
7171
```
7272

73-
The commit message can be
74-
```
75-
commit 8cb1de45c60f2d520551166610115531db673518
76-
Author: Shigeki Ohtsu <ohtsu@ohtsu.org>
77-
Date: Thu Mar 29 16:46:11 2018 +0900
78-
79-
deps: update archs files for OpenSSL-1.1.0
80-
81-
`cd deps/openssl/config; make` updates all archs dependant files.
82-
```
8373
### 4. Check diffs
8474

8575
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
9686
created. When source files or build options are updated in Windows,
9787
it needs to change these two Makefiles by hand. If you are not sure,
9888
please ask @shigeki for details.
89+
9990
### 5. Commit and make test
10091

10192
Update all architecture dependent files. Do not forget to git add or remove
102-
files if they are changed before commit.
93+
files if they are changed before commit:
10394
```sh
104-
$ cd deps/openssl/openssl/config
105-
$ git add archs
106-
$ git commit archs
95+
$ git add deps/openssl/config/archs
96+
$ git add deps/openssl/openssl/crypto/include/internal/bn_conf.h
97+
$ git add deps/openssl/openssl/crypto/include/internal/dso_conf.h
98+
$ git add deps/openssl/openssl/include/openssl/opensslconf.h
99+
$ git add deps/openssl/openssl/.gitignore
100+
$ git commit
107101
```
108102

109103
The commit message can be
@@ -113,6 +107,8 @@ The commit message can be
113107
Date: Thu Mar 29 16:46:11 2018 +0900
114108
115109
deps: update archs files for OpenSSL-1.1.0
110+
111+
`cd deps/openssl/config; make` updates all archs dependant files.
116112
```
117113

118114
Finally, build Node and run tests.

0 commit comments

Comments
 (0)