From 3607d751807f222fb9bd018fca49433a3e6a14a2 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Sun, 26 Jan 2025 18:06:41 +0100 Subject: [PATCH 1/3] Update copyright year --- erts/preloaded/src/init.erl | 2 +- lib/common_test/src/ct_logs.erl | 2 +- lib/ssh/src/ssh.erl | 2 +- lib/ssh/src/ssh_connection.erl | 2 +- lib/ssh/src/ssh_fsm_userauth_client.erl | 2 +- lib/ssh/test/ssh_connection_SUITE.erl | 2 +- lib/ssh/test/ssh_protocol_SUITE.erl | 2 +- lib/ssh/test/ssh_sftp_SUITE.erl | 2 +- lib/ssl/src/ssl_gen_statem.erl | 2 +- lib/ssl/src/tls_client_connection_1_3.erl | 2 +- lib/ssl/src/tls_connection.erl | 2 +- lib/ssl/src/tls_gen_connection_1_3.erl | 2 +- lib/ssl/src/tls_server_connection_1_3.erl | 2 +- lib/ssl/test/ssl_api_SUITE.erl | 2 +- lib/ssl/test/ssl_trace_SUITE.erl | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl index 08b7cc8ca6d5..930abb2b4a8c 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2023. 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/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl index b1e186d8dde2..9509ba5b2209 100644 --- a/lib/common_test/src/ct_logs.erl +++ b/lib/common_test/src/ct_logs.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2023. All Rights Reserved. +%% Copyright Ericsson AB 2003-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/src/ssh.erl b/lib/ssh/src/ssh.erl index 6fbcb128d68b..be32bb997ddf 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -1,7 +1,7 @@ % %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2024. All Rights Reserved. +%% Copyright Ericsson AB 2004-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/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl index 18a9a68c3d4c..9ee17d4a30e8 100644 --- 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/src/ssh_fsm_userauth_client.erl b/lib/ssh/src/ssh_fsm_userauth_client.erl index 124d07e79c2b..f0c15731a8aa 100644 --- a/lib/ssh/src/ssh_fsm_userauth_client.erl +++ b/lib/ssh/src/ssh_fsm_userauth_client.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2021. 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 index 11f2d9dcf141..dc053b2b2717 100644 --- 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_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl index d5605e13240c..561b528c091f 100644 --- a/lib/ssh/test/ssh_protocol_SUITE.erl +++ b/lib/ssh/test/ssh_protocol_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 index e1b25bc3c183..eee295ac8241 100644 --- 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/ssl/src/ssl_gen_statem.erl b/lib/ssl/src/ssl_gen_statem.erl index 9ebd320a28e0..a0e4975f41e7 100644 --- a/lib/ssl/src/ssl_gen_statem.erl +++ b/lib/ssl/src/ssl_gen_statem.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2024. All Rights Reserved. +%% Copyright Ericsson AB 2007-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_client_connection_1_3.erl b/lib/ssl/src/tls_client_connection_1_3.erl index cd414d9703c1..b1a72690679d 100644 --- a/lib/ssl/src/tls_client_connection_1_3.erl +++ b/lib/ssl/src/tls_client_connection_1_3.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2022-2023. All Rights Reserved. +%% Copyright Ericsson AB 2022-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_connection.erl b/lib/ssl/src/tls_connection.erl index ef67bc025679..9347fa116df4 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2023. All Rights Reserved. +%% Copyright Ericsson AB 2007-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_gen_connection_1_3.erl b/lib/ssl/src/tls_gen_connection_1_3.erl index 7cb0c001034e..db1038de1cbb 100644 --- a/lib/ssl/src/tls_gen_connection_1_3.erl +++ b/lib/ssl/src/tls_gen_connection_1_3.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2022-2023. All Rights Reserved. +%% Copyright Ericsson AB 2022-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_1_3.erl b/lib/ssl/src/tls_server_connection_1_3.erl index 3e0171dcb817..6a4f66687940 100644 --- a/lib/ssl/src/tls_server_connection_1_3.erl +++ b/lib/ssl/src/tls_server_connection_1_3.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2022-2024. All Rights Reserved. +%% Copyright Ericsson AB 2022-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/test/ssl_api_SUITE.erl b/lib/ssl/test/ssl_api_SUITE.erl index 9dc8d2dac809..61b701dd565b 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-2024. All Rights Reserved. +%% Copyright Ericsson AB 2019-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/test/ssl_trace_SUITE.erl b/lib/ssl/test/ssl_trace_SUITE.erl index 9eda8fb0b155..46267d837010 100644 --- a/lib/ssl/test/ssl_trace_SUITE.erl +++ b/lib/ssl/test/ssl_trace_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2022-2024. All Rights Reserved. +%% Copyright Ericsson AB 2022-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. From 1317faad27af0f74b154240cc330110ca6fff617 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Sun, 26 Jan 2025 18:06:43 +0100 Subject: [PATCH 2/3] Prepare release --- erts/doc/src/notes.xml | 14 ++++++++++++++ erts/vsn.mk | 2 +- lib/common_test/doc/src/notes.xml | 16 ++++++++++++++++ lib/common_test/vsn.mk | 2 +- lib/dialyzer/doc/src/notes.xml | 14 ++++++++++++++ lib/dialyzer/vsn.mk | 2 +- lib/kernel/doc/src/notes.xml | 17 +++++++++++++++++ lib/kernel/vsn.mk | 2 +- lib/ssh/doc/src/notes.xml | 29 +++++++++++++++++++++++++++++ lib/ssh/vsn.mk | 2 +- lib/ssl/doc/src/notes.xml | 23 +++++++++++++++++++++++ lib/ssl/vsn.mk | 2 +- make/otp_version_tickets | 20 +++++++++----------- 13 files changed, 128 insertions(+), 17 deletions(-) diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index f3b1ee08ae9f..28f01366cc1c 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,20 @@

This document describes the changes made to the ERTS application.

+
Erts 14.2.5.6 + +
Fixed Bugs and Malfunctions + + +

Fixed configure tests for GCC 14

+

+ Own Id: OTP-19407 Aux Id: GH-9211, PR-9234

+ + +
+ +
+
Erts 14.2.5.5
Fixed Bugs and Malfunctions diff --git a/erts/vsn.mk b/erts/vsn.mk index 6356ddeb8e92..90ce9be831ad 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 14.2.5.5 +VSN = 14.2.5.6 # Port number 4365 in 4.2 # Port number 4366 in 4.3 diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml index 130567ae6801..f0dbda7a62c6 100644 --- a/lib/common_test/doc/src/notes.xml +++ b/lib/common_test/doc/src/notes.xml @@ -33,6 +33,22 @@ notes.xml +
Common_Test 1.26.2.4 + +
Fixed Bugs and Malfunctions + + +

Common test will now not crash when running tests with + OTP-26 and earlier, while having previous test results + from OTP-27.

+

+ Own Id: OTP-19385 Aux Id: ERIERL-1166, PR-9155, PR-9156

+ + +
+ +
+
Common_Test 1.26.2.3
Fixed Bugs and Malfunctions diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk index 8e30d92ffe3a..03d0d6071c05 100644 --- a/lib/common_test/vsn.mk +++ b/lib/common_test/vsn.mk @@ -1 +1 @@ -COMMON_TEST_VSN = 1.26.2.3 +COMMON_TEST_VSN = 1.26.2.4 diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml index 15b076110e9b..dd23df2f4510 100644 --- a/lib/dialyzer/doc/src/notes.xml +++ b/lib/dialyzer/doc/src/notes.xml @@ -32,6 +32,20 @@

This document describes the changes made to the Dialyzer application.

+
Dialyzer 5.1.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

+ + +
+ +
+
Dialyzer 5.1.3
Fixed Bugs and Malfunctions diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk index 274c1bdddaee..510ee8c7e1d0 100644 --- a/lib/dialyzer/vsn.mk +++ b/lib/dialyzer/vsn.mk @@ -1 +1 @@ -DIALYZER_VSN = 5.1.3 +DIALYZER_VSN = 5.1.3.1 diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml index 256840b83241..b372d3d0fab7 100644 --- a/lib/kernel/doc/src/notes.xml +++ b/lib/kernel/doc/src/notes.xml @@ -31,6 +31,23 @@

This document describes the changes made to the Kernel application.

+
Kernel 9.2.4.5 + +
Fixed Bugs and Malfunctions + + +

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

+ + +
+ +
+
Kernel 9.2.4.4
Fixed Bugs and Malfunctions diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk index a702dc018edf..b7792969b3e0 100644 --- a/lib/kernel/vsn.mk +++ b/lib/kernel/vsn.mk @@ -1 +1 @@ -KERNEL_VSN = 9.2.4.4 +KERNEL_VSN = 9.2.4.5 diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index 53fdbbb2df1a..caa8bc7cf515 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -30,6 +30,35 @@ notes.xml +
Ssh 5.1.4.5 + +
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

+ + +
+ +
+
Ssh 5.1.4.4
Fixed Bugs and Malfunctions diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index b4e87f959231..d95512e627dd 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,4 +1,4 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 5.1.4.4 +SSH_VSN = 5.1.4.5 APP_VSN = "ssh-$(SSH_VSN)" diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index 4406b6a9a601..81a4b49eb08b 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -27,6 +27,29 @@

This document describes the changes made to the SSL application.

+
SSL 11.1.4.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

+ + +
+ +
+
SSL 11.1.4.6
Fixed Bugs and Malfunctions diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index e061700f5372..e44426082cb3 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 11.1.4.6 +SSL_VSN = 11.1.4.7 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index d0e316e29e35..e05a436c954f 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,11 +1,9 @@ -OTP-19240 -OTP-19330 -OTP-19332 -OTP-19350 -OTP-19352 -OTP-19357 -OTP-19365 -OTP-19366 -OTP-19368 -OTP-19379 -OTP-19380 +OTP-19385 +OTP-19388 +OTP-19392 +OTP-19407 +OTP-19411 +OTP-19418 +OTP-19435 +OTP-19439 +OTP-19445 From 3b059b6caf4e087c8c207ae7012bb50736fdf18c Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Sun, 26 Jan 2025 18:06:45 +0100 Subject: [PATCH 3/3] Updated OTP version --- OTP_VERSION | 2 +- otp_versions.table | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OTP_VERSION b/OTP_VERSION index a712c3415de0..b88777cda41a 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -26.2.5.6 +26.2.5.7 diff --git a/otp_versions.table b/otp_versions.table index d45b49f76e11..8c70819931fb 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -1,3 +1,4 @@ +OTP-26.2.5.7 : common_test-1.26.2.4 dialyzer-5.1.3.1 erts-14.2.5.6 kernel-9.2.4.5 ssh-5.1.4.5 ssl-11.1.4.7 # asn1-5.2.2 compiler-8.4.3.2 crypto-5.4.2.3 debugger-5.3.4 diameter-2.3.2.2 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 et-1.7 eunit-2.9 ftp-1.2.1.1 inets-9.1.0.2 jinterface-1.14 megaco-4.5 mnesia-4.23.1.1 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 public_key-1.15.1.4 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 stdlib-5.2.3.3 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 xmerl-1.3.34.1 : OTP-26.2.5.6 : common_test-1.26.2.3 erts-14.2.5.5 inets-9.1.0.2 kernel-9.2.4.4 mnesia-4.23.1.1 public_key-1.15.1.4 ssl-11.1.4.6 stdlib-5.2.3.3 # asn1-5.2.2 compiler-8.4.3.2 crypto-5.4.2.3 debugger-5.3.4 dialyzer-5.1.3 diameter-2.3.2.2 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 et-1.7 eunit-2.9 ftp-1.2.1.1 jinterface-1.14 megaco-4.5 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 ssh-5.1.4.4 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 xmerl-1.3.34.1 : OTP-26.2.5.5 : common_test-1.26.2.2 crypto-5.4.2.3 ssh-5.1.4.4 ssl-11.1.4.5 # asn1-5.2.2 compiler-8.4.3.2 debugger-5.3.4 dialyzer-5.1.3 diameter-2.3.2.2 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 erts-14.2.5.4 et-1.7 eunit-2.9 ftp-1.2.1.1 inets-9.1.0.1 jinterface-1.14 kernel-9.2.4.3 megaco-4.5 mnesia-4.23.1 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 public_key-1.15.1.3 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 stdlib-5.2.3.2 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 xmerl-1.3.34.1 : OTP-26.2.5.4 : common_test-1.26.2.1 compiler-8.4.3.2 crypto-5.4.2.2 erts-14.2.5.4 inets-9.1.0.1 kernel-9.2.4.3 public_key-1.15.1.3 ssh-5.1.4.3 ssl-11.1.4.4 stdlib-5.2.3.2 xmerl-1.3.34.1 # asn1-5.2.2 debugger-5.3.4 dialyzer-5.1.3 diameter-2.3.2.2 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 et-1.7 eunit-2.9 ftp-1.2.1.1 jinterface-1.14 megaco-4.5 mnesia-4.23.1 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 :