making invocations of mktemp portable (FreeBSD does not have a default value for...

diff --git a/packaging/freebsd/distinfo b/packaging/freebsd/distinfo
index 9a5c4902d62099cb1384497c60cd2625be7f55af..9716554aa96f3adaed4176b25fc242954392f49b 100644 (file)
--- a/packaging/freebsd/distinfo
+++ b/packaging/freebsd/distinfo
@@ -1,3 +1,3 @@
-MD5 (monkeysphere_0.16~pre.orig.tar.gz) = 3f996607a31f8e94a20982ae9424abe3
-SHA256 (monkeysphere_0.16~pre.orig.tar.gz) = a601f531ba48013e7ec09d27507c909243f908b1bac224653681bb0d2be03b72
-SIZE (monkeysphere_0.16~pre.orig.tar.gz) = 58130
+MD5 (monkeysphere_0.16~pre.orig.tar.gz) = cc02c34932b781bb2436f54d99fde2cc
+SHA256 (monkeysphere_0.16~pre.orig.tar.gz) = b54f66a2aed82864d22348800752e3881633af0aa4692beb367c88c8a4c4bc31
+SIZE (monkeysphere_0.16~pre.orig.tar.gz) = 58172

diff --git a/src/common b/src/common
index 556dd5ad6b5e88ddac1ce550ef2510b567a5125c..c8a7db65425523a59d84ec7aab094e384db96100 100644 (file)
--- a/src/common
+++ b/src/common
@@ -726,7 +726,7 @@ process_host_known_hosts() {
            if [ "$HASH_KNOWN_HOSTS" = 'true' ] ; then
                # FIXME: this is really hackish cause ssh-keygen won't
                # hash from stdin to stdout
-               tmpfile=$(mktemp)
+               tmpfile=$(mktemp ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
                ssh2known_hosts "$host" "$sshKey" > "$tmpfile"
                ssh-keygen -H -f "$tmpfile" 2> /dev/null
                cat "$tmpfile" >> "$KNOWN_HOSTS"

diff --git a/src/monkeysphere b/src/monkeysphere
index 512d608bf7d2f376f1fb36ff3ddbe2348af0864b..36b44dd4a457f78a6f39ea901150776c005ae2df 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -147,7 +147,7 @@ EOF
 )
 
     log verbose "generating subkey..."
-    fifoDir=$(mktemp -d)
+    fifoDir=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
     (umask 077 && mkfifo "$fifoDir/pass")
     echo "$editCommands" | gpg --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --edit-key "$keyID" &
 
@@ -210,7 +210,7 @@ You might want to run 'gpg --gen-key'."
 You might want to 'monkeysphere gen-subkey'"
     fi
 
-    workingdir=$(mktemp -d)
+    workingdir=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
     umask 077
     mkfifo "$workingdir/passphrase"
     keysuccess=1

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 4cda00841bf8f33992eee20df9fa2add41986112..e590f3cdd3469ab0104ce231ff054bed45542d20 100755 (executable)
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -120,7 +120,7 @@ show_server_key() {
 
     # dumping to a file named ' ' so that the ssh-keygen output
     # doesn't claim any potentially bogus hostname(s):
-    tmpkey=$(mktemp -d)
+    tmpkey=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
     gpg_authentication "--export $fingerprint" | openpgp2ssh "$fingerprint" 2>/dev/null > "$tmpkey/ "
     echo -n "ssh fingerprint: "
     (cd "$tmpkey" && ssh-keygen -l -f ' ' | awk '{ print $2 }')
@@ -188,7 +188,7 @@ update_users() {
        fi
 
         # make temporary directory
-        TMPDIR=$(mktemp -d)
+        TMPDIR=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
 
        # trap to delete temporary directory on exit
        trap "rm -rf $TMPDIR" EXIT

diff --git a/utils/build-releasenote b/utils/build-releasenote
index af7ceb38c5d5bd001bd0c5460358ed636f68a816..1b832a43cb33a71b7c3c987e47212a15bce5aca3 100755 (executable)
--- a/utils/build-releasenote
+++ b/utils/build-releasenote
@@ -25,7 +25,7 @@ checksums() {
 
 checksums
 
-temprelease=$(mktemp)
+temprelease=$(mktemp ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
 trap "rm -f $temprelease" EXIT
 set -e
 head -n$(( $(grep -n '^-----BEGIN PGP SIGNED MESSAGE-----$' website/download.mdwn | head -n1 | cut -f1 -d:) - 1 )) website/download.mdwn >$temprelease