From 900242e6538b064d95bcc9b7147605eb3ab72e96 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Wed, 18 Sep 2024 08:52:11 +0200 Subject: [PATCH 1/3] Update copyright year --- lib/diameter/src/base/diameter_internal.hrl | 2 +- lib/diameter/src/base/diameter_lib.erl | 2 +- lib/diameter/test/Makefile | 2 +- lib/diameter/test/diameter_config_SUITE.erl | 2 +- lib/diameter/test/diameter_event_SUITE.erl | 2 +- lib/public_key/src/public_key.erl | 2 +- lib/public_key/test/public_key_SUITE.erl | 2 +- lib/ssh/src/ssh_acceptor.erl | 2 +- lib/ssh/src/ssh_connection_handler.erl | 2 +- lib/xmerl/src/xmerl.erl | 2 +- lib/xmerl/src/xmerl_html.erl | 2 +- lib/xmerl/src/xmerl_lib.erl | 2 +- lib/xmerl/src/xmerl_otpsgml.erl | 2 +- lib/xmerl/src/xmerl_sgml.erl | 2 +- lib/xmerl/src/xmerl_text.erl | 2 +- lib/xmerl/src/xmerl_xml.erl | 2 +- lib/xmerl/test/xmerl_SUITE.erl | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/diameter/src/base/diameter_internal.hrl b/lib/diameter/src/base/diameter_internal.hrl index 0ac626696a31..3f4c958c7b03 100644 --- a/lib/diameter/src/base/diameter_internal.hrl +++ b/lib/diameter/src/base/diameter_internal.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2018. All Rights Reserved. +%% Copyright Ericsson AB 2010-2024. 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/diameter/src/base/diameter_lib.erl b/lib/diameter/src/base/diameter_lib.erl index 6dfdcc334afc..623877310803 100644 --- a/lib/diameter/src/base/diameter_lib.erl +++ b/lib/diameter/src/base/diameter_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2018. All Rights Reserved. +%% Copyright Ericsson AB 2010-2024. 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/diameter/test/Makefile b/lib/diameter/test/Makefile index e124ae7a6a5f..7e78730bf8ed 100644 --- a/lib/diameter/test/Makefile +++ b/lib/diameter/test/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2010-2022. All Rights Reserved. +# Copyright Ericsson AB 2010-2024. 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/diameter/test/diameter_config_SUITE.erl b/lib/diameter/test/diameter_config_SUITE.erl index 86c98d038194..ff2c64fc65b9 100644 --- a/lib/diameter/test/diameter_config_SUITE.erl +++ b/lib/diameter/test/diameter_config_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2013-2022. All Rights Reserved. +%% Copyright Ericsson AB 2013-2024. 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/diameter/test/diameter_event_SUITE.erl b/lib/diameter/test/diameter_event_SUITE.erl index 2a391311da7e..c28da58d2f93 100644 --- a/lib/diameter/test/diameter_event_SUITE.erl +++ b/lib/diameter/test/diameter_event_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2013-2022. All Rights Reserved. +%% Copyright Ericsson AB 2013-2024. 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/public_key.erl b/lib/public_key/src/public_key.erl index 94f1bad405fe..8f2a33a0b2c0 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2023. All Rights Reserved. +%% Copyright Ericsson AB 2008-2024. 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/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl index d1f2cc1da368..ee3c6177c8b3 100644 --- a/lib/public_key/test/public_key_SUITE.erl +++ b/lib/public_key/test/public_key_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2023. All Rights Reserved. +%% Copyright Ericsson AB 2008-2024. 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_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl index 33aecfff12b0..ff0f0dfe5abc 100644 --- a/lib/ssh/src/ssh_acceptor.erl +++ b/lib/ssh/src/ssh_acceptor.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2021. All Rights Reserved. +%% Copyright Ericsson AB 2008-2024. 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_handler.erl b/lib/ssh/src/ssh_connection_handler.erl index 0e7e8884e2a2..91a5e2b20e79 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2023. All Rights Reserved. +%% Copyright Ericsson AB 2008-2024. 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/xmerl/src/xmerl.erl b/lib/xmerl/src/xmerl.erl index 216859b28b3f..9f258e3dbabf 100644 --- a/lib/xmerl/src/xmerl.erl +++ b/lib/xmerl/src/xmerl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2016. All Rights Reserved. +%% Copyright Ericsson AB 2003-2024. 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/xmerl/src/xmerl_html.erl b/lib/xmerl/src/xmerl_html.erl index 807c6afb2807..e89081bfbe56 100644 --- a/lib/xmerl/src/xmerl_html.erl +++ b/lib/xmerl/src/xmerl_html.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2016. All Rights Reserved. +%% Copyright Ericsson AB 2003-2024. 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/xmerl/src/xmerl_lib.erl b/lib/xmerl/src/xmerl_lib.erl index c8ebc292a9e0..5c0527596012 100644 --- a/lib/xmerl/src/xmerl_lib.erl +++ b/lib/xmerl/src/xmerl_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2016. All Rights Reserved. +%% Copyright Ericsson AB 2003-2024. 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/xmerl/src/xmerl_otpsgml.erl b/lib/xmerl/src/xmerl_otpsgml.erl index 763671381180..1672e61f2a13 100644 --- a/lib/xmerl/src/xmerl_otpsgml.erl +++ b/lib/xmerl/src/xmerl_otpsgml.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2016. All Rights Reserved. +%% Copyright Ericsson AB 2004-2024. 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/xmerl/src/xmerl_sgml.erl b/lib/xmerl/src/xmerl_sgml.erl index 0dcd23784727..6c98cce5a725 100644 --- a/lib/xmerl/src/xmerl_sgml.erl +++ b/lib/xmerl/src/xmerl_sgml.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2016. All Rights Reserved. +%% Copyright Ericsson AB 2004-2024. 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/xmerl/src/xmerl_text.erl b/lib/xmerl/src/xmerl_text.erl index 74eedcaf7186..eb90b1a35880 100644 --- a/lib/xmerl/src/xmerl_text.erl +++ b/lib/xmerl/src/xmerl_text.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2016. All Rights Reserved. +%% Copyright Ericsson AB 2003-2024. 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/xmerl/src/xmerl_xml.erl b/lib/xmerl/src/xmerl_xml.erl index 78c73c17cb42..fe6b6abe0ea2 100644 --- a/lib/xmerl/src/xmerl_xml.erl +++ b/lib/xmerl/src/xmerl_xml.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2016. All Rights Reserved. +%% Copyright Ericsson AB 2003-2024. 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/xmerl/test/xmerl_SUITE.erl b/lib/xmerl/test/xmerl_SUITE.erl index 25e803697734..9b37a58e205c 100644 --- a/lib/xmerl/test/xmerl_SUITE.erl +++ b/lib/xmerl/test/xmerl_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2023. All Rights Reserved. +%% Copyright Ericsson AB 2008-2024. 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 62a32f91d2aa406561ea462cbd4fdae5d9c73984 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Wed, 18 Sep 2024 08:52:12 +0200 Subject: [PATCH 2/3] Prepare release --- lib/diameter/doc/src/notes.xml | 15 +++++++++++++++ lib/diameter/vsn.mk | 2 +- lib/public_key/doc/src/notes.xml | 17 +++++++++++++++++ lib/public_key/vsn.mk | 2 +- lib/ssh/doc/src/notes.xml | 25 +++++++++++++++++++++++++ lib/ssh/vsn.mk | 2 +- lib/xmerl/doc/src/notes.xml | 18 ++++++++++++++++++ lib/xmerl/vsn.mk | 2 +- make/otp_version_tickets | 11 +++++------ 9 files changed, 84 insertions(+), 10 deletions(-) diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml index 8bf041cec510..a09961643025 100644 --- a/lib/diameter/doc/src/notes.xml +++ b/lib/diameter/doc/src/notes.xml @@ -43,6 +43,21 @@ first.

+
diameter 2.2.7.2 + +
Fixed Bugs and Malfunctions + + +

+ `diameter:stop_service/1` has been made more synchronous.

+

+ Own Id: OTP-19206 Aux Id: ERIERL-1102

+ + +
+ +
+
diameter 2.2.7.1
Fixed Bugs and Malfunctions diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk index f157297ae60a..8266b6d92b04 100644 --- a/lib/diameter/vsn.mk +++ b/lib/diameter/vsn.mk @@ -17,5 +17,5 @@ # %CopyrightEnd% APPLICATION = diameter -DIAMETER_VSN = 2.2.7.1 +DIAMETER_VSN = 2.2.7.2 APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN) diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml index d1e956b55b62..a70d94171751 100644 --- a/lib/public_key/doc/src/notes.xml +++ b/lib/public_key/doc/src/notes.xml @@ -35,6 +35,23 @@ notes.xml +
Public_Key 1.13.3.3 + +
Fixed Bugs and Malfunctions + + +

+ For completeness handle rsa_pss implicit default value, + although this will probably not be commonly used as it + provides very weak security.

+

+ Own Id: OTP-19179

+ + +
+ +
+
Public_Key 1.13.3.2
Fixed Bugs and Malfunctions diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk index 1abec179b541..93c72b544a73 100644 --- a/lib/public_key/vsn.mk +++ b/lib/public_key/vsn.mk @@ -1 +1 @@ -PUBLIC_KEY_VSN = 1.13.3.2 +PUBLIC_KEY_VSN = 1.13.3.3 diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index 12506657d7f8..8029f947abf8 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -30,6 +30,31 @@ notes.xml +
Ssh 4.15.3.6 + +
Fixed Bugs and Malfunctions + + +

+ The SSh daemon started with a TCP port number argument + will now re-try obtaining a listen socket before + returning an error to the user.

+

+ Own Id: OTP-19170 Aux Id: GH-7746

+ + +

+ Robustness has been improved by monitoring the connection + handler process before casting the socket control + notification.

+

+ Own Id: OTP-19173 Aux Id: PR-8310

+ + +
+ +
+
Ssh 4.15.3.5
Fixed Bugs and Malfunctions diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index dce44fdffe45..d53ea8f85494 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.5 +SSH_VSN = 4.15.3.6 APP_VSN = "ssh-$(SSH_VSN)" diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml index a3942bbe59bc..695fcf376115 100644 --- a/lib/xmerl/doc/src/notes.xml +++ b/lib/xmerl/doc/src/notes.xml @@ -32,6 +32,24 @@

This document describes the changes made to the Xmerl application.

+
Xmerl 1.3.31.2 + +
Fixed Bugs and Malfunctions + + +

+ Corrected export functions from internal structure to XML + so xmlText items of type cdata are handled correctly. + They were just exported as normal text instead of output + in a CDATA section.

+

+ Own Id: OTP-19217 Aux Id: ERIERL-1104

+ + +
+ +
+
Xmerl 1.3.31.1
Fixed Bugs and Malfunctions diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk index 3f780125a9a9..ecf3c56ef5c9 100644 --- a/lib/xmerl/vsn.mk +++ b/lib/xmerl/vsn.mk @@ -1 +1 @@ -XMERL_VSN = 1.3.31.1 +XMERL_VSN = 1.3.31.2 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index 213f0897e0d2..f63e92bed561 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,6 +1,5 @@ -OTP-19057 -OTP-19109 -OTP-19123 -OTP-19140 -OTP-19147 -OTP-19154 +OTP-19170 +OTP-19173 +OTP-19179 +OTP-19206 +OTP-19217 From 412febbe2eb15958f92dd6f908b14cfcd2ff2c16 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Wed, 18 Sep 2024 08:52:14 +0200 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 8c3229e1394a..3f029b83e239 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -25.3.2.13 +25.3.2.14 diff --git a/otp_versions.table b/otp_versions.table index a67e19f8b542..c5cb810b194b 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -1,3 +1,4 @@ +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 : OTP-25.3.2.13 : erts-13.2.2.10 ssh-4.15.3.5 ssl-10.9.1.5 # 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 diameter-2.2.7.1 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.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 public_key-1.13.3.2 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 stdlib-4.3.1.4 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.1 : OTP-25.3.2.12 : erts-13.2.2.9 mnesia-4.21.4.3 ssl-10.9.1.4 # 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 diameter-2.2.7.1 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.3 jinterface-1.13.2 kernel-8.5.4.3 megaco-4.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.2 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssh-4.15.3.4 stdlib-4.3.1.4 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.1 : OTP-25.3.2.11 : common_test-1.24.0.3 crypto-5.1.4.3 debugger-5.3.1.3 diameter-2.2.7.1 erts-13.2.2.8 inets-8.3.1.3 kernel-8.5.4.3 observer-2.14.0.1 os_mon-2.8.2.1 reltool-0.9.1.1 ssh-4.15.3.4 stdlib-4.3.1.4 # asn1-5.0.21.1 compiler-8.2.6.4 dialyzer-5.0.5 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 megaco-4.4.3 mnesia-4.21.4.2 odbc-2.14 parsetools-2.4.1 public_key-1.13.3.2 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.3 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.1 :