aboutsummaryrefslogtreecommitdiffstats
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
commitc8e77e814f94c0f18937ca53800cb63bdfa9db77 (patch)
tree61fce9b52722626542a2e3d3cfd5e81d28db2970
parent2c8aa4e4289474e5ff59930e6c37533f42a7b3ef (diff)
downloadsrc-c8e77e814f94c0f18937ca53800cb63bdfa9db77.tar.gz
src-c8e77e814f94c0f18937ca53800cb63bdfa9db77.zip
MFC: Correct insecure temporary file usage.
Security: FreeBSD-SA-05:20.cvsbug Approved by: so (cperciva)
Notes
Notes: svn path=/releng/4.11/; revision=149854
-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 426a61321afe..e743c931d7d3 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.
+20050907: p12 FreeBSD-SA-05:20.cvsbug
+ Correct insecure temporary file usage.
+
20050629: p11 FreeBSD-SA-05:14.bzip2, FreeBSD-SA-05:15.tcp
Correct bzip2 denial of service and permission race vulnerabilities.
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 e8b8bd3df020..2d0852476102 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="4.11"
-BRANCH="RELEASE-p11"
+BRANCH="RELEASE-p12"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"