summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2015-03-19 17:41:17 +0000
committerXin LI <delphij@FreeBSD.org>2015-03-19 17:41:17 +0000
commit4983bacf2c52ad308250f40455c766eaeacfc119 (patch)
tree7d83a4bfb765a4f9192d9b8bb0b23cf76b6b8bdb
parent99fd9fc5a1e6c148f0fb1ab97d695afaab18b6e8 (diff)
downloadsrc-test2-4983bacf2c52ad308250f40455c766eaeacfc119.tar.gz
src-test2-4983bacf2c52ad308250f40455c766eaeacfc119.zip
Notes
-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 df3f0e80cbd4..016e339dac70 100644
--- a/UPDATING
+++ b/UPDATING
@@ -15,6 +15,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW ON IA64 OR SUN4V:
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
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index be089d174c8e..f00cdba38d9c 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -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