auto upstream

2 files changed, 5 insertions, 2 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 81d85f8f24c..9c6413aa14f 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,5 +1,8 @@
 2012-12-08  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Use putenv+unsetenv instead of modifying environ directly (Bug#13070).
+        * merge-gnulib (GNULIB_MODULES): Add putenv, unsetenv.
+
         Simplify get_lim_data.
         * CPP-DEFINES (ULIMIT_BREAK_VALUE): Remove.
 
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 75e7ec6b000..1f60bb2973e 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -31,10 +31,10 @@ GNULIB_MODULES='
   dtoastr dtotimespec dup2 environ execinfo faccessat
   fcntl-h filemode getloadavg getopt-gnu gettime gettimeofday
   ignore-value intprops largefile lstat
-  manywarnings mktime pselect pthread_sigmask readlink
+  manywarnings mktime pselect pthread_sigmask putenv readlink
   sig2str socklen stat-time stdalign stdarg stdbool stdio
   strftime strtoimax strtoumax symlink sys_stat
-  sys_time time timer-time timespec-add timespec-sub utimens
+  sys_time time timer-time timespec-add timespec-sub unsetenv utimens
   warnings
 '