aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 e5aba6bf161f..0b3756641057 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,6 +17,9 @@ minimal number of processes, if possible, for that patch. For those
updates that don't have an advisory, or to be safe, you can do a full
build and install as described in the COMMON ITEMS section.
+20040519: p21 FreeBSD-SA-04:10.cvs
+ Correct a heap overflow in cvs's pserver protocol parser.
+
20040205: p20 FreeBSD-SA-04:02.shmat
Correct a reference counting bug in shmat(2).
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 499adff2f923..a3a0c78caf63 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="5.0"
-BRANCH="RELEASE-p20"
+BRANCH="RELEASE-p21"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"