Skip to content

Commit 764bda7

Browse files
committed
Merge branch 'master' of github.com:nodejs/node into i-32845
2 parents 9fdb1a6 + 684a81d commit 764bda7

File tree

205 files changed

+2499
-957
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+2499
-957
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
# Reset this number to 0 on major V8 upgrades.
3737
# Increment by one for each non-official patch applied to deps/v8.
38-
'v8_embedder_string': '-node.13',
38+
'v8_embedder_string': '-node.14',
3939

4040
##### V8 defaults for Node.js #####
4141

deps/openssl/config/archs/BSD-x86/asm/configdata.pm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1f",
115-
version_num => "0x1010106fL",
114+
version => "1.1.1g",
115+
version_num => "0x1010107fL",
116116
);
117117

118118
our %target = (
@@ -7413,6 +7413,7 @@ our %unified_info = (
74137413
[
74147414
".",
74157415
"include",
7416+
"crypto/modes",
74167417
],
74177418
"crypto/rand/drbg_lib.o" =>
74187419
[

deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86"
14-
#define DATE "built on: Tue Mar 31 13:06:25 2020 UTC"
14+
#define DATE "built on: Tue Apr 21 13:28:30 2020 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1f",
115-
version_num => "0x1010106fL",
114+
version => "1.1.1g",
115+
version_num => "0x1010107fL",
116116
);
117117

118118
our %target = (
@@ -7413,6 +7413,7 @@ our %unified_info = (
74137413
[
74147414
".",
74157415
"include",
7416+
"crypto/modes",
74167417
],
74177418
"crypto/rand/drbg_lib.o" =>
74187419
[

deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86"
14-
#define DATE "built on: Tue Mar 31 13:06:27 2020 UTC"
14+
#define DATE "built on: Tue Apr 21 13:28:32 2020 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ our %config = (
110110
sourcedir => ".",
111111
target => "BSD-x86",
112112
tdirs => [ "ossl_shim" ],
113-
version => "1.1.1f",
114-
version_num => "0x1010106fL",
113+
version => "1.1.1g",
114+
version_num => "0x1010107fL",
115115
);
116116

117117
our %target = (
@@ -7363,6 +7363,7 @@ our %unified_info = (
73637363
[
73647364
".",
73657365
"include",
7366+
"crypto/modes",
73667367
],
73677368
"crypto/rand/drbg_lib.o" =>
73687369
[

deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86"
14-
#define DATE "built on: Tue Mar 31 13:06:30 2020 UTC"
14+
#define DATE "built on: Tue Apr 21 13:28:34 2020 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86_64",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1f",
115-
version_num => "0x1010106fL",
114+
version => "1.1.1g",
115+
version_num => "0x1010107fL",
116116
);
117117

118118
our %target = (
@@ -7502,6 +7502,7 @@ our %unified_info = (
75027502
[
75037503
".",
75047504
"include",
7505+
"crypto/modes",
75057506
],
75067507
"crypto/rand/drbg_lib.o" =>
75077508
[

deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86_64"
14-
#define DATE "built on: Tue Mar 31 13:06:31 2020 UTC"
14+
#define DATE "built on: Tue Apr 21 13:28:35 2020 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86_64",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1f",
115-
version_num => "0x1010106fL",
114+
version => "1.1.1g",
115+
version_num => "0x1010107fL",
116116
);
117117

118118
our %target = (
@@ -7502,6 +7502,7 @@ our %unified_info = (
75027502
[
75037503
".",
75047504
"include",
7505+
"crypto/modes",
75057506
],
75067507
"crypto/rand/drbg_lib.o" =>
75077508
[

0 commit comments

Comments
 (0)