summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--erts/doc/src/notes.xml115
-rw-r--r--erts/emulator/beam/dist.c2
-rw-r--r--erts/emulator/test/scheduler_SUITE.erl2
-rw-r--r--erts/preloaded/src/erlang.erl2
-rw-r--r--erts/preloaded/src/erts.app.src2
-rw-r--r--erts/test/erlexec_SUITE.erl2
-rw-r--r--erts/test/otp_SUITE.erl2
-rw-r--r--erts/test/upgrade_SUITE.erl2
-rw-r--r--erts/vsn.mk2
-rw-r--r--lib/asn1/doc/src/notes.xml16
-rw-r--r--lib/asn1/src/asn1ct_gen_jer.erl2
-rw-r--r--lib/asn1/src/asn1rtt_jer.erl2
-rw-r--r--lib/asn1/test/asn1_SUITE.erl2
-rw-r--r--lib/asn1/vsn.mk2
-rw-r--r--lib/common_test/doc/src/basics_chapter.xml2
-rw-r--r--lib/common_test/doc/src/notes.xml15
-rw-r--r--lib/common_test/vsn.mk2
-rw-r--r--lib/compiler/doc/src/notes.xml31
-rw-r--r--lib/compiler/vsn.mk2
-rw-r--r--lib/crypto/c_src/Makefile.in2
-rw-r--r--lib/crypto/doc/src/crypto.xml2
-rw-r--r--lib/crypto/doc/src/crypto_app.xml2
-rw-r--r--lib/crypto/doc/src/notes.xml77
-rw-r--r--lib/crypto/vsn.mk2
-rw-r--r--lib/debugger/doc/src/notes.xml16
-rw-r--r--lib/debugger/vsn.mk2
-rw-r--r--lib/diameter/doc/src/notes.xml17
-rw-r--r--lib/diameter/src/diameter.appup.src2
-rw-r--r--lib/diameter/vsn.mk2
-rw-r--r--lib/eldap/doc/src/eldap.xml7
-rw-r--r--lib/eldap/doc/src/notes.xml31
-rw-r--r--lib/eldap/vsn.mk2
-rw-r--r--lib/erl_docgen/doc/src/notes.xml25
-rw-r--r--lib/erl_docgen/vsn.mk2
-rw-r--r--lib/erl_interface/doc/src/notes.xml32
-rw-r--r--lib/erl_interface/vsn.mk2
-rw-r--r--lib/inets/doc/src/inets.xml2
-rw-r--r--lib/inets/doc/src/notes.xml33
-rw-r--r--lib/inets/vsn.mk2
-rw-r--r--lib/jinterface/doc/src/notes.xml17
-rw-r--r--lib/jinterface/vsn.mk2
-rw-r--r--lib/kernel/doc/src/gen_sctp.xml9
-rw-r--r--lib/kernel/doc/src/gen_tcp.xml5
-rw-r--r--lib/kernel/doc/src/gen_udp.xml6
-rw-r--r--lib/kernel/doc/src/net_kernel.xml3
-rw-r--r--lib/kernel/doc/src/notes.xml106
-rw-r--r--lib/kernel/src/erl_distribution.erl2
-rw-r--r--lib/kernel/src/kernel.app.src2
-rw-r--r--lib/kernel/src/kernel.appup.src8
-rw-r--r--lib/kernel/src/net_kernel.erl2
-rw-r--r--lib/kernel/test/prim_file_SUITE.erl2
-rw-r--r--lib/kernel/vsn.mk2
-rw-r--r--lib/megaco/doc/src/notes.xml32
-rw-r--r--lib/megaco/vsn.mk2
-rw-r--r--lib/mnesia/doc/src/notes.xml18
-rw-r--r--lib/mnesia/test/mnesia_dirty_access_test.erl2
-rw-r--r--lib/mnesia/vsn.mk2
-rw-r--r--lib/observer/doc/src/notes.xml16
-rw-r--r--lib/observer/vsn.mk2
-rw-r--r--lib/public_key/doc/src/notes.xml16
-rw-r--r--lib/public_key/src/pubkey_cert.erl2
-rw-r--r--lib/public_key/vsn.mk2
-rw-r--r--lib/runtime_tools/doc/src/notes.xml32
-rw-r--r--lib/runtime_tools/doc/src/scheduler.xml4
-rw-r--r--lib/runtime_tools/vsn.mk2
-rw-r--r--lib/sasl/doc/src/notes.xml15
-rw-r--r--lib/sasl/src/sasl.appup.src6
-rw-r--r--lib/sasl/vsn.mk2
-rw-r--r--lib/snmp/doc/src/notes.xml31
-rw-r--r--lib/snmp/src/agent/snmpa_net_if.erl2
-rw-r--r--lib/snmp/vsn.mk2
-rw-r--r--lib/ssh/doc/src/notes.xml60
-rw-r--r--lib/ssh/vsn.mk2
-rw-r--r--lib/ssl/doc/src/notes.xml68
-rw-r--r--lib/ssl/doc/src/standards_compliance.xml2
-rw-r--r--lib/ssl/src/ssl.erl2
-rw-r--r--lib/ssl/src/ssl_session.erl2
-rw-r--r--lib/ssl/src/tls_connection.erl2
-rw-r--r--lib/ssl/vsn.mk2
-rw-r--r--lib/stdlib/doc/src/notes.xml17
-rw-r--r--lib/stdlib/src/stdlib.appup.src4
-rw-r--r--lib/stdlib/vsn.mk2
-rw-r--r--lib/wx/api_gen/gen_util.erl2
-rw-r--r--lib/wx/api_gen/wx_gen_doc.erl2
-rw-r--r--lib/wx/api_gen/wx_gen_nif.erl2
-rw-r--r--lib/wx/doc/src/notes.xml21
-rw-r--r--lib/wx/doc/src/wxImage.xml2
-rw-r--r--lib/wx/test/wxt.erl2
-rw-r--r--lib/wx/vsn.mk2
-rw-r--r--make/otp_version_tickets_in_merge53
-rw-r--r--otp_versions.table1
91 files changed, 991 insertions, 84 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 78f971dba9..022c3b7eb1 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,121 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 12.3</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>Fixed a bug in the x86 JIT that might cause floating
+ point instructions to wrongly throw an exception.</p>
+ <p>
+ Own Id: OTP-17822</p>
+ </item>
+ <item>
+ <p>
+ Preserve correct <c>nodedown_reason</c> if supervised
+ distribution controller processes exit with <c>{shutdown,
+ Reason}</c>.</p>
+ <p>
+ Own Id: OTP-17838 Aux Id: PR-5748 </p>
+ </item>
+ <item>
+ <p>
+ Handling of <c>send_timeout</c> for <c>gen_tcp</c> has
+ been corrected so that the timeout is honored also when
+ sending 0 bytes.</p>
+ <p>
+ Own Id: OTP-17840</p>
+ </item>
+ <item>
+ <p> By default <c>global</c> does <i>not</i> take any
+ actions to restore a fully connected network when
+ connections are lost due to network issues. This is
+ problematic for all applications expecting a fully
+ connected network to be provided, such as for example
+ <c>mnesia</c>, but also for <c>global</c> itself. A
+ network of overlapping partitions might cause the
+ internal state of <c>global</c> to become inconsistent.
+ Such an inconsistency can remain even after such
+ partitions have been brought together to form a fully
+ connected network again. The effect on other applications
+ that expects that a fully connected network is maintained
+ may vary, but they might misbehave in very subtle hard to
+ detect ways during such a partitioning. </p> <p> In order
+ to prevent such issues, we have introduced a <i>prevent
+ overlapping partitions</i> fix which can be enabled using
+ the <seeapp
+ marker="kernel:kernel_app#prevent_overlapping_partitions"><c>prevent_overlapping_partitions</c></seeapp>
+ <c>kernel(6)</c> parameter. When this fix has been
+ enabled, <c>global</c> will actively disconnect from
+ nodes that reports that they have lost connections to
+ other nodes. This will cause fully connected partitions
+ to form instead of leaving the network in a state with
+ overlapping partitions. Note that this fix <i>has</i> to
+ be enabled on <i>all</i> nodes in the network in order to
+ work properly. Since this quite substantially changes the
+ behavior, this fix is currently disabled by default.
+ Since you might get hard to detect issues without this
+ fix you are, however, <i>strongly</i> advised to enable
+ this fix in order to avoid issues such as the ones
+ described above. As of OTP 25 this fix will become
+ enabled by default. </p>
+ <p>
+ Own Id: OTP-17843 Aux Id: ERIERL-732, PR-5611 </p>
+ </item>
+ <item>
+ <p>Corrected the type specification of
+ <c>erlang:seq_trace/2</c>.</p>
+ <p>
+ Own Id: OTP-17900 Aux Id: GH-5667 </p>
+ </item>
+ <item>
+ <p>
+ Fix memory leak when tracing on running on a process that
+ only handle system tasks or non-message signals (for
+ example process_info requests).</p>
+ <p>
+ Own Id: OTP-17904 Aux Id: ERIERL-757 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Add support for using socket:sockaddr_in() and
+ socket:sockaddr_in6() when using gen_sctp, gen_tcp and
+ gen_udp. This will make it possible to use Link Local
+ IPv6 addresses.</p>
+ <p>
+ Own Id: OTP-17455 Aux Id: GH-4852 </p>
+ </item>
+ <item>
+ <p>
+ Show <c>on_load</c> failure reasons in embedded mode.</p>
+ <p>
+ Own Id: OTP-17718 Aux Id: PR-5199 </p>
+ </item>
+ <item>
+ <p>
+ Compile date saved in the Erlang VM executable has been
+ removed.</p>
+ <p>
+ Own Id: OTP-17891 Aux Id: PR-5589 </p>
+ </item>
+ <item>
+ <p>
+ Improve documentation for the dynamic node name feature.</p>
+ <p>
+ Own Id: OTP-17918</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 12.2.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index d7ce076e90..00b429738a 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 1996-2021. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2022. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl
index ad9d8a902f..817062c397 100644
--- a/erts/emulator/test/scheduler_SUITE.erl
+++ b/erts/emulator/test/scheduler_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index fcb75d58f5..b0430f4182 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2021. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/erts/preloaded/src/erts.app.src b/erts/preloaded/src/erts.app.src
index 5f8a19f68a..94fd77b80d 100644
--- a/erts/preloaded/src/erts.app.src
+++ b/erts/preloaded/src/erts.app.src
@@ -42,7 +42,7 @@
{registered, []},
{applications, []},
{env, []},
- {runtime_dependencies, ["stdlib-3.13", "kernel-@OTP-17843@", "sasl-3.3"]}
+ {runtime_dependencies, ["stdlib-3.13", "kernel-8.3", "sasl-3.3"]}
]}.
%% vim: ft=erlang
diff --git a/erts/test/erlexec_SUITE.erl b/erts/test/erlexec_SUITE.erl
index 43b73c93f6..ab2439be09 100644
--- a/erts/test/erlexec_SUITE.erl
+++ b/erts/test/erlexec_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2007-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index ad2bf0d8e8..1690406314 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2000-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl
index 42955fee69..9c26852e00 100644
--- a/erts/test/upgrade_SUITE.erl
+++ b/erts/test/upgrade_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2014-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2014-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/erts/vsn.mk b/erts/vsn.mk
index f7bef92a70..9c8116cf69 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 12.2.1
+VSN = 12.3
# Port number 4365 in 4.2
# Port number 4366 in 4.3
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index ac92e2d548..1c2dc07ebe 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -32,6 +32,22 @@
<p>This document describes the changes made to the asn1 application.</p>
+<section><title>Asn1 5.0.18</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Add support for the <c>maps</c> option in combination
+ with the <c>jer</c> backend.</p>
+ <p>
+ Own Id: OTP-17959 Aux Id: GH-5757 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Asn1 5.0.17</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/asn1/src/asn1ct_gen_jer.erl b/lib/asn1/src/asn1ct_gen_jer.erl
index 4a1e5c3380..7f6152ad80 100644
--- a/lib/asn1/src/asn1ct_gen_jer.erl
+++ b/lib/asn1/src/asn1ct_gen_jer.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2019-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2019-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/asn1/src/asn1rtt_jer.erl b/lib/asn1/src/asn1rtt_jer.erl
index 52a0f2f651..b7e9390940 100644
--- a/lib/asn1/src/asn1rtt_jer.erl
+++ b/lib/asn1/src/asn1rtt_jer.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2012-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 1741fad71d..eeb5253c32 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2001-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 647c303d6a..5800ce8f67 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 5.0.17
+ASN1_VSN = 5.0.18
diff --git a/lib/common_test/doc/src/basics_chapter.xml b/lib/common_test/doc/src/basics_chapter.xml
index 7e2e6d0627..359237289e 100644
--- a/lib/common_test/doc/src/basics_chapter.xml
+++ b/lib/common_test/doc/src/basics_chapter.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2003</year><year>2021</year>
+ <year>2003</year><year>2022</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index 9864825f2a..a49a42075d 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -33,6 +33,21 @@
<file>notes.xml</file>
</header>
+<section><title>Common_Test 1.22.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ OTP internal test fix.</p>
+ <p>
+ Own Id: OTP-17888</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Common_Test 1.22</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index d6090aa544..79ba7cfe07 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.22
+COMMON_TEST_VSN = 1.22.1
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 7c4961be4f..891495d0f0 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -32,6 +32,37 @@
<p>This document describes the changes made to the Compiler
application.</p>
+<section><title>Compiler 8.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>The expression
+ <c>&lt;&lt;0/native-float&gt;&gt;=Bin</c> would always
+ fail to match, while
+ <c>&lt;&lt;0/float-native&gt;&gt;=Bin</c> would match
+ (provided that <c>Bin</c> contained the binary
+ representation of <c>0.0</c>)</p>
+ <p>
+ Own Id: OTP-17895</p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>The compiler will now compile huge functions with
+ straight-line code faster.</p>
+ <p>
+ Own Id: OTP-17886 Aux Id: GH-5140, GH-5686 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Compiler 8.0.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index a5a9fdb663..cb8a98d39a 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 8.0.4
+COMPILER_VSN = 8.1
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 1a1e83cef7..ec5cb32973 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 1999-2021. All Rights Reserved.
+# Copyright Ericsson AB 1999-2022. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 84cd64e0b8..ededb1cef1 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -3,7 +3,7 @@
<erlref>
<header>
<copyright>
- <year>1999</year><year>2021</year>
+ <year>1999</year><year>2022</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
diff --git a/lib/crypto/doc/src/crypto_app.xml b/lib/crypto/doc/src/crypto_app.xml
index a823000a64..84fad2f5b8 100644
--- a/lib/crypto/doc/src/crypto_app.xml
+++ b/lib/crypto/doc/src/crypto_app.xml
@@ -5,7 +5,7 @@
<header>
<copyright>
<year>1999</year>
- <year>2021</year>
+ <year>2022</year>
<holder>Ericsson AB, All Rights Reserved</holder>
</copyright>
<legalnotice>
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index e503129511..3d73ee3a76 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,83 @@
</header>
<p>This document describes the changes made to the Crypto application.</p>
+<section><title>Crypto 5.0.6</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ The crypto app in OTP can since OTP-24.2 be compiled,
+ linked and used with the new OpenSSL 3.0 cryptolib.</p>
+ <p>
+ The crypto app has 3.0 support has been improved, but is
+ still <em>*not recommended*</em> for other usages than
+ experiments and alpha testing. There are not yet any
+ guaranties that it works, not even together with other
+ OTP applications like for example SSL and SSH, although
+ there are no known errors.</p>
+ <p>
+ Since the previous release, OTP-24.2, the following
+ improvements have been done:</p>
+ <p>
+ - It has been tested during nearly every nightly test on
+ the OTP lab</p>
+ <p>
+ - The hash algorithms <c>md4</c> and <c>ripemd160</c>
+ have been enabled with OpenSSL 3.0.</p>
+ <p>
+ - The ciphers <c>blowfish_cbc</c>, <c>blowfish_ecb</c>,
+ <c>des_cbc</c>, <c>des_cfb</c>, <c>des_ecb</c>,
+ <c>rc2_cbc</c> and <c>rc4</c> have been enabled with
+ OpenSSL 3.0.</p>
+ <p>
+ Disabled or unsupported with OpenSSL 3.0 are still:</p>
+ <p>
+ - ENGINE support</p>
+ <p>
+ - FIPS mode</p>
+ <p>
+ - Other providers than the built-in ones</p>
+ <p>
+ - Compiling and linking with OpenSSL 3.0 cryptolib in
+ compatibility modes (for example to behave as 1.1.1) </p>
+ <p>
+ and, the ciphers <c>blowfish_cfb64</c> and
+ <c>blowfish_ofb64</c> are not supported and will not be
+ either.</p>
+ <p>
+ Deprecated functions in the OpenSSL 3.0 cryptolib must
+ not be disabled as OTP/crypto still uses some of the
+ deprecated API functions. The gcc flag
+ <c>-Wno-deprecated-declarations</c> is set to prevent
+ deprecation warnings to be printed when compiling.</p>
+ <p>
+ Own Id: OTP-17812 Aux Id: OTP-16646, OTP-16282 </p>
+ </item>
+ <item>
+ <p>
+ Crypto is adapted to LibreSSL 3.5.0 on OpenBSD.</p>
+ <p>
+ Own Id: OTP-17941 Aux Id: OTP-17942 </p>
+ </item>
+ <item>
+ <p>
+ New configure option ( <c>--disable-otp-test-engine</c>)
+ to prohibit the build of the OTP test engine used in some
+ test suites.</p>
+ <p>
+ The reason is that the test engine could be hard to
+ compile on for instance LibreSSL 3.5.0. For that
+ particular cryptolib version (or higher), this configure
+ option is set automatically.</p>
+ <p>
+ Own Id: OTP-17942 Aux Id: OTP-17941 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Crypto 5.0.5</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index 3379d020be..9e3356b8c2 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 5.0.5
+CRYPTO_VSN = 5.0.6
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index 3ca783ca1c..ee5aceed34 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -33,6 +33,22 @@
<p>This document describes the changes made to the Debugger
application.</p>
+<section><title>Debugger 5.2.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix record index matching, it was broken and could never
+ match.</p>
+ <p>
+ Own Id: OTP-17865 Aux Id: GH-5571 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Debugger 5.2</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/debugger/vsn.mk b/lib/debugger/vsn.mk
index 4498cd797a..c95d0fda17 100644
--- a/lib/debugger/vsn.mk
+++ b/lib/debugger/vsn.mk
@@ -1 +1 @@
-DEBUGGER_VSN = 5.2
+DEBUGGER_VSN = 5.2.1
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index 373b83b7b4..b42cc2dad2 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -43,6 +43,23 @@ first.</p>
<!-- ===================================================================== -->
+<section><title>diameter 2.2.5</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>The compilation time is no longer recorded in BEAM
+ files. There remained several undocumented functions that
+ attempted to retrieve compilation times. Those have now
+ been removed.</p>
+ <p>
+ Own Id: OTP-17962</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>diameter 2.2.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 6fa06d48a2..bbfa44086e 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -2,7 +2,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2010-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index c20faf97f9..0aafdde57c 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -17,5 +17,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 2.2.4
+DIAMETER_VSN = 2.2.5
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
diff --git a/lib/eldap/doc/src/eldap.xml b/lib/eldap/doc/src/eldap.xml
index c4bcc59beb..4d9ec96a70 100644
--- a/lib/eldap/doc/src/eldap.xml
+++ b/lib/eldap/doc/src/eldap.xml
@@ -483,7 +483,7 @@
<desc> <p>Negate a filter.</p> </desc>
</func>
<func>
- <name since="OTP @OTP-17924@">paged_result_control(PageSize) -&gt;
+ <name since="OTP 24.3">paged_result_control(PageSize) -&gt;
{control, "1.2.840.113556.1.4.319", true, binary()}</name>
<fsummary>Create a paged result control tuple</fsummary>
<type>
@@ -502,7 +502,7 @@ Control = eldap:paged_result_control(50),
</desc>
</func>
<func>
- <name since="OTP @OTP-17924@">paged_result_control(PageSize, Cookie)
+ <name since="OTP 24.3">paged_result_control(PageSize, Cookie)
-&gt; {control, "1.2.840.113556.1.4.319", true,
binary()}</name>
<fsummary>Create a paged result control tuple with the given
@@ -531,7 +531,7 @@ Control2 = eldap:paged_result_control(PageSize, Cookie1),
</desc>
</func>
<func>
- <name since="OTP @OTP-17924@">paged_result_cookie(SearchResult)
+ <name since="OTP 24.3">paged_result_cookie(SearchResult)
-&gt; binary()</name>
<fsummary>Extract a cookie from search results for use in the
subsequent search.</fsummary>
@@ -552,4 +552,3 @@ Control2 = eldap:paged_result_control(PageSize, Cookie1),
</funcs>
</erlref>
-
diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml
index 9e0d748c36..563f75e827 100644
--- a/lib/eldap/doc/src/notes.xml
+++ b/lib/eldap/doc/src/notes.xml
@@ -31,6 +31,37 @@
</header>
<p>This document describes the changes made to the Eldap application.</p>
+<section><title>Eldap 1.2.10</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix eldap extensibleMatch dnAttributes option.</p>
+ <p>
+ According to the ldap ASN1 the dnAttributes should be a
+ bool, instead it was generated as a string.</p>
+ <p>
+ Own Id: OTP-17877 Aux Id: PR-5615 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Implemented paged searches according to
+ https://www.rfc-editor.org/rfc/rfc2696.txt</p>
+ <p>
+ Own Id: OTP-17924 Aux Id: PR-5538 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Eldap 1.2.9</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk
index f0b9745f08..77d89248c9 100644
--- a/lib/eldap/vsn.mk
+++ b/lib/eldap/vsn.mk
@@ -1 +1 @@
-ELDAP_VSN = 1.2.9
+ELDAP_VSN = 1.2.10
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index 6aa1440596..797efb5216 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -31,7 +31,30 @@
</header>
<p>This document describes the changes made to the <em>erl_docgen</em> application.</p>
- <section><title>Erl_Docgen 1.2</title>
+ <section><title>Erl_Docgen 1.2.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix css for large tables and images on small screens</p>
+ <p>
+ Own Id: OTP-17852</p>
+ </item>
+ <item>
+ <p>
+ Fix bug with codeinclude tag that caused it to not
+ include the code if used in a correct, but unexpected
+ way.</p>
+ <p>
+ Own Id: OTP-17907 Aux Id: GH-5662 PR-5666 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Erl_Docgen 1.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 12cc2eecf4..e621f3a897 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1 @@
-ERL_DOCGEN_VSN = 1.2
+ERL_DOCGEN_VSN = 1.2.1
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index bcd942ea15..770276433f 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -31,6 +31,38 @@
</header>
<p>This document describes the changes made to the Erl_interface application.</p>
+<section><title>Erl_Interface 5.2</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Add <c>--enable-ei-dynamic-lib</c> configure option that
+ will make erl_interface also release a dynamic library
+ version of libei.</p>
+ <p>
+ Own Id: OTP-17883 Aux Id: PR-5601 ERIERL-724 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Known Bugs and Problems</title>
+ <list>
+ <item>
+ <p>
+ The <c>ei</c> API for decoding/encoding terms is not
+ fully 64-bit compatible since terms that have a
+ representation on the external term format larger than 2
+ GB cannot be handled.</p>
+ <p>
+ Own Id: OTP-16607 Aux Id: OTP-16608 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erl_Interface 5.1</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index ae6f8e7935..28d350de7c 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 5.1
+EI_VSN = 5.2
ERL_INTERFACE_VSN = $(EI_VSN)
diff --git a/lib/inets/doc/src/inets.xml b/lib/inets/doc/src/inets.xml
index 8f3933489d..45557d73f2 100644
--- a/lib/inets/doc/src/inets.xml
+++ b/lib/inets/doc/src/inets.xml
@@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
- <year>2007</year><year>2021</year>
+ <year>2007</year><year>2022</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 4aec96b98e..90f6d1b374 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,38 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 7.5.1</title>
+ <section><title>Inets 7.5.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>The compilation time is no longer recorded in BEAM
+ files. There remained several undocumented functions that
+ attempted to retrieve compilation times. Those have now
+ been removed.</p>
+ <p>
+ Own Id: OTP-17962</p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Documentation fix for inets:services_info/0, which now
+ describes that Info might be a Reason term() in case when
+ {error, Reason} is returned as service info.</p>
+ <p>
+ Own Id: OTP-17931 Aux Id: ERIERL-761 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 7.5.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index c651460d3f..65e6b8dc49 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 7.5.1
+INETS_VSN = 7.5.2
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/jinterface/doc/src/notes.xml b/lib/jinterface/doc/src/notes.xml
index d4f0c9e42c..07236bd0a3 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -31,6 +31,23 @@
</header>
<p>This document describes the changes made to the Jinterface application.</p>
+<section><title>Jinterface 1.12.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix bug in <c>OtpOutputStream.write_pid/4</c> and
+ <c>write_ref/3</c> causing faulty encodig. Bug exists
+ since OTP 23.0.</p>
+ <p>
+ Own Id: OTP-17887 Aux Id: ERIERL-750, PR-5640 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Jinterface 1.12.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/jinterface/vsn.mk b/lib/jinterface/vsn.mk
index f3e946db39..04de6b642b 100644
--- a/lib/jinterface/vsn.mk
+++ b/lib/jinterface/vsn.mk
@@ -1 +1 @@
-JINTERFACE_VSN = 1.12.1
+JINTERFACE_VSN = 1.12.2
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index 2aa97d07c2..2683a4f77d 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -128,7 +128,7 @@
</func>
<func>
- <name name="connect" arity="3" anchor="connect-sockaddr3" since="OTP @OTP-17455@"/>
+ <name name="connect" arity="3" anchor="connect-sockaddr3" since="OTP 24.3"/>
<fsummary>Same as <c>connect(Socket, SockAddr, Opts, infinity)</c>.</fsummary>
<desc>
<p>Same as <c>connect(<anno>Socket</anno>, <anno>SockAddr</anno>,
@@ -137,7 +137,7 @@
</func>
<func>
- <name name="connect" arity="4" clause_i="1" anchor="connect-sockaddr4" since="OTP @OTP-17455@"/>
+ <name name="connect" arity="4" clause_i="1" anchor="connect-sockaddr4" since="OTP 24.3"/>
<fsummary>Establish a new association for socket <c>Socket</c>, with a
peer (SCTP server socket).</fsummary>
<desc>
@@ -243,7 +243,7 @@ connect(Socket, Ip, Port>,
</func>
<func>
- <name name="connect_init" arity="3" anchor="connect_init-sockaddr3" since="OTP @OTP-17455@"/>
+ <name name="connect_init" arity="3" anchor="connect_init-sockaddr3" since="OTP 24.3"/>
<fsummary>Same as <c>connect_init(Socket, SockAddr, Opts, infinity)</c>.</fsummary>
<desc>
<p>Same as <c>connect_init(<anno>Socket</anno>, <anno>SockAddr</anno>,
@@ -252,7 +252,7 @@ connect(Socket, Ip, Port>,
</func>
<func>
- <name name="connect_init" arity="4" clause_i="1" anchor="connect_init-sockaddr4" since="OTP @OTP-17455@"/>
+ <name name="connect_init" arity="4" clause_i="1" anchor="connect_init-sockaddr4" since="OTP 24.3"/>
<fsummary>Same as <c>connect_init(Socket, Addr, Port, Opts, infinity)</c>..</fsummary>
<desc>
<p>This is conceptually the same as
@@ -1255,4 +1255,3 @@ client_loop(S, Peer1, Port1, AssocId1, Peer2, Port2, AssocId2) -&gt;
API Extensions for SCTP</url></p>
</section>
</erlref>
-
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index 80fa78a3f8..e455cfdaf5 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -294,8 +294,8 @@ do_recv(Sock, Bs) ->
</func>
<func>
- <name name="connect" arity="2" clause_i="1" since="OTP @OTP-17455@" anchor="connect-sockaddr2"/>
- <name name="connect" arity="3" clause_i="2" since="OTP @OTP-17455@" anchor="connect-sockaddr3"/>
+ <name name="connect" arity="2" clause_i="1" since="OTP 24.3" anchor="connect-sockaddr2"/>
+ <name name="connect" arity="3" clause_i="2" since="OTP 24.3" anchor="connect-sockaddr3"/>
<fsummary>Connect to a TCP port.</fsummary>
<desc>
<p>Connects to a server according to <c><anno>SockAddr</anno></c>.
@@ -740,4 +740,3 @@ loop(Sock) ->
comes in handy.</p>
</section>
</erlref>
-
diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml
index c940cc2cdf..042a73823d 100644
--- a/lib/kernel/doc/src/gen_udp.xml
+++ b/lib/kernel/doc/src/gen_udp.xml
@@ -119,7 +119,7 @@
</func>
<func>
- <name name="connect" arity="2" since="OTP @OTP-17455@" anchor="connect-sockaddr"/>
+ <name name="connect" arity="2" since="OTP 24.3" anchor="connect-sockaddr"/>
<fsummary>Connect a UDP port.</fsummary>
<desc>
<p>Connecting a UDP socket only means storing the specified
@@ -142,7 +142,7 @@
</func>
<func>
- <name name="connect" arity="3" since="OTP @OTP-17455@" anchor="connect-addr-port"/>
+ <name name="connect" arity="3" since="OTP 24.3" anchor="connect-addr-port"/>
<fsummary>Connect a UDP port.</fsummary>
<desc>
<p>Connecting a UDP socket only means storing the specified
@@ -339,7 +339,7 @@
</func>
<func>
- <name name="send" arity="2" since="OTP @OTP-17455@" anchor="send-2"/>
+ <name name="send" arity="2" since="OTP 24.3" anchor="send-2"/>
<fsummary>Send a packet on a connected socket.</fsummary>
<desc>
<p>
diff --git a/lib/kernel/doc/src/net_kernel.xml b/lib/kernel/doc/src/net_kernel.xml
index 0166b78a4b..6ffe063e91 100644
--- a/lib/kernel/doc/src/net_kernel.xml
+++ b/lib/kernel/doc/src/net_kernel.xml
@@ -349,7 +349,7 @@ $ <input>erl -sname foobar</input></pre>
</func>
<func>
- <name name="start" arity="2" since="OTP @OTP-17905@"/>
+ <name name="start" arity="2" since="OTP 24.3"/>
<fsummary>Turn an Erlang runtime system into a distributed node.</fsummary>
<desc>
<p>
@@ -463,4 +463,3 @@ $ <input>erl -sname foobar</input></pre>
</func>
</funcs>
</erlref>
-
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 2f0cc44d9b..4239d6901c 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,112 @@
</header>
<p>This document describes the changes made to the Kernel application.</p>
+<section><title>Kernel 8.3</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Handling of <c>send_timeout</c> for <c>gen_tcp</c> has
+ been corrected so that the timeout is honored also when
+ sending 0 bytes.</p>
+ <p>
+ Own Id: OTP-17840</p>
+ </item>
+ <item>
+ <p> By default <c>global</c> does <i>not</i> take any
+ actions to restore a fully connected network when
+ connections are lost due to network issues. This is
+ problematic for all applications expecting a fully
+ connected network to be provided, such as for example
+ <c>mnesia</c>, but also for <c>global</c> itself. A
+ network of overlapping partitions might cause the
+ internal state of <c>global</c> to become inconsistent.
+ Such an inconsistency can remain even after such
+ partitions have been brought together to form a fully
+ connected network again. The effect on other applications
+ that expects that a fully connected network is maintained
+ may vary, but they might misbehave in very subtle hard to
+ detect ways during such a partitioning. </p> <p> In order
+ to prevent such issues, we have introduced a <i>prevent
+ overlapping partitions</i> fix which can be enabled using
+ the <seeapp
+ marker="kernel:kernel_app#prevent_overlapping_partitions"><c>prevent_overlapping_partitions</c></seeapp>
+ <c>kernel(6)</c> parameter. When this fix has been
+ enabled, <c>global</c> will actively disconnect from
+ nodes that reports that they have lost connections to
+ other nodes. This will cause fully connected partitions
+ to form instead of leaving the network in a state with
+ overlapping partitions. Note that this fix <i>has</i> to
+ be enabled on <i>all</i> nodes in the network in order to
+ work properly. Since this quite substantially changes the
+ behavior, this fix is currently disabled by default.
+ Since you might get hard to detect issues without this
+ fix you are, however, <i>strongly</i> advised to enable
+ this fix in order to avoid issues such as the ones
+ described above. As of OTP 25 this fix will become
+ enabled by default. </p>
+ <p>
+ Own Id: OTP-17843 Aux Id: ERIERL-732, PR-5611 </p>
+ </item>
+ <item>
+ <p>
+ Fix bug where <c>logger</c> would crash when logging a
+ report including improper lists.</p>
+ <p>
+ Own Id: OTP-17851</p>
+ </item>
+ <item>
+ <p>
+ Make <c>erlang:set_cookie</c> work for dynamic node
+ names.</p>
+ <p>
+ Own Id: OTP-17902 Aux Id: GH-5402, PR-5670 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Add support for using socket:sockaddr_in() and
+ socket:sockaddr_in6() when using gen_sctp, gen_tcp and
+ gen_udp. This will make it possible to use Link Local
+ IPv6 addresses.</p>
+ <p>
+ Own Id: OTP-17455 Aux Id: GH-4852 </p>
+ </item>
+ <item>
+ <p>
+ A <seeapp
+ marker="kernel:kernel_app#net_tickintensity"><c>net_tickintensity</c></seeapp>
+ <c>kernel</c> parameter has been introduced. It can be
+ used to control the amount of ticks during a <seeapp
+ marker="kernel:kernel_app#net_ticktime"><c>net_ticktime</c></seeapp>
+ period.</p>
+ <p>
+ A new <seemfa
+ marker="kernel:net_kernel#start/2"><c>net_kernel:start/2</c></seemfa>
+ function has also been introduced in order to make it
+ easier to add new options. The use of <seemfa
+ marker="kernel:net_kernel#start/1"><c>net_kernel:start/1</c></seemfa>
+ has been deprecated.</p>
+ <p>
+ Own Id: OTP-17905 Aux Id: ERIERL-732, PR-5740 </p>
+ </item>
+ <item>
+ <p>
+ Improve documentation for the dynamic node name feature.</p>
+ <p>
+ Own Id: OTP-17918</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Kernel 8.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/src/erl_distribution.erl b/lib/kernel/src/erl_distribution.erl
index 668305982c..9e12ef8ad4 100644
--- a/lib/kernel/src/erl_distribution.erl
+++ b/lib/kernel/src/erl_distribution.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2021. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index 780def93af..2f3a753511 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -158,6 +158,6 @@
{shell_docs_ansi,auto}
]},
{mod, {kernel, []}},
- {runtime_dependencies, ["erts-@OTP-17843@", "stdlib-@OTP-17720@", "sasl-3.0", "crypto-5.0"]}
+ {runtime_dependencies, ["erts-12.3", "stdlib-@OTP-17720@", "sasl-3.0", "crypto-5.0"]}
]
}.
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index 116a45cddc..5634b0e58a 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -53,7 +53,9 @@
{<<"^8\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^8\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^8\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^8\\.1\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
+ {<<"^8\\.1\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^8\\.2$">>,[restart_new_emulator]},
+ {<<"^8\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
[{<<"^6\\.4$">>,[restart_new_emulator]},
{<<"^6\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^6\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -79,4 +81,6 @@
{<<"^8\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^8\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^8\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^8\\.1\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+ {<<"^8\\.1\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^8\\.2$">>,[restart_new_emulator]},
+ {<<"^8\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index cd500f16b0..91eb57fa89 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2021. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index a8a341d95a..086e54ce7f 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2000-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index cb2767987f..ac90eb0901 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 8.2
+KERNEL_VSN = 8.3
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 1d981f18e0..8787d63375 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -37,7 +37,37 @@
section is the version number of Megaco.</p>
- <section><title>Megaco 4.2</title>
+ <section><title>Megaco 4.3</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>The compilation time is no longer recorded in BEAM
+ files. There remained several undocumented functions that
+ attempted to retrieve compilation times. Those have now
+ been removed.</p>
+ <p>
+ Own Id: OTP-17962</p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Update the performance and debug chapters of the megaco
+ user's guide. Also some updates to the meas tools.</p>
+ <p>
+ Own Id: OTP-17839</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Megaco 4.2</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index 5283d6cf40..d1fd7c372a 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = megaco
-MEGACO_VSN = 4.2
+MEGACO_VSN = 4.3
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 14cf0884d7..a8374dd188 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,7 +39,23 @@
thus constitutes one section in this document. The title of each
section is the version number of Mnesia.</p>
- <section><title>Mnesia 4.20.1</title>
+ <section><title>Mnesia 4.20.2</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Reduce the number of locks taken during table copying,
+ should reduce the startup time on large systems.</p>
+ <p>
+ Own Id: OTP-17656 Aux Id: ERIERL-688 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Mnesia 4.20.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/mnesia/test/mnesia_dirty_access_test.erl b/lib/mnesia/test/mnesia_dirty_access_test.erl
index d1606838fa..e883931e36 100644
--- a/lib/mnesia/test/mnesia_dirty_access_test.erl
+++ b/lib/mnesia/test/mnesia_dirty_access_test.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2020. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index e656522732..257039c3cc 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.20.1
+MNESIA_VSN = 4.20.2
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index 91e682026a..95a6203d03 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -32,6 +32,22 @@
<p>This document describes the changes made to the Observer
application.</p>
+<section><title>Observer 2.11</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Calculate the display width in <c>etop</c>, instead of
+ hard-coding it to 89 characters.</p>
+ <p>
+ Own Id: OTP-17880 Aux Id: PR-5557 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Observer 2.10.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index 54b5902448..8f09233e21 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 2.10.1
+OBSERVER_VSN = 2.11
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 8199277e25..a3565d8064 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,6 +35,22 @@
<file>notes.xml</file>
</header>
+<section><title>Public_Key 1.12</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Support password fun for protected keyfiles in
+ ssl:connect function.</p>
+ <p>
+ Own Id: OTP-17816 Aux Id: PR-5607 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Public_Key 1.11.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl
index d9f38488b7..630981c841 100644
--- a/lib/public_key/src/pubkey_cert.erl
+++ b/lib/public_key/src/pubkey_cert.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 262e927fce..9d4f2c4f6a 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.11.3
+PUBLIC_KEY_VSN = 1.12
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index c08fb06205..03e6a9af8c 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -32,6 +32,38 @@
<p>This document describes the changes made to the Runtime_Tools
application.</p>
+<section><title>Runtime_Tools 1.18</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed bug in <c>scheduler:utilization(Seconds)</c> that
+ would leave the <c>scheduler_wall_time</c> system flag
+ incorrectly enabled.</p>
+ <p>
+ Own Id: OTP-17800 Aux Id: PR-5425 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Add <c>scheduler:get_sample/0</c> and
+ <c>get_sample_all/0</c>. Also clarify <c>scheduler</c>
+ module documentation about how it depends on system flag
+ <c>scheduler_wall_time</c>.</p>
+ <p>
+ Own Id: OTP-17830 Aux Id: GH-5425, PR-5444 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Runtime_Tools 1.17</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/runtime_tools/doc/src/scheduler.xml b/lib/runtime_tools/doc/src/scheduler.xml
index 6590c7d63b..4cfe922ae9 100644
--- a/lib/runtime_tools/doc/src/scheduler.xml
+++ b/lib/runtime_tools/doc/src/scheduler.xml
@@ -127,7 +127,7 @@
<funcs>
<func>
- <name name="get_sample" arity="0" since="OTP @OTP-17830@"/>
+ <name name="get_sample" arity="0" since="OTP 24.3"/>
<fsummary>Get scheduler utilization sample.</fsummary>
<desc>
<p>Returns a scheduler utilization sample for normal and dirty-cpu
@@ -138,7 +138,7 @@
</func>
<func>
- <name name="get_sample_all" arity="0" since="OTP @OTP-17830@"/>
+ <name name="get_sample_all" arity="0" since="OTP 24.3"/>
<fsummary>Get scheduler utilization sample.</fsummary>
<desc>
<p>Return a scheduler utilization sample for all schedulers,
diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index 1cfbda69be..3e7545b8c5 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.17
+RUNTIME_TOOLS_VSN = 1.18
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index a6369b1205..f9162b67e7 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -31,6 +31,21 @@
</header>
<p>This document describes the changes made to the SASL application.</p>
+<section><title>SASL 4.1.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix bug in systools:make_script/1 documentation.</p>
+ <p>
+ Own Id: OTP-17854 Aux Id: PR-5596 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>SASL 4.1.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src
index f536696fc2..e2fc3e5b7f 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -37,7 +37,8 @@
{<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^4\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^4\\.1$">>,[restart_new_emulator]},
- {<<"^4\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+ {<<"^4\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^4\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
[{<<"^3\\.4$">>,[restart_new_emulator]},
{<<"^3\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -47,4 +48,5 @@
{<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^4\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^4\\.1$">>,[restart_new_emulator]},
- {<<"^4\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+ {<<"^4\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^4\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index 17e5664e32..c38e64d0a9 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 4.1.1
+SASL_VSN = 4.1.2
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index fa3e2355a3..d6289a4d9a 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,7 +34,36 @@
</header>
- <section><title>SNMP 5.11</title>
+ <section><title>SNMP 5.12</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>The compilation time is no longer recorded in BEAM
+ files. There remained several undocumented functions that
+ attempted to retrieve compilation times. Those have now
+ been removed.</p>
+ <p>
+ Own Id: OTP-17962</p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ [agent] Remove expectation of socket being a port.</p>
+ <p>
+ Own Id: OTP-16559</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>SNMP 5.11</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/snmp/src/agent/snmpa_net_if.erl b/lib/snmp/src/agent/snmpa_net_if.erl
index cfdaeafe7e..0f4ab6e65f 100644
--- a/lib/snmp/src/agent/snmpa_net_if.erl
+++ b/lib/snmp/src/agent/snmpa_net_if.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2004-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 7d8bc57a67..c448034840 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = snmp
-SNMP_VSN = 5.11
+SNMP_VSN = 5.12
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index c8e57a1649..4e644e6c0e 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,66 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.13.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix makefile dependency bugs.</p>
+ <p>
+ Own Id: OTP-17847 Aux Id: PR-5574 GH-5548 </p>
+ </item>
+ <item>
+ <p>
+ Fixed faulty OpenSSH decoding of Ed25519/Ed448 keys in
+ the OpenSSH format <c>openssh_key_v1</c>.</p>
+ <p>
+ Own Id: OTP-17868 Aux Id: PR-5520 </p>
+ </item>
+ <item>
+ <p>
+ Correction of ssh_file typing, specially for the
+ experimental openssh-key-v1 encoding.</p>
+ <p>
+ Own Id: OTP-17912 Aux Id: GH-5680 </p>
+ </item>
+ <item>
+ <p>
+ Improper tag for private ED keys when encoding with
+ ssh:encode/2.</p>
+ <p>
+ The tuple had <c>ed_priv</c> as first element, but should
+ have had <c>ed_pri</c>. This is now corrected.</p>
+ <p>
+ *** POTENTIAL INCOMPATIBILITY ***</p>
+ <p>
+ Own Id: OTP-17928 Aux Id: PR-5679 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Add support for Ed25519/Ed448 SSH host keys in the RFC
+ 4716 format ("<c>-----BEGIN EC PRIVATE KEY-----</c>")
+ generated by for example openssl or via Erlang functions
+ (i.e. <c>public_key:generate_key({namedCurve,
+ ed25519})</c>).</p>
+ <p>
+ Ed25519 SSH host keys generated by <c>ssh-keygen</c> was,
+ and are still, supported.</p>
+ <p>
+ Own Id: OTP-17857 Aux Id: PR-5532 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.13.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 4dfe0f1b8a..3a88e96f93 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.13.1
+SSH_VSN = 4.13.2
APP_VSN = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index cf25f19277..2f4453598e 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,74 @@
</header>
<p>This document describes the changes made to the SSL application.</p>
+<section><title>SSL 10.7</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Improved error handling.</p>
+ <p>
+ Own Id: OTP-17759 Aux Id: GH-5367 </p>
+ </item>
+ <item>
+ <p>
+ Before this change, net_kernel used with TLS distribution
+ might be leaking processes in case of connectivity
+ issues.</p>
+ <p>
+ Own Id: OTP-17815 Aux Id: GH-5332 </p>
+ </item>
+ <item>
+ <p>
+ Fix makefile dependency bugs.</p>
+ <p>
+ Own Id: OTP-17847 Aux Id: PR-5574 GH-5548 </p>
+ </item>
+ <item>
+ <p>
+ Make sure the TLS sender process handles explicit calls
+ to erlang:disconnect_node properly, avoiding potential
+ hanging problems in net_kernel.</p>
+ <p>
+ Own Id: OTP-17929 Aux Id: GH-5708 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Add support for TLS-1.3 certificate_authorities
+ extension. And process certificate_authorities field in
+ pre-TLS-1.3 certificate requests.</p>
+ <p>
+ Own Id: OTP-15719</p>
+ </item>
+ <item>
+ <p>
+ Support password fun for protected keyfiles in
+ ssl:connect function.</p>
+ <p>
+ Own Id: OTP-17816 Aux Id: PR-5607 </p>
+ </item>
+ <item>
+ <p>
+ Add in some cases earlier detection of possible DoS
+ attacks by malicious clients sending unexpected TLS
+ messages instead of the client hello. Note that such
+ attacks are already mitigated by providing a timeout for
+ the TLS handshake.</p>
+ <p>
+ Own Id: OTP-17903</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>SSL 10.6.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/doc/src/standards_compliance.xml b/lib/ssl/doc/src/standards_compliance.xml
index 32c49eb1a3..0311174978 100644
--- a/lib/ssl/doc/src/standards_compliance.xml
+++ b/lib/ssl/doc/src/standards_compliance.xml
@@ -5,7 +5,7 @@
<header>
<copyright>
<year>2015</year>
- <year>2021</year>
+ <year>2022</year>
<holder>Ericsson AB, All Rights Reserved</holder>
</copyright>
<legalnotice>
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index e94aeb22ee..d87f447a26 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1999-2021. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/src/ssl_session.erl b/lib/ssl/src/ssl_session.erl
index bfc23566a6..2f35c54c64 100644
--- a/lib/ssl/src/ssl_session.erl
+++ b/lib/ssl/src/ssl_session.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2007-2020. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index 0fea23c6f3..05cf5bb6c3 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2007-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 910118fa9a..00b5177e97 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 10.6.1
+SSL_VSN = 10.7
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 57cbdcc925..0eece83846 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,6 +31,23 @@
</header>
<p>This document describes the changes made to the STDLIB application.</p>
+<section><title>STDLIB 3.17.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>The compilation time is no longer recorded in BEAM
+ files. There remained several undocumented functions that
+ attempted to retrieve compilation times. Those have now
+ been removed.</p>
+ <p>
+ Own Id: OTP-17962</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>STDLIB 3.17</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 47a5a16fa3..a01e8c0e10 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -52,6 +52,8 @@
{<<"^3\\.16$">>,[restart_new_emulator]},
{<<"^3\\.16\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^3\\.16\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^3\\.17$">>,[restart_new_emulator]},
+ {<<"^3\\.17\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^3\\.9$">>,[restart_new_emulator]},
{<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -80,6 +82,8 @@
{<<"^3\\.16$">>,[restart_new_emulator]},
{<<"^3\\.16\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^3\\.16\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^3\\.17$">>,[restart_new_emulator]},
+ {<<"^3\\.17\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^3\\.9$">>,[restart_new_emulator]},
{<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index 147d565583..a38292f165 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.17
+STDLIB_VSN = 3.17.1
diff --git a/lib/wx/api_gen/gen_util.erl b/lib/wx/api_gen/gen_util.erl
index 0a11f82aba..da36992fb8 100644
--- a/lib/wx/api_gen/gen_util.erl
+++ b/lib/wx/api_gen/gen_util.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/wx/api_gen/wx_gen_doc.erl b/lib/wx/api_gen/wx_gen_doc.erl
index 80d30336f3..eb22dccfad 100644
--- a/lib/wx/api_gen/wx_gen_doc.erl
+++ b/lib/wx/api_gen/wx_gen_doc.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2020-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2020-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/wx/api_gen/wx_gen_nif.erl b/lib/wx/api_gen/wx_gen_nif.erl
index a8066f4d5e..ab4850c6a9 100644
--- a/lib/wx/api_gen/wx_gen_nif.erl
+++ b/lib/wx/api_gen/wx_gen_nif.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 8ad5269a05..c6a6e7104e 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -32,6 +32,27 @@
<p>This document describes the changes made to the wxErlang
application.</p>
+<section><title>Wx 2.1.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p> Removed the <c>static_data</c> option from
+ <c>wxImage</c> creation functions, as it was broken and
+ could lead to crashes. Now image data is always copied to
+ wxWidgets as was the default behavior. </p> <p> Removed
+ some non working <c>wxGridEvent</c> event types, which
+ have there own events in newer <c>wxWidgets</c> versions,
+ and added a couple of event types that where missing in
+ <c>wx</c>. </p>
+ <p>
+ Own Id: OTP-17947</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Wx 2.1.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/doc/src/wxImage.xml b/lib/wx/doc/src/wxImage.xml
index 2933e05e8e..3c2232fe0f 100644
--- a/lib/wx/doc/src/wxImage.xml
+++ b/lib/wx/doc/src/wxImage.xml
@@ -7,7 +7,7 @@
<erlref>
<header>
<copyright>
- <year>2020</year>
+ <year>2020</year><year>2022</year>
<holder>wxWidgets team.</holder></copyright>
<legalnotice>Licensed under the wxWindows Free Documentation Licence, Version 3
</legalnotice>
diff --git a/lib/wx/test/wxt.erl b/lib/wx/test/wxt.erl
index 21cd9d7a94..ae490e0bd3 100644
--- a/lib/wx/test/wxt.erl
+++ b/lib/wx/test/wxt.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index 6dfa80406a..027203c50c 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 2.1.1
+WX_VSN = 2.1.2
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index e69de29bb2..9b051a1bcd 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -0,0 +1,53 @@
+OTP-15719
+OTP-16559
+OTP-16607
+OTP-17455
+OTP-17656
+OTP-17718
+OTP-17759
+OTP-17800
+OTP-17812
+OTP-17815
+OTP-17816
+OTP-17822
+OTP-17828
+OTP-17830
+OTP-17833
+OTP-17838
+OTP-17839
+OTP-17840
+OTP-17843
+OTP-17847
+OTP-17851
+OTP-17852
+OTP-17854
+OTP-17857
+OTP-17865
+OTP-17868
+OTP-17872
+OTP-17877
+OTP-17880
+OTP-17883
+OTP-17886
+OTP-17887
+OTP-17888
+OTP-17891
+OTP-17893
+OTP-17895
+OTP-17900
+OTP-17902
+OTP-17903
+OTP-17904
+OTP-17905
+OTP-17907
+OTP-17912
+OTP-17918
+OTP-17924
+OTP-17928
+OTP-17929
+OTP-17931
+OTP-17941
+OTP-17942
+OTP-17947
+OTP-17959
+OTP-17962
diff --git a/otp_versions.table b/otp_versions.table
index 6a1f4776e5..2efed80e91 100644
--- a/otp_versions.table
+++ b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-24.3 : asn1-5.0.18 common_test-1.22.1 compiler-8.1 crypto-5.0.6 debugger-5.2.1 diameter-2.2.5 eldap-1.2.10 erl_docgen-1.2.1 erl_interface-5.2 erts-12.3 inets-7.5.2 jinterface-1.12.2 kernel-8.3 megaco-4.3 mnesia-4.20.2 observer-2.11 public_key-1.12 runtime_tools-1.18 sasl-4.1.2 snmp-5.12 ssh-4.13.2 ssl-10.7 stdlib-3.17.1 wx-2.1.2 # dialyzer-4.4.3 edoc-1.1 et-1.6.5 eunit-2.7 ftp-1.1 odbc-2.13.5 os_mon-2.7.1 parsetools-2.3.2 reltool-0.9 syntax_tools-2.6 tftp-1.0.3 tools-3.5.2 xmerl-1.3.28 :
OTP-24.2.2 : inets-7.5.1 ssh-4.13.1 # asn1-5.0.17 common_test-1.22 compiler-8.0.4 crypto-5.0.5 debugger-5.2 dialyzer-4.4.3 diameter-2.2.4 edoc-1.1 eldap-1.2.9 erl_docgen-1.2 erl_interface-5.1 erts-12.2.1 et-1.6.5 eunit-2.7 ftp-1.1 jinterface-1.12.1 kernel-8.2 megaco-4.2 mnesia-4.20.1 observer-2.10.1 odbc-2.13.5 os_mon-2.7.1 parsetools-2.3.2 public_key-1.11.3 reltool-0.9 runtime_tools-1.17 sasl-4.1.1 snmp-5.11 ssl-10.6.1 stdlib-3.17 syntax_tools-2.6 tftp-1.0.3 tools-3.5.2 wx-2.1.1 xmerl-1.3.28 :
OTP-24.2.1 : erts-12.2.1 ssl-10.6.1 # asn1-5.0.17 common_test-1.22 compiler-8.0.4 crypto-5.0.5 debugger-5.2 dialyzer-4.4.3 diameter-2.2.4 edoc-1.1 eldap-1.2.9 erl_docgen-1.2 erl_interface-5.1 et-1.6.5 eunit-2.7 ftp-1.1 inets-7.5 jinterface-1.12.1 kernel-8.2 megaco-4.2 mnesia-4.20.1 observer-2.10.1 odbc-2.13.5 os_mon-2.7.1 parsetools-2.3.2 public_key-1.11.3 reltool-0.9 runtime_tools-1.17 sasl-4.1.1 snmp-5.11 ssh-4.13 stdlib-3.17 syntax_tools-2.6 tftp-1.0.3 tools-3.5.2 wx-2.1.1 xmerl-1.3.28 :
OTP-24.2 : common_test-1.22 compiler-8.0.4 crypto-5.0.5 dialyzer-4.4.3 edoc-1.1 erl_docgen-1.2 erts-12.2 inets-7.5 kernel-8.2 megaco-4.2 mnesia-4.20.1 observer-2.10.1 parsetools-2.3.2 sasl-4.1.1 snmp-5.11 ssh-4.13 ssl-10.6 stdlib-3.17 tools-3.5.2 wx-2.1.1 # asn1-5.0.17 debugger-5.2 diameter-2.2.4 eldap-1.2.9 erl_interface-5.1 et-1.6.5 eunit-2.7 ftp-1.1 jinterface-1.12.1 odbc-2.13.5 os_mon-2.7.1 public_key-1.11.3 reltool-0.9 runtime_tools-1.17 syntax_tools-2.6 tftp-1.0.3 xmerl-1.3.28 :