Prepare release

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 14.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Removed unnecessary PCRE source tar-ball.</p>
+          <p>
+	    Own Id: OTP-18902</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 14.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

erts/vsn.mk

@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 14.2
+VSN = 14.2.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3

lib/ssh/doc/src/notes.xml

@@ -30,6 +30,34 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 5.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    With this change (being response to CVE-2023-48795), ssh
+	    can negotiate "strict KEX" OpenSSH extension with peers
+	    supporting it; also '[email protected]'
+	    algorithm becomes a less preferred cipher.</p>
+          <p>
+	    If strict KEX availability cannot be ensured on both
+	    connection sides, affected encryption modes(CHACHA and
+	    CBC) can be disabled with standard ssh configuration.
+	    This will provide protection against vulnerability, but
+	    at a cost of affecting interoperability. See <seeguide
+	    marker="configure_algos">Configuring algorithms in
+	    SSH</seeguide>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-18897</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 5.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

lib/ssh/vsn.mk

@@ -1,4 +1,4 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 5.1
+SSH_VSN = 5.1.1
 APP_VSN    = "ssh-$(SSH_VSN)"

make/otp_version_tickets

@@ -1,76 +1,3 @@
-OTP-16607
-OTP-17844
-OTP-18728
-OTP-18730
-OTP-18735
-OTP-18739
-OTP-18749
-OTP-18751
-OTP-18760
-OTP-18762
-OTP-18764
-OTP-18765
-OTP-18767
-OTP-18769
-OTP-18771
-OTP-18772
-OTP-18775
-OTP-18776
-OTP-18777
-OTP-18782
-OTP-18798
-OTP-18799
-OTP-18800
-OTP-18802
-OTP-18810
-OTP-18811
-OTP-18812
-OTP-18814
-OTP-18815
-OTP-18817
-OTP-18818
-OTP-18821
-OTP-18822
-OTP-18823
-OTP-18824
-OTP-18826
-OTP-18827
-OTP-18828
-OTP-18829
-OTP-18830
-OTP-18832
-OTP-18833
-OTP-18836
-OTP-18838
-OTP-18839
-OTP-18840
-OTP-18841
-OTP-18842
-OTP-18843
-OTP-18844
-OTP-18850
-OTP-18853
-OTP-18854
-OTP-18855
-OTP-18857
-OTP-18858
-OTP-18861
-OTP-18866
-OTP-18867
-OTP-18868
-OTP-18869
-OTP-18871
-OTP-18872
-OTP-18873
-OTP-18877
-OTP-18880
-OTP-18882
-OTP-18883
-OTP-18885
-OTP-18886
-OTP-18888
-OTP-18891
-OTP-18893
-OTP-18895
-OTP-18896
-OTP-18899
+OTP-18897
+OTP-18902
+OTP-18903