--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-14  Paul Eggert  <eggert@twinsun.com>
+
+	* modules/tzset: New file.
+
 2003-08-12  Paul Eggert  <eggert@twinsun.com>
 
 	Merge from coreutils.

--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,47 @@
+2003-08-14  Jim Meyering  <jim@meyering.net>
+
+	* mountlist.c: Remove anachronistic casts of xmalloc, xrealloc,
+	and xcalloc return values.
+	(read_filesystem_list) [MOUNTED_GETFSSTAT]:
+	Use MNT_NOWAIT, rather than MNT_WAIT.  Otherwise, `df DIR' could
+	hang on OSF/1 5.1 for DIR on both local and remote file systems.
+	Reported by (and fix confirmed by) Nelson H. F. Beebe.
+	(read_filesystem_list) [MOUNTED_VMOUNT]: Detect any
+	error from mntctl.
+	Use mntctl's return value to drive the entry-processing loop, since
+	we can't rely on the value of the vmt_length member in the last
+	entry.  On some systems doing so could result in exhausting
+	virtual memory.  Based in part on a patch from Mike Jetzer.
+
+2003-08-14  Jim Meyering  <jim@meyering.net>
+        and Paul Eggert  <eggert@twinsun.com>
+
+	Merges from coreutils, plus other fixes.
+	* memcasecmp.c: Remove unnecessary parentheses after 'defined'.
+	(memcasecmp): Don't assume size_t fits in unsigned int.
+	Remove casts and duplicate code.
+	* md5.c: Include <string.h> and <stdlib.h> unconditionally.
+	(memcpy): Remove definition.
+	Merge in some clean-up and optimization changes from glibc.
+	[BLOCKSIZE]: Move definition to top of file.
+	Ensure that it is a multiple of 64.
+	Rearrange loop exit tests so as to avoid performing an
+	additional fread after encountering an error or EOF.
+	* md5.h (md5_uintptr): Define.
+	* makepath.c (CLEANUP_CWD): Report an error if we failed to
+	return to the initial working directory.  Preserve errno
+	for caller.
+	* idcache.c: Include "xalloc.h".
+	(xmalloc, xrealloc): Remove decls.
+	(getuser): Remove casts no longer required in C89.
+	* human.c: Include stdio.h, for sprintf.
+	* group-member.c: Include "xalloc.h".
+	(xmalloc, xrealloc): Remove decls.
+	(get_group_info): Remove casts no longer required in C89.
+	* getusershell.c (readname): Remove casts no longer required in C89.
+	* gettimeofday.c (rpl_gmtime, rpl_tzset): New functions.
+	* getline.c: Whitespace fix, from coreutils.
+
 2003-08-13  Paul Eggert  <eggert@twinsun.com>
 
 	* exclude.c: Include <ctype.h>

--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,20 @@
+2003-08-14  Paul Eggert  <eggert@twinsun.com>
+
+	* gettimeofday.m4 (gl_GETTIMEOFDAY_REPLACE_LOCALTIME): New macro.
+	(AC_FUNC_GETTIMEOFDAY_CLOBBER): Use it.
+	* tzset.m4: Use it too.
+
+2003-08-14  Jim Meyering  <jim@meyering.net>
+
+	* tzset.m4: New file.
+	* ls-mntd-fs.m4 (jm_LIST_MOUNTED_FILESYSTEMS): Move the MOUNTED_VMOUNT
+	test to precede the MOUNTED_GETMNTENT1 tests, since otherwise, AIX 5.1
+	systems would end up using the latter.  MOUNTED_GETMNTENT1 support
+	is inadequate on such systems: 1) detecting whether a file system
+	is remote doesn't work  2) the MOUNTED_VMOUNT code reports the
+	HOSTNAME:/MOUNT_POINT, while the MOUNTED_GETMNTENT1 code reports
+	merely /MOUNT_POINT.  Reported by Mike Jetzer.
+
 2003-08-13  Paul Eggert  <eggert@twinsun.com>
 
 	* exclude.m4 (gl_EXCLUDE): Require AC_C_INLINE, AC_HEADER_STDC.