MFC: Correct insecure temporary file usage.

Security:	FreeBSD-SA-05:20.cvsbug
Approved by:	so (cperciva)

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}"