v10.16.1 proposal

CHANGELOG.md

@@ -33,7 +33,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V12.md#12.0.0">12.0.0</a><br/>
     </td>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V10.md#10.16.0">10.16.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V10.md#10.16.1">10.16.1</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V10.md#10.16.0">10.16.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V10.md#10.15.3">10.15.3</a><br/>
 <a href="doc/changelogs/CHANGELOG_V10.md#10.15.2">10.15.2</a><br/>
 <a href="doc/changelogs/CHANGELOG_V10.md#10.15.1">10.15.1</a><br/>

common.gypi

@@ -33,7 +33,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.52',
+    'v8_embedder_string': '-node.54',
 
     # Enable disassembler for `--print-code` v8 options
     'v8_enable_disassembler': 1,

deps/openssl/config/README.md

@@ -50,49 +50,15 @@ 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/`:
 ```sh
 $ 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: