Merge branch 'maint' into master

* maint: Updated OTP version Prepare release
erlang · Sep 30, 2024 · 6e1b3d8 · 6e1b3d8
2 parents a71684e + 2624596
commit 6e1b3d8
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 7 deletions.
diff --git a/erts/doc/notes.md b/erts/doc/notes.md
@@ -21,6 +21,21 @@ limitations under the License.
 
 This document describes the changes made to the ERTS application.
 
+## Erts 15.1.1
+
+### Fixed Bugs and Malfunctions
+
+- On Windows, successive failed socket calls caused socket to become "uninitialized".
+
+  Own Id: OTP-19251 Aux Id: [#8853]
+
+- The socket framework fails to start on a IPv6-only Windows machine.
+
+  Own Id: OTP-19254 Aux Id: [#8848]
+
+[#8853]: https://github.com/erlang/otp/issues/8853
+[#8848]: https://github.com/erlang/otp/issues/8848
+
 ## Erts 15.1
 
 ### Fixed Bugs and Malfunctions

diff --git a/erts/vsn.mk b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 15.1
+VSN = 15.1.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3

diff --git a/lib/common_test/doc/notes.md b/lib/common_test/doc/notes.md
@@ -19,6 +19,16 @@ limitations under the License.
 -->
 # Common Test Release Notes
 
+## Common_Test 1.27.2
+
+### Fixed Bugs and Malfunctions
+
+- With this change, HTML reports include jQuery version 3.7.1.
+
+  Own Id: OTP-19252 Aux Id: [PR-8858]
+
+[PR-8858]: https://github.com/erlang/otp/pull/8858
+
 ## Common_Test 1.27.1
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.27.1
+COMMON_TEST_VSN = 1.27.2
diff --git a/lib/public_key/doc/notes.md b/lib/public_key/doc/notes.md
@@ -19,6 +19,20 @@ limitations under the License.
 -->
 # Public_Key Release Notes
 
+## Public_Key 1.16.3
+
+### Fixed Bugs and Malfunctions
+
+- Introduction of verify_fun/4 unfortunately introduced an argument switch for some specific path validation errors so that verify_fun/3 could under these circumstances be called with a DER cert instead of a decod cert, also in this situation the verify_fun/4 would have the certificates in reverse order.
+
+  Own Id: OTP-19245 Aux Id: Gh-8832
+
+### Improvements and New Features
+
+- Do not hide crypto badarg reason, this error handling enhancement facilitates debugging. These kind of runtime errors are not documented and should never be relied on for matching, they are intended for catching input errors early.
+
+  Own Id: OTP-19238
+
 ## Public_Key 1.16.2
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.16.2
+PUBLIC_KEY_VSN = 1.16.3
diff --git a/lib/ssl/doc/notes.md b/lib/ssl/doc/notes.md
@@ -21,6 +21,20 @@ limitations under the License.
 
 This document describes the changes made to the SSL application.
 
+## SSL 11.2.3
+
+### Fixed Bugs and Malfunctions
+
+- Starting from TLS-1.3 some server handshake alerts might arrive after ssl:connection/2,3,4 has returned. If the socket is in active mode the controlling process will get the alert message, but passive sockets would only get {error, closed} on next call to ssl:recv/2,3 or ssl/setopts/2. Passive sockets calls will now return  {error,  error_alert()}  instead.
+
+  Own Id: OTP-19236 Aux Id: [PR-8261]
+
+- Servers configured to support only version (pre TLS-1.2) should ignore hello version extension, as it is an unknown extension to them, this will result in that new clients that do not support the old server version will get an insufficient security alert from the server and not a protocol version alert, this is consistent with how old servers not able to support higher protocol versions work.
+
+  Own Id: OTP-19257
+
+[PR-8261]: https://github.com/erlang/otp/pull/8261
+
 ## SSL 11.2.2
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 11.2.2
+SSL_VSN = 11.2.3
diff --git a/lib/stdlib/doc/notes.md b/lib/stdlib/doc/notes.md
@@ -21,6 +21,26 @@ limitations under the License.
 
 This document describes the changes made to the STDLIB application.
 
+## STDLIB 6.1.1
+
+### Fixed Bugs and Malfunctions
+
+- Remove whitespace stripping of returned binaries in `json:decode/3`.
+
+  Own Id: OTP-19227 Aux Id: ERIERL-1130, [PR-8809]
+
+- Fix `zip:unzip/2` to not crash when extracting zip files with garbage in the Zip64 extra header. This bug was introduced in Erlang 27.1 and has so far only been seen on some archives creates by MS Excel.
+
+  Own Id: OTP-19241 Aux Id: [PR-8836]
+
+- With this change, shutdown procedure handles a race condition between supervisor executing a shutdown and child process termination from other reason.
+
+  Own Id: OTP-19256 Aux Id: [PR-8780]
+
+[PR-8809]: https://github.com/erlang/otp/pull/8809
+[PR-8836]: https://github.com/erlang/otp/pull/8836
+[PR-8780]: https://github.com/erlang/otp/pull/8780
+
 ## STDLIB 6.1
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
@@ -53,7 +53,9 @@
   {<<"^5\\.2\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^6\\.0$">>,[restart_new_emulator]},
   {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
+  {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.1$">>,[restart_new_emulator]},
+  {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
  [{<<"^4\\.0$">>,[restart_new_emulator]},
   {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -79,4 +81,6 @@
   {<<"^5\\.2\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^6\\.0$">>,[restart_new_emulator]},
   {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+  {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.1$">>,[restart_new_emulator]},
+  {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 6.1
+STDLIB_VSN = 6.1.1
diff --git a/otp_versions.table b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-27.1.1 : common_test-1.27.2 erts-15.1.1 public_key-1.16.3 ssl-11.2.3 stdlib-6.1.1 # asn1-5.3.1 compiler-8.5.2 crypto-5.5.1 debugger-5.4 dialyzer-5.2.1 diameter-2.4.1 edoc-1.3.2 eldap-1.2.13 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 inets-9.3 jinterface-1.14.1 kernel-10.1 megaco-4.6 mnesia-4.23.2 observer-2.16 odbc-2.15 os_mon-2.10 parsetools-2.6 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 snmp-5.17 ssh-5.2.2 syntax_tools-3.2.1 tftp-1.2.1 tools-4.1 wx-2.4.3 xmerl-2.1 :
 OTP-27.1 : asn1-5.3.1 common_test-1.27.1 compiler-8.5.2 crypto-5.5.1 dialyzer-5.2.1 diameter-2.4.1 edoc-1.3.2 erts-15.1 ftp-1.2.3 inets-9.3 kernel-10.1 odbc-2.15 public_key-1.16.2 runtime_tools-2.1.1 snmp-5.17 ssh-5.2.2 ssl-11.2.2 stdlib-6.1 syntax_tools-3.2.1 tftp-1.2.1 tools-4.1 wx-2.4.3 xmerl-2.1 # debugger-5.4 eldap-1.2.13 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 jinterface-1.14.1 megaco-4.6 mnesia-4.23.2 observer-2.16 os_mon-2.10 parsetools-2.6 reltool-1.0.1 sasl-4.2.2 :
 OTP-27.0.1 : compiler-8.5.1 edoc-1.3.1 erts-15.0.1 kernel-10.0.1 public_key-1.16.1 ssh-5.2.1 ssl-11.2.1 stdlib-6.0.1 # asn1-5.3 common_test-1.27 crypto-5.5 debugger-5.4 dialyzer-5.2 diameter-2.4 eldap-1.2.13 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.2 inets-9.2 jinterface-1.14.1 megaco-4.6 mnesia-4.23.2 observer-2.16 odbc-2.14.3 os_mon-2.10 parsetools-2.6 reltool-1.0.1 runtime_tools-2.1 sasl-4.2.2 snmp-5.16 syntax_tools-3.2 tftp-1.2 tools-4.0 wx-2.4.2 xmerl-2.0 :
 OTP-27.0 : asn1-5.3 common_test-1.27 compiler-8.5 crypto-5.5 debugger-5.4 dialyzer-5.2 diameter-2.4 edoc-1.3 eldap-1.2.13 erl_interface-5.5.2 erts-15.0 et-1.7.1 eunit-2.9.1 ftp-1.2.2 inets-9.2 jinterface-1.14.1 kernel-10.0 megaco-4.6 mnesia-4.23.2 observer-2.16 odbc-2.14.3 os_mon-2.10 parsetools-2.6 public_key-1.16 reltool-1.0.1 runtime_tools-2.1 sasl-4.2.2 snmp-5.16 ssh-5.2 ssl-11.2 stdlib-6.0 syntax_tools-3.2 tftp-1.2 tools-4.0 wx-2.4.2 xmerl-2.0 # :