Merge branch 'maint' into master

* maint: Updated OTP version Prepare release Update copyright year
garazdawi · Mar 5, 2025 · bcda16e · bcda16e
2 parents 2e5f88e + 05737d1
commit bcda16e
Show file tree

Hide file tree

Showing 47 changed files with 279 additions and 33 deletions.
diff --git a/.github/scripts/build-base-image.sh b/.github/scripts/build-base-image.sh
@@ -2,7 +2,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/erts/doc/notes.md b/erts/doc/notes.md
@@ -21,6 +21,40 @@ limitations under the License.
 
 This document describes the changes made to the ERTS application.
 
+## Erts 15.2.3
+
+### Fixed Bugs and Malfunctions
+
+- Fixed failed runtime assert in debug VM when built with statically linked NIFs.
+
+  Own Id: OTP-19443 Aux Id: [GH-9306], [PR-9307]
+
+- Fixed a bug where reading a binary from `m:persistent_term` could cause a segmentation fault on Windows. This bug was introduced in Erlang/OTP 27.0.
+
+  Own Id: OTP-19458 Aux Id: [PR-9349], [GH-9222]
+
+- Fixed a crash in `erlexec` (an executable used by `erl` during startup) when a `PATH` longer than 10240 was set.
+
+  Own Id: OTP-19471 Aux Id: [PR-9331]
+
+- Fixed bug in `erlang:halt`. Two processes calling `erlang:halt` at the same time could lead to one of them crashing with `badarg` as if it called `erlang:halt(undefined,undefined)`.
+
+  Own Id: OTP-19490 Aux Id: [PR-8640], [GH-8634]
+
+- Fixed BEAM crash when a custom thread sends a large map (>128 keys) externally encoded with, for example, `erl_drv_send_term()`.
+
+  Own Id: OTP-19495 Aux Id: [GH-8208], [PR-8209]
+
+[GH-9306]: https://github.com/erlang/otp/issues/9306
+[PR-9307]: https://github.com/erlang/otp/pull/9307
+[PR-9349]: https://github.com/erlang/otp/pull/9349
+[GH-9222]: https://github.com/erlang/otp/issues/9222
+[PR-9331]: https://github.com/erlang/otp/pull/9331
+[PR-8640]: https://github.com/erlang/otp/pull/8640
+[GH-8634]: https://github.com/erlang/otp/issues/8634
+[GH-8208]: https://github.com/erlang/otp/issues/8208
+[PR-8209]: https://github.com/erlang/otp/pull/8209
+
 ## Erts 15.2.2
 
 ### Fixed Bugs and Malfunctions

diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
@@ -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/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1997-2024. All Rights Reserved.
+ * Copyright Ericsson AB 1997-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.2
+VSN = 15.2.3
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3

diff --git a/lib/asn1/doc/notes.md b/lib/asn1/doc/notes.md
@@ -21,6 +21,17 @@ limitations under the License.
 
 This document describes the changes made to the asn1 application.
 
+## Asn1 5.3.2
+
+### Fixed Bugs and Malfunctions
+
+- Multiple bugs in decoding of the `REAL` type has been eliminated. Also, the documentation for `REAL` has been updated to mention the special values `0`, `PLUS-INFINITY`, and `MINUS-INFINITY`.
+
+  Own Id: OTP-19504 Aux Id: [GH-9096], [PR-9469]
+
+[GH-9096]: https://github.com/erlang/otp/issues/9096
+[PR-9469]: https://github.com/erlang/otp/pull/9469
+
 ## Asn1 5.3.1
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2024. All Rights Reserved.
+%% Copyright Ericsson AB 2002-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/asn1/src/asn1rtt_real_common.erl b/lib/asn1/src/asn1rtt_real_common.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2012-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/asn1/test/testPrim.erl b/lib/asn1/test/testPrim.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2021. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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/asn1/vsn.mk b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 5.3.1
+ASN1_VSN = 5.3.2
diff --git a/lib/common_test/doc/notes.md b/lib/common_test/doc/notes.md
@@ -19,6 +19,21 @@ limitations under the License.
 -->
 # Common Test Release Notes
 
+## Common_Test 1.27.7
+
+### Fixed Bugs and Malfunctions
+
+- Reduced the memory usage when testcases prints a lot to the log.
+
+  Own Id: OTP-19489 Aux Id: [PR-9424]
+
+- Fixed the built-in hook `cth_surefire` to not crash when a group within a skipped group is skipped.
+
+  Own Id: OTP-19491 Aux Id: [PR-9419]
+
+[PR-9424]: https://github.com/erlang/otp/pull/9424
+[PR-9419]: https://github.com/erlang/otp/pull/9419
+
 ## Common_Test 1.27.6
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/common_test/src/cth_surefire.erl b/lib/common_test/src/cth_surefire.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2024. All Rights Reserved.
+%% Copyright Ericsson AB 2012-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/common_test/src/test_server_gl.erl b/lib/common_test/src/test_server_gl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2024. All Rights Reserved.
+%% Copyright Ericsson AB 2012-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/common_test/test/ct_surefire_SUITE.erl b/lib/common_test/test/ct_surefire_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2024. All Rights Reserved.
+%% Copyright Ericsson AB 2012-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/common_test/vsn.mk b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.27.6
+COMMON_TEST_VSN = 1.27.7
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.6
+
+### Improvements and New Features
+
+- The `beam_validator` pass in the compiler that validates generated BEAM now does stronger checks for binary syntax matching.
+
+  Own Id: OTP-19449 Aux Id: [PR-9338]
+
+[PR-9338]: https://github.com/erlang/otp/pull/9338
+
 ## Compiler 8.5.5
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 8.5.5
+COMPILER_VSN = 8.6
diff --git a/lib/crypto/doc/notes.md b/lib/crypto/doc/notes.md
@@ -21,6 +21,17 @@ limitations under the License.
 
 This document describes the changes made to the Crypto application.
 
+## Crypto 5.5.3
+
+### Fixed Bugs and Malfunctions
+
+- `crypto` will now work when ED25519 and X25519 are available while ED448 and X448 are not, which is the case in LibreSSL. This is necessary for supporting TLS1.3 using LibreSSL.
+
+  Own Id: OTP-19399 Aux Id: [GH-9000], [PR-9136]
+
+[GH-9000]: https://github.com/erlang/otp/issues/9000
+[PR-9136]: https://github.com/erlang/otp/pull/9136
+
 ## Crypto 5.5.2
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 5.5.2
+CRYPTO_VSN = 5.5.3
diff --git a/lib/kernel/doc/notes.md b/lib/kernel/doc/notes.md
@@ -21,6 +21,30 @@ limitations under the License.
 
 This document describes the changes made to the Kernel application.
 
+## Kernel 10.2.3
+
+### Fixed Bugs and Malfunctions
+
+- Clarify inet:setopts documentation
+
+  Own Id: OTP-19416 Aux Id: [PR-9248]
+
+- Fix bug where log printouts would go missing when `application_controller` is stopping while log messages are being sent.
+
+  This bug was introduced by OTP-19078 in Erlang/OTP 26.2.5.
+
+  Own Id: OTP-19418 Aux Id: [GH-9163], [PR-9274]
+
+- Fixes a bug in the socket type spec, which caused Dialyzer to reject some valid programs.
+
+  Own Id: OTP-19429 Aux Id: [PR-9295], [PR-9379]
+
+[PR-9248]: https://github.com/erlang/otp/pull/9248
+[GH-9163]: https://github.com/erlang/otp/issues/9163
+[PR-9274]: https://github.com/erlang/otp/pull/9274
+[PR-9295]: https://github.com/erlang/otp/pull/9295
+[PR-9379]: https://github.com/erlang/otp/pull/9379
+
 ## Kernel 10.2.2
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
@@ -38,6 +38,7 @@
   {<<"^10\\.2$">>,[restart_new_emulator]},
   {<<"^10\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^10\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^10\\.2\\.2(?:\\.[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]},
@@ -70,6 +71,7 @@
   {<<"^10\\.2$">>,[restart_new_emulator]},
   {<<"^10\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^10\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^10\\.2\\.2(?:\\.[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.2
+KERNEL_VSN = 10.2.3
diff --git a/lib/mnesia/doc/notes.md b/lib/mnesia/doc/notes.md
@@ -25,6 +25,16 @@ as all enhancements and bugfixes for every release of Mnesia. Each release of
 Mnesia thus constitutes one section in this document. The title of each section
 is the version number of Mnesia.
 
+## Mnesia 4.23.4
+
+### Fixed Bugs and Malfunctions
+
+- Mnesia could fail to load a table, if one of the copy holders was moved during startup.
+
+  Own Id: OTP-19501 Aux Id: ERIERL-1195, [PR-9499]
+
+[PR-9499]: https://github.com/erlang/otp/pull/9499
+
 ## Mnesia 4.23.3
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.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/mnesia/vsn.mk b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.23.3
+MNESIA_VSN = 4.23.4
diff --git a/lib/public_key/doc/notes.md b/lib/public_key/doc/notes.md
@@ -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/ssh/doc/notes.md b/lib/ssh/doc/notes.md
@@ -19,6 +19,22 @@ limitations under the License.
 -->
 # SSH Release Notes
 
+## Ssh 5.2.8
+
+### Fixed Bugs and Malfunctions
+
+- Minor documentation improvements.
+
+  Own Id: OTP-19410 Aux Id: [PR-9188]
+
+- Function specification for `ssh_sftp:start_channel/2` is fixed.
+
+  Own Id: OTP-19475 Aux Id: [PR-9368], [GH-9359]
+
+[PR-9188]: https://github.com/erlang/otp/pull/9188
+[PR-9368]: https://github.com/erlang/otp/pull/9368
+[GH-9359]: https://github.com/erlang/otp/issues/9359
+
 ## Ssh 5.2.7
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 5.2.7
+SSH_VSN = 5.2.8
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/notes.md b/lib/ssl/doc/notes.md
@@ -21,6 +21,26 @@ limitations under the License.
 
 This document describes the changes made to the SSL application.
 
+## SSL 11.2.9
+
+### Fixed Bugs and Malfunctions
+
+- The function for selecting the best server  certificate and key pair has been enhanced when several options are available to ensure that the fallback will not always be chosen.
+
+  Own Id: OTP-19423 Aux Id: [PR-9185]
+
+- Avoided duplicating a few algorithms in default values caused by an interoperability workaround not needed in this case.
+
+  Own Id: OTP-19428 Aux Id: [PR-9288]
+
+- Fixed two alert bugs, which could result in a crash instead of an alert.
+
+  Own Id: OTP-19433 Aux Id: [PR-9308]
+
+[PR-9185]: https://github.com/erlang/otp/pull/9185
+[PR-9288]: https://github.com/erlang/otp/pull/9288
+[PR-9308]: https://github.com/erlang/otp/pull/9308
+
 ## SSL 11.2.8
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 11.2.8
+SSL_VSN = 11.2.9