Fixed location of tmp. files in dpkg-checkbuilddeps and sb2-check-pkg-mappings - Put temp.files to session's private tmp.directory; absolute pathnames must be used in the dpkg-checkbuilddeps wrapper, because it disables mappings.. - This patch also includes changes from Riku Voipio (use mktemp() instead of $$ in shell scripts, when creating temp.files)

2 files changed, 12 insertions, 10 deletions

diff --git a/utils/dpkg-checkbuilddeps b/utils/dpkg-checkbuilddeps
index eae2974..3d739ca 100755
--- a/utils/dpkg-checkbuilddeps
+++ b/utils/dpkg-checkbuilddeps
@@ -69,7 +69,7 @@ function check_host_pkg()
 			fi
 		fi
 
-		pkg_stat_tmp=/tmp/dpkg.$$.tmp
+		pkg_stat_tmp=`mktemp -p $SBOX_SESSION_DIR/tmp pkg-stat.XXXXXXXXXX`
 		# next check again if the package exists on the target,
 		# just to be able to give a better error message.
 		if dpkg-query -s --admindir=$TARGET_DPKG_ADMINDIR_ALL_PKGS \
@@ -184,6 +184,7 @@ function check_target_builddeps()
 {
 	ret=0
 	echo "SB2 Checking target build deps..."
+	missing_dep_file=`mktemp -p $SBOX_SESSION_DIR/tmp missing_deps.XXXXXXXXXX`
 
 	# call dpkg-checkbuilddeps with mapping disabled, because the
 	# version which is available in /usr/bin may not know about the
@@ -191,21 +192,21 @@ function check_target_builddeps()
 	# dpkg-checkbuilddeps' return status.
 	SBOX_DISABLE_MAPPING=1 /usr/bin/dpkg-checkbuilddeps \
 		--admindir=$TARGET_DPKG_ADMINDIR_USABLE_PKGS $args \
-		> /tmp/missing_deps.$$ 2>&1
+		> $missing_dep_file 2>&1
 	if [ $? == 0 ]
 	then
 		# real dpkg-checkbuilddeps says "all ok"
-		rm /tmp/missing_deps.$$
+		rm $missing_dep_file
 		return 0
 	fi
 
 	# else real dpkg-checkbuilddeps failed.
-	sed -e 's/^/     /' < /tmp/missing_deps.$$
+	sed -e 's/^/     /' < $missing_dep_file
 	missing_deps=$(egrep \
 		"^dpkg-checkbuilddeps: Unmet build dependencies:" \
-			/tmp/missing_deps.$$ | \
+			$missing_dep_file | \
 		sed 's/dpkg-checkbuilddeps: Unmet build dependencies: //')
-	rm /tmp/missing_deps.$$
+	rm $missing_dep_file
 
 	if [ -n "$missing_deps" ]; then
 		# failing target deps, and missing packages are listed
diff --git a/utils/sb2-check-pkg-mappings b/utils/sb2-check-pkg-mappings
index 9af701b..6ead0d9 100644
--- a/utils/sb2-check-pkg-mappings
+++ b/utils/sb2-check-pkg-mappings
@@ -88,17 +88,18 @@ do
 	pkgnum=`expr $pkgnum + 1`
 	echo "=========== $pkgnum. Checking $pkg ==========="
 
-	# get list of files intalled by this package (dpkg -L),
+	# get list of files installed by this package (dpkg -L),
 	# and feed it to sb2-show to be verified (-D causes directories
 	# to be ignored). Also ignore all files which are installed
 	# to these diretories listed in $SB2_CHECK_PKG_MAPPINGS_IGNORE_LIST.
-	dpkg -L $pkg >/tmp/sb2-pkg-chk.$tstamp.$$
+	sb2_pkg_chk=`mktemp /tmp/sb2-pkg-chk.XXXXXXXXXX`
+	dpkg -L $pkg >$sb2_pkg_chk
 	if [ $? != 0 ]
 	then
 		num_failed=`expr $num_failed + 1`
 		echo "	$pkg is not available"
 	else
-		sed < /tmp/sb2-pkg-chk.$tstamp.$$ \
+		sed < $sb2_pkg_chk\
 		    -e 's/diverted by .* to: //' \
 		    -e 's/package diverts others to: //' |
 		sb2-show -D verify-pathlist-mappings \
@@ -121,7 +122,7 @@ do
 			echo "	$pkg can not be used in this mode ($SBOX_MAPMODE)"
 		fi
 	fi
-	rm /tmp/sb2-pkg-chk.$tstamp.$$
+	rm $sb2_pkg_chk
 done
 
 echo "Checked $pkgnum packages: Ok=$num_ok, unusable=$num_failed"