[PATCH] index: fix another regression from faulty strstr

[Eric Blake]

* gnulib: Update to latest, for strstr fix.
* doc/m4.texinfo (Index macro): Test for the bug.
* NEWS: Document the fix.
* THANKS: Update.
Reported by Mike Stump, with additional analysis from Ralf
Wildenhues and Jim Meyering.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog      |   10 ++++++++++
 NEWS           |    7 ++++---
 THANKS         |    1 +
 doc/m4.texinfo |    8 ++++++++
 gnulib         |    2 +-
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9f3c5a8..cf135ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-26  Eric Blake  <address@hidden>
+
+       index: fix another regression from faulty strstr
+       * gnulib: Update to latest, for strstr fix.
+       * doc/m4.texinfo (Index macro): Test for the bug.
+       * NEWS: Document the fix.
+       * THANKS: Update.
+       Reported by Mike Stump, with additional analysis from Ralf
+       Wildenhues and Jim Meyering.
+
 2011-02-07  Eric Blake  <address@hidden>

        maint: speed up configure, using latest gnulib
diff --git a/NEWS b/NEWS
index 54c58ca..d4dbb1a 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,10 @@ GNU M4 NEWS - User visible changes.

 * Noteworthy changes in release 1.4.16 (2011-01-??) [?]

-** Ensure the `index' builtin cannot give false positive results.  On
-   glibc platforms, this avoids a strstr bug in glibc 2.9 through 2.12;
-   on many other platforms, it fixes a regression introduced in 1.4.11.
+** Fix regressions in the `index' builtin.  On glibc platforms, this
+   avoids false positives from a strstr bug in glibc 2.9 through 2.12;
+   on many other platforms, it fixes two separate regressions, a false
+   positive introduced in 1.4.11 and a false negative in 1.4.15.

 ** A number of portability improvements inherited from gnulib.

diff --git a/THANKS b/THANKS
index 36e239e..082e7e8 100644
--- a/THANKS
+++ b/THANKS
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 1512ae1..922c649 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -5652,6 +5652,14 @@ Index macro
 `:12-:12-:12-:12-:12-:12-:12-:12-')
 @result{}-1
 @end example
+
address@hidden Expose a bug in the gnulib replacement strstr() algorithm
address@hidden present from Jun 2010 to Feb 2011, including m4 1.4.15.
+
address@hidden
+index(`..wi.d.', `.d')
address@hidden
address@hidden example
 @end ignore

 @node Regexp
diff --git a/gnulib b/gnulib
index 6f0680e..06901ea 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 6f0680eb29a1737d704a1df26aafc00490cd34d8
+Subproject commit 06901ea287fd2d4d8f68afab41c6dbf95a854b5c
-- 
1.7.4