From 58d9f187256fe1747a2dd5efcec909184736ed02 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Mon, 13 Jan 2020 10:45:47 +0100 Subject: Prepare release --- erts/doc/src/notes.xml | 48 +++++++++++++++++++++++++++++++++++++++++ erts/vsn.mk | 2 +- lib/crypto/doc/src/notes.xml | 15 +++++++++++++ lib/crypto/vsn.mk | 2 +- lib/ssh/doc/src/notes.xml | 29 +++++++++++++++++++++++++ lib/ssh/src/ssh.app.src | 2 +- lib/ssh/vsn.mk | 2 +- lib/stdlib/doc/src/notes.xml | 17 +++++++++++++++ lib/stdlib/src/stdlib.app.src | 2 +- lib/stdlib/src/stdlib.appup.src | 4 ++++ lib/stdlib/vsn.mk | 2 +- make/otp_version_tickets | 13 +++++------ 12 files changed, 126 insertions(+), 12 deletions(-) diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 2776407af9..b0b84b7b9a 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,54 @@

This document describes the changes made to the ERTS application.

+
Erts 10.6.2 + +
Fixed Bugs and Malfunctions + + +

+ Taking a scheduler offline could cause timers set while + executing on that scheduler to be delayed until the + scheduler was put online again. This bug was introduced + in ERTS version 10.0 (OTP 21.0).

+

+ Own Id: OTP-16371

+ + +

+ The ets:update_counter/4 core dumped when given an + ordered_set with write_concurrency enabled and an invalid + position. This bug has been fixed.

+

+ Own Id: OTP-16378 Aux Id: ERL-1125

+ + +

+ A process calling erlang:system_flag(multi_scheduling, + block) could end up blocked waiting for the + operation to complete indefinitely.

+

+ Own Id: OTP-16379

+ + +
+ + +
Improvements and New Features + + +

+ Duplicate entries for [socket:]getopt and [socket:]setopt + in man page.

+

+ Own Id: OTP-16333 Aux Id: ERL-1104

+ + +
+ +
+
Erts 10.6.1
Fixed Bugs and Malfunctions diff --git a/erts/vsn.mk b/erts/vsn.mk index da4516530c..e397521b9c 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.6.1 +VSN = 10.6.2 # Port number 4365 in 4.2 # Port number 4366 in 4.3 diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml index 2d238582b2..476b9f0cb1 100644 --- a/lib/crypto/doc/src/notes.xml +++ b/lib/crypto/doc/src/notes.xml @@ -31,6 +31,21 @@

This document describes the changes made to the Crypto application.

+
Crypto 4.6.4 + +
Fixed Bugs and Malfunctions + + +

+ Constant time comparisons added.

+

+ Own Id: OTP-16376

+ + +
+ +
+
Crypto 4.6.3
Improvements and New Features diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk index c773529c84..b86553d0a6 100644 --- a/lib/crypto/vsn.mk +++ b/lib/crypto/vsn.mk @@ -1 +1 @@ -CRYPTO_VSN = 4.6.3 +CRYPTO_VSN = 4.6.4 diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index b5a718c0b9..074d718331 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -30,6 +30,35 @@ notes.xml +
Ssh 4.8.2 + +
Fixed Bugs and Malfunctions + + +

+ Fixed that ssh_connection:send could allocate a + large amount of memory if given an iolist() as input + data.

+

+ Own Id: OTP-16373

+ + +

+ Safe atom conversions.

+

+ Own Id: OTP-16375

+ + +

+ Constant time comparisons added.

+

+ Own Id: OTP-16376

+ + +
+ +
+
Ssh 4.8.1
Fixed Bugs and Malfunctions diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src index 41bd0d2dcd..6846979202 100644 --- a/lib/ssh/src/ssh.app.src +++ b/lib/ssh/src/ssh.app.src @@ -44,7 +44,7 @@ {env, []}, {mod, {ssh_app, []}}, {runtime_dependencies, [ - "crypto-@OTP-16376@", + "crypto-4.6.4", "erts-9.0", "kernel-5.3", "public_key-1.6.1", diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index a205da67fc..64b0bda0b4 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,4 +1,4 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 4.8.1 +SSH_VSN = 4.8.2 APP_VSN = "ssh-$(SSH_VSN)" diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index fb24bb63b5..01ae7909f8 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -31,6 +31,23 @@

This document describes the changes made to the STDLIB application.

+
STDLIB 3.11.1 + +
Fixed Bugs and Malfunctions + + +

+ The ets:update_counter/4 core dumped when given an + ordered_set with write_concurrency enabled and an invalid + position. This bug has been fixed.

+

+ Own Id: OTP-16378 Aux Id: ERL-1125

+ + +
+ +
+
STDLIB 3.11
Fixed Bugs and Malfunctions diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src index 8eee9ba846..06e33a23cc 100644 --- a/lib/stdlib/src/stdlib.app.src +++ b/lib/stdlib/src/stdlib.app.src @@ -108,7 +108,7 @@ dets]}, {applications, [kernel]}, {env, []}, - {runtime_dependencies, ["sasl-3.0","kernel-6.0","erts-@OTP-16378@","crypto-3.3", + {runtime_dependencies, ["sasl-3.0","kernel-6.0","erts-10.6.2","crypto-3.3", "compiler-5.0"]} ]}. diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src index 20d93f1fee..19dc9bc49c 100644 --- a/lib/stdlib/src/stdlib.appup.src +++ b/lib/stdlib/src/stdlib.appup.src @@ -29,6 +29,8 @@ {"%VSN%", [{<<"^3\\.10$">>,[restart_new_emulator]}, {<<"^3\\.10\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, + {<<"^3\\.11$">>,[restart_new_emulator]}, + {<<"^3\\.11\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.5$">>,[restart_new_emulator]}, {<<"^3\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, @@ -47,6 +49,8 @@ {<<"^3\\.9\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}], [{<<"^3\\.10$">>,[restart_new_emulator]}, {<<"^3\\.10\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, + {<<"^3\\.11$">>,[restart_new_emulator]}, + {<<"^3\\.11\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.5$">>,[restart_new_emulator]}, {<<"^3\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk index 6f74c2cd06..90c514cf02 100644 --- a/lib/stdlib/vsn.mk +++ b/lib/stdlib/vsn.mk @@ -1 +1 @@ -STDLIB_VSN = 3.11 +STDLIB_VSN = 3.11.1 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index f04e1d49f5..76050459e4 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,6 +1,7 @@ -OTP-16314 -OTP-16349 -OTP-16357 -OTP-16359 -OTP-16360 -OTP-16361 +OTP-16333 +OTP-16371 +OTP-16373 +OTP-16375 +OTP-16376 +OTP-16378 +OTP-16379 -- cgit v1.2.1 From 11b70e35e2322819d3b1bbe6a9af17800671394c Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Mon, 13 Jan 2020 10:45:49 +0100 Subject: Updated OTP version --- OTP_VERSION | 2 +- otp_versions.table | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OTP_VERSION b/OTP_VERSION index 0398faf11c..637c2a1643 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -22.2.1 +22.2.2 diff --git a/otp_versions.table b/otp_versions.table index 47fdc5db8d..80d69b0bed 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -1,3 +1,4 @@ +OTP-22.2.2 : crypto-4.6.4 erts-10.6.2 ssh-4.8.2 stdlib-3.11.1 # asn1-5.0.9 common_test-1.18.1 compiler-7.5 debugger-4.2.8 dialyzer-4.1.1 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.11 erl_interface-3.13.1 et-1.6.4 eunit-2.4 ftp-1.0.4 hipe-3.19.2 inets-7.1.2 jinterface-1.10.1 kernel-6.5.1 megaco-3.18.7 mnesia-4.16.2 observer-2.9.3 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7.1 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 snmp-5.4.5 ssl-9.5.1 syntax_tools-2.2.1 tftp-1.0.2 tools-3.3 wx-1.9 xmerl-1.3.23 : OTP-22.2.1 : erts-10.6.1 snmp-5.4.5 ssl-9.5.1 # asn1-5.0.9 common_test-1.18.1 compiler-7.5 crypto-4.6.3 debugger-4.2.8 dialyzer-4.1.1 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.11 erl_interface-3.13.1 et-1.6.4 eunit-2.4 ftp-1.0.4 hipe-3.19.2 inets-7.1.2 jinterface-1.10.1 kernel-6.5.1 megaco-3.18.7 mnesia-4.16.2 observer-2.9.3 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7.1 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 ssh-4.8.1 stdlib-3.11 syntax_tools-2.2.1 tftp-1.0.2 tools-3.3 wx-1.9 xmerl-1.3.23 : OTP-22.2 : common_test-1.18.1 compiler-7.5 crypto-4.6.3 debugger-4.2.8 dialyzer-4.1.1 erl_docgen-0.11 erl_interface-3.13.1 erts-10.6 eunit-2.4 ftp-1.0.4 hipe-3.19.2 inets-7.1.2 kernel-6.5.1 megaco-3.18.7 mnesia-4.16.2 observer-2.9.3 public_key-1.7.1 snmp-5.4.4 ssh-4.8.1 ssl-9.5 stdlib-3.11 tftp-1.0.2 tools-3.3 wx-1.9 xmerl-1.3.23 # asn1-5.0.9 diameter-2.2.1 edoc-0.11 eldap-1.2.8 et-1.6.4 jinterface-1.10.1 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 syntax_tools-2.2.1 : OTP-22.1.8 : erts-10.5.6 # asn1-5.0.9 common_test-1.18 compiler-7.4.9 crypto-4.6.2 debugger-4.2.7 dialyzer-4.1 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.10 erl_interface-3.13 et-1.6.4 eunit-2.3.8 ftp-1.0.3 hipe-3.19.1 inets-7.1.1 jinterface-1.10.1 kernel-6.5 megaco-3.18.6 mnesia-4.16.1 observer-2.9.2 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 snmp-5.4.3 ssh-4.8 ssl-9.4 stdlib-3.10 syntax_tools-2.2.1 tftp-1.0.1 tools-3.2.1 wx-1.8.9 xmerl-1.3.22 : -- cgit v1.2.1