Merge branch 'maint-27' into maint

* maint-27: Updated OTP version Prepare release Update copyright year
garazdawi · Feb 6, 2025 · 6340dc7 · 6340dc7
2 parents 3b29413 + 8a4e04e
commit 6340dc7
Show file tree

Hide file tree

Showing 21 changed files with 81 additions and 13 deletions.
diff --git a/OTP_VERSION b/OTP_VERSION
@@ -1 +1 @@
-27.2.1
+27.2.2
diff --git a/erts/doc/notes.md b/erts/doc/notes.md
@@ -21,6 +21,16 @@ limitations under the License.
 
 This document describes the changes made to the ERTS application.
 
+## Erts 15.2.2
+
+### Fixed Bugs and Malfunctions
+
+- Disabled an unsafe runtime optimization in binary construction that caused silent memory corruption.
+
+  Own Id: OTP-19462 Aux Id: ERIERL-1177, [PR-9372]
+
+[PR-9372]: https://github.com/erlang/otp/pull/9372
+
 ## Erts 15.2.1
 
 ### Fixed Bugs and Malfunctions

diff --git a/erts/emulator/beam/erl_bits.c b/erts/emulator/beam/erl_bits.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1999-2024. All Rights Reserved.
+ * Copyright Ericsson AB 1999-2025. 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/bs_construct_SUITE.erl b/erts/emulator/test/bs_construct_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2024. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2025. 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
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 15.2.1
+VSN = 15.2.2
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3

diff --git a/lib/compiler/doc/notes.md b/lib/compiler/doc/notes.md
@@ -21,6 +21,16 @@ limitations under the License.
 
 This document describes the changes made to the Compiler application.
 
+## Compiler 8.5.5
+
+### Fixed Bugs and Malfunctions
+
+- Eliminated a bug in the alias analysis pass that could potentially cause unsafe optimizations of binary construction or record updates.
+
+  Own Id: OTP-19455 Aux Id: [PR-9356]
+
+[PR-9356]: https://github.com/erlang/otp/pull/9356
+
 ## Compiler 8.5.4
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/compiler/src/beam_ssa_alias.erl b/lib/compiler/src/beam_ssa_alias.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2024. All Rights Reserved.
+%% Copyright Ericsson AB 2024-2025. 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/compiler/vsn.mk b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 8.5.4
+COMPILER_VSN = 8.5.5
diff --git a/lib/kernel/doc/notes.md b/lib/kernel/doc/notes.md
@@ -21,6 +21,18 @@ limitations under the License.
 
 This document describes the changes made to the Kernel application.
 
+## Kernel 10.2.2
+
+### Fixed Bugs and Malfunctions
+
+- Fixed a couple of bugs that could make `global`'s internal state inconsistent when a connection was reconnected.
+
+  Own Id: OTP-19381 Aux Id: [PR-9377], [GH-9112], [GH-9117]
+
+[PR-9377]: https://github.com/erlang/otp/pull/9377
+[GH-9112]: https://github.com/erlang/otp/issues/9112
+[GH-9117]: https://github.com/erlang/otp/issues/9117
+
 ## Kernel 10.2.1
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/kernel/src/global.erl b/lib/kernel/src/global.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2024. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2025. 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.appup.src b/lib/kernel/src/kernel.appup.src
@@ -37,6 +37,7 @@
   {<<"^10\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^10\\.2$">>,[restart_new_emulator]},
   {<<"^10\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^10\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.4$">>,[restart_new_emulator]},
   {<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -68,6 +69,7 @@
   {<<"^10\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^10\\.2$">>,[restart_new_emulator]},
   {<<"^10\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^10\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.4$">>,[restart_new_emulator]},
   {<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},

diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 10.2.1
+KERNEL_VSN = 10.2.2
diff --git a/lib/public_key/doc/notes.md b/lib/public_key/doc/notes.md
@@ -19,6 +19,17 @@ limitations under the License.
 -->
 # Public_Key Release Notes
 
+## Public_Key 1.17.1
+
+### Fixed Bugs and Malfunctions
+
+- Consider keyCertSign to compatible with extended key usage for TLS client/server auth in CAs, adhere to wide spread implementations
+
+  Own Id: OTP-19240 Aux Id: [PR-9286], [GH-9208]
+
+[PR-9286]: https://github.com/erlang/otp/pull/9286
+[GH-9208]: https://github.com/erlang/otp/issues/9208
+
 ## Public_Key 1.17
 
 ### Improvements and New Features

diff --git 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-2024. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2025. 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
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.17
+PUBLIC_KEY_VSN = 1.17.1
diff --git a/lib/ssl/doc/notes.md b/lib/ssl/doc/notes.md
@@ -21,6 +21,22 @@ limitations under the License.
 
 This document describes the changes made to the SSL application.
 
+## SSL 11.2.7
+
+### Fixed Bugs and Malfunctions
+
+- An initiated handshake should always be closed with an alert, some corner cases have been fixed so that this should always be the case.
+
+  Own Id: OTP-19411 Aux Id: [PR-9273], ERIERL-1174
+
+- Correct option handling to work properly for paused handshaking. Could result in unwanted alerts or or error messages.
+
+  Own Id: OTP-19445 Aux Id: [GH-9177], [PR-9322]
+
+[PR-9273]: https://github.com/erlang/otp/pull/9273
+[GH-9177]: https://github.com/erlang/otp/issues/9177
+[PR-9322]: https://github.com/erlang/otp/pull/9322
+
 ## SSL 11.2.6
 
 ### Improvements and New Features

diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2024. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2025. 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_server_connection.erl b/lib/ssl/src/tls_server_connection.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2023-2024. All Rights Reserved.
+%% Copyright Ericsson AB 2023-2025. 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
@@ -1 +1 @@
-SSL_VSN = 11.2.6
+SSL_VSN = 11.2.7
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
@@ -0,0 +1,6 @@
+OTP-19240
+OTP-19381
+OTP-19411
+OTP-19445
+OTP-19455
+OTP-19462
diff --git a/otp_versions.table b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-27.2.2 : compiler-8.5.5 erts-15.2.2 kernel-10.2.2 public_key-1.17.1 ssl-11.2.7 # asn1-5.3.1 common_test-1.27.6 crypto-5.5.2 debugger-5.5 dialyzer-5.3.1 diameter-2.4.1 edoc-1.3.2 eldap-1.2.14 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 inets-9.3.1 jinterface-1.14.1 megaco-4.7 mnesia-4.23.3 observer-2.17 odbc-2.15 os_mon-2.10.1 parsetools-2.6 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 snmp-5.18 ssh-5.2.6 stdlib-6.2 syntax_tools-3.2.1 tftp-1.2.2 tools-4.1.1 wx-2.4.3 xmerl-2.1 :
 OTP-27.2.1 : common_test-1.27.6 dialyzer-5.3.1 erts-15.2.1 kernel-10.2.1 ssh-5.2.6 tftp-1.2.2 # asn1-5.3.1 compiler-8.5.4 crypto-5.5.2 debugger-5.5 diameter-2.4.1 edoc-1.3.2 eldap-1.2.14 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 inets-9.3.1 jinterface-1.14.1 megaco-4.7 mnesia-4.23.3 observer-2.17 odbc-2.15 os_mon-2.10.1 parsetools-2.6 public_key-1.17 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 snmp-5.18 ssl-11.2.6 stdlib-6.2 syntax_tools-3.2.1 tools-4.1.1 wx-2.4.3 xmerl-2.1 :
 OTP-27.2 : common_test-1.27.5 compiler-8.5.4 crypto-5.5.2 debugger-5.5 dialyzer-5.3 eldap-1.2.14 erts-15.2 inets-9.3.1 kernel-10.2 megaco-4.7 mnesia-4.23.3 observer-2.17 os_mon-2.10.1 public_key-1.17 snmp-5.18 ssh-5.2.5 ssl-11.2.6 stdlib-6.2 tools-4.1.1 # asn1-5.3.1 diameter-2.4.1 edoc-1.3.2 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 jinterface-1.14.1 odbc-2.15 parsetools-2.6 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 syntax_tools-3.2.1 tftp-1.2.1 wx-2.4.3 xmerl-2.1 :
 OTP-27.1.3 : common_test-1.27.4 compiler-8.5.3 erts-15.1.3 kernel-10.1.2 public_key-1.16.4 ssh-5.2.4 ssl-11.2.5 # asn1-5.3.1 crypto-5.5.1 debugger-5.4 dialyzer-5.2.1 diameter-2.4.1 edoc-1.3.2 eldap-1.2.13 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 inets-9.3 jinterface-1.14.1 megaco-4.6 mnesia-4.23.2 observer-2.16 odbc-2.15 os_mon-2.10 parsetools-2.6 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 snmp-5.17 stdlib-6.1.2 syntax_tools-3.2.1 tftp-1.2.1 tools-4.1 wx-2.4.3 xmerl-2.1 :