From cc1dc767b7d0a33f03e4c5e2e6ff13abb8b2de12 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 6 Feb 2025 17:26:51 +0100 Subject: [PATCH 1/3] Update copyright year --- erts/emulator/beam/erl_bits.c | 2 +- erts/emulator/test/bs_construct_SUITE.erl | 2 +- lib/common_test/src/ct_logs.erl | 2 +- lib/kernel/src/global.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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/erts/emulator/beam/erl_bits.c b/erts/emulator/beam/erl_bits.c index 7bfd3712e3fb..76f2b287131e 100644 --- a/erts/emulator/beam/erl_bits.c +++ b/erts/emulator/beam/erl_bits.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1999-2023. 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 index 0ac7c7d744c9..8c60237ee08e 100644 --- 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-2022. 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/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl index b52be2f9c2a9..abd7733414c1 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-2021. 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/kernel/src/global.erl b/lib/kernel/src/global.erl index 02241e5fd5de..0ba7eb4b216b 100644 --- a/lib/kernel/src/global.erl +++ b/lib/kernel/src/global.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2022. 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/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 bbe46c3b2082..8b94834e8714 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 1a231a9e12ef..d0fa35e10d17 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. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in 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. From b76a802567353d7c3ccf561f3a727c823ba40775 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 6 Feb 2025 17:26:53 +0100 Subject: [PATCH 2/3] Prepare release --- erts/doc/src/notes.xml | 15 +++++++++++++++ erts/vsn.mk | 2 +- lib/common_test/doc/src/notes.xml | 16 ++++++++++++++++ lib/common_test/vsn.mk | 2 +- lib/kernel/doc/src/notes.xml | 16 ++++++++++++++++ lib/kernel/vsn.mk | 2 +- lib/ssh/doc/src/notes.xml | 29 +++++++++++++++++++++++++++++ lib/ssh/vsn.mk | 2 +- make/otp_version_tickets | 15 ++++++--------- 9 files changed, 86 insertions(+), 13 deletions(-) diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 7b24a3feaf6e..ab161664bd71 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,21 @@

This document describes the changes made to the ERTS application.

+
Erts 13.2.2.13 + +
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

+ + +
+ +
+
Erts 13.2.2.12
Fixed Bugs and Malfunctions diff --git a/erts/vsn.mk b/erts/vsn.mk index 0938fe515489..dfaeb14238e1 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 13.2.2.12 +VSN = 13.2.2.13 # 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 678de096cbf1..71af0ccac433 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.24.0.6 + +
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.24.0.5
Fixed Bugs and Malfunctions diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk index 7045c2565530..3a787b98e4c3 100644 --- a/lib/common_test/vsn.mk +++ b/lib/common_test/vsn.mk @@ -1 +1 @@ -COMMON_TEST_VSN = 1.24.0.5 +COMMON_TEST_VSN = 1.24.0.6 diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml index 05077bcc2b8f..bf724bde6317 100644 --- a/lib/kernel/doc/src/notes.xml +++ b/lib/kernel/doc/src/notes.xml @@ -31,6 +31,22 @@

This document describes the changes made to the Kernel application.

+
Kernel 8.5.4.4 + +
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

+ + +
+ +
+
Kernel 8.5.4.3
Fixed Bugs and Malfunctions diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk index 888775ca11e1..2df837438017 100644 --- a/lib/kernel/vsn.mk +++ b/lib/kernel/vsn.mk @@ -1 +1 @@ -KERNEL_VSN = 8.5.4.3 +KERNEL_VSN = 8.5.4.4 diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index 699a8b40da68..c44e76bab662 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -30,6 +30,35 @@ notes.xml +
Ssh 4.15.3.9 + +
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 4.15.3.8
Fixed Bugs and Malfunctions diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index a4fbd973e400..513836c559da 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,4 +1,4 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 4.15.3.8 +SSH_VSN = 4.15.3.9 APP_VSN = "ssh-$(SSH_VSN)" diff --git a/make/otp_version_tickets b/make/otp_version_tickets index 7c837737be7d..6e4c211d820c 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,9 +1,6 @@ -OTP-19240 -OTP-19311 -OTP-19326 -OTP-19330 -OTP-19350 -OTP-19352 -OTP-19365 -OTP-19379 -OTP-19380 +OTP-19381 +OTP-19385 +OTP-19388 +OTP-19392 +OTP-19435 +OTP-19462 From 2915bea4768308995489fecfed2357dcb1574e6b Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 6 Feb 2025 17:26:54 +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 712c3c133514..f2111c5fce20 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -25.3.2.16 +25.3.2.17 diff --git a/otp_versions.table b/otp_versions.table index 305bda905e18..0c4d807ad037 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -1,3 +1,4 @@ +OTP-25.3.2.17 : common_test-1.24.0.6 erts-13.2.2.13 kernel-8.5.4.4 ssh-4.15.3.9 # asn1-5.0.21.1 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.2 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.5 jinterface-1.13.2 megaco-4.4.3 mnesia-4.21.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 public_key-1.13.3.5 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.7 stdlib-4.3.1.6 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.2 : OTP-25.3.2.16 : common_test-1.24.0.5 erts-13.2.2.12 inets-8.3.1.5 public_key-1.13.3.5 ssh-4.15.3.8 ssl-10.9.1.7 stdlib-4.3.1.6 # asn1-5.0.21.1 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.2 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 jinterface-1.13.2 kernel-8.5.4.3 megaco-4.4.3 mnesia-4.21.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.2 : OTP-25.3.2.15 : common_test-1.24.0.4 erts-13.2.2.11 inets-8.3.1.4 public_key-1.13.3.4 ssh-4.15.3.7 ssl-10.9.1.6 stdlib-4.3.1.5 # asn1-5.0.21.1 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.2 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 jinterface-1.13.2 kernel-8.5.4.3 megaco-4.4.3 mnesia-4.21.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.2 : OTP-25.3.2.14 : diameter-2.2.7.2 public_key-1.13.3.3 ssh-4.15.3.6 xmerl-1.3.31.2 # asn1-5.0.21.1 common_test-1.24.0.3 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 erts-13.2.2.10 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.3 jinterface-1.13.2 kernel-8.5.4.3 megaco-4.4.3 mnesia-4.21.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.5 stdlib-4.3.1.4 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 :