3 files changed, 7 insertions, 2 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 066347b3826..a98d1b9039e 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -368,7 +368,6 @@ HAVE___FPENDING
 INTERNAL_TERMINAL
 IS_ANY_SEP
 IS_DIRECTORY_SEP
-LOCALTIME_CACHE
 MAIL_USE_FLOCK
 MAIL_USE_LOCKF
 MAIL_USE_POP
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 742a64ce15d..258ce04783f 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix putenv race conditions with undefined behavior (Bug#8705).
+        * merge-gnulib (GNULIB_MODULES): Add time_r, since Emacs now
+        calls localtime_r and gmtime_r directly.
+
 2014-10-07  Glenn Morris  <rgm@gnu.org>
 
         * unidata/Makefile.in: Check for deleted uni- files.  (Bug#18489)
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 5b9b716bed2..dc3cd6cf541 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -37,7 +37,7 @@ GNULIB_MODULES='
   pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
   sig2str socklen stat-time stdalign stdio
   strftime strtoimax strtoumax symlink sys_stat
-  sys_time time timer-time timespec-add timespec-sub
+  sys_time time time_r timer-time timespec-add timespec-sub
   unsetenv update-copyright utimens
   vla warnings
 '