Prepare release

weiss · Oct 4, 2021 · 4424887 · 4424887
1 parent 8b08f19
commit 4424887
Show file tree

Hide file tree

Showing 13 changed files with 136 additions and 16 deletions.
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
@@ -31,6 +31,25 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 12.1.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The python scripts that existed in
+	    erts/lib_src/yielding_c_fun/lib/tiny_regex_c/scripts had
+	    a license that was incompatible with Erlang/OTP's
+	    license. This ticket removes these scripts that were not
+	    used by us.</p>
+          <p>
+	    Own Id: OTP-17658</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 12.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

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

diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,28 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 5.0.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed minor memory leak at <c>crypto</c> module purge.</p>
+          <p>
+	    Own Id: OTP-17668 Aux Id: PR-5245 </p>
+        </item>
+        <item>
+          <p>
+	    Fix possible inconsistency in fips mode when linking with
+	    some cryptolibs.</p>
+          <p>
+	    Own Id: OTP-17672</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 5.0.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 5.0.3
+CRYPTO_VSN = 5.0.4
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,25 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 8.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> The undocumented DNS encode/decode module
+	    <c>inet_dns</c> has been cleaned up to handle the
+	    difference between "symbolic" and "raw" records in a more
+	    consistent manner. </p><p> PR-5145/OTP-17584 introduced a
+	    change that contributed to an already existing confusion,
+	    which this correction should remedy. </p>
+          <p>
+	    Own Id: OTP-17659 Aux Id: ERIERL-702 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 8.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
@@ -50,7 +50,8 @@
   {<<"^8\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.1$">>,[restart_new_emulator]},
-  {<<"^8\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+  {<<"^8\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^8\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
  [{<<"^6\\.4$">>,[restart_new_emulator]},
   {<<"^6\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^6\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -73,4 +74,5 @@
   {<<"^8\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.1$">>,[restart_new_emulator]},
-  {<<"^8\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+  {<<"^8\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^8\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 8.1.1
+KERNEL_VSN = 8.1.2
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
@@ -35,6 +35,24 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Public_Key 1.11.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Avoid re-encoding of decoded certificates. This could
+	    cause unexpected failures as some subtle encoding errors
+	    can be tolerated when decoding but hence creating another
+	    sequence of bytes if the decoded value is re-encoded.</p>
+          <p>
+	    Own Id: OTP-17657</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Public_Key 1.11.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.11.2
+PUBLIC_KEY_VSN = 1.11.3
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,46 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 10.5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Before that change, TLS downgrade could occasionally fail
+	    when data intended for downgraded socket were delivered
+	    together with CLOSE_NOTIFY alert to ssl app.</p>
+          <p>
+	    Own Id: OTP-17393</p>
+        </item>
+        <item>
+          <p>
+	    Avoid re-encoding of decoded certificates. This could
+	    cause unexpected failures as some subtle encoding errors
+	    can be tolerated when decoding but hence creating another
+	    sequence of bytes if the decoded value is re-encoded.</p>
+          <p>
+	    Own Id: OTP-17657</p>
+        </item>
+        <item>
+          <p>
+	    Fix possible process leak when the process doing
+	    ssl:transport_accept dies before initiating the TLS
+	    handshake.</p>
+          <p>
+	    Own Id: OTP-17666 Aux Id: GH-5239 </p>
+        </item>
+        <item>
+          <p>
+	    Fix dtls memory leak, the replay window code was broken.</p>
+          <p>
+	    Own Id: OTP-17670 Aux Id: GH-5224 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 10.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
@@ -84,6 +84,6 @@
     {applications, [crypto, public_key, kernel, stdlib]},
     {env, []},
     {mod, {ssl_app, []}},
-    {runtime_dependencies, ["stdlib-3.12","public_key-@OTP-17657@","kernel-8.0",
+    {runtime_dependencies, ["stdlib-3.12","public_key-1.11.3","kernel-8.0",
                             "erts-10.0","crypto-5.0", "inets-5.10.7",
                             "runtime_tools-1.15.1"]}]}.
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 10.5
+SSL_VSN = 10.5.1
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
@@ -1,8 +1,8 @@
-OTP-17640
-OTP-17641
-OTP-17642
-OTP-17646
-OTP-17647
-OTP-17649
-OTP-17651
-OTP-17665
+OTP-17393
+OTP-17657
+OTP-17658
+OTP-17659
+OTP-17666
+OTP-17668
+OTP-17670
+OTP-17672