summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2015-02-25 05:56:16 +0000
committerdelphij <delphij@FreeBSD.org>2015-02-25 05:56:16 +0000
commitb69ba8fe10a0df78165b9e34091ed7cadb989de2 (patch)
tree0d1cd5f4c2b24bd9f8b8387ba6ad41aeb8b5d8e4 /sys/conf
parent02d2873b419d69120c7ee1b98d152a5c0931f043 (diff)
downloadFreeBSD-src-b69ba8fe10a0df78165b9e34091ed7cadb989de2.zip
FreeBSD-src-b69ba8fe10a0df78165b9e34091ed7cadb989de2.tar.gz
Fix integer overflow in IGMP protocol. [SA-15:04]
Fix vt(4) crash with improper ioctl parameters. [EN-15:01] Updated base system OpenSSL to 1.0.1l. [EN-15:02] Fix freebsd-update libraries update ordering issue. [EN-15:03] Approved by: so
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/newvers.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index fc9d5f7..63cadaa 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.1"
-BRANCH="RELEASE-p5"
+BRANCH="RELEASE-p6"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud