[PATCH] maint: use modules/tempname.diff file, not a replacement; update gnulib

[Jim Meyering]

A naive update to latest gnulib was failing like this:

    mktemp.o: In function `mkdtemp_len':
    /h/j/w/co/cu/src/mktemp.c:127: undefined reference to `gen_tempname_len'
    mktemp.o: In function `mkstemp_len':
    /h/j/w/co/cu/src/mktemp.c:120: undefined reference to `gen_tempname_len'
    collect2: error: ld returned 1 exit status
    make[3]: *** [mktemp] Error 1
    make[3]: *** Waiting for unfinished jobs....

That was a result of my using a replacement gl/modules/tempname
file rather than a delta: gl/modules/tempname.diff
The recent change to gnulib's modules/tempname would have had
to be propagated to the copy we VC in coreutils.
Rather than do that and risk similar, I am now storing only the delta:


>From 23ddefd3d151fa20169ffb939b8b4b619af88c27 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 17 Jun 2011 10:02:58 +0200
Subject: [PATCH] maint: use modules/tempname.diff file, not a replacement;
 update gnulib

Using a .diff is much more maintainable.  Otherwise, changes in
the gnulib module description file may not be noticed and merged
promptly and may even result in subtle errors.  Luckily, this time,
the failure to propagate gnulib's changes to modules/tempname resulted
only in an obvious link failure.
* gl/modules/tempname: Remove file.
* gl/modules/tempname.diff: Use a .diff file instead.
* gnulib: Update submodule to latest.
---
 gl/modules/tempname      |   30 ------------------------------
 gl/modules/tempname.diff |   18 ++++++++++++++++++
 gnulib                   |    2 +-
 3 files changed, 19 insertions(+), 31 deletions(-)
 delete mode 100644 gl/modules/tempname
 create mode 100644 gl/modules/tempname.diff

diff --git a/gl/modules/tempname b/gl/modules/tempname
deleted file mode 100644
index 3d84317..0000000
--- a/gl/modules/tempname
+++ /dev/null
@@ -1,30 +0,0 @@
-Description:
-gen_tempname, gen_tempname_len: create a private temporary file or directory.
-
-Files:
-lib/tempname.c
-lib/tempname.h
-m4/tempname.m4
-
-Depends-on:
-extensions
-gettimeofday
-randint
-stdbool
-stdint
-sys_stat
-sys_time
-
-configure.ac:
-gl_FUNC_GEN_TEMPNAME
-
-Makefile.am:
-
-Include:
-"tempname.h"
-
-License:
-LGPL
-
-Maintainer:
-Eric Blake and Jim Meyering
diff --git a/gl/modules/tempname.diff b/gl/modules/tempname.diff
new file mode 100644
index 0000000..c5278d9
--- /dev/null
+++ b/gl/modules/tempname.diff
@@ -0,0 +1,18 @@
+--- /gnulib/modules/tempname   2011-06-17 11:41:46.070787376 +0200
++++ gl/modules/tempname        2011-06-17 11:43:49.571154551 +0200
+@@ -1,2 +1,2 @@
+ Description:
+-gen_tempname() function: create a private temporary file or directory.
++gen_tempname, gen_tempname_len: create a private temporary file or directory.
+
+ Files:
+ lib/tempname.c
+@@ -10,6 +10,8 @@ Depends-on:
+ extensions
+ gettimeofday
+ lstat
++randint
++stdbool
+ stdint
+ sys_stat
+ sys_time
diff --git a/gnulib b/gnulib
index a203d01..6eedb6a 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit a203d01a877e80e8a07147d892ec89a63498f7ff
+Subproject commit 6eedb6a104486c2df4384195e5dfc487d97c5beb
--
1.7.6.rc0.293.g40857