!33 挑单node.js update to 14.20.1

Merge pull request !33 from kangchongtao/cherry-pick-1667441226

BUILDING.md

@@ -52,6 +52,7 @@ file a new issue.
   * [Build with a specific ICU](#build-with-a-specific-icu)
     * [Unix/macOS](#unixmacos-3)
     * [Windows](#windows-4)
+* [Configuring OpenSSL config appname](#configure-openssl-appname)
 * [Building Node.js with FIPS-compliant OpenSSL](#building-nodejs-with-fips-compliant-openssl)
 * [Building Node.js with external core modules](#building-nodejs-with-external-core-modules)
   * [Unix/macOS](#unixmacos-4)
@@ -766,6 +767,19 @@ as `deps/icu` (You'll have: `deps/icu/source/...`)
 > .\vcbuild full-icu
 ```
 
+### Configure OpenSSL appname
+
+Node.js can use an OpenSSL configuration file by specifying the environment
+variable `OPENSSL_CONF`, or using the command line option `--openssl-conf`, and
+if none of those are specified will default to reading the default OpenSSL
+configuration file `openssl.cnf`. Node.js will only read a section that is by
+default named `nodejs_conf`, but this name can be overridden using the following
+configure option:
+
+```console
+$ ./configure --openssl-conf-name=<some_conf_name>
+```
+
 ## Building Node.js with FIPS-compliant OpenSSL
 
 The current version of Node.js does not support FIPS.

CHANGELOG.md

@@ -29,7 +29,11 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V14.md#14.19.1">14.19.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V14.md#14.20.1">14.20.1</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V14.md#14.20.0">14.20.0</a><br/>
+<a href="doc/changelogs/CHANGELOG_V14.md#14.19.3">14.19.3</a><br/>
+<a href="doc/changelogs/CHANGELOG_V14.md#14.19.2">14.19.2</a><br/>
+<a href="doc/changelogs/CHANGELOG_V14.md#14.19.1">14.19.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V14.md#14.19.0">14.19.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V14.md#14.18.3">14.18.3</a><br/>
 <a href="doc/changelogs/CHANGELOG_V14.md#14.18.2">14.18.2</a><br/>

Makefile

@@ -825,6 +825,9 @@ else
 ifeq ($(findstring s390,$(UNAME_M)),s390)
 DESTCPU ?= s390
 else
+ifeq ($(findstring arm64,$(UNAME_M)),arm64)
+DESTCPU ?= arm64
+else
 ifeq ($(findstring arm,$(UNAME_M)),arm)
 DESTCPU ?= arm
 else
@@ -844,6 +847,7 @@ endif
 endif
 endif
 endif
+endif
 ifeq ($(DESTCPU),x64)
 ARCH=x64
 else

README.OpenSource

@@ -3,7 +3,7 @@
     "Name": "node",
     "License": "ISC License,Public Domain,MIT License,Free Software Foundation - MIT License,Apache License V2.0,ICU License,zlib/libpng License,BSD 2-Clause License,BSD 3-Clause License",
     "License File": "LICENSE",
-    "Version Number": "14.19.1",
+    "Version Number": "14.20.1",
     "Owner": "sunbingxin@huawei.com",
     "Upstream URL": "http://www.nodejs.org/",
     "Description": "Node.js is an open-source, cross-platform, JavaScript runtime environment. It executes JavaScript code outside of a browser."

README.md

@@ -116,7 +116,7 @@ For Current and LTS, the GPG detached signature of `SHASUMS256.txt` is in
 import the keys:
 
 ```console
-$ gpg --keyserver pool.sks-keyservers.net --recv-keys DD8F2338BAE7501E3DD5AC78C273792F7D83545D
+$ gpg --keyserver hkps://keys.openpgp.org --recv-keys DD8F2338BAE7501E3DD5AC78C273792F7D83545D
 ```
 
 See the bottom of this README for a full script to import active release keys.
@@ -635,12 +635,16 @@ Primary GPG keys for Node.js Releasers (some Releasers sign with subkeys):
 
 * **Beth Griggs** <bgriggs@redhat.com>
 `4ED778F539E3634C779C87C6D7062848A1AB005C`
+* **Bryan English** <bryan@bryanenglish.com>
+`141F07595B7B3FFE74309A937405533BE57C7D57`
 * **Colin Ihrig** <cjihrig@gmail.com>
 `94AE36675C464D64BAFA68DD7434390BDBE9B9C5`
 * **Danielle Adams** <adamzdanielle@gmail.com>
 `74F12602B6F1C4E913FAA37AD3A89613643B6201`
 * **James M Snell** <jasnell@keybase.io>
 `71DCFD284A79C3B38668286BC97EC7A07EDE3FC1`
+* **Juan José Arboleda** <soyjuanarbol@gmail.com>
+`61FC681DFB92A079F1685E77973F295594EC4689`
 * **Michaël Zasso** <targos@protonmail.com>
 `8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600`
 * **Myles Borins** <myles.borins@gmail.com>
@@ -660,17 +664,19 @@ To import the full set of trusted release keys (including subkeys possibly used
 to sign releases):
 
 ```bash
-gpg --keyserver pool.sks-keyservers.net --recv-keys 4ED778F539E3634C779C87C6D7062848A1AB005C
-gpg --keyserver pool.sks-keyservers.net --recv-keys 94AE36675C464D64BAFA68DD7434390BDBE9B9C5
-gpg --keyserver pool.sks-keyservers.net --recv-keys 74F12602B6F1C4E913FAA37AD3A89613643B6201
-gpg --keyserver pool.sks-keyservers.net --recv-keys 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1
-gpg --keyserver pool.sks-keyservers.net --recv-keys 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600
-gpg --keyserver pool.sks-keyservers.net --recv-keys C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8
-gpg --keyserver pool.sks-keyservers.net --recv-keys C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C
-gpg --keyserver pool.sks-keyservers.net --recv-keys DD8F2338BAE7501E3DD5AC78C273792F7D83545D
-gpg --keyserver pool.sks-keyservers.net --recv-keys A48C2BEE680E841632CD4E44F07496B3EB3C1762
-gpg --keyserver pool.sks-keyservers.net --recv-keys 108F52B48DB57BB0CC439B2997B01419BD92F80A
-gpg --keyserver pool.sks-keyservers.net --recv-keys B9E2F5981AA6E0CD28160D9FF13993A75599653C
+gpg --keyserver hkps://keys.openpgp.org --recv-keys 4ED778F539E3634C779C87C6D7062848A1AB005C
+gpg --keyserver hkps://keys.openpgp.org --recv-keys 141F07595B7B3FFE74309A937405533BE57C7D57
+gpg --keyserver hkps://keys.openpgp.org --recv-keys 94AE36675C464D64BAFA68DD7434390BDBE9B9C5
+gpg --keyserver hkps://keys.openpgp.org --recv-keys 74F12602B6F1C4E913FAA37AD3A89613643B6201
+gpg --keyserver hkps://keys.openpgp.org --recv-keys 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1
+gpg --keyserver hkps://keys.openpgp.org --recv-keys 61FC681DFB92A079F1685E77973F295594EC4689
+gpg --keyserver hkps://keys.openpgp.org --recv-keys 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600
+gpg --keyserver hkps://keys.openpgp.org --recv-keys C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8
+gpg --keyserver hkps://keys.openpgp.org --recv-keys C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C
+gpg --keyserver hkps://keys.openpgp.org --recv-keys DD8F2338BAE7501E3DD5AC78C273792F7D83545D
+gpg --keyserver hkps://keys.openpgp.org --recv-keys A48C2BEE680E841632CD4E44F07496B3EB3C1762
+gpg --keyserver hkps://keys.openpgp.org --recv-keys 108F52B48DB57BB0CC439B2997B01419BD92F80A
+gpg --keyserver hkps://keys.openpgp.org --recv-keys B9E2F5981AA6E0CD28160D9FF13993A75599653C
 ```
 
 See the section above on [Verifying Binaries](#verifying-binaries) for how to

common.gypi

@@ -36,7 +36,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.85',
+    'v8_embedder_string': '-node.87',
 
     ##### V8 defaults for Node.js #####
 

configure.py

@@ -176,6 +176,12 @@ parser.add_option("--link-module",
          "e.g. /root/x/y.js will be referenced via require('root/x/y'). "
          "Can be used multiple times")
 
+parser.add_option("--openssl-conf-name",
+    action="store",
+    dest="openssl_conf_name",
+    default='nodejs_conf',
+    help="The OpenSSL config appname (config section name) used by Node.js")
+
 parser.add_option('--openssl-default-cipher-list',
     action='store',
     dest='openssl_default_cipher_list',
@@ -1337,6 +1343,8 @@ def configure_openssl(o):
   if options.openssl_no_asm:
     variables['openssl_no_asm'] = 1
 
+  o['defines'] += ['NODE_OPENSSL_CONF_NAME=' + options.openssl_conf_name]
+
   if options.without_ssl:
     def without_ssl_error(option):
       error('--without-ssl is incompatible with %s' % option)

deps/llhttp/include/llhttp.h

@@ -3,7 +3,7 @@
 
 #define LLHTTP_VERSION_MAJOR 2
 #define LLHTTP_VERSION_MINOR 1
-#define LLHTTP_VERSION_PATCH 4
+#define LLHTTP_VERSION_PATCH 6
 
 #ifndef LLHTTP_STRICT_MODE
 # define LLHTTP_STRICT_MODE 0
@@ -58,6 +58,7 @@ enum llhttp_errno {
   HPE_OK = 0,
   HPE_INTERNAL = 1,
   HPE_STRICT = 2,
+  HPE_CR_EXPECTED = 25,
   HPE_LF_EXPECTED = 3,
   HPE_UNEXPECTED_CONTENT_LENGTH = 4,
   HPE_CLOSED_CONNECTION = 5,
@@ -78,7 +79,7 @@ enum llhttp_errno {
   HPE_CB_CHUNK_COMPLETE = 20,
   HPE_PAUSED = 21,
   HPE_PAUSED_UPGRADE = 22,
-  HPE_USER = 23
+  HPE_USER = 24
 };
 typedef enum llhttp_errno llhttp_errno_t;
 
@@ -153,6 +154,7 @@ typedef enum llhttp_method llhttp_method_t;
   XX(0, OK, OK) \
   XX(1, INTERNAL, INTERNAL) \
   XX(2, STRICT, STRICT) \
+  XX(25, CR_EXPECTED, CR_EXPECTED) \
   XX(3, LF_EXPECTED, LF_EXPECTED) \
   XX(4, UNEXPECTED_CONTENT_LENGTH, UNEXPECTED_CONTENT_LENGTH) \
   XX(5, CLOSED_CONNECTION, CLOSED_CONNECTION) \
@@ -173,7 +175,7 @@ typedef enum llhttp_method llhttp_method_t;
   XX(20, CB_CHUNK_COMPLETE, CB_CHUNK_COMPLETE) \
   XX(21, PAUSED, PAUSED) \
   XX(22, PAUSED_UPGRADE, PAUSED_UPGRADE) \
-  XX(23, USER, USER) \
+  XX(24, USER, USER) \
 
 
 #define HTTP_METHOD_MAP(XX) \

deps/npm/CHANGELOG.md

+## 6.14.17 (2022-04-28)
+
+### DEPENDENCIES
+
+* [`a869ec48b`](https://github.com/npm/cli/commit/a869ec48b9481c10302378e6c2d94fe36e4c81c2)
+  `ansi-regex@4.1.1`
+* [`a869ec48b`](https://github.com/npm/cli/commit/a869ec48b9481c10302378e6c2d94fe36e4c81c2)
+  `minimist@1.2.6`
+
 ## 6.14.16 (2022-01-19)
 
 ### CHORE

deps/npm/man/man1/npm-README.1

-.TH "NPM" "1" "January 2022" "" ""
+.TH "NPM" "1" "April 2022" "" ""
 .SH "NAME"
 \fBnpm\fR \- a JavaScript package manager
 .P

deps/npm/man/man1/npm-access.1

-.TH "NPM\-ACCESS" "1" "January 2022" "" ""
+.TH "NPM\-ACCESS" "1" "April 2022" "" ""
 .SH "NAME"
 \fBnpm-access\fR \- Set access level on published packages
 .SS Synopsis

deps/npm/man/man1/npm-adduser.1

@@ -4,7 +4,7 @@ section: cli\-commands
 title: npm\-adduser
 description: Set access level on published packages
 .HR
-.TH "NPM\-ADDUSER" "1" "January 2022" "" ""
+.TH "NPM\-ADDUSER" "1" "April 2022" "" ""
 .SH "NAME"
 \fBnpm-adduser\fR \- Add a registry user account
 .SS Synopsis

deps/npm/man/man1/npm-build.1

-.TH "NPM\-BUILD" "1" "January 2022" "" ""
+.TH "NPM\-BUILD" "1" "April 2022" "" ""
 .SH "NAME"
 \fBnpm-build\fR \- Build a package
 .SS Synopsis