Merge branch 'maint' into master

* maint:
  Updated OTP version
  Prepare release
  Update copyright year

Author: jhogberg

erts/doc/notes.md

@@ -23,6 +23,17 @@ limitations under the License.
 
 This document describes the changes made to the ERTS application.
 
+## Erts 17.0.5
+
+### Fixed Bugs and Malfunctions
+
+- Fixed a regression in the previous patch release that prevented epmd from binding to localhost.
+
+  Own Id: OTP-20275 Aux Id: [PR-11409], [GH-11402]
+
+[PR-11409]: https://github.com/erlang/otp/pull/11409
+[GH-11402]: https://github.com/erlang/otp/issues/11402
+
 ## Erts 17.0.4
 
 ### Fixed Bugs and Malfunctions

erts/vsn.mk

@@ -20,7 +20,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 17.0.4
+VSN = 17.0.5
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3

lib/ssh/doc/notes.md

@@ -21,6 +21,16 @@ limitations under the License.
 -->
 # SSH Release Notes
 
+## Ssh 6.0.4
+
+### Fixed Bugs and Malfunctions
+
+- The SSH client and server now reject incoming packets not aligned to the cipher block size as required by RFC 4253 §6. For CBC ciphers, a timing-safe "packet discard" mechanism (CVE-2008-5161 mitigation) ensures structural errors are indistinguishable from MAC failures before disconnecting. AEAD and encrypt-then-MAC modes disconnect immediately.
+
+  Own Id: OTP-20137 Aux Id: [PR-11110]
+
+[PR-11110]: https://github.com/erlang/otp/pull/11110
+
 ## Ssh 6.0.3
 
 ### Fixed Bugs and Malfunctions

lib/ssh/vsn.mk

@@ -1,6 +1,6 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 6.0.3
+SSH_VSN = 6.0.4
 APP_VSN    = "ssh-$(SSH_VSN)"
 
 # %CopyrightBegin%

otp_versions.table

@@ -1,3 +1,4 @@
+OTP-29.0.5 : erts-17.0.5 ssh-6.0.4 # asn1-5.5 common_test-1.31.1 compiler-10.0.3 crypto-5.9.2 debugger-7.0 dialyzer-6.0.2 diameter-2.7.2 edoc-1.5 eldap-1.3 erl_interface-5.8.1 et-1.8 eunit-2.11 ftp-1.2.6 inets-9.7.1 jinterface-1.16 kernel-11.0.3 megaco-4.9.1 mnesia-4.26.1 observer-2.19 odbc-2.17 os_mon-2.12 parsetools-2.8 public_key-1.21.4 reltool-1.1 runtime_tools-2.4 sasl-4.4 snmp-5.20.4 ssl-11.7.4 stdlib-8.0.3 syntax_tools-4.1 tftp-1.3 tools-4.2.1 wx-2.6 xmerl-2.2 :
 OTP-29.0.4 : compiler-10.0.3 crypto-5.9.2 diameter-2.7.2 erts-17.0.4 megaco-4.9.1 public_key-1.21.4 ssh-6.0.3 ssl-11.7.4 stdlib-8.0.3 # asn1-5.5 common_test-1.31.1 debugger-7.0 dialyzer-6.0.2 edoc-1.5 eldap-1.3 erl_interface-5.8.1 et-1.8 eunit-2.11 ftp-1.2.6 inets-9.7.1 jinterface-1.16 kernel-11.0.3 mnesia-4.26.1 observer-2.19 odbc-2.17 os_mon-2.12 parsetools-2.8 reltool-1.1 runtime_tools-2.4 sasl-4.4 snmp-5.20.4 syntax_tools-4.1 tftp-1.3 tools-4.2.1 wx-2.6 xmerl-2.2 :
 OTP-29.0.3 : common_test-1.31.1 compiler-10.0.2 crypto-5.9.1 dialyzer-6.0.2 erts-17.0.3 kernel-11.0.3 public_key-1.21.3 ssh-6.0.2 ssl-11.7.3 stdlib-8.0.2 # asn1-5.5 debugger-7.0 diameter-2.7.1 edoc-1.5 eldap-1.3 erl_interface-5.8.1 et-1.8 eunit-2.11 ftp-1.2.6 inets-9.7.1 jinterface-1.16 megaco-4.9 mnesia-4.26.1 observer-2.19 odbc-2.17 os_mon-2.12 parsetools-2.8 reltool-1.1 runtime_tools-2.4 sasl-4.4 snmp-5.20.4 syntax_tools-4.1 tftp-1.3 tools-4.2.1 wx-2.6 xmerl-2.2 :
 OTP-29.0.2 : dialyzer-6.0.1 diameter-2.7.1 erl_interface-5.8.1 erts-17.0.2 ftp-1.2.6 inets-9.7.1 kernel-11.0.2 mnesia-4.26.1 public_key-1.21.2 ssh-6.0.1 ssl-11.7.2 stdlib-8.0.1 tools-4.2.1 # asn1-5.5 common_test-1.31 compiler-10.0.1 crypto-5.9 debugger-7.0 edoc-1.5 eldap-1.3 et-1.8 eunit-2.11 jinterface-1.16 megaco-4.9 observer-2.19 odbc-2.17 os_mon-2.12 parsetools-2.8 reltool-1.1 runtime_tools-2.4 sasl-4.4 snmp-5.20.4 syntax_tools-4.1 tftp-1.3 wx-2.6 xmerl-2.2 :