summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2014-11-04 23:34:46 +0000
committerdes <des@FreeBSD.org>2014-11-04 23:34:46 +0000
commit65e2173972f82c3087455a2c8df18092b087ccf6 (patch)
tree0dcd0d69a60e632fbfeb35906400a6d64c770624 /sys/conf
parent98a779ac259d7def4d241c69e6813ece3393a5ad (diff)
downloadFreeBSD-src-65e2173972f82c3087455a2c8df18092b087ccf6.zip
FreeBSD-src-65e2173972f82c3087455a2c8df18092b087ccf6.tar.gz
[SA-14:25] Fix kernel stack disclosure in setlogin(2) / getlogin(2).
[SA-14:26] Fix remote command execution in ftp(1). Approved by: re (gjb)
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 5485ad2..f3004e3 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.1"
-BRANCH="RC4"
+BRANCH="RC4-p1"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud