Secure tempfile generation

Obtained from:		OpenBSD
No Response From:	Maintainer

36 files changed, 624 insertions, 0 deletions

diff --git a/devel/autoconf/files/patch-ad b/devel/autoconf/files/patch-ad
new file mode 100644
index 000000000000..f8a4d1ae6b0c
--- /dev/null
+++ b/devel/autoconf/files/patch-ad
@@ -0,0 +1,21 @@
+--- autoconf.sh.orig	Mon Nov 22 21:47:28 1999
++++ autoconf.sh	Mon Nov 22 21:49:50 1999
+@@ -45,7 +45,7 @@
+ esac
+ 
+ : ${TMPDIR=/tmp}
+-tmpout=${TMPDIR}/acout.$$
++tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
+ localdir=
+ show_version=no
+ 
+@@ -97,7 +97,8 @@
+ 
+ trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
+ 
+-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
++tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
++# Always set this, to avoid bogus errors from some rm's.
+ if test z$infile = z-; then
+   infile=$tmpin
+   cat > $infile
diff --git a/devel/autoconf/files/patch-ae b/devel/autoconf/files/patch-ae
new file mode 100644
index 000000000000..87e6102e3ba9
--- /dev/null
+++ b/devel/autoconf/files/patch-ae
@@ -0,0 +1,11 @@
+--- autoheader.sh.orig	Mon Nov 22 21:50:45 1999
++++ autoheader.sh	Mon Nov 22 21:52:02 1999
+@@ -194,7 +194,7 @@
+   # Some fgrep's have limits on the number of lines that can be in the
+   # pattern on the command line, so use a temporary file containing the
+   # pattern.
+-  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
++  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
+    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
+    cat > $fgrep_tmp <<EOF
+ $syms
diff --git a/devel/autoconf/files/patch-af b/devel/autoconf/files/patch-af
new file mode 100644
index 000000000000..d40bc0ee9e7a
--- /dev/null
+++ b/devel/autoconf/files/patch-af
@@ -0,0 +1,20 @@
+--- autoupdate.sh.orig	Mon Nov 22 21:52:26 1999
++++ autoupdate.sh	Mon Nov 22 21:54:30 1999
+@@ -26,7 +26,7 @@
+ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
+        [--version] [template-file]" 
+ 
+-sedtmp=/tmp/acups.$$
++sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
+ # For debugging.
+ #sedtmp=/tmp/acups
+ show_version=no
+@@ -66,7 +66,7 @@
+ 
+ : ${SIMPLE_BACKUP_SUFFIX='~'}
+ 
+-tmpout=acupo.$$
++tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
+ trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
+ case $# in
+   0) infile=configure.in; out="> $tmpout"
diff --git a/devel/autoconf213/files/patch-ad b/devel/autoconf213/files/patch-ad
new file mode 100644
index 000000000000..f8a4d1ae6b0c
--- /dev/null
+++ b/devel/autoconf213/files/patch-ad
@@ -0,0 +1,21 @@
+--- autoconf.sh.orig	Mon Nov 22 21:47:28 1999
++++ autoconf.sh	Mon Nov 22 21:49:50 1999
+@@ -45,7 +45,7 @@
+ esac
+ 
+ : ${TMPDIR=/tmp}
+-tmpout=${TMPDIR}/acout.$$
++tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
+ localdir=
+ show_version=no
+ 
+@@ -97,7 +97,8 @@
+ 
+ trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
+ 
+-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
++tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
++# Always set this, to avoid bogus errors from some rm's.
+ if test z$infile = z-; then
+   infile=$tmpin
+   cat > $infile
diff --git a/devel/autoconf213/files/patch-ae b/devel/autoconf213/files/patch-ae
new file mode 100644
index 000000000000..87e6102e3ba9
--- /dev/null
+++ b/devel/autoconf213/files/patch-ae
@@ -0,0 +1,11 @@
+--- autoheader.sh.orig	Mon Nov 22 21:50:45 1999
++++ autoheader.sh	Mon Nov 22 21:52:02 1999
+@@ -194,7 +194,7 @@
+   # Some fgrep's have limits on the number of lines that can be in the
+   # pattern on the command line, so use a temporary file containing the
+   # pattern.
+-  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
++  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
+    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
+    cat > $fgrep_tmp <<EOF
+ $syms
diff --git a/devel/autoconf213/files/patch-af b/devel/autoconf213/files/patch-af
new file mode 100644
index 000000000000..d40bc0ee9e7a
--- /dev/null
+++ b/devel/autoconf213/files/patch-af
@@ -0,0 +1,20 @@
+--- autoupdate.sh.orig	Mon Nov 22 21:52:26 1999
++++ autoupdate.sh	Mon Nov 22 21:54:30 1999
+@@ -26,7 +26,7 @@
+ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
+        [--version] [template-file]" 
+ 
+-sedtmp=/tmp/acups.$$
++sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
+ # For debugging.
+ #sedtmp=/tmp/acups
+ show_version=no
+@@ -66,7 +66,7 @@
+ 
+ : ${SIMPLE_BACKUP_SUFFIX='~'}
+ 
+-tmpout=acupo.$$
++tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
+ trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
+ case $# in
+   0) infile=configure.in; out="> $tmpout"
diff --git a/devel/autoconf253/files/patch-ad b/devel/autoconf253/files/patch-ad
new file mode 100644
index 000000000000..f8a4d1ae6b0c
--- /dev/null
+++ b/devel/autoconf253/files/patch-ad
@@ -0,0 +1,21 @@
+--- autoconf.sh.orig	Mon Nov 22 21:47:28 1999
++++ autoconf.sh	Mon Nov 22 21:49:50 1999
+@@ -45,7 +45,7 @@
+ esac
+ 
+ : ${TMPDIR=/tmp}
+-tmpout=${TMPDIR}/acout.$$
++tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
+ localdir=
+ show_version=no
+ 
+@@ -97,7 +97,8 @@
+ 
+ trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
+ 
+-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
++tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
++# Always set this, to avoid bogus errors from some rm's.
+ if test z$infile = z-; then
+   infile=$tmpin
+   cat > $infile
diff --git a/devel/autoconf253/files/patch-ae b/devel/autoconf253/files/patch-ae
new file mode 100644
index 000000000000..87e6102e3ba9
--- /dev/null
+++ b/devel/autoconf253/files/patch-ae
@@ -0,0 +1,11 @@
+--- autoheader.sh.orig	Mon Nov 22 21:50:45 1999
++++ autoheader.sh	Mon Nov 22 21:52:02 1999
+@@ -194,7 +194,7 @@
+   # Some fgrep's have limits on the number of lines that can be in the
+   # pattern on the command line, so use a temporary file containing the
+   # pattern.
+-  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
++  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
+    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
+    cat > $fgrep_tmp <<EOF
+ $syms
diff --git a/devel/autoconf253/files/patch-af b/devel/autoconf253/files/patch-af
new file mode 100644
index 000000000000..d40bc0ee9e7a
--- /dev/null
+++ b/devel/autoconf253/files/patch-af
@@ -0,0 +1,20 @@
+--- autoupdate.sh.orig	Mon Nov 22 21:52:26 1999
++++ autoupdate.sh	Mon Nov 22 21:54:30 1999
+@@ -26,7 +26,7 @@
+ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
+        [--version] [template-file]" 
+ 
+-sedtmp=/tmp/acups.$$
++sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
+ # For debugging.
+ #sedtmp=/tmp/acups
+ show_version=no
+@@ -66,7 +66,7 @@
+ 
+ : ${SIMPLE_BACKUP_SUFFIX='~'}
+ 
+-tmpout=acupo.$$
++tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
+ trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
+ case $# in
+   0) infile=configure.in; out="> $tmpout"
diff --git a/devel/autoconf254/files/patch-ad b/devel/autoconf254/files/patch-ad
new file mode 100644
index 000000000000..f8a4d1ae6b0c
--- /dev/null
+++ b/devel/autoconf254/files/patch-ad
@@ -0,0 +1,21 @@
+--- autoconf.sh.orig	Mon Nov 22 21:47:28 1999
++++ autoconf.sh	Mon Nov 22 21:49:50 1999
+@@ -45,7 +45,7 @@
+ esac
+ 
+ : ${TMPDIR=/tmp}
+-tmpout=${TMPDIR}/acout.$$
++tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
+ localdir=
+ show_version=no
+ 
+@@ -97,7 +97,8 @@
+ 
+ trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
+ 
+-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
++tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
++# Always set this, to avoid bogus errors from some rm's.
+ if test z$infile = z-; then
+   infile=$tmpin
+   cat > $infile
diff --git a/devel/autoconf254/files/patch-ae b/devel/autoconf254/files/patch-ae
new file mode 100644
index 000000000000..87e6102e3ba9
--- /dev/null
+++ b/devel/autoconf254/files/patch-ae
@@ -0,0 +1,11 @@
+--- autoheader.sh.orig	Mon Nov 22 21:50:45 1999
++++ autoheader.sh	Mon Nov 22 21:52:02 1999
+@@ -194,7 +194,7 @@
+   # Some fgrep's have limits on the number of lines that can be in the
+   # pattern on the command line, so use a temporary file containing the
+   # pattern.
+-  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
++  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
+    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
+    cat > $fgrep_tmp <<EOF
+ $syms
diff --git a/devel/autoconf254/files/patch-af b/devel/autoconf254/files/patch-af
new file mode 100644
index 000000000000..d40bc0ee9e7a
--- /dev/null
+++ b/devel/autoconf254/files/patch-af
@@ -0,0 +1,20 @@
+--- autoupdate.sh.orig	Mon Nov 22 21:52:26 1999
++++ autoupdate.sh	Mon Nov 22 21:54:30 1999
+@@ -26,7 +26,7 @@
+ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
+        [--version] [template-file]" 
+ 
+-sedtmp=/tmp/acups.$$
++sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
+ # For debugging.
+ #sedtmp=/tmp/acups
+ show_version=no
+@@ -66,7 +66,7 @@
+ 
+ : ${SIMPLE_BACKUP_SUFFIX='~'}
+ 
+-tmpout=acupo.$$
++tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
+ trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
+ case $# in
+   0) infile=configure.in; out="> $tmpout"
diff --git a/devel/autoconf257/files/patch-ad b/devel/autoconf257/files/patch-ad
new file mode 100644
index 000000000000..f8a4d1ae6b0c
--- /dev/null
+++ b/devel/autoconf257/files/patch-ad
@@ -0,0 +1,21 @@
+--- autoconf.sh.orig	Mon Nov 22 21:47:28 1999
++++ autoconf.sh	Mon Nov 22 21:49:50 1999
+@@ -45,7 +45,7 @@
+ esac
+ 
+ : ${TMPDIR=/tmp}
+-tmpout=${TMPDIR}/acout.$$
++tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
+ localdir=
+ show_version=no
+ 
+@@ -97,7 +97,8 @@
+ 
+ trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
+ 
+-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
++tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
++# Always set this, to avoid bogus errors from some rm's.
+ if test z$infile = z-; then
+   infile=$tmpin
+   cat > $infile
diff --git a/devel/autoconf257/files/patch-ae b/devel/autoconf257/files/patch-ae
new file mode 100644
index 000000000000..87e6102e3ba9
--- /dev/null
+++ b/devel/autoconf257/files/patch-ae
@@ -0,0 +1,11 @@
+--- autoheader.sh.orig	Mon Nov 22 21:50:45 1999
++++ autoheader.sh	Mon Nov 22 21:52:02 1999
+@@ -194,7 +194,7 @@
+   # Some fgrep's have limits on the number of lines that can be in the
+   # pattern on the command line, so use a temporary file containing the
+   # pattern.
+-  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
++  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
+    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
+    cat > $fgrep_tmp <<EOF
+ $syms
diff --git a/devel/autoconf257/files/patch-af b/devel/autoconf257/files/patch-af
new file mode 100644
index 000000000000..d40bc0ee9e7a
--- /dev/null
+++ b/devel/autoconf257/files/patch-af
@@ -0,0 +1,20 @@
+--- autoupdate.sh.orig	Mon Nov 22 21:52:26 1999
++++ autoupdate.sh	Mon Nov 22 21:54:30 1999
+@@ -26,7 +26,7 @@
+ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
+        [--version] [template-file]" 
+ 
+-sedtmp=/tmp/acups.$$
++sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
+ # For debugging.
+ #sedtmp=/tmp/acups
+ show_version=no
+@@ -66,7 +66,7 @@
+ 
+ : ${SIMPLE_BACKUP_SUFFIX='~'}
+ 
+-tmpout=acupo.$$
++tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
+ trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
+ case $# in
+   0) infile=configure.in; out="> $tmpout"
diff --git a/devel/autoconf259/files/patch-ad b/devel/autoconf259/files/patch-ad
new file mode 100644
index 000000000000..f8a4d1ae6b0c
--- /dev/null
+++ b/devel/autoconf259/files/patch-ad
@@ -0,0 +1,21 @@
+--- autoconf.sh.orig	Mon Nov 22 21:47:28 1999
++++ autoconf.sh	Mon Nov 22 21:49:50 1999
+@@ -45,7 +45,7 @@
+ esac
+ 
+ : ${TMPDIR=/tmp}
+-tmpout=${TMPDIR}/acout.$$
++tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
+ localdir=
+ show_version=no
+ 
+@@ -97,7 +97,8 @@
+ 
+ trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
+ 
+-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
++tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
++# Always set this, to avoid bogus errors from some rm's.
+ if test z$infile = z-; then
+   infile=$tmpin
+   cat > $infile
diff --git a/devel/autoconf259/files/patch-ae b/devel/autoconf259/files/patch-ae
new file mode 100644
index 000000000000..87e6102e3ba9
--- /dev/null
+++ b/devel/autoconf259/files/patch-ae
@@ -0,0 +1,11 @@
+--- autoheader.sh.orig	Mon Nov 22 21:50:45 1999
++++ autoheader.sh	Mon Nov 22 21:52:02 1999
+@@ -194,7 +194,7 @@
+   # Some fgrep's have limits on the number of lines that can be in the
+   # pattern on the command line, so use a temporary file containing the
+   # pattern.
+-  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
++  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
+    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
+    cat > $fgrep_tmp <<EOF
+ $syms
diff --git a/devel/autoconf259/files/patch-af b/devel/autoconf259/files/patch-af
new file mode 100644
index 000000000000..d40bc0ee9e7a
--- /dev/null
+++ b/devel/autoconf259/files/patch-af
@@ -0,0 +1,20 @@
+--- autoupdate.sh.orig	Mon Nov 22 21:52:26 1999
++++ autoupdate.sh	Mon Nov 22 21:54:30 1999
+@@ -26,7 +26,7 @@
+ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
+        [--version] [template-file]" 
+ 
+-sedtmp=/tmp/acups.$$
++sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
+ # For debugging.
+ #sedtmp=/tmp/acups
+ show_version=no
+@@ -66,7 +66,7 @@
+ 
+ : ${SIMPLE_BACKUP_SUFFIX='~'}
+ 
+-tmpout=acupo.$$
++tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
+ trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
+ case $# in
+   0) infile=configure.in; out="> $tmpout"
diff --git a/devel/autoconf26/files/patch-ad b/devel/autoconf26/files/patch-ad
new file mode 100644
index 000000000000..f8a4d1ae6b0c
--- /dev/null
+++ b/devel/autoconf26/files/patch-ad
@@ -0,0 +1,21 @@
+--- autoconf.sh.orig	Mon Nov 22 21:47:28 1999
++++ autoconf.sh	Mon Nov 22 21:49:50 1999
+@@ -45,7 +45,7 @@
+ esac
+ 
+ : ${TMPDIR=/tmp}
+-tmpout=${TMPDIR}/acout.$$
++tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
+ localdir=
+ show_version=no
+ 
+@@ -97,7 +97,8 @@
+ 
+ trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
+ 
+-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
++tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
++# Always set this, to avoid bogus errors from some rm's.
+ if test z$infile = z-; then
+   infile=$tmpin
+   cat > $infile
diff --git a/devel/autoconf26/files/patch-ae b/devel/autoconf26/files/patch-ae
new file mode 100644
index 000000000000..87e6102e3ba9
--- /dev/null
+++ b/devel/autoconf26/files/patch-ae
@@ -0,0 +1,11 @@
+--- autoheader.sh.orig	Mon Nov 22 21:50:45 1999
++++ autoheader.sh	Mon Nov 22 21:52:02 1999
+@@ -194,7 +194,7 @@
+   # Some fgrep's have limits on the number of lines that can be in the
+   # pattern on the command line, so use a temporary file containing the
+   # pattern.
+-  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
++  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
+    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
+    cat > $fgrep_tmp <<EOF
+ $syms
diff --git a/devel/autoconf26/files/patch-af b/devel/autoconf26/files/patch-af
new file mode 100644
index 000000000000..d40bc0ee9e7a
--- /dev/null
+++ b/devel/autoconf26/files/patch-af
@@ -0,0 +1,20 @@
+--- autoupdate.sh.orig	Mon Nov 22 21:52:26 1999
++++ autoupdate.sh	Mon Nov 22 21:54:30 1999
+@@ -26,7 +26,7 @@
+ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
+        [--version] [template-file]" 
+ 
+-sedtmp=/tmp/acups.$$
++sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
+ # For debugging.
+ #sedtmp=/tmp/acups
+ show_version=no
+@@ -66,7 +66,7 @@
+ 
+ : ${SIMPLE_BACKUP_SUFFIX='~'}
+ 
+-tmpout=acupo.$$
++tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
+ trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
+ case $# in
+   0) infile=configure.in; out="> $tmpout"
diff --git a/devel/autoconf261/files/patch-ad b/devel/autoconf261/files/patch-ad
new file mode 100644
index 000000000000..f8a4d1ae6b0c
--- /dev/null
+++ b/devel/autoconf261/files/patch-ad
@@ -0,0 +1,21 @@
+--- autoconf.sh.orig	Mon Nov 22 21:47:28 1999
++++ autoconf.sh	Mon Nov 22 21:49:50 1999
+@@ -45,7 +45,7 @@
+ esac
+ 
+ : ${TMPDIR=/tmp}
+-tmpout=${TMPDIR}/acout.$$
++tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
+ localdir=
+ show_version=no
+ 
+@@ -97,7 +97,8 @@
+ 
+ trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
+ 
+-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
++tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
++# Always set this, to avoid bogus errors from some rm's.
+ if test z$infile = z-; then
+   infile=$tmpin
+   cat > $infile
diff --git a/devel/autoconf261/files/patch-ae b/devel/autoconf261/files/patch-ae
new file mode 100644
index 000000000000..87e6102e3ba9
--- /dev/null
+++ b/devel/autoconf261/files/patch-ae
@@ -0,0 +1,11 @@
+--- autoheader.sh.orig	Mon Nov 22 21:50:45 1999
++++ autoheader.sh	Mon Nov 22 21:52:02 1999
+@@ -194,7 +194,7 @@
+   # Some fgrep's have limits on the number of lines that can be in the
+   # pattern on the command line, so use a temporary file containing the
+   # pattern.
+-  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
++  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
+    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
+    cat > $fgrep_tmp <<EOF
+ $syms
diff --git a/devel/autoconf261/files/patch-af b/devel/autoconf261/files/patch-af
new file mode 100644
index 000000000000..d40bc0ee9e7a
--- /dev/null
+++ b/devel/autoconf261/files/patch-af
@@ -0,0 +1,20 @@
+--- autoupdate.sh.orig	Mon Nov 22 21:52:26 1999
++++ autoupdate.sh	Mon Nov 22 21:54:30 1999
+@@ -26,7 +26,7 @@
+ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
+        [--version] [template-file]" 
+ 
+-sedtmp=/tmp/acups.$$
++sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
+ # For debugging.
+ #sedtmp=/tmp/acups
+ show_version=no
+@@ -66,7 +66,7 @@
+ 
+ : ${SIMPLE_BACKUP_SUFFIX='~'}
+ 
+-tmpout=acupo.$$
++tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
+ trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
+ case $# in
+   0) infile=configure.in; out="> $tmpout"
diff --git a/devel/autoconf262/files/patch-ad b/devel/autoconf262/files/patch-ad
new file mode 100644
index 000000000000..f8a4d1ae6b0c
--- /dev/null
+++ b/devel/autoconf262/files/patch-ad
@@ -0,0 +1,21 @@
+--- autoconf.sh.orig	Mon Nov 22 21:47:28 1999
++++ autoconf.sh	Mon Nov 22 21:49:50 1999
+@@ -45,7 +45,7 @@
+ esac
+ 
+ : ${TMPDIR=/tmp}
+-tmpout=${TMPDIR}/acout.$$
++tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
+ localdir=
+ show_version=no
+ 
+@@ -97,7 +97,8 @@
+ 
+ trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
+ 
+-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
++tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
++# Always set this, to avoid bogus errors from some rm's.
+ if test z$infile = z-; then
+   infile=$tmpin
+   cat > $infile
diff --git a/devel/autoconf262/files/patch-ae b/devel/autoconf262/files/patch-ae
new file mode 100644
index 000000000000..87e6102e3ba9
--- /dev/null
+++ b/devel/autoconf262/files/patch-ae
@@ -0,0 +1,11 @@
+--- autoheader.sh.orig	Mon Nov 22 21:50:45 1999
++++ autoheader.sh	Mon Nov 22 21:52:02 1999
+@@ -194,7 +194,7 @@
+   # Some fgrep's have limits on the number of lines that can be in the
+   # pattern on the command line, so use a temporary file containing the
+   # pattern.
+-  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
++  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
+    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
+    cat > $fgrep_tmp <<EOF
+ $syms
diff --git a/devel/autoconf262/files/patch-af b/devel/autoconf262/files/patch-af
new file mode 100644
index 000000000000..d40bc0ee9e7a
--- /dev/null
+++ b/devel/autoconf262/files/patch-af
@@ -0,0 +1,20 @@
+--- autoupdate.sh.orig	Mon Nov 22 21:52:26 1999
++++ autoupdate.sh	Mon Nov 22 21:54:30 1999
+@@ -26,7 +26,7 @@
+ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
+        [--version] [template-file]" 
+ 
+-sedtmp=/tmp/acups.$$
++sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
+ # For debugging.
+ #sedtmp=/tmp/acups
+ show_version=no
+@@ -66,7 +66,7 @@
+ 
+ : ${SIMPLE_BACKUP_SUFFIX='~'}
+ 
+-tmpout=acupo.$$
++tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
+ trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
+ case $# in
+   0) infile=configure.in; out="> $tmpout"
diff --git a/devel/autoconf267/files/patch-ad b/devel/autoconf267/files/patch-ad
new file mode 100644
index 000000000000..f8a4d1ae6b0c
--- /dev/null
+++ b/devel/autoconf267/files/patch-ad
@@ -0,0 +1,21 @@
+--- autoconf.sh.orig	Mon Nov 22 21:47:28 1999
++++ autoconf.sh	Mon Nov 22 21:49:50 1999
+@@ -45,7 +45,7 @@
+ esac
+ 
+ : ${TMPDIR=/tmp}
+-tmpout=${TMPDIR}/acout.$$
++tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
+ localdir=
+ show_version=no
+ 
+@@ -97,7 +97,8 @@
+ 
+ trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
+ 
+-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
++tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
++# Always set this, to avoid bogus errors from some rm's.
+ if test z$infile = z-; then
+   infile=$tmpin
+   cat > $infile
diff --git a/devel/autoconf267/files/patch-ae b/devel/autoconf267/files/patch-ae
new file mode 100644
index 000000000000..87e6102e3ba9
--- /dev/null
+++ b/devel/autoconf267/files/patch-ae
@@ -0,0 +1,11 @@
+--- autoheader.sh.orig	Mon Nov 22 21:50:45 1999
++++ autoheader.sh	Mon Nov 22 21:52:02 1999
+@@ -194,7 +194,7 @@
+   # Some fgrep's have limits on the number of lines that can be in the
+   # pattern on the command line, so use a temporary file containing the
+   # pattern.
+-  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
++  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
+    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
+    cat > $fgrep_tmp <<EOF
+ $syms
diff --git a/devel/autoconf267/files/patch-af b/devel/autoconf267/files/patch-af
new file mode 100644
index 000000000000..d40bc0ee9e7a
--- /dev/null
+++ b/devel/autoconf267/files/patch-af
@@ -0,0 +1,20 @@
+--- autoupdate.sh.orig	Mon Nov 22 21:52:26 1999
++++ autoupdate.sh	Mon Nov 22 21:54:30 1999
+@@ -26,7 +26,7 @@
+ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
+        [--version] [template-file]" 
+ 
+-sedtmp=/tmp/acups.$$
++sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
+ # For debugging.
+ #sedtmp=/tmp/acups
+ show_version=no
+@@ -66,7 +66,7 @@
+ 
+ : ${SIMPLE_BACKUP_SUFFIX='~'}
+ 
+-tmpout=acupo.$$
++tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
+ trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
+ case $# in
+   0) infile=configure.in; out="> $tmpout"
diff --git a/devel/autoconf268/files/patch-ad b/devel/autoconf268/files/patch-ad
new file mode 100644
index 000000000000..f8a4d1ae6b0c
--- /dev/null
+++ b/devel/autoconf268/files/patch-ad
@@ -0,0 +1,21 @@
+--- autoconf.sh.orig	Mon Nov 22 21:47:28 1999
++++ autoconf.sh	Mon Nov 22 21:49:50 1999
+@@ -45,7 +45,7 @@
+ esac
+ 
+ : ${TMPDIR=/tmp}
+-tmpout=${TMPDIR}/acout.$$
++tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
+ localdir=
+ show_version=no
+ 
+@@ -97,7 +97,8 @@
+ 
+ trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
+ 
+-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
++tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
++# Always set this, to avoid bogus errors from some rm's.
+ if test z$infile = z-; then
+   infile=$tmpin
+   cat > $infile
diff --git a/devel/autoconf268/files/patch-ae b/devel/autoconf268/files/patch-ae
new file mode 100644
index 000000000000..87e6102e3ba9
--- /dev/null
+++ b/devel/autoconf268/files/patch-ae
@@ -0,0 +1,11 @@
+--- autoheader.sh.orig	Mon Nov 22 21:50:45 1999
++++ autoheader.sh	Mon Nov 22 21:52:02 1999
+@@ -194,7 +194,7 @@
+   # Some fgrep's have limits on the number of lines that can be in the
+   # pattern on the command line, so use a temporary file containing the
+   # pattern.
+-  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
++  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
+    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
+    cat > $fgrep_tmp <<EOF
+ $syms
diff --git a/devel/autoconf268/files/patch-af b/devel/autoconf268/files/patch-af
new file mode 100644
index 000000000000..d40bc0ee9e7a
--- /dev/null
+++ b/devel/autoconf268/files/patch-af
@@ -0,0 +1,20 @@
+--- autoupdate.sh.orig	Mon Nov 22 21:52:26 1999
++++ autoupdate.sh	Mon Nov 22 21:54:30 1999
+@@ -26,7 +26,7 @@
+ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
+        [--version] [template-file]" 
+ 
+-sedtmp=/tmp/acups.$$
++sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
+ # For debugging.
+ #sedtmp=/tmp/acups
+ show_version=no
+@@ -66,7 +66,7 @@
+ 
+ : ${SIMPLE_BACKUP_SUFFIX='~'}
+ 
+-tmpout=acupo.$$
++tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
+ trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
+ case $# in
+   0) infile=configure.in; out="> $tmpout"
diff --git a/devel/gnu-autoconf/files/patch-ad b/devel/gnu-autoconf/files/patch-ad
new file mode 100644
index 000000000000..f8a4d1ae6b0c
--- /dev/null
+++ b/devel/gnu-autoconf/files/patch-ad
@@ -0,0 +1,21 @@
+--- autoconf.sh.orig	Mon Nov 22 21:47:28 1999
++++ autoconf.sh	Mon Nov 22 21:49:50 1999
+@@ -45,7 +45,7 @@
+ esac
+ 
+ : ${TMPDIR=/tmp}
+-tmpout=${TMPDIR}/acout.$$
++tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
+ localdir=
+ show_version=no
+ 
+@@ -97,7 +97,8 @@
+ 
+ trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
+ 
+-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
++tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
++# Always set this, to avoid bogus errors from some rm's.
+ if test z$infile = z-; then
+   infile=$tmpin
+   cat > $infile
diff --git a/devel/gnu-autoconf/files/patch-ae b/devel/gnu-autoconf/files/patch-ae
new file mode 100644
index 000000000000..87e6102e3ba9
--- /dev/null
+++ b/devel/gnu-autoconf/files/patch-ae
@@ -0,0 +1,11 @@
+--- autoheader.sh.orig	Mon Nov 22 21:50:45 1999
++++ autoheader.sh	Mon Nov 22 21:52:02 1999
+@@ -194,7 +194,7 @@
+   # Some fgrep's have limits on the number of lines that can be in the
+   # pattern on the command line, so use a temporary file containing the
+   # pattern.
+-  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
++  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
+    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
+    cat > $fgrep_tmp <<EOF
+ $syms
diff --git a/devel/gnu-autoconf/files/patch-af b/devel/gnu-autoconf/files/patch-af
new file mode 100644
index 000000000000..d40bc0ee9e7a
--- /dev/null
+++ b/devel/gnu-autoconf/files/patch-af
@@ -0,0 +1,20 @@
+--- autoupdate.sh.orig	Mon Nov 22 21:52:26 1999
++++ autoupdate.sh	Mon Nov 22 21:54:30 1999
+@@ -26,7 +26,7 @@
+ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
+        [--version] [template-file]" 
+ 
+-sedtmp=/tmp/acups.$$
++sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
+ # For debugging.
+ #sedtmp=/tmp/acups
+ show_version=no
+@@ -66,7 +66,7 @@
+ 
+ : ${SIMPLE_BACKUP_SUFFIX='~'}
+ 
+-tmpout=acupo.$$
++tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
+ trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
+ case $# in
+   0) infile=configure.in; out="> $tmpout"