Merge branch 'maint' into master

* maint: Updated OTP version Prepare release Update copyright year
erlang · Jan 23, 2025 · d2264ff · d2264ff
2 parents 1b95331 + 44b92da
commit d2264ff
Show file tree

Hide file tree

Showing 24 changed files with 104 additions and 76 deletions.
diff --git a/erts/configure.ac b/erts/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -*-Autoconf-*
 
 dnl %CopyrightBegin%
 dnl
-dnl Copyright Ericsson AB 1997-2024. All Rights Reserved.
+dnl Copyright Ericsson AB 1997-2025. All Rights Reserved.
 dnl
 dnl Licensed under the Apache License, Version 2.0 (the "License");
 dnl 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,25 @@ limitations under the License.
 
 This document describes the changes made to the ERTS application.
 
+## Erts 15.2.1
+
+### Fixed Bugs and Malfunctions
+
+- Fixed configure tests for GCC 14
+
+  Own Id: OTP-19407 Aux Id: [GH-9211], [PR-9234]
+
+- 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]
+
+[GH-9211]: https://github.com/erlang/otp/issues/9211
+[PR-9234]: https://github.com/erlang/otp/pull/9234
+[GH-9163]: https://github.com/erlang/otp/issues/9163
+[PR-9274]: https://github.com/erlang/otp/pull/9274
+
 ## Erts 15.2
 
 ### Fixed Bugs and Malfunctions

diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.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/erts/vsn.mk b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 15.2
+VSN = 15.2.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3

diff --git a/lib/common_test/doc/notes.md b/lib/common_test/doc/notes.md
@@ -19,6 +19,17 @@ limitations under the License.
 -->
 # Common Test Release Notes
 
+## Common_Test 1.27.6
+
+### Fixed Bugs and Malfunctions
+
+- Common test will now not crash when running tests with otp26 and earlier, while having previous test resuts from otp27.
+
+  Own Id: OTP-19385 Aux Id: ERIERL-1166, [PR-9155], [PR-9156]
+
+[PR-9155]: https://github.com/erlang/otp/pull/9155
+[PR-9156]: https://github.com/erlang/otp/pull/9156
+
 ## Common_Test 1.27.5
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.27.5
+COMMON_TEST_VSN = 1.27.6
diff --git a/lib/dialyzer/doc/notes.md b/lib/dialyzer/doc/notes.md
@@ -21,6 +21,16 @@ limitations under the License.
 
 This document describes the changes made to the Dialyzer application.
 
+## Dialyzer 5.3.1
+
+### Fixed Bugs and Malfunctions
+
+- Fixed a crash caused by the use of opaque types.
+
+  Own Id: OTP-19439 Aux Id: ERIERL-1183, [PR-9314]
+
+[PR-9314]: https://github.com/erlang/otp/pull/9314
+
 ## Dialyzer 5.3
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 5.3
+DIALYZER_VSN = 5.3.1
diff --git a/lib/kernel/doc/notes.md b/lib/kernel/doc/notes.md
@@ -21,6 +21,19 @@ limitations under the License.
 
 This document describes the changes made to the Kernel application.
 
+## Kernel 10.2.1
+
+### Fixed Bugs and Malfunctions
+
+- Fix the default group_leader to reply `{error,request}` on invalid I/O requests instead of crashing.
+
+  This bug was introduced in Erlang/OTP 27.2.
+
+  Own Id: OTP-19444 Aux Id: [GH-9237], [PR-9318]
+
+[GH-9237]: https://github.com/erlang/otp/issues/9237
+[PR-9318]: https://github.com/erlang/otp/pull/9318
+
 ## Kernel 10.2
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/kernel/src/application_controller.erl b/lib/kernel/src/application_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/kernel/src/group.erl b/lib/kernel/src/group.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
@@ -35,6 +35,8 @@
   {<<"^10\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^10\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^10\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^10\\.2$">>,[restart_new_emulator]},
+  {<<"^10\\.2\\.0(?:\\.[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]},
@@ -64,6 +66,8 @@
   {<<"^10\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^10\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^10\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^10\\.2$">>,[restart_new_emulator]},
+  {<<"^10\\.2\\.0(?:\\.[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
+KERNEL_VSN = 10.2.1
diff --git a/lib/ssh/doc/notes.md b/lib/ssh/doc/notes.md
@@ -19,6 +19,27 @@ limitations under the License.
 -->
 # SSH Release Notes
 
+## Ssh 5.2.6
+
+### Fixed Bugs and Malfunctions
+
+- With this change, type specs for ssh:connection_info/1,2 functions are fixed so they include \{error, term()\} return value.
+
+  Own Id: OTP-19388 Aux Id: ERIERL-1165, [PR-9161]
+
+- With this change, ssh client accepts a banner sent during processing keyboard interactive user authentication.
+
+  Own Id: OTP-19392 Aux Id: [PR-9139], [GH-9065]
+
+- With this change, large sftp transfers does not hang. Redundant window adjustment are not requested.
+
+  Own Id: OTP-19435 Aux Id: [PR-9309]
+
+[PR-9161]: https://github.com/erlang/otp/pull/9161
+[PR-9139]: https://github.com/erlang/otp/pull/9139
+[GH-9065]: https://github.com/erlang/otp/issues/9065
+[PR-9309]: https://github.com/erlang/otp/pull/9309
+
 ## Ssh 5.2.5
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.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/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.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/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl
@@ -1,7 +1,7 @@
 %
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2024. All Rights Reserved.
+%% Copyright Ericsson AB 2005-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/vsn.mk b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 5.2.5
+SSH_VSN = 5.2.6
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2024. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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/tftp/doc/notes.md b/lib/tftp/doc/notes.md
@@ -19,6 +19,16 @@ limitations under the License.
 -->
 # TFTP Release Notes
 
+## Tftp 1.2.2
+
+### Fixed Bugs and Malfunctions
+
+- Fix specs in tftp:read_file function.
+
+  Own Id: OTP-19446 Aux Id: [PR-9327], ERIERL-1179
+
+[PR-9327]: https://github.com/erlang/otp/pull/9327
+
 ## Tftp 1.2.1
 
 ### Improvements and New Features

diff --git a/lib/tftp/src/tftp.erl b/lib/tftp/src/tftp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2024. All Rights Reserved.
+%% Copyright Ericsson AB 2005-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/tftp/vsn.mk b/lib/tftp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = tftp
-TFTP_VSN   = 1.2.1
+TFTP_VSN   = 1.2.2
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(TFTP_VSN)$(PRE_VSN)"
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
@@ -1,61 +0,0 @@
-OTP-16607
-OTP-19158
-OTP-19221
-OTP-19223
-OTP-19225
-OTP-19232
-OTP-19234
-OTP-19243
-OTP-19248
-OTP-19253
-OTP-19260
-OTP-19261
-OTP-19264
-OTP-19270
-OTP-19273
-OTP-19280
-OTP-19281
-OTP-19282
-OTP-19283
-OTP-19284
-OTP-19289
-OTP-19292
-OTP-19299
-OTP-19300
-OTP-19301
-OTP-19302
-OTP-19304
-OTP-19305
-OTP-19307
-OTP-19309
-OTP-19310
-OTP-19318
-OTP-19320
-OTP-19321
-OTP-19322
-OTP-19329
-OTP-19330
-OTP-19331
-OTP-19333
-OTP-19335
-OTP-19338
-OTP-19341
-OTP-19342
-OTP-19344
-OTP-19351
-OTP-19353
-OTP-19356
-OTP-19359
-OTP-19360
-OTP-19361
-OTP-19362
-OTP-19363
-OTP-19368
-OTP-19370
-OTP-19372
-OTP-19373
-OTP-19375
-OTP-19377
-OTP-19379
-OTP-19380
-OTP-19387

diff --git a/otp_versions.table b/otp_versions.table
@@ -1,3 +1,4 @@
+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 :
 OTP-27.1.2 : common_test-1.27.3 erts-15.1.2 kernel-10.1.1 ssh-5.2.3 ssl-11.2.4 stdlib-6.1.2 # asn1-5.3.1 compiler-8.5.2 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 public_key-1.16.3 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 snmp-5.17 syntax_tools-3.2.1 tftp-1.2.1 tools-4.1 wx-2.4.3 xmerl-2.1 :