From ca12fdda2e6ca6ba7c5a927b9c99c66d1b4417af Mon Sep 17 00:00:00 2001
From: delphij <delphij@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 19 Mar 2015 17:41:17 +0000
Subject: [PATCH] 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


git-svn-id: svn://svn.freebsd.org/base/releng/10.1@280267 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 UPDATING            | 3 +++
 sys/conf/newvers.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index 7dcc5e50f..f20dbc71f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,9 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
 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
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 63cadaa3a..d4b4eac41 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -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
-- 
2.42.0