svn commit: r360151 - in releng: 11.3 11.3/sys/conf 12.1 12.1/sys/conf

[Gordon Tetlow]

Author: gordon
Date: Tue Apr 21 15:54:08 2020
New Revision: 360151
URL: https://svnweb.freebsd.org/changeset/base/360151

Log:
  Add UPDATING entries and bump version.
  
  Approved by:	so

Modified:
  releng/11.3/UPDATING
  releng/11.3/sys/conf/newvers.sh
  releng/12.1/UPDATING
  releng/12.1/sys/conf/newvers.sh

Modified: releng/11.3/UPDATING
==============================================================================
--- releng/11.3/UPDATING	Tue Apr 21 15:53:08 2020	(r360150)
+++ releng/11.3/UPDATING	Tue Apr 21 15:54:08 2020	(r360151)
@@ -16,6 +16,13 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+20200421	p8	FreeBSD-EN-20:07.quotad
+			FreeBSD-SA-20:10.ipfw
+
+        Fix regression in rpc.rquotad with certain NFS servers [EN-20:07.quotad]
+
+        Fix ipfw invalid mbuf handling [SA-20:10.ipfw]
+
 20200319	p7	FreeBSD-EN-20:04.pfctl
 			FreeBSD-EN-20:06.ipv6
 			FreeBSD-SA-20:04.tcp

Modified: releng/11.3/sys/conf/newvers.sh
==============================================================================
--- releng/11.3/sys/conf/newvers.sh	Tue Apr 21 15:53:08 2020	(r360150)
+++ releng/11.3/sys/conf/newvers.sh	Tue Apr 21 15:54:08 2020	(r360151)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.3"
-BRANCH="RELEASE-p7"
+BRANCH="RELEASE-p8"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/12.1/UPDATING
==============================================================================
--- releng/12.1/UPDATING	Tue Apr 21 15:53:08 2020	(r360150)
+++ releng/12.1/UPDATING	Tue Apr 21 15:54:08 2020	(r360151)
@@ -16,6 +16,16 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+20200421	p4	FreeBSD-EN-20:07.quotad
+			FreeBSD-SA-20:10.ipfw
+			FreeBSD-SA-20:11.openssl
+
+        Fix regression in rpc.rquotad with certain NFS servers [EN-20:07.quotad]
+
+        Fix ipfw invalid mbuf handling [SA-20:10.ipfw]
+
+        Fix OpenSSL remote denial of service vulnerability [SA-20:11.openssl]
+
 20200319	p3	FreeBSD-EN-20:03.sshd
 			FreeBSD-EN-20:05.mlx5en
 			FreeBSD-EN-20:06.ipv6

Modified: releng/12.1/sys/conf/newvers.sh
==============================================================================
--- releng/12.1/sys/conf/newvers.sh	Tue Apr 21 15:53:08 2020	(r360150)
+++ releng/12.1/sys/conf/newvers.sh	Tue Apr 21 15:54:08 2020	(r360151)
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.1"
-BRANCH="RELEASE-p3"
+BRANCH="RELEASE-p4"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi