summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2005-09-07 13:44:36 +0000
committerColin Percival <cperciva@FreeBSD.org>2005-09-07 13:44:36 +0000
commit8ad39d2c89dfd0a394b33f3ed64366496bb70d1e (patch)
tree3e92b25e7d7ae6c29fe9a26706a1cbbc1a209783
parentbd990f48961543df4739ea3a212caf75ba16276d (diff)
downloadsrc-test2-8ad39d2c89dfd0a394b33f3ed64366496bb70d1e.tar.gz
src-test2-8ad39d2c89dfd0a394b33f3ed64366496bb70d1e.zip
Notes
-rw-r--r--UPDATING3
-rwxr-xr-xcontrib/cvs/src/cvsbug.in2
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 4 insertions, 3 deletions
diff --git a/UPDATING b/UPDATING
index 03ec85cea461..5294f1d831a9 100644
--- a/UPDATING
+++ b/UPDATING
@@ -8,6 +8,9 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running
portupgrade. Important recent entries: 20040724 (default X changes).
+20050907: p21 FreeBSD-SA-05:20.cvsbug
+ Correct insecure temporary file usage.
+
20050727: p20 FreeBSD-SA-05:18.zlib, FreeBSD-SA-05:19.ipsec
Correct buffer overflow when handling certain deflated data
streams.
diff --git a/contrib/cvs/src/cvsbug.in b/contrib/cvs/src/cvsbug.in
index efc156d35fcf..07de1512249e 100755
--- a/contrib/cvs/src/cvsbug.in
+++ b/contrib/cvs/src/cvsbug.in
@@ -109,14 +109,12 @@ elif [ -f /bin/domainname ]; then
/usr/bin/ypcat passwd 2>/dev/null | cat - /etc/passwd | grep "^$LOGNAME:" |
cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
ORIGINATOR="`cat $TEMP`"
- rm -f $TEMP
fi
fi
if [ "$ORIGINATOR" = "" ]; then
grep "^$LOGNAME:" /etc/passwd | cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
ORIGINATOR="`cat $TEMP`"
- rm -f $TEMP
fi
if [ -n "$ORGANIZATION" ]; then
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index bedcffe14861..90debeda12b7 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="5.3"
-BRANCH="RELEASE-p20"
+BRANCH="RELEASE-p21"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"