svn commit: r280267 - in releng: 10.1 10.1/sys/conf 8.4 8.4/sys/conf 9.3 9.3/sys/conf

[Xin LI]

Author: delphij
Date: Thu Mar 19 17:41:17 2015
New Revision: 280267
URL: https://svnweb.freebsd.org/changeset/base/280267

Log:
  Fix multiple OpenSSL vulnerabilities.
  
  Security:	FreeBSD-SA-15:06.openssl
  Security:	CVE-2015-0209
  Security:	CVE-2015-0286
  Security:	CVE-2015-0287
  Security:	CVE-2015-0288
  Security:	CVE-2015-0289
  Security:	CVE-2015-0293
  Approved by:	so

Modified:
  releng/10.1/UPDATING
  releng/10.1/sys/conf/newvers.sh
  releng/8.4/UPDATING
  releng/8.4/sys/conf/newvers.sh
  releng/9.3/UPDATING
  releng/9.3/sys/conf/newvers.sh

Modified: releng/10.1/UPDATING
==============================================================================
--- releng/10.1/UPDATING	Thu Mar 19 17:40:43 2015	(r280266)
+++ releng/10.1/UPDATING	Thu Mar 19 17:41:17 2015	(r280267)
@@ -16,6 +16,9 @@ from older versions of FreeBSD, try WITH
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20150319:	p7	FreeBSD-SA-15:06.openssl
+	Fix multiple vulnerabilities in OpenSSL.  [SA-15:06]
+
 20150225:	p6	FreeBSD-SA-15:04.igmp
 			FreeBSD-EN-15:01.vt
 			FreeBSD-EN-15:02.openssl

Modified: releng/10.1/sys/conf/newvers.sh
==============================================================================
--- releng/10.1/sys/conf/newvers.sh	Thu Mar 19 17:40:43 2015	(r280266)
+++ releng/10.1/sys/conf/newvers.sh	Thu Mar 19 17:41:17 2015	(r280267)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.1"
-BRANCH="RELEASE-p6"
+BRANCH="RELEASE-p7"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/8.4/UPDATING
==============================================================================
--- releng/8.4/UPDATING	Thu Mar 19 17:40:43 2015	(r280266)
+++ releng/8.4/UPDATING	Thu Mar 19 17:41:17 2015	(r280267)
@@ -15,6 +15,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	debugging tools present in HEAD were left in place because
 	sun4v support still needs work to become production ready.
 
+20150319:	p25	FreeBSD-SA-15:06.openssl
+	Fix multiple vulnerabilities in OpenSSL.  [SA-15:06]
+
 20150225:	p24	FreeBSD-SA-15:04.igmp
 			FreeBSD-SA-15:05.bind
 			FreeBSD-EN-15:01.vt

Modified: releng/8.4/sys/conf/newvers.sh
==============================================================================
--- releng/8.4/sys/conf/newvers.sh	Thu Mar 19 17:40:43 2015	(r280266)
+++ releng/8.4/sys/conf/newvers.sh	Thu Mar 19 17:41:17 2015	(r280267)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="8.4"
-BRANCH="RELEASE-p24"
+BRANCH="RELEASE-p25"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/9.3/UPDATING
==============================================================================
--- releng/9.3/UPDATING	Thu Mar 19 17:40:43 2015	(r280266)
+++ releng/9.3/UPDATING	Thu Mar 19 17:41:17 2015	(r280267)
@@ -11,6 +11,9 @@ handbook:
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running portupgrade.
 
+20150319:	p11	FreeBSD-SA-15:06.openssl
+	Fix multiple vulnerabilities in OpenSSL.  [SA-15:06]
+
 20150225:	p10	FreeBSD-SA-15:04.igmp
 			FreeBSD-SA-15:05.bind
 			FreeBSD-EN-15:01.vt

Modified: releng/9.3/sys/conf/newvers.sh
==============================================================================
--- releng/9.3/sys/conf/newvers.sh	Thu Mar 19 17:40:43 2015	(r280266)
+++ releng/9.3/sys/conf/newvers.sh	Thu Mar 19 17:41:17 2015	(r280267)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="9.3"
-BRANCH="RELEASE-p10"
+BRANCH="RELEASE-p11"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi