Merge branch 'maint-22' into maint

* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
weiss · Oct 22, 2019 · b61de40 · b61de40
2 parents 2c882ec + 6611181
commit b61de40
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 4 deletions.
diff --git a/OTP_VERSION b/OTP_VERSION
@@ -1 +1 @@
-22.1.3
+22.1.4
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
@@ -31,6 +31,21 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 10.5.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Erlang/OTP can now be built on macOS Catalina (10.15).</p>
+          <p>
+	    Own Id: OTP-16177 Aux Id: ERL-1063 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 10.5.2</title>
 
     <section><title>Improvements and New Features</title>

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

diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
@@ -32,6 +32,22 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 7.4.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a bug where the compiler could generate
+	    incorrect code for a '<c>receive</c>' statement inside a
+	    '<c>try</c>'.</p>
+          <p>
+	    Own Id: OTP-16199</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 7.4.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 7.4.6
+COMPILER_VSN = 7.4.7
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,25 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 4.6.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    FIxed a bug if the erlang emulator was linked with a very
+	    old cryptolib version (1.0.1 or earlier).</p>
+          <p>
+	    The bug now fixed could have triggered a core dump if an
+	    unknown cipher name was used in crypto functions.</p>
+          <p>
+	    Own Id: OTP-16202</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 4.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 4.6
+CRYPTO_VSN = 4.6.1
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
@@ -0,0 +1,3 @@
+OTP-16177
+OTP-16199
+OTP-16202
diff --git a/otp_versions.table b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-22.1.4 : compiler-7.4.7 crypto-4.6.1 erts-10.5.3 # asn1-5.0.9 common_test-1.18 debugger-4.2.7 dialyzer-4.1 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.10 erl_interface-3.13 et-1.6.4 eunit-2.3.8 ftp-1.0.3 hipe-3.19.1 inets-7.1.1 jinterface-1.10.1 kernel-6.5 megaco-3.18.6 mnesia-4.16.1 observer-2.9.2 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 snmp-5.4.1 ssh-4.8 ssl-9.4 stdlib-3.10 syntax_tools-2.2.1 tftp-1.0.1 tools-3.2.1 wx-1.8.9 xmerl-1.3.22 :
 OTP-22.1.3 : inets-7.1.1 # asn1-5.0.9 common_test-1.18 compiler-7.4.6 crypto-4.6 debugger-4.2.7 dialyzer-4.1 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.10 erl_interface-3.13 erts-10.5.2 et-1.6.4 eunit-2.3.8 ftp-1.0.3 hipe-3.19.1 jinterface-1.10.1 kernel-6.5 megaco-3.18.6 mnesia-4.16.1 observer-2.9.2 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 snmp-5.4.1 ssh-4.8 ssl-9.4 stdlib-3.10 syntax_tools-2.2.1 tftp-1.0.1 tools-3.2.1 wx-1.8.9 xmerl-1.3.22 :
 OTP-22.1.2 : erts-10.5.2 # asn1-5.0.9 common_test-1.18 compiler-7.4.6 crypto-4.6 debugger-4.2.7 dialyzer-4.1 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.10 erl_interface-3.13 et-1.6.4 eunit-2.3.8 ftp-1.0.3 hipe-3.19.1 inets-7.1 jinterface-1.10.1 kernel-6.5 megaco-3.18.6 mnesia-4.16.1 observer-2.9.2 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 snmp-5.4.1 ssh-4.8 ssl-9.4 stdlib-3.10 syntax_tools-2.2.1 tftp-1.0.1 tools-3.2.1 wx-1.8.9 xmerl-1.3.22 :
 OTP-22.1.1 : compiler-7.4.6 erts-10.5.1 snmp-5.4.1 # asn1-5.0.9 common_test-1.18 crypto-4.6 debugger-4.2.7 dialyzer-4.1 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.10 erl_interface-3.13 et-1.6.4 eunit-2.3.8 ftp-1.0.3 hipe-3.19.1 inets-7.1 jinterface-1.10.1 kernel-6.5 megaco-3.18.6 mnesia-4.16.1 observer-2.9.2 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 ssh-4.8 ssl-9.4 stdlib-3.10 syntax_tools-2.2.1 tftp-1.0.1 tools-3.2.1 wx-1.8.9 xmerl-1.3.22 :