Merge from mainline.

1 files changed, 21 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 20083294875..6d4f6e042e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2011-02-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Import getloadavg module from gnulib.
+        * .bzrignore: Add lib/stdlib.h.
+        * Makefile.in (GNULIB_MODULES): Add getloadavg.
+        * admin/notes/copyright: Remove src/getloadavg.c as a special case.
+        * configure.in (LIBS_SYSTEM): Omit -lkstat on sol2*; gnulib does this.
+        (AC_CONFIG_LIBOBJ_DIR, AC_FUNC_GETLOADAVG, GETLOADAVG_FILES):
+        Remove; gnulib does this now.
+        * lib/getloadavg.c: Rename from src/getloadavg.c, and sync
+        from gnulib.  This adds support for several other systems, such
+        as Tru64 4.0D, QNX, AIX perfstat, etc.  It also fixes a potential
+        buffer overrun on Linux hosts under very high load, and on hosts
+        that maintain a channel to the load average file it makes sure
+        the file descriptor is close-on-exec (on hosts that support this)
+        and is not stdin, stdout, or stderr.
+        * lib/stdlib.in.h, m4/getloadavg.m4, m4/stdlib_h.m4: New files,
+        from gnulib.
+        * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
+        * src/config.in: Regenerate.
+
 2011-02-15  Paul Eggert  <eggert@cs.ucla.edu>
 
         Merge from proposed getloadavg simplifications in gnulib.