From 38de450c39645f2e74cbe00da50148b8cb8b5883 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 6 Feb 2025 17:27:39 +0100 Subject: [PATCH 1/3] Update copyright year --- erts/emulator/beam/erl_bits.c | 2 +- erts/emulator/test/bs_construct_SUITE.erl | 2 +- lib/kernel/src/global.erl | 2 +- lib/public_key/src/pubkey_cert.erl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erts/emulator/beam/erl_bits.c b/erts/emulator/beam/erl_bits.c index 9fcbf7e9ac61..ff2dfa3bf9af 100644 --- 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 index 407cec461184..998466b70c62 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-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/kernel/src/global.erl b/lib/kernel/src/global.erl index 583d1f2e387d..0cf9249450d0 100644 --- a/lib/kernel/src/global.erl +++ b/lib/kernel/src/global.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/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl index 1fa06dd1d4ed..f29466ed7ca4 100644 --- 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. From fdbb6eb99f586d62e322771f3bef73ed5f139ddb Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 6 Feb 2025 17:27:41 +0100 Subject: [PATCH 2/3] Prepare release --- erts/doc/src/notes.xml | 15 +++++++++++++++ erts/vsn.mk | 2 +- lib/kernel/doc/src/notes.xml | 16 ++++++++++++++++ lib/kernel/vsn.mk | 2 +- lib/public_key/doc/src/notes.xml | 16 ++++++++++++++++ lib/public_key/vsn.mk | 2 +- make/otp_version_tickets | 12 +++--------- 7 files changed, 53 insertions(+), 12 deletions(-) diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 28f01366cc1c..bb4f401d8c28 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 14.2.5.7 + +
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 14.2.5.6
Fixed Bugs and Malfunctions diff --git a/erts/vsn.mk b/erts/vsn.mk index 90ce9be831ad..3fbd4eea3620 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 14.2.5.6 +VSN = 14.2.5.7 # Port number 4365 in 4.2 # Port number 4366 in 4.3 diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml index b372d3d0fab7..e683ef0c527e 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 9.2.4.6 + +
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 9.2.4.5
Fixed Bugs and Malfunctions diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk index b7792969b3e0..c282cd0754c8 100644 --- a/lib/kernel/vsn.mk +++ b/lib/kernel/vsn.mk @@ -1 +1 @@ -KERNEL_VSN = 9.2.4.5 +KERNEL_VSN = 9.2.4.6 diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml index 0c0f05b61540..f6da5294dc8e 100644 --- a/lib/public_key/doc/src/notes.xml +++ b/lib/public_key/doc/src/notes.xml @@ -35,6 +35,22 @@ notes.xml +
Public_Key 1.15.1.5 + +
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

+ + +
+ +
+
Public_Key 1.15.1.4
Fixed Bugs and Malfunctions diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk index 352250e4edee..156f6c8ccba3 100644 --- a/lib/public_key/vsn.mk +++ b/lib/public_key/vsn.mk @@ -1 +1 @@ -PUBLIC_KEY_VSN = 1.15.1.4 +PUBLIC_KEY_VSN = 1.15.1.5 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index e05a436c954f..528348007b14 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,9 +1,3 @@ -OTP-19385 -OTP-19388 -OTP-19392 -OTP-19407 -OTP-19411 -OTP-19418 -OTP-19435 -OTP-19439 -OTP-19445 +OTP-19240 +OTP-19381 +OTP-19462 From a7a875106c7af7f094b04a765e93dd90522ef7da Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 6 Feb 2025 17:27:42 +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 b88777cda41a..4c564bb537fa 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -26.2.5.7 +26.2.5.8 diff --git a/otp_versions.table b/otp_versions.table index 8c70819931fb..e09ae37839d9 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -1,3 +1,4 @@ +OTP-26.2.5.8 : erts-14.2.5.7 kernel-9.2.4.6 public_key-1.15.1.5 # asn1-5.2.2 common_test-1.26.2.4 compiler-8.4.3.2 crypto-5.4.2.3 debugger-5.3.4 dialyzer-5.1.3.1 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 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 ssh-5.1.4.5 ssl-11.1.4.7 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.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 :