summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2015-03-19 17:41:17 +0000
committerdelphij <delphij@FreeBSD.org>2015-03-19 17:41:17 +0000
commit04d14a968bebe850087b4fa98001a562746fdded (patch)
treea40136f67873e515d2cd09720e583a21b5a03004
parentb69ba8fe10a0df78165b9e34091ed7cadb989de2 (diff)
downloadFreeBSD-src-04d14a968bebe850087b4fa98001a562746fdded.zip
FreeBSD-src-04d14a968bebe850087b4fa98001a562746fdded.tar.gz
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
-rw-r--r--UPDATING3
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 4 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index 7dcc5e5..f20dbc7 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 63cadaa..d4b4eac 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
OpenPOWER on IntegriCloud