Ticket #57134: patch-autogen-mktemp.diff

agen5/ag-text.c

@@ -289 +289 @@
 /*  5125 */ "malloc of %zd bytes failed\n\0"
 /*  5153 */ "gperf --version > /dev/null 2>&1 || die 'no gperf program'\n"
             "test -z ${gpdir} && {\n"
-            "  gpdir=`mktemp -d ./.gperf.XXXXXX` 2>/dev/null\n"
+            "  gpdir=`gmktemp -d ./.gperf.XXXXXX` 2>/dev/null\n"
             "  test -z \"${gpdir}\" && gpdir=.gperf.$$\n"
             "  test -d ${gpdir} || mkdir ${gpdir} || die \"cannot mkdir ${gpdir}\"\n"
             "}\n"
@@ -616 +616 @@
             "mk_tmp_dir() {\n"
             "  test -d \"${tmp_dir}\" && return 0\n"
             "  tmp_dir=`\n"
-            "    t=\\`mktemp -d ${TMPDIR}/.ag-XXXXXX\\`\n"
+            "    t=\\`gmktemp -d ${TMPDIR}/.ag-XXXXXX\\`\n"
             "    test -d \"${t}\" || {\n"
             "      t=${TMPDIR}/.ag-$$\n"
             "      rm -rf ${t}\n"

agen5/ag-text.def

@@ -450 +450 @@
    str = <<- _GP_Script_
         gperf --version > /dev/null 2>&1 || die 'no gperf program'
         test -z ${gpdir} && {
-          gpdir=`mktemp -d ./.gperf.XXXXXX` 2>/dev/null
+          gpdir=`gmktemp -d ./.gperf.XXXXXX` 2>/dev/null
           test -z "${gpdir}" && gpdir=.gperf.$$
           test -d ${gpdir} || mkdir ${gpdir} || die "cannot mkdir ${gpdir}"
         }
@@ -743 +743 @@
         mk_tmp_dir() {
           test -d "${tmp_dir}" && return 0
           tmp_dir=`
-            t=\`mktemp -d ${TMPDIR}/.ag-XXXXXX\`
+            t=\`gmktemp -d ${TMPDIR}/.ag-XXXXXX\`
             test -d "${t}" || {
               t=${TMPDIR}/.ag-$$
               rm -rf ${t}

agen5/mk-stamps.sh

@@ -28 +28 @@
 #  because some of the rules are complex and we don't want to
 #  deal with the dual update problem.
 
-STAMP_TEMP_DIR=$(mktemp --suffix=.tdir -d /tmp/mk-stamps-XXXXXXXX)
+STAMP_TEMP_DIR=$(gmktemp --suffix=.tdir -d /tmp/mk-stamps-XXXXXXXX)
 exec 9>&2 2>> ${STAMP_TEMP_DIR}/mk-stamps.log
 stop_tracing=:
 if (shopt -qo xtrace)
@@ -310 +310 @@
 #
 export PS4='+stmp=${FUNCNAME:-=}-$LINENO> '
 set_defaults ${1+"$@"}
-rmlist=`mktemp ${TMPDIR:-/tmp}/rmlist-XXXXXX`
+rmlist=`gmktemp ${TMPDIR:-/tmp}/rmlist-XXXXXX`
 test -f "$rmlist" || {
     rmlist=${TMPDIR:-/tmp}/rmlist-$$
     rm -f $rmlist

agen5/test/daemon.test

@@ -23 +23 @@
 #
 # ----------------------------------------------------------------------
 
-tdir=$( (mktemp -d $PWD/.daemon-XXXXXX.d) 2>/dev/null)
+tdir=$( (gmktemp -d $PWD/.daemon-XXXXXX.d) 2>/dev/null)
 test -z "${tdir}" && {
   tdir=$PWD/.daemon-$$.d
   rm -rf ${tdir}

build-aux/run-ag.sh

@@ -45 +45 @@
   return 0
 }
 
-STAMP_TEMP_DIR=$(mktemp --suffix=.tdir -d /tmp/run-ag-XXXXXXXX)
+STAMP_TEMP_DIR=$(gmktemp --suffix=.tdir -d /tmp/run-ag-XXXXXXXX)
 exec 9>&2 2>> ${STAMP_TEMP_DIR}/mk-stamps.log
 VERBOSE=1
 

config/bootstrap

@@ -95 +95 @@
         i_made_temp_dir=false
 
     else
-        TEMP_DIR=`mktemp -d ${TMPDIR:-/tmp}/bs-XXXXXX`
+        TEMP_DIR=`gmktemp -d ${TMPDIR:-/tmp}/bs-XXXXXX`
         i_made_temp_dir=true
         export TEMP_DIR
     fi

config/config.guess

@@ -100 +100 @@
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && gmktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;

config/ltmain.sh

@@ -899 +899 @@
     else
 
       # If mktemp works, use that first and foremost
-      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
+      _G_tmpdir=`gmktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
 
       if test ! -d "$_G_tmpdir"; then
         # Failing that, at least try and use $RANDOM to avoid a race

config/mk-shdefs.in

@@ -130 +130 @@
 
 set -x
 exec 9>&2
-tmp=$(mktemp --suffix=.tdir -d /tmp/shdefs-XXXXXXXXX)
+tmp=$(gmktemp --suffix=.tdir -d /tmp/shdefs-XXXXXXXXX)
 exec 2>> $tmp/mk-shdef.log
 init $0 $1
 mk_config

configure

@@ -20060 +20060 @@
 # Create a (secure) tmp directory for tmp files.
 
 {
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  tmp=`(umask 077 && gmktemp -d "./confXXXXXX") 2>/dev/null` &&
   test -d "$tmp"
 }  ||
 {