Merge branch 'maint-24' into maint

* maint-24:
  Updated OTP version
  Prepare release
  Update copyright year

13 files changed, 86 insertions, 9 deletions

diff --git a/OTP_VERSION b/OTP_VERSION
index 9dc0ade502..8fadab0565 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1 @@
-24.2
+24.2.1
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 842ae54841..5162de93b4 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,28 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 12.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a memory leak in <c>file:read_file_info/2</c>
+	    and <c>file:read_file/1</c> on Windows.</p>
+          <p>
+	    Own Id: OTP-17827 Aux Id: GH-5527 </p>
+        </item>
+        <item>
+          <p>
+	    Fix GC emulator crash when <c>spawn_request</c> was used
+	    when message tracing was enabled.</p>
+          <p>
+	    Own Id: OTP-17871 Aux Id: PR-5612 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 12.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 3bde786f50..ce9bd303f0 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.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/vsn.mk b/erts/vsn.mk
index 3d1d81a854..f7bef92a70 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 12.2
+VSN = 12.2.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 96d2886995..5c6e4b911b 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,54 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 10.6.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Improve SNI (server name indication) handling so that
+	    protocol version can be selected with regards to SNI.
+	    Also, make sure that ssl:connection_information/1 returns
+	    the correct SNI value.</p>
+          <p>
+	    Own Id: OTP-17794 Aux Id: GH-5341, GH-4450 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed cipher suite listing functions so that the listing
+	    of all cipher suites will be complete. Another fix for
+	    cipher suite handling in OTP-24.1 accidentally excludes a
+	    few cipher suites from the listing of all cipher suites.</p>
+          <p>
+	    Own Id: OTP-17829 Aux Id: ERIERL-708 </p>
+        </item>
+        <item>
+          <p>
+	    Reenable legacy cipher suite
+	    TLS_RSA_WITH_3DES_EDE_CBC_SHA for explicit configuration
+	    in TLS-1.2, not supported by default.</p>
+          <p>
+	    Own Id: OTP-17879 Aux Id: GH-5624 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Avoid unnecessary logs by better adjusting the tls_sender
+	    process to the new supervisor structure in OTP-24.2</p>
+          <p>
+	    Own Id: OTP-17831</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 10.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/src/tls_sender.erl b/lib/ssl/src/tls_sender.erl
index 11f9457dc0..a0dee0b29b 100644
--- a/lib/ssl/src/tls_sender.erl
+++ b/lib/ssl/src/tls_sender.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2018-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2018-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_v1.erl b/lib/ssl/src/tls_v1.erl
index 622eae0c50..75d994f18c 100644
--- a/lib/ssl/src/tls_v1.erl
+++ b/lib/ssl/src/tls_v1.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/test/openssl_sni_SUITE.erl b/lib/ssl/test/openssl_sni_SUITE.erl
index 3d00d25e1e..a6d9746164 100644
--- a/lib/ssl/test/openssl_sni_SUITE.erl
+++ b/lib/ssl/test/openssl_sni_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2019-2020. 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/ssl/test/ssl_api_SUITE.erl b/lib/ssl/test/ssl_api_SUITE.erl
index e7dc0eb43f..c686fac6d6 100644
--- a/lib/ssl/test/ssl_api_SUITE.erl
+++ b/lib/ssl/test/ssl_api_SUITE.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/ssl/test/ssl_sni_SUITE.erl b/lib/ssl/test/ssl_sni_SUITE.erl
index 247ab7e4cc..a5419e8586 100644
--- a/lib/ssl/test/ssl_sni_SUITE.erl
+++ b/lib/ssl/test/ssl_sni_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015-2020. All Rights Reserved.
+%% Copyright Ericsson AB 2015-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 2e5fb4f6ad..910118fa9a 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 10.6
+SSL_VSN = 10.6.1
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index e69de29bb2..18ac1d3359 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -0,0 +1,6 @@
+OTP-17794
+OTP-17827
+OTP-17829
+OTP-17831
+OTP-17871
+OTP-17879
diff --git a/otp_versions.table b/otp_versions.table
index dcaeab4573..0bc287b850 100644
--- a/otp_versions.table
+++ b/otp_versions.table
@@ -1,3 +1,4 @@
+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 :
 OTP-24.1.7 : ssh-4.12.5 # asn1-5.0.17 common_test-1.21 compiler-8.0.3 crypto-5.0.4 debugger-5.2 dialyzer-4.4.2 diameter-2.2.4 edoc-1.0.1 eldap-1.2.9 erl_docgen-1.1.2 erl_interface-5.1 erts-12.1.5 et-1.6.5 eunit-2.7 ftp-1.1 inets-7.4.2 jinterface-1.12.1 kernel-8.1.3 megaco-4.1 mnesia-4.20 observer-2.10 odbc-2.13.5 os_mon-2.7.1 parsetools-2.3.1 public_key-1.11.3 reltool-0.9 runtime_tools-1.17 sasl-4.1 snmp-5.10.1 ssl-10.5.3 stdlib-3.16.1 syntax_tools-2.6 tftp-1.0.3 tools-3.5.1 wx-2.1 xmerl-1.3.28 :
 OTP-24.1.6 : ssl-10.5.3 # asn1-5.0.17 common_test-1.21 compiler-8.0.3 crypto-5.0.4 debugger-5.2 dialyzer-4.4.2 diameter-2.2.4 edoc-1.0.1 eldap-1.2.9 erl_docgen-1.1.2 erl_interface-5.1 erts-12.1.5 et-1.6.5 eunit-2.7 ftp-1.1 inets-7.4.2 jinterface-1.12.1 kernel-8.1.3 megaco-4.1 mnesia-4.20 observer-2.10 odbc-2.13.5 os_mon-2.7.1 parsetools-2.3.1 public_key-1.11.3 reltool-0.9 runtime_tools-1.17 sasl-4.1 snmp-5.10.1 ssh-4.12.4 stdlib-3.16.1 syntax_tools-2.6 tftp-1.0.3 tools-3.5.1 wx-2.1 xmerl-1.3.28 :