trans-coord/gnun/server/gnun ChangeLog Makefile...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       16/06/29 16:13:27

Modified files:
        gnun/server/gnun: ChangeLog Makefile.am NEWS add-fuzzy-diff.in 
                          configure.ac diff-po.awk.in gnun-diff-po.in 
                          gnun-validate-html.in mailfail.in 
                          update-localized-urls.in 

Log message:
        Support mktemps lacking -t.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.441&r2=1.442
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/Makefile.am?cvsroot=trans-coord&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/add-fuzzy-diff.in?cvsroot=trans-coord&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?cvsroot=trans-coord&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/diff-po.awk.in?cvsroot=trans-coord&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-diff-po.in?cvsroot=trans-coord&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-validate-html.in?cvsroot=trans-coord&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/mailfail.in?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/update-localized-urls.in?cvsroot=trans-coord&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -b -r1.441 -r1.442
--- ChangeLog   29 Jun 2016 16:02:27 -0000      1.441
+++ ChangeLog   29 Jun 2016 16:13:26 -0000      1.442
@@ -1,6 +1,22 @@
 2016-06-29  Pavel Kharitonov  <address@hidden>
 
+       Support mktemps lacking -t.
+
+       * configure.ac: Check if mktemp supports -t.
+       * Makefile.am: Merge -t to @MKTEMP@ when available.
+       * add-fuzzy-diff.in:
+       * diff-po.awk.in:
+       * gnun-diff.po.in:
+       * gnun-validate-html.in:
+       * mailfail.in:
+       * update-localized-urls: Use @MKTEMP@ with -t merged.
+       * NEWS: Update.
+
+
+2016-06-29  Pavel Kharitonov  <address@hidden>
+
        * gnun-validate-html.in: Drop unneeded 'set -o pipefail'.
+       * NEWS: Update.
 
 2016-06-29  Pavel Kharitonov  <address@hidden>
 

Index: Makefile.am
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- Makefile.am 29 Jun 2016 15:54:56 -0000      1.42
+++ Makefile.am 29 Jun 2016 16:13:26 -0000      1.43
@@ -127,7 +127,7 @@
        -e 's|@address@hidden|$(BASH)|g' \
        -e 's|@address@hidden|$(GREP)|g' \
        -e 's|@address@hidden|$(MAIL)|g' \
-       -e 's|@address@hidden|$(MKTEMP)|g' \
+       -e 's|@address@hidden|$(MKTEMP) $(MKTEMP_T)|g' \
        -e 's|@address@hidden|$(MSGATTRIB)|g' \
        -e 's|@address@hidden|$(MSGCAT)|g' \
        -e 's|@address@hidden|$(MSGEXEC)|g' \

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- NEWS        29 Jun 2016 16:02:28 -0000      1.118
+++ NEWS        29 Jun 2016 16:13:26 -0000      1.119
@@ -9,6 +9,8 @@
 *** `gnun-validate-html' didn't work with bash versions that don't
     support set -o pipefail.
 
+*** Many utilities didn't work when mktemp had no -t option.
+
 * Changes in GNUnited Nations 0.10 (2015-11-07)
 
 ** Support for po4a versions < 0.37 is dropped.

Index: add-fuzzy-diff.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/add-fuzzy-diff.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- add-fuzzy-diff.in   29 Jun 2016 15:54:56 -0000      1.4
+++ add-fuzzy-diff.in   29 Jun 2016 16:13:26 -0000      1.5
@@ -39,7 +39,7 @@
   :create-file;
 # It seems to be considerably faster to create a new file than
 # to rewrite an existing one on fencepost (?)
-  x; address@hidden@ -t addiff.XXXXXXXXXXXXX%e;
+  x; address@hidden@ addiff.XXXXXXXXXXXXX%e;
   H; g;
 # Cut out the lines with current msgid.
   s/\nmsgid ".*\(\n[^\n]*\)$/\1/;

Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- configure.ac        29 Jun 2016 15:54:56 -0000      1.48
+++ configure.ac        29 Jun 2016 16:13:26 -0000      1.49
@@ -175,6 +175,19 @@
 ])
 ])
 
+AC_MSG_CHECKING([whether mktemp supports -t])
+have_mktemp_t=no
+mktemp_t=
+AS_CASE(["x$MKTEMP"], [x],,
+[tempfile=`"$MKTEMP" -t conf.XXXXXXX 2> /dev/null`
+AS_CASE(["x$tempfile"], [x],,
+[have_mktemp_t=yes
+rm -f "$tempfile"
+mktemp_t=-t
+])])
+AC_MSG_RESULT([$have_mktemp_t])
+AC_SUBST([MKTEMP_T], [$mktemp_t])
+
 AC_ARG_VAR([MSGCAT], [the `msgcat' program])
 AC_PATH_PROGS([MSGCAT], [msgcat gmsgcat])
 AC_ARG_VAR([MSGFMT], [the `msgfmt' program])

Index: diff-po.awk.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/diff-po.awk.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- diff-po.awk.in      29 Jun 2016 15:54:56 -0000      1.6
+++ diff-po.awk.in      29 Jun 2016 16:13:26 -0000      1.7
@@ -125,7 +125,7 @@
   msg_no = 0;
   comment_no = 0;
   msgstr_no = 0;
-  mktemp_cmd = "@MKTEMP@ -t diff-po-tmp.XXXXXXXXXX"
+  mktemp_cmd = "@MKTEMP@ diff-po-tmp.XXXXXXXXXX"
   mktemp_cmd | getline tmp_file[0]
   close(mktemp_cmd)
   mktemp_cmd | getline tmp_file[1]

Index: gnun-diff-po.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/gnun-diff-po.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gnun-diff-po.in     29 Jun 2016 15:54:56 -0000      1.13
+++ gnun-diff-po.in     29 Jun 2016 16:13:27 -0000      1.14
@@ -177,15 +177,15 @@
 
 # File to count msgid number, since msgexec doesn't provide
 # a variable for it, and for POT when merging is needed.
address@hidden@ -t gnun-diff-po.XXXXXXXXXX`
address@hidden@ gnun-diff-po.XXXXXXXXXX`
 # Files for po-msg-diff use; we could create them in po-msg-diff,
 # but then mktemp and rm would run for every compared msgstr pair.
address@hidden@ -t gnun-diff-po1.XXXXXXXXXX`
address@hidden@ -t gnun-diff-po2.XXXXXXXXXX`
address@hidden@ gnun-diff-po1.XXXXXXXXXX`
address@hidden@ gnun-diff-po2.XXXXXXXXXX`
 # File for the merged PO.
address@hidden@ -t gnun-diff-po3.XXXXXXXXXX`
address@hidden@ gnun-diff-po3.XXXXXXXXXX`
 # Temporary file with cleared ``fuzzy'' flags and removed obsolete entries.
address@hidden@ -t gnun-diff-po4.XXXXXXXXXX`
address@hidden@ gnun-diff-po4.XXXXXXXXXX`
 trap 'rm -f "$temp" "$temp1" "$temp2" "$temp3" "$temp4"' EXIT
 
 cat <<EOF

Index: gnun-validate-html.in
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/server/gnun/gnun-validate-html.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gnun-validate-html.in       29 Jun 2016 16:02:28 -0000      1.22
+++ gnun-validate-html.in       29 Jun 2016 16:13:27 -0000      1.23
@@ -158,8 +158,8 @@
 address@hidden@
 
 # Create two tempfiles and mark them for deletion on exit.
address@hidden@ -t gnun.1.XXXXXX`
address@hidden@ -t gnun.2.XXXXXX`
address@hidden@ gnun.1.XXXXXX`
address@hidden@ gnun.2.XXXXXX`
 trap "rm -f $TMP1 $TMP2" EXIT
 
 # Use $TMP1 if no $OUTPUT is specified.

Index: mailfail.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/mailfail.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- mailfail.in 29 Jun 2016 15:54:56 -0000      1.2
+++ mailfail.in 29 Jun 2016 16:13:27 -0000      1.3
@@ -49,7 +49,7 @@
 fi
 
 # Create tempfile and mark it for deletion on exit.
address@hidden@ -t gnun.mailfail.XXXXXX`
address@hidden@ gnun.mailfail.XXXXXX`
 trap "rm -f $TMP" EXIT
 
 # Execute the command and capture it's output

Index: update-localized-urls.in
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/server/gnun/update-localized-urls.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- update-localized-urls.in    29 Jun 2016 15:54:56 -0000      1.5
+++ update-localized-urls.in    29 Jun 2016 16:13:27 -0000      1.6
@@ -107,7 +107,7 @@
   exit 1
 fi
 
address@hidden@ -t urls.XXXXXXXXXX`
address@hidden@ urls.XXXXXXXXXX`
 trap "rm -f ${TMP}" EXIT
 
 cat > ${TMP} <<EOF