From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sun, 13 Feb 2011 17:54:10 +0000 (+0000)
Subject: - add generic tempfile()
X-Git-Tag: auto/th/rpm-build-tools-4_5-1~23
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=390d081dd5565adf10d8aafd2b0bf87528c3a69d;p=packages%2Frpm-build-tools.git

- add generic tempfile()

Changed files:
    builder.sh -> 1.645
---

diff --git a/builder.sh b/builder.sh
index 2e004f8..134c650 100644
--- a/builder.sh
+++ b/builder.sh
@@ -231,7 +231,7 @@ POLDEK_INDEX_DIR="$($RPM --eval %_rpmdir)/"
 POLDEK_CMD="$SU_SUDO /usr/bin/poldek --noask"
 
 run_poldek() {
-	RES_FILE=$(mktemp -t builder.XXXXXX || ${TMPDIR:-/tmp}/builder.$RANDOM)
+	RES_FILE=$(tempfile)
 	if [ -n "$LOGFILE" ]; then
 		LOG=`eval echo $LOGFILE`
 		if [ -n "$LASTLOG_FILE" ]; then
@@ -394,6 +394,11 @@ Usage: builder [-D|--debug] [-V|--version] [--short-version] [--as_anon] [-a|--a
 "
 }
 
+# create tempfile. as secure as possible
+tempfile() {
+	mktemp -t builder.XXXXXX || ${TMPDIR:-/tmp}/builder.$RANDOM.$$
+}
+
 # change dependency to specname
 # common changes:
 # - perl(Package::Name) -> perl-Package-Name
@@ -1555,7 +1560,7 @@ build_package() {
 		if [ -n "$LASTLOG_FILE" ]; then
 			echo "LASTLOG=$LOG" > $LASTLOG_FILE
 		fi
-		RES_FILE=$(mktemp -t builder.XXXXXX || ${TMPDIR:-/tmp}/builder.$RANDOM)
+		RES_FILE=$(tempfile)
 
 		(time eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
 		RETVAL=`cat $RES_FILE`