version 8.4

* NEWS: Record release date.
tests: avoid spurious failures on older shells
2025-09-10 07:59:52 +02:00 · 2010-01-13 21:57:54 +01:00 · 2010-01-13 13:42:49 +01:00 · 2010-01-13 10:55:55 +01:00 · 2010-01-13 10:21:02 +01:00 · 2010-01-12 06:00:05 -07:00
634 changed files with 1824 additions and 1123 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.I[12]
 *.[EIOX]
+*.bak
 *.o
 */.deps
 *~
@@ -44,18 +45,21 @@ coreutils-*.tar.lzma.sig
 gnulib-tests
 lib/.cvsignore
 lib/.gitignore
+lib/arg-nonnull.h
 lib/arpa
 lib/binary-io.h
 lib/charset.alias
 lib/configmake.h
 lib/glthread
 lib/libcoreutils.a
+lib/link-warning.h
 lib/printf.c
 lib/progname.c
 lib/progname.h
 lib/selinux
 lib/unistr
 lib/uniwidth
+lib/unused-parameter.h
 m4/.cvsignore
 m4/.gitignore
 maint.mk
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-8.0
+8.3
--- a/.vg-suppressions
+++ b/.vg-suppressions
@@ -1,6 +1,6 @@
 # Suppress valgrind diagnostics we don't care about.

-# Copyright (C) 2003, 2004, 2006-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003-2004, 2006-2010 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/2
+++ b/2
@@ -11609,7 +11609,7 @@

 	-----

-	Copyright (C) 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
+	Copyright (C) 2002-2005, 2009-2010 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/2
+++ b/2
@@ -4033,7 +4033,7 @@

 	-----

-	Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+	Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/2
+++ b/2
@@ -4015,7 +4015,7 @@

 	-----

-	Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+	Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/2
+++ b/2
@@ -372,7 +372,7 @@

 	-----

-	Copyright (C) 2008-2009 Free Software Foundation, Inc.
+	Copyright (C) 2008-2010 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/4
+++ b/4
@@ -481,10 +481,10 @@ Then just open the index.html file (in the generated lcov-html directory)
 in your favorite web browser.

 ========================================================================
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2009-2010 Free Software Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
 Texts.  A copy of the license is included in the ``GNU Free
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Make coreutils.					-*-Makefile-*-

-# Copyright (C) 1990, 1993-2009 Free Software Foundation, Inc.
+# Copyright (C) 1990, 1993-2010 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/110
+++ b/110
@@ -1,5 +1,111 @@
 GNU coreutils NEWS                                    -*- outline -*-

+* Noteworthy changes in release 8.4 (2010-01-13) [stable]
+
+** Bug fixes
+
+  nproc --all is now guaranteed to be as large as the count
+  of available processors, which may not have been the case
+  on GNU/Linux systems with neither /proc nor /sys available.
+  [bug introduced in coreutils-8.1]
+
+** Build-related
+
+  Work around a build failure when using buggy <sys/capability.h>.
+  Alternatively, configure with --disable-libcap.
+
+  Compilation would fail on systems using glibc-2.7..2.9 due to changes in
+  gnulib's wchar.h that tickled a bug in at least those versions of glibc's
+  own <wchar.h> header.  Now, gnulib works around the bug in those older
+  glibc <wchar.h> headers.
+
+  Building would fail with a link error (cp/copy.o) when XATTR headers
+  were installed without the corresponding library.  Now, configure
+  detects that and disables xattr support, as one would expect.
+
+
+* Noteworthy changes in release 8.3 (2010-01-07) [stable]
+
+** Bug fixes
+
+  cp -p, install -p, mv, and touch -c could trigger a spurious error
+  message when using new glibc coupled with an old kernel.
+  [bug introduced in coreutils-6.12].
+
+  ls -l --color no longer prints "argetm" in front of dangling
+  symlinks when the 'LINK target' directive was given to dircolors.
+  [bug introduced in fileutils-4.0]
+
+  pr's page header was improperly formatted for long file names.
+  [bug introduced in coreutils-7.2]
+
+  rm -r --one-file-system works once again.
+  The rewrite to make rm use fts introduced a regression whereby
+  a commmand of the above form would fail for all subdirectories.
+  [bug introduced in coreutils-8.0]
+
+  stat -f recognizes more file system types: k-afs, fuseblk, gfs/gfs2, ocfs2,
+  and rpc_pipefs. Also Minix V3 is displayed correctly as minix3, not minux3.
+  [bug introduced in coreutils-8.1]
+
+  tail -f (inotify-enabled) once again works with remote files.
+  The use of inotify with remote files meant that any changes to those
+  files that was not done from the local system would go unnoticed.
+  [bug introduced in coreutils-7.5]
+
+  tail -F (inotify-enabled) would abort when a tailed file is repeatedly
+  renamed-aside and then recreated.
+  [bug introduced in coreutils-7.5]
+
+  tail -F (inotify-enabled) could fail to follow renamed files.
+  E.g., given a "tail -F a b" process, running "mv a b" would
+  make tail stop tracking additions to "b".
+  [bug introduced in coreutils-7.5]
+
+  touch -a and touch -m could trigger bugs in some file systems, such
+  as xfs or ntfs-3g, and fail to update timestamps.
+  [bug introduced in coreutils-8.1]
+
+  wc now prints counts atomically so that concurrent
+  processes will not intersperse their output.
+  [the issue dates back to the initial implementation]
+
+
+* Noteworthy changes in release 8.2 (2009-12-11) [stable]
+
+** Bug fixes
+
+  id's use of mgetgroups no longer writes beyond the end of a malloc'd buffer
+  [bug introduced in coreutils-8.1]
+
+  id no longer crashes on systems without supplementary group support.
+  [bug introduced in coreutils-8.1]
+
+  rm once again handles zero-length arguments properly.
+  The rewrite to make rm use fts introduced a regression whereby
+  a command like "rm a '' b" would fail to remove "a" and "b", due to
+  the presence of the empty string argument.
+  [bug introduced in coreutils-8.0]
+
+  sort is now immune to the signal handling of its parent.
+  Specifically sort now doesn't exit with an error message
+  if it uses helper processes for compression and its parent
+  ignores CHLD signals. [bug introduced in coreutils-6.9]
+
+  tail without -f no longer access uninitialized memory
+  [bug introduced in coreutils-7.6]
+
+  timeout is now immune to the signal handling of its parent.
+  Specifically timeout now doesn't exit with an error message
+  if its parent ignores CHLD signals. [bug introduced in coreutils-7.6]
+
+  a user running "make distcheck" in the coreutils source directory,
+  with TMPDIR unset or set to the name of a world-writable directory,
+  and with a malicious user on the same system
+  was vulnerable to arbitrary code execution
+  [bug introduced in coreutils-5.0]
+
+
 * Noteworthy changes in release 8.1 (2009-11-18) [stable]

 ** Bug fixes
@@ -2800,10 +2906,10 @@ packages, see ./old/*/NEWS.

 ========================================================================

-Copyright (C) 2001-2009 Free Software Foundation, Inc.
+Copyright (C) 2001-2010 Free Software Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
 Texts.  A copy of the license is included in the ``GNU Free
--- a/4
+++ b/4
@@ -229,10 +229,10 @@ the address on the last line of --help output.

 ========================================================================

-Copyright (C) 1998, 2002-2009 Free Software Foundation, Inc.
+Copyright (C) 1998, 2002-2010 Free Software Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
 Texts.  A copy of the license is included in the ``GNU Free
--- a/2
+++ b/2
@@ -56,7 +56,7 @@ reporting address of this package, and not to that of gnulib, even
 if the problem seems to originate in a gnulib-provided file.
 -----

-Copyright (C) 2002-2009 Free Software Foundation, Inc.
+Copyright (C) 2002-2010 Free Software Foundation, Inc.

 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
--- a/15
+++ b/15
@@ -17,11 +17,15 @@ Note please try to install/build official packages for your system.
 If these are not available then one can make them available only to
 the coreutils build using the following instructions.  Even if the
 official packages for your system are too old, please install them
-as they may be required to build the newer versions.
+as they may be required to build the newer versions.  The examples
+below build into $HOME/coreutils/deps/, so first ensure that your
+$PATH is set correctly, which can be done for the current shell like:
+
+  export PATH=$HOME/coreutils/deps/bin:$PATH

 * autoconf *

-  # Note Autoconf 2.62 or newer is needed to build automake-1.11
+  # Note Autoconf 2.62 or newer is needed to build automake-1.11.1
  git clone --depth=1 git://git.sv.gnu.org/autoconf.git
  git checkout v2.62
  autoreconf -vi
@@ -33,7 +37,7 @@ as they may be required to build the newer versions.
  # Note help2man is required to build automake fully
  git clone git://git.sv.gnu.org/automake.git
  cd automake
-  git checkout -b branch-1.11 --track origin/branch-1.11
+  git checkout v1.11.1
  ./bootstrap
  ./configure --prefix=$HOME/coreutils/deps
  make install
@@ -50,7 +54,4 @@ requires version 1.10a or newer, as well as the xz program itself.
  ./configure --prefix=$HOME/coreutils/deps
  make install

-Now we can build coreutils as described in README-hacking
-as long as $PATH starts with $HOME/coreutils/deps/bin, which
-one can set for the current shell like:
-  $ export PATH=$HOME/coreutils/deps/bin:$PATH
+Now one can build coreutils as described in README-hacking.
--- a/2
+++ b/2
@@ -50,7 +50,7 @@ FIXME: enable excluded programs like arch? to get their manual pages?

 Once all the builds and tests have passed,

-* Run the gnupload command that was suggested by your "make major" run above.
+* Run the gnupload command that was suggested by your "make stable" run above.

 * Wait a few minutes (maybe up to 30?) and then use the release URLs to
  download all tarball/signature pairs and use gpg --verify to ensure
--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 #! /bin/bash
 # Convert this package for use with valgrind.

-# Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/10
+++ b/10
@@ -102,8 +102,10 @@ Carlos Canau                        Carlos.Canau@relay.puug.pt
 Charles Karney                      karney@pppl.gov
 Charles Randall                     crandall@matchlogic.com
 Chip Salzenberg                     chip@valinux.com
+Chris Clayton                       chris2553@googlemail.com
 Chris Faylor                        cgf@cygnus.com
 Chris J. Bednar                     cjb@AdvancedDataSolutions.com
+Chris Jones                         cjns1989@gmail.com
 Chris Lesniewski                    ctl@mit.edu
 Chris Sylvain                       csylvain@umm.edu
 Chris Yeo                           cyeo@biking.org
@@ -150,6 +152,7 @@ Dawson Engler                       engler@stanford.edu
 Dean Gaudet                         dean-savannah@arctic.org
 Deepak Goel                         deego@gnufans.org
 Denis Excoffier                     denis.excoffier@airbus.com
+Denis McKeon                        dmckeon@swcp.com
 Dennis Henriksen                    opus@flamingo.osrl.dk
 Dennis Smit                         ds@nerds-incorporated.org
 Derek Clegg                         dclegg@next.com
@@ -300,6 +303,7 @@ John Kodis                          kodis@acm.org
 John Murphy                         jam@philabs.research.philips.com
 John Roll                           john@panic.harvard.edu
 John Salmon                         johns@mullet.anu.edu.au
+John Stanley                        johnstops@verizon.net
 John Summerfield                    summer@OS2.ami.com.au
 Jon Peatfield                       J.S.Peatfield@damtp.cam.ac.uk
 Joost van Baal                      joostvb@xs4all.nl
@@ -334,6 +338,7 @@ Kirk Kelsey                         kirk.kelsey@0x4b.net
 Kristin E Thomas                    kristint@us.ibm.com
 Kjetil Torgrim Homme                kjetilho@ifi.uio.no
 Kristoffer Rose                     kris@diku.dk
+Ladislav Hagara                     ladislav.hagara@unob.cz
 Larry McVoy                         lm@sgi.com
 Lars Hecking                        lhecking@nmrc.ucc.ie
 Leah Q                              eequor@earthlink.net
@@ -509,9 +514,11 @@ Richard Sharman                     rsharman@magmacom.com
 Rick Sladkey                        jrs@world.std.com
 Rik Faith                           faith@cs.unc.edu
 Risto Kankkunen                     kankkune@lingsoft.fi
+Rob Wortman                         wyrm@haell.com
 Robert H. de Vries                  robert@and.nl
 Robert Lindgren                     robert@orcafat.com
 Robert Millan                       zeratul2@wanadoo.es
+Robert Schwebel                     r.schwebel@pengutronix.de
 Rogier Wolff                        R.E.Wolff@BitWizard.nl
 Roland Huebner                      ro-huebner@gmx.de
 Roland Turner                       raz.tah.bet@raz.cx
@@ -528,6 +535,7 @@ Samuli Karkkainen                   Samuli.Karkkainen@hut.fi
 Sander van Malssen                  svm@kozmix.ow.nl
 Santiago Vila Doncel                sanvila@unex.es
 Savochkin Andrey Vladimirovich      saw@msu.ru
+Scott Harrison                      scott.gnu.2009@scottrix.co.uk
 Scott Lurndal                       slurn@griffin.engr.sgi.com
 Sébastien Maret                     smaret@umich.edu
 Sergei Steshenko                    sergstesh@yahoo.com
@@ -537,6 +545,7 @@ Solar Designer                      solar@owl.openwall.com
 Stanislav Ievlev                    inger@altlinux.ru
 Stavros Passas                      stabat@ics.forth.gr
 Stéphane Chazelas                   Stephane_CHAZELAS@yahoo.fr
+Stéphane Raimbault                  stephane.raimbault@makina-corpus.com
 Stephen Depooter                    sbdep@myrealbox.com
 Stephen Eglen                       eglen@pcg.wustl.edu
 Stephen Gildea                      gildea@stop.mail-abuse.org
@@ -550,6 +559,7 @@ Steven Mocking                      ufo@quicknet.nl
 Steven Parkes                       smparkes@smparkes.net
 Steven Schveighoffer                schveiguy@yahoo.com
 Steven P Watson                     steven@magelico.net
+Stuart Citrin                       ctrn3e8@gmail.com
 Stuart Kemp                         skemp@peter.bmc.com
 Stuart Shelton                      stuart@shelton.me
 Sven Joachim                        svenjoac@gmx.de
--- a/6
+++ b/6
@@ -59,10 +59,6 @@ Integrate use of sendfile, suggested here:
  http://mail.gnu.org/archive/html/bug-fileutils/2003-03/msg00030.html
 I don't plan to do that, since a few tests demonstrate no significant benefit.

-Should printf '\0123' print "\n3"?
-  per report from TAKAI Kousuke on Mar 27
-  http://mail.gnu.org/archive/html/bug-coreutils/2003-03/index.html
-
 printf: consider adapting builtins/printf.def from bash

 tail: don't use xlseek; it *exits*.
@@ -169,7 +165,7 @@ pr's use of nstrftime can make it malloc a very large (up to SIZE_MAX) buffer

 -----

-Copyright (C) 2002-2009 Free Software Foundation, Inc.
+Copyright (C) 2002-2010 Free Software Foundation, Inc.

 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
--- a/14
+++ b/14
@@ -2,7 +2,7 @@

 # Bootstrap this package from checked-out sources.

-# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003-2010 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -314,10 +314,20 @@ get_version() {
  $app --version >/dev/null 2>&1 || return 1

  $app --version 2>&1 |
-  sed -n 's/[^0-9.]*\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/p
+  sed -n '# extract version within line
+          s/.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
          t done
+
+          # extract version at start of line
+          s/^\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
+          t done
+
          d
+
          :done
+          #the following essentially does s/5.005/5.5/
+          s/\.0*\([1-9]\)/.\1/g
+          p
          q'
 }

--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.

-# Copyright (C) 2006-2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2010 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -210,7 +210,6 @@ gnulib_modules="
  strsignal
  strtoimax
  strtoumax
-  strverscmp
  symlink
  sys_stat
  timespec
@@ -232,7 +231,6 @@ gnulib_modules="
  verify
  verror
  version-etc-fsf
-  warnings
  wcwidth
  winsz-ioctl
  winsz-termios
@@ -312,8 +310,8 @@ gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests --with-tests"

 # Build prerequisites
 buildreq="\
-autoconf   2.61
-automake   1.11
+autoconf   2.62
+automake   1.11.1
 autopoint  -
 bison      -
 gettext    -
--- a/build-aux/ChangeLog-2007
+++ b/build-aux/ChangeLog-2007
@@ -234,7 +234,7 @@

 	-----

-	Copyright (C) 2002-2009 Free Software Foundation, Inc.
+	Copyright (C) 2002-2010 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk                           -*- makefile -*-
-# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003-2010 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,22 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

-# Use alpha.gnu.org for alpha and beta releases.
-# Use ftp.gnu.org for major releases.
-gnu_ftp_host-alpha = alpha.gnu.org
-gnu_ftp_host-beta = alpha.gnu.org
-gnu_ftp_host-major = ftp.gnu.org
-gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
-
 # Used in maint.mk's web-manual rule
 manual_title = Core GNU utilities

-url_dir_list = \
-  ftp://$(gnu_rel_host)/gnu/$(PACKAGE)
-
-# The GnuPG ID of the key used to sign the tarballs.
-gpg_key_ID = B9AB9A16
-
 # Tests not to run as part of "make distcheck".
 local-checks-to-skip =

@@ -39,7 +26,10 @@ bootstrap-tools = autoconf,automake,gnulib,bison
 # Now that we have better tests, make this the default.
 export VERBOSE = yes

-old_NEWS_hash = 785e51bc9af87e7eb004f9ba24a0ca27
+old_NEWS_hash = beab130e9d41bf8014a0594cfe8b28d4
+
+# Add an exemption for sc_makefile_at_at_check.
+_makefile_at_at_check_exceptions = ' && !/^cu_install_program =/'

 # Ensure that the list of O_ symbols used to compute O_FULLBLOCK is complete.
 dd = $(srcdir)/src/dd.c
@@ -249,4 +239,14 @@ sc_require_stdio_safer:
 	else :;								\
 	fi

+# Prefer xnanosleep over other less-precise sleep methods
+sc_prohibit_sleep:
+	@re='\<(nano|u)?sleep \('					\
+	msg='prefer xnanosleep over other sleep interfaces'		\
+	  $(_prohibit_regexp)
+
 include $(srcdir)/dist-check.mk
+
+update-copyright-env = \
+  UPDATE_COPYRIGHT_USE_INTERVALS=1 \
+  UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # -*- autoconf -*-
 # Process this file with autoconf to produce a configure script.

-# Copyright (C) 1991, 1993-2009 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1993-2010 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@

 dnl Written by Jim Meyering.

-AC_PREREQ([2.61])
+AC_PREREQ([2.62])

 # Make inter-release version strings look like, e.g., v6.9-219-g58ddd, which
 # indicates that it is built from the 219th delta (in _some_ repository)
@@ -32,7 +32,7 @@ AC_CONFIG_SRCDIR([src/ls.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])

-AM_INIT_AUTOMAKE([1.11 dist-xz color-tests parallel-tests])
+AM_INIT_AUTOMAKE([1.11.1 dist-xz color-tests parallel-tests])
 AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.

 AC_PROG_CC_STDC
--- a/dist-check.mk
+++ b/dist-check.mk
@@ -4,36 +4,63 @@ bin=bin-$$$$

 write_loser = printf '\#!%s\necho $$0: bad path 1>&2; exit 1\n' '$(SHELL)'

-TMPDIR ?= /tmp
-t=$(TMPDIR)/$(PACKAGE)/test
+tmpdir = $(abs_top_builddir)/tests/torture
+
+t=$(tmpdir)/$(PACKAGE)/test
 pfx=$(t)/i

+built_programs =						\
+  $$(echo 'spy:;@echo $$(bin_PROGRAMS)'				\
+    | MAKEFLAGS= $(MAKE) -s -C src -f Makefile -f - spy		\
+    | fmt -1 | sed 's,$(EXEEXT)$$,,' | sort -u)
+
 # More than once, tainted build and source directory names would
 # have caused at least one "make check" test to apply "chmod 700"
 # to all directories under $HOME.  Make sure it doesn't happen again.
-tp := $(shell echo "$(TMPDIR)/$(PACKAGE)-$$$$")
+tp = $(tmpdir)/taint
 t_prefix = $(tp)/a
 t_taint = '$(t_prefix) b'
 fake_home = $(tp)/home

+# When extracting from a distribution tarball, extract using the fastest
+# method possible.  With dist-xz, that means using the *.xz file.
+ifneq ('', $(filter *.xz, $(DIST_ARCHIVES)))
+  tar_decompress_opt_ = J
+  suffix_ = xz
+else
+  ifneq ('', $(filter *.gz, $(DIST_ARCHIVES)))
+    tar_decompress_opt_ = z
+    suffix_ = gz
+  else
+    tar_decompress_opt_ = j
+    suffix_ = bz2
+  endif
+endif
+amtar_extract_ = $(AMTAR) -$(tar_decompress_opt_)xf
+preferred_tarball_ = $(distdir).tar.$(suffix_)
+
 # Ensure that tests run from tainted build and src dir names work,
 # and don't affect anything in $HOME.  Create witness files in $HOME,
 # record their attributes, and build/test.  Then ensure that the
 # witnesses were not affected.
+# Skip this test when using libtool, since libtool-generated scripts
+# cannot deal with a space-tainted srcdir.
 ALL_RECURSIVE_TARGETS += taint-distcheck
 taint-distcheck: $(DIST_ARCHIVES)
+	grep '^[	 ]*LT_INIT' configure.ac >/dev/null && exit 0 || :
 	test -d $(t_taint) && chmod -R 700 $(t_taint) || :
 	-rm -rf $(t_taint) $(fake_home)
 	mkdir -p $(t_prefix) $(t_taint) $(fake_home)
-	GZIP=$(GZIP_ENV) $(AMTAR) -C $(t_taint) -zxf $(distdir).tar.gz
+	$(amtar_extract_) $(preferred_tarball_) -C $(t_taint)
 	mkfifo $(fake_home)/fifo
 	touch $(fake_home)/f
 	mkdir -p $(fake_home)/d/e
 	ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-before
+	HOME=$(fake_home); export HOME;			\
 	cd $(t_taint)/$(distdir)			\
 	  && ./configure				\
 	  && $(MAKE)					\
-	  && HOME=$(fake_home) $(MAKE) check		\
+	  && $(MAKE) check				\
 	  && ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-after \
 	  && diff $(tp)/.ls-before $(tp)/.ls-after	\
 	  && test -d $(t_prefix)
@@ -50,8 +77,9 @@ define install-transform-check
 endef

 # Install, then verify that all binaries and man pages are in place.
-# Note that neither the binary, ginstall, nor the ].1 man page is installed.
+# Note that neither the binary, ginstall, nor the [.1 man page is installed.
 define my-instcheck
+  echo running my-instcheck;				\
  $(MAKE) prefix=$(pfx) install				\
    && test ! -f $(pfx)/bin/ginstall			\
    && { fail=0;					\
@@ -68,8 +96,16 @@ define my-instcheck
    }
 endef

+# The hard-linking for-loop below ensures that there is a bin/ directory
+# full of all of the programs under test (except the ones that are required
+# for basic Makefile rules), all symlinked to the just-built "false" program.
+# This is to ensure that if ever a test neglects to make PATH include
+# the build srcdir, these always-failing programs will run.
+# Otherwise, it is too easy to test the wrong programs.
+# Note that "false" itself is a symlink to true, so it too will malfunction.
 define coreutils-path-check
  {							\
+    echo running coreutils-path-check;			\
    if test -f $(srcdir)/src/true.c; then		\
      fail=1;						\
      mkdir $(bin)					\
@@ -97,37 +133,38 @@ define coreutils-path-check
  }
 endef

-# Use -Wformat -Werror to detect format-string/arg-list mismatches.
-# Also, check for shadowing problems with -Wshadow, and for pointer
-# arithmetic problems with -Wpointer-arith.
-# These CFLAGS are pretty strict.  If you build this target, you probably
-# have to have a recent version of gcc and glibc headers.
-# The hard-linking for-loop below ensures that there is a bin/ directory
-# full of all of the programs under test (except the ones that are required
-# for basic Makefile rules), all symlinked to the just-built "false" program.
-# This is to ensure that if ever a test neglects to make PATH include
-# the build srcdir, these always-failing programs will run.
-# Otherwise, it is too easy to test the wrong programs.
-# Note that "false" itself is a symlink to true, so it too will malfunction.
+# Use this to make sure we don't run these programs when building
+# from a virgin compressed tarball file, below.
+null_AM_MAKEFLAGS ?= \
+  ACLOCAL=false \
+  AUTOCONF=false \
+  AUTOMAKE=false \
+  AUTOHEADER=false \
+  GPERF=false \
+  MAKEINFO=false
+
 ALL_RECURSIVE_TARGETS += my-distcheck
 my-distcheck: $(DIST_ARCHIVES) $(local-check)
 	$(MAKE) syntax-check
 	$(MAKE) check
 	-rm -rf $(t)
 	mkdir -p $(t)
-	GZIP=$(GZIP_ENV) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz
-	cd $(t)/$(distdir)				\
-	  && ./configure --enable-gcc-warnings --disable-nls \
-	  && $(MAKE) AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)' \
-	  && $(MAKE) dvi				\
-	  && $(install-transform-check)			\
-	  && $(my-instcheck)				\
-	  && $(coreutils-path-check)			\
-	  && $(MAKE) distclean
+	$(amtar_extract_) $(preferred_tarball_) -C $(t)
+	(set -e; cd $(t)/$(distdir);			\
+	  ./configure --quiet --enable-gcc-warnings --disable-nls; \
+	  $(MAKE) AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)';	\
+	  $(MAKE) dvi;					\
+	  $(install-transform-check);			\
+	  $(my-instcheck);				\
+	  $(coreutils-path-check);			\
+	  $(MAKE) distclean				\
+	)
 	(cd $(t) && mv $(distdir) $(distdir).old	\
-	  && $(AMTAR) -zxf - ) < $(distdir).tar.gz
+	  && $(amtar_extract_) - ) < $(preferred_tarball_)
 	diff -ur $(t)/$(distdir).old $(t)/$(distdir)
 	-rm -rf $(t)
+	rmdir $(tmpdir)/$(PACKAGE) $(tmpdir)
 	@echo "========================"; \
-	echo "$(distdir).tar.gz is ready for distribution"; \
+	echo "ready for distribution:"; \
+	for i in $(DIST_ARCHIVES); do echo "  $$i"; done; \
 	echo "========================"
--- a/doc/ChangeLog-2007
+++ b/doc/ChangeLog-2007
@@ -2002,7 +2002,7 @@

 	-----

-	Copyright (C) 2001-2009 Free Software Foundation, Inc.
+	Copyright (C) 2001-2010 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 # Make coreutils documentation.				-*-Makefile-*-

-# Copyright (C) 1995-1998, 2001-2009 Free Software Foundation, Inc.
+# Copyright (C) 1995-1998, 2001-2010 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,13 +30,12 @@ EXTRA_DIST = perm.texi getdate.texi constants.texi fdl.texi
 AM_MAKEINFOFLAGS = --no-split

 constants.texi: $(top_srcdir)/src/tail.c $(top_srcdir)/src/shred.c
-	LC_ALL=C \
-	sed -n -e 's/^#define \(DEFAULT_MAX[_A-Z]*\) \(.*\)/@set \1 \2/p' \
-	  $(top_srcdir)/src/tail.c > t-$@
-	LC_ALL=C \
-	sed -n -e 's/.*\(DEFAULT_PASSES\)[ =]* \([0-9]*\).*/@set SHRED_\1 \2/p'\
-	  $(top_srcdir)/src/shred.c >> t-$@
-	mv t-$@ $@
+	$(AM_V_GEN)LC_ALL=C; export LC_ALL; \
+	{ sed -n -e 's/^#define \(DEFAULT_MAX[_A-Z]*\) \(.*\)/@set \1 \2/p' \
+	    $(top_srcdir)/src/tail.c && \
+	  sed -n -e 's/.*\(DEFAULT_PASSES\)[ =]* \([0-9]*\).*/@set SHRED_\1 \2/p'\
+	    $(top_srcdir)/src/shred.c; } > t-$@ \
+	  && mv t-$@ $@

 MAINTAINERCLEANFILES = constants.texi

--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -139,7 +139,7 @@
 This manual documents version @value{VERSION} of the @sc{gnu} core
 utilities, including the standard programs for text and file manipulation.

-Copyright @copyright{} 1994-1996, 2000-2009 Free Software Foundation, Inc.
+Copyright @copyright{} 1994-1996, 2000-2010 Free Software Foundation, Inc.

@quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -2770,8 +2770,10 @@ If you'd like to continue to track the end of a growing file even after
 it has been unlinked, use @option{--follow=descriptor}.  This is the default
 behavior, but it is not useful if you're tracking a log file that may be
 rotated (removed or renamed, then reopened).  In that case, use
-@option{--follow=name} to track the named file by reopening it periodically
-to see if it has been removed and recreated by some other program.
+@option{--follow=name} to track the named file, perhaps by reopening it
+periodically to see if it has been removed and recreated by some other program.
+Note that the inotify-based implementation handles this case without
+the need for any periodic reopening.

 No matter which method you use, if the tracked file is determined to have
 shrunk, @command{tail} prints a message saying the file has been truncated
@@ -3862,10 +3864,9 @@ To compare such strings numerically, use the
@opindex -V
@opindex --version-sort
@cindex version number sort
-@vindex LC_NUMERIC
-Sort per @code{strverscmp(3)}.  This is a normal string comparison, except
-that embedded decimal numbers are sorted by numeric value
-(see @option{--numeric-sort} above).
+Sort by version name and number.  It behaves like a standard sort,
+except that each sequence of decimal digits is treated numerically
+as an index/version number.  (@xref{Details about version sort}.)

@item -r
@itemx --reverse
@@ -6685,23 +6686,17 @@ after the last @samp{.}); files with no extension are sorted first.
@node Details about version sort
@subsection Details about version sort

-The version sort takes into account the fact that file names frequently include
-indices or version numbers.  Standard sorting functions usually do not produce
-the ordering that people expect because comparisons are made on a
-character-by-character basis.  The version
-sort addresses this problem, and is especially useful when browsing
-directories that contain many files with indices/version numbers in their
-names:
+Version sorting handles the fact that file names frequently include indices or
+version numbers.  Standard sorting usually does not produce the order that one
+expects because comparisons are made on a character-by-character basis.
+Version sorting is especially useful when browsing directories that contain
+many files with indices/version numbers in their names:

@example
 $ ls -1            $ ls -1v
-foo.zml-1.gz       foo.zml-1.gz
-foo.zml-100.gz     foo.zml-2.gz
-foo.zml-12.gz      foo.zml-6.gz
-foo.zml-13.gz      foo.zml-12.gz
-foo.zml-2.gz       foo.zml-13.gz
-foo.zml-25.gz      foo.zml-25.gz
-foo.zml-6.gz       foo.zml-100.gz
+abc.zml-1.gz       abc.zml-1.gz
+abc.zml-12.gz      abc.zml-2.gz
+abc.zml-2.gz       abc.zml-12.gz
@end example

 Version-sorted strings are compared such that if @var{ver1} and @var{ver2}
@@ -6720,11 +6715,27 @@ abc-1.012b.tgz     abc-1.007.tgz
 abc-1.01a.tgz      abc-1.012b.tgz
@end example

-This functionality is implemented using gnulib's @code{filevercmp} function.
-One result of that implementation decision is that @samp{ls -v}
-and @samp{sort -V} do not use the locale category, @env{LC_COLLATE},
-which means non-numeric prefixes are sorted as if @env{LC_COLLATE} were set
-to @samp{C}.
+This functionality is implemented using gnulib's @code{filevercmp} function,
+which has some caveats worth noting.
+
+@itemize @bullet
+@item @env{LC_COLLATE} is ignored, which means @samp{ls -v} and @samp{sort -V}
+will sort non-numeric prefixes as if the @env{LC_COLLATE} locale category
+was set to @samp{C}.
+@item Some suffixes will not be matched by the regular
+expression mentioned above.  Consequently these examples may
+not sort as you expect:
+
+@example
+abc-1.2.3.4.7z
+abc-1.2.3.7z
+@end example
+
+@example
+abc-1.2.3.4.x86_64.rpm
+abc-1.2.3.x86_64.rpm
+@end example
+@end itemize

@node General output formatting
@subsection General output formatting
--- a/doc/perm.texi
+++ b/doc/perm.texi
@@ -1,7 +1,7 @@
@c File mode bits

-@c Copyright (C) 1994, 1996, 1999-2001, 2003-2006,
-@c 2008-2009 Free Software Foundation, Inc.
+@c Copyright (C) 1994, 1996, 1999-2001, 2003-2006, 2008-2010 Free Software
+@c Foundation, Inc.

@c Permission is granted to copy, distribute and/or modify this document
@c under the terms of the GNU Free Documentation License, Version 1.3 or
--- a/gl/lib/mbsalign.c
+++ b/gl/lib/mbsalign.c
@@ -1,5 +1,5 @@
 /* Align/Truncate a string in a given screen width
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/gl/lib/mbsalign.h
+++ b/gl/lib/mbsalign.h
@@ -1,5 +1,5 @@
 /* Align/Truncate a string in a given screen width
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/gl/lib/rand-isaac.c
+++ b/gl/lib/rand-isaac.c
@@ -1,6 +1,6 @@
 /* Bob Jenkins's cryptographic random number generator, ISAAC.

-   Copyright (C) 1999-2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1999-2006, 2009-2010 Free Software Foundation, Inc.
   Copyright (C) 1997, 1998, 1999 Colin Plumb.

   This program is free software: you can redistribute it and/or modify
--- a/gl/lib/rand-isaac.h
+++ b/gl/lib/rand-isaac.h
@@ -1,6 +1,6 @@
 /* Bob Jenkins's cryptographic random number generator, ISAAC.

-   Copyright (C) 1999-2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1999-2005, 2009-2010 Free Software Foundation, Inc.
   Copyright (C) 1997, 1998, 1999 Colin Plumb.

   This program is free software: you can redistribute it and/or modify
--- a/gl/lib/randint.c
+++ b/gl/lib/randint.c
@@ -1,6 +1,6 @@
 /* Generate random integers.

-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/gl/lib/randint.h
+++ b/gl/lib/randint.h
@@ -1,6 +1,6 @@
 /* Generate random integers.

-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/gl/lib/randperm.c
+++ b/gl/lib/randperm.c
@@ -1,6 +1,6 @@
 /* Generate random permutations.

-   Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/gl/lib/randread.c
+++ b/gl/lib/randread.c
@@ -1,6 +1,6 @@
 /* Generate buffers of random data.

-   Copyright (C) 2006, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/gl/lib/randread.h
+++ b/gl/lib/randread.h
@@ -1,6 +1,6 @@
 /* Generate buffers of random data.

-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/gl/lib/root-dev-ino.c
+++ b/gl/lib/root-dev-ino.c
@@ -1,5 +1,5 @@
 /* root-dev-ino.c -- get the device and inode numbers for `/'.
-   Copyright (C) 2003, 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2006, 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/gl/lib/root-dev-ino.h
+++ b/gl/lib/root-dev-ino.h
@@ -1,6 +1,6 @@
 /* Root device and inode number checking.

-   Copyright (C) 2003, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/gl/lib/tempname.c.diff
+++ b/gl/lib/tempname.c.diff
@@ -127,48 +127,48 @@ index 2da5afe..562955a 100644
 +        XXXXXX[i] = letters[randint_genmax (rand_src, sizeof letters - 2)];

       switch (kind)
- 	{
+         {
@@ -276,7 +271,7 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
- 	  break;
+           break;

- 	case __GT_NOCREATE:
-	  /* This case is backward from the other three.  __gen_tempname
-+	  /* This case is backward from the other three.  This function
- 	     succeeds if __xstat fails because the name does not exist.
- 	     Note the continue to bypass the common logic at the bottom
- 	     of the loop.  */
+         case __GT_NOCREATE:
+-          /* This case is backward from the other three.  __gen_tempname
+          /* This case is backward from the other three.  This function
+              succeeds if __xstat fails because the name does not exist.
+              Note the continue to bypass the common logic at the bottom
+              of the loop.  */
@@ -285,11 +280,15 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
- 	      if (errno == ENOENT)
- 		{
- 		  __set_errno (save_errno);
-		  return 0;
-+		  fd = 0;
-+		  goto done;
- 		}
- 	      else
-		/* Give up now. */
-		return -1;
-+		{
-+		  /* Give up now. */
-+		  fd = -1;
-+		  goto done;
-+		}
- 	    }
- 	  continue;
+               if (errno == ENOENT)
+                 {
+                   __set_errno (save_errno);
+-                  return 0;
+                  fd = 0;
+                  goto done;
+                 }
+               else
+-                /* Give up now. */
+-                return -1;
+                {
+                  /* Give up now. */
+                  fd = -1;
+                  goto done;
+                }
+             }
+           continue;

@@ -301,13 +300,32 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
       if (fd >= 0)
- 	{
- 	  __set_errno (save_errno);
-	  return fd;
-+	  goto done;
- 	}
+         {
+           __set_errno (save_errno);
+-          return fd;
+          goto done;
+         }
       else if (errno != EEXIST)
-	return -1;
-+	{
-+	  fd = -1;
-+	  goto done;
-+	}
+-        return -1;
+        {
+          fd = -1;
+          goto done;
+        }
     }

 +  randint_all_free (rand_src);
--- a/gl/lib/xfreopen.c
+++ b/gl/lib/xfreopen.c
@@ -1,42 +0,0 @@
-/* a wrapper for frepoen
-   Copyright (C) 2008-2009 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include <config.h>
-#include "xfreopen.h"
-
-#include <errno.h>
-#include "error.h"
-#include "exitfail.h"
-#include "quote.h"
-#include "stdio--.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-
-void
-xfreopen (char const *filename, char const *mode, FILE *fp)
-{
-  if (!freopen (filename, mode, fp))
-    {
-      char const *f = (filename ? filename
-                       : (fp == stdin ? _("stdin")
-                          : (fp == stdout ? _("stdout")
-                             : (fp == stderr ? _("stderr")
-                                : _("unknown stream")))));
-      error (exit_failure, errno, _("failed to reopen %s with mode %s"),
-             quote_n (0, f), quote_n (1, mode));
-    }
-}
--- a/gl/lib/xfreopen.h
+++ b/gl/lib/xfreopen.h
@@ -1,2 +0,0 @@
-#include <stdio.h>
-void xfreopen (char const *filename, char const *mode, FILE *fp);
--- a/gl/m4/root-dev-ino.m4
+++ b/gl/m4/root-dev-ino.m4
@@ -1,5 +1,5 @@
 #serial 3
-dnl Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
--- a/gl/modules/link-tests.diff
+++ b/gl/modules/link-tests.diff
@@ -0,0 +1,9 @@
+diff --git i/modules/link-tests w/modules/link-tests
+index d8e7b1a..aca0e74 100644
+--- i/modules/link-tests
+++ w/modules/link-tests
+@@ -12,3 +12,4 @@ configure.ac:
+ Makefile.am:
+ TESTS += test-link
+ check_PROGRAMS += test-link
+test_link_LDADD = $(LDADD) @LIBINTL@
--- a/gl/modules/xfreopen
+++ b/gl/modules/xfreopen
@@ -1,26 +0,0 @@
-Description:
-a wrapper for frepoen
-
-Files:
-lib/xfreopen.c
-lib/xfreopen.h
-
-Depends-on:
-error
-exitfail
-freopen-safer
-quote
-
-configure.ac:
-
-Makefile.am:
-lib_SOURCES += xfreopen.c xfreopen.h
-
-Include:
-"xfreopen.h"
-
-License:
-LGPL
-
-Maintainer:
-Jim Meyering
--- a/2
+++ b/2
--- a/lib/ChangeLog-2007
+++ b/lib/ChangeLog-2007
@@ -8746,7 +8746,7 @@

 	-----

-	Copyright (C) 2000-2009 Free Software Foundation, Inc.
+	Copyright (C) 2000-2010 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile for gnulib/lib				-*-Makefile-*-

-# Copyright (C) 1995-2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1995-2007, 2009-2010 Free Software Foundation, Inc.

 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
--- a/lib/buffer-lcm.c
+++ b/lib/buffer-lcm.c
@@ -1,6 +1,6 @@
 /* buffer-lcm.c - compute a good buffer size for dealing with two files

-   Copyright (C) 2002, 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/lib/euidaccess-stat.c
+++ b/lib/euidaccess-stat.c
@@ -2,7 +2,7 @@
   This function is probably useful only for choosing whether to issue
   a prompt in an implementation of POSIX-specified rm.

-   Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/lib/fd-reopen.c
+++ b/lib/fd-reopen.c
@@ -1,6 +1,6 @@
 /* Invoke open, but return either a desired file descriptor or -1.

-   Copyright (C) 2005, 2006, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/lib/fd-reopen.h
+++ b/lib/fd-reopen.h
@@ -1,6 +1,6 @@
 /* Invoke open, but return either a desired file descriptor or -1.

-   Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/lib/memxfrm.c
+++ b/lib/memxfrm.c
@@ -1,6 +1,6 @@
 /* Locale-specific memory transformation

-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/lib/strintcmp.c
+++ b/lib/strintcmp.c
@@ -1,6 +1,6 @@
 /* Compare integer strings.

-   Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/lib/strnumcmp-in.h
+++ b/lib/strnumcmp-in.h
@@ -1,7 +1,7 @@
 /* Compare numeric strings.  This is an internal include file.

-   Copyright (C) 1988, 1991, 1992, 1993, 1995, 1996, 1998, 1999, 2000,
-   2003, 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1991-1993, 1995-1996, 1998-2000, 2003-2006, 2009-2010
+   Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/lib/strnumcmp.c
+++ b/lib/strnumcmp.c
@@ -1,6 +1,6 @@
 /* Compare numeric strings.

-   Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/lib/t-chdir-long
+++ b/lib/t-chdir-long
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise chdir-long's sample main program.

-# Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/lib/xfts.c
+++ b/lib/xfts.c
@@ -1,6 +1,6 @@
 /* xfts.c -- a wrapper for fts_open

-   Copyright (C) 2003, 2005-2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,13 +21,9 @@

 #include <stdbool.h>
 #include <stdlib.h>
+#include <errno.h>
+#include <assert.h>

-#include "error.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-
-#include "quote.h"
 #include "xalloc.h"
 #include "xfts.h"

@@ -40,23 +36,10 @@ xfts_open (char * const *argv, int options,
  FTS *fts = fts_open (argv, options | FTS_CWDFD, compar);
  if (fts == NULL)
    {
-      /* This can fail in three ways: out of memory, invalid bit_flags,
-         and one or more of the FILES is an empty string.  We could try
-         to decipher that errno==EINVAL means invalid bit_flags and
-         errno==ENOENT means there's an empty string, but that seems wrong.
-         Ideally, fts_open would return a proper error indicator.  For now,
-         we'll presume that the bit_flags are valid and just check for
-         empty strings.  */
-      bool invalid_arg = false;
-      for (; *argv; ++argv)
-        {
-          if (**argv == '\0')
-            invalid_arg = true;
-        }
-      if (invalid_arg)
-        error (EXIT_FAILURE, 0, _("invalid argument: %s"), quote (""));
-      else
-        xalloc_die ();
+      /* This can fail in two ways: out of memory or with errno==EINVAL,
+         which indicates it was called with invalid bit_flags.  */
+      assert (errno != EINVAL);
+      xalloc_die ();
    }

  return fts;
--- a/lib/xmemxfrm.c
+++ b/lib/xmemxfrm.c
@@ -1,6 +1,6 @@
 /* Locale-specific memory transformation

-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/m4/ChangeLog-2007
+++ b/m4/ChangeLog-2007
@@ -5004,8 +5004,7 @@

 	-----

-	Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-	2005, 2006, 2009 Free Software Foundation, Inc.
+	Copyright (C) 1997-2006, 2009-2010 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/m4/boottime.m4
+++ b/m4/boottime.m4
@@ -1,7 +1,8 @@
 # boottime.m4 serial 4
 # Determine whether this system has infrastructure for obtaining the boot time.

-# Copyright (C) 1996, 2000, 2002-2004, 2006, 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 1996, 2000, 2002-2004, 2006, 2008-2010 Free Software
+# Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,8 +1,8 @@
 #serial 26
 # Check declarations for this package.

-dnl Copyright (C) 1997-2001, 2003-2006, 2008-2009 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 1997-2001, 2003-2006, 2008-2010 Free Software Foundation,
+dnl Inc.

 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
--- a/m4/euidaccess-stat.m4
+++ b/m4/euidaccess-stat.m4
@@ -1,5 +1,5 @@
 # serial 1
-dnl Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
--- a/m4/fd-reopen.m4
+++ b/m4/fd-reopen.m4
@@ -1,6 +1,6 @@
 # Invoke open, but return either a desired file descriptor or -1.

-dnl Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.

 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
--- a/m4/gmp.m4
+++ b/m4/gmp.m4
@@ -1,6 +1,6 @@
 # Tests for GNU GMP (or any compatible replacement).

-dnl Copyright (C) 2008-2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.

 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
--- a/m4/include-exclude-prog.m4
+++ b/m4/include-exclude-prog.m4
@@ -1,5 +1,5 @@
 #serial 2
-dnl Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -2,7 +2,7 @@

 dnl Misc type-related macros for coreutils.

-# Copyright (C) 1998, 2000-2009 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2000-2010 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/m4/lib-check.m4
+++ b/m4/lib-check.m4
@@ -2,8 +2,8 @@

 dnl Misc lib-related macros for coreutils.

-# Copyright (C) 1993-1997, 2000-2001, 2003-2006, 2008-2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1993-1997, 2000-2001, 2003-2006, 2008-2010 Free Software
+# Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/m4/memxfrm.m4
+++ b/m4/memxfrm.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -7,7 +7,7 @@ m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
 # directory of the coreutils package.


-# Copyright (C) 1998, 2000, 2001, 2003-2009 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2000-2001, 2003-2010 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/m4/stat-prog.m4
+++ b/m4/stat-prog.m4
@@ -1,7 +1,7 @@
 # stat-prog.m4 serial 6
 # Record the prerequisites of src/stat.c from the coreutils package.

-# Copyright (C) 2002-2004, 2006, 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2004, 2006, 2008-2010 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/m4/strnumcmp.m4
+++ b/m4/strnumcmp.m4
@@ -1,6 +1,6 @@
 # Compare numeric strings.

-dnl Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.

 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
--- a/m4/xattr.m4
+++ b/m4/xattr.m4
@@ -1,6 +1,6 @@
 # xattr.m4 - check for Extended Attributes (Linux)

-# Copyright (C) 2003, 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2008-2010 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,25 +15,29 @@ AC_DEFUN([gl_FUNC_XATTR],
                       [do not support extended attributes]),
        [use_xattr=$enableval], [use_xattr=yes])

+  LIB_XATTR=
+  AC_SUBST([LIB_XATTR])
+
  if test "$use_xattr" = "yes"; then
    AC_CHECK_HEADERS([attr/error_context.h attr/libattr.h])
+    use_xattr=no
    if test $ac_cv_header_attr_libattr_h = yes \
-       && test $ac_cv_header_attr_error_context_h = yes; then
-      use_xattr=1
-    else
-      use_xattr=0
-      AC_MSG_WARN([libattr development library was not found or not usable.])
-      AC_MSG_WARN([AC_PACKAGE_NAME will be built without xattr support.])
+        && test $ac_cv_header_attr_error_context_h = yes; then
+      xattr_saved_LIBS=$LIBS
+      AC_SEARCH_LIBS([attr_copy_file], [attr],
+                     [test "$ac_cv_search_attr_copy_file" = "none required" ||
+                        LIB_XATTR=$ac_cv_search_attr_copy_file])
+      AC_CHECK_FUNCS([attr_copy_file])
+      LIBS=$xattr_saved_LIBS
+      if test $ac_cv_func_attr_copy_file = yes; then
+        use_xattr=yes
+      fi
    fi
    AC_DEFINE_UNQUOTED([USE_XATTR], [$use_xattr],
                       [Define if you want extended attribute support.])
-    LIB_XATTR=
-    xattr_saved_LIBS=$LIBS
-    AC_SEARCH_LIBS([attr_copy_file], [attr],
-                   [test "$ac_cv_search_attr_copy_file" = "none required" ||
-                      LIB_XATTR=$ac_cv_search_attr_copy_file])
-    AC_CHECK_FUNCS([attr_copy_file])
-    LIBS=$xattr_saved_LIBS
-    AC_SUBST([LIB_XATTR])
+    if test $use_xattr = no; then
+      AC_MSG_WARN([libattr development library was not found or not usable.])
+      AC_MSG_WARN([AC_PACKAGE_NAME will be built without xattr support.])
+    fi
  fi
 ])
--- a/m4/xfts.m4
+++ b/m4/xfts.m4
@@ -1,5 +1,5 @@
 #serial 1
-dnl Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,6 @@
 # Make coreutils man pages.				-*-Makefile-*-

-# Copyright (C) 2002-2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/man/chmod.x
+++ b/man/chmod.x
@@ -1,4 +1,5 @@
-'\" Copyright (C) 1998, 1999, 2001, 2006, 2007, 2009 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-1999, 2001, 2006-2007, 2009-2010 Free Software
+'\" Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
--- a/man/chown.x
+++ b/man/chown.x
@@ -1,4 +1,5 @@
-'\" Copyright (C) 1998, 1999, 2001, 2006, 2009 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-1999, 2001, 2006, 2009-2010 Free Software Foundation,
+'\" Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
--- a/man/df.x
+++ b/man/df.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998, 1999, 2004, 2009 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-1999, 2004, 2009-2010 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
--- a/man/du.x
+++ b/man/du.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998, 1999, 2000, 2002, 2009 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-2000, 2002, 2009-2010 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
--- a/man/help2man
+++ b/man/help2man
@@ -1,8 +1,7 @@
 #!/usr/bin/perl -w

 # Generate a short man page from --help and --version output.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2004, 2008-2010 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/man/rm.x
+++ b/man/rm.x
@@ -1,5 +1,5 @@
-'\" Copyright (C) 1998, 1999, 2001, 2003, 2004,
-'\" 2006, 2009 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-1999, 2001, 2003-2004, 2006, 2009-2010 Free Software
+'\" Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
--- a/man/stdbuf.x
+++ b/man/stdbuf.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 2009 Free Software Foundation, Inc.
+'\" Copyright (C) 2009-2010 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -8390,7 +8390,7 @@

 	-----

-	Copyright (C) 1998-2009 Free Software Foundation, Inc.
+	Copyright (C) 1998-2010 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/old/fileutils/NEWS
+++ b/old/fileutils/NEWS
@@ -749,8 +749,7 @@ Major changes in release 3.3:

 ========================================================================

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2009 Free Software Foundation, Inc.
+Copyright (C) 1992-2003, 2009-2010 Free Software Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -4858,8 +4858,8 @@ Thu Nov 17 23:47:26 1994  Jim Meyering  (meyering@comco.com)

 	-----

-	Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2006
-	Free Software Foundation, Inc.
+	Copyright (C) 1994-1997, 1999-2002, 2006, 2010 Free Software
+	Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/old/sh-utils/ChangeLog.0
+++ b/old/sh-utils/ChangeLog.0
@@ -1706,8 +1706,7 @@ Sat Oct 28 13:20:43 1989  David J. MacKenzie  (djm at spiff)

 	-----

-	Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994 Free Software
-	Foundation, Inc.
+	Copyright (C) 1989-1994, 2010 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/old/sh-utils/NEWS
+++ b/old/sh-utils/NEWS
@@ -273,8 +273,7 @@ Major changes in release 1.7:

 ========================================================================

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2009 Free Software Foundation, Inc.
+Copyright (C) 1992-2003, 2009-2010 Free Software Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
--- a/old/textutils/ChangeLog
+++ b/old/textutils/ChangeLog
@@ -8745,7 +8745,7 @@ Sat Dec 16 15:15:50 1989  David J. MacKenzie  (djm at hobbes.ai.mit.edu)

 	-----

-	Copyright (C) 1998-2009 Free Software Foundation, Inc.
+	Copyright (C) 1998-2010 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/old/textutils/NEWS
+++ b/old/textutils/NEWS
@@ -461,8 +461,7 @@ Major changes in release 1.4:

 ========================================================================

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 1992-2002, 2006, 2009-2010 Free Software Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
--- a/po/ChangeLog-2007
+++ b/po/ChangeLog-2007
@@ -246,7 +246,7 @@

 	-----

-	Copyright (C) 2002-2009 Free Software Foundation, Inc.
+	Copyright (C) 2002-2010 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,5 @@
 # List of files which contain translatable strings.
-# Copyright (C) 1996-2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2010 Free Software Foundation, Inc.

 # These are nominally temporary...
 lib/argmatch.c
@@ -28,7 +28,6 @@ lib/verror.c
 lib/version-etc.c
 lib/xalloc-die.c
 lib/xfreopen.c
-lib/xfts.c
 lib/xmemcoll.c
 lib/xmemxfrm.c
 lib/xprintf.c
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-

-## Copyright (C) 1990, 1991, 1993-2009 Free Software Foundation, Inc.
+## Copyright (C) 1990-1991, 1993-2010 Free Software Foundation, Inc.

 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -325,12 +325,13 @@ ls_LDADD += $(LIB_CLOCK_GETTIME)
 pr_LDADD += $(LIB_CLOCK_GETTIME)
 touch_LDADD += $(LIB_CLOCK_GETTIME)

-# for gethrxtime, randint, randread, gen_tempname
+# for gethrxtime, randint, randread, gen_tempname, mkstemp
 dd_LDADD += $(LIB_GETHRXTIME)
 mktemp_LDADD += $(LIB_GETHRXTIME)
 shred_LDADD += $(LIB_GETHRXTIME)
 shuf_LDADD += $(LIB_GETHRXTIME)
 sort_LDADD += $(LIB_GETHRXTIME)
+tac_LDADD += $(LIB_GETHRXTIME)

 # for cap_get_file
 ls_LDADD += $(LIB_CAP)
@@ -349,6 +350,7 @@ uptime_LDADD += $(POW_LIB)

 # for xnanosleep
 sleep_LDADD += $(LIB_NANOSLEEP)
+sort_LDADD += $(LIB_NANOSLEEP)
 tail_LDADD += $(LIB_NANOSLEEP)

 # for various GMP functions
--- a/src/base64.c
+++ b/src/base64.c
@@ -1,5 +1,5 @@
 /* Base64 encode/decode strings or files.
-   Copyright (C) 2004-2009 Free Software Foundation, Inc.
+   Copyright (C) 2004-2010 Free Software Foundation, Inc.

   This file is part of Base64.

@@ -68,9 +68,8 @@ Base64 encode or decode FILE, or standard input, to standard output.\n\
  -i, --ignore-garbage  When decoding, ignore non-alphabet characters.\n\
 \n\
 "), stdout);
-      fputs (_("\
-      --help            Display this help and exit.\n\
-      --version         Output version information and exit.\n"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
      fputs (_("\
 \n\
 With no FILE, or when FILE is -, read standard input.\n"), stdout);
--- a/src/basename.c
+++ b/src/basename.c
@@ -1,5 +1,5 @@
 /* basename -- strip directory and suffix from file names
-   Copyright (C) 1990-1997, 1999-2009 Free Software Foundation, Inc.
+   Copyright (C) 1990-1997, 1999-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/src/cat.c
+++ b/src/cat.c
@@ -1,5 +1,5 @@
 /* cat -- concatenate files and print on the standard output.
-   Copyright (C) 88, 90, 91, 1995-2009 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1990-1991, 1995-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/src/chcon.c
+++ b/src/chcon.c
@@ -1,5 +1,5 @@
 /* chcon -- change security context of files
-   Copyright (C) 2005-2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -1,5 +1,5 @@
 /* chgrp -- change group ownership of files
-   Copyright (C) 89, 90, 91, 1995-2009 Free Software Foundation, Inc.
+   Copyright (C) 1989-1991, 1995-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -1,5 +1,5 @@
 /* chmod -- change permission modes of files
-   Copyright (C) 89, 90, 91, 1995-2009 Free Software Foundation, Inc.
+   Copyright (C) 1989-1991, 1995-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/src/chown-core.c
+++ b/src/chown-core.c
@@ -1,5 +1,5 @@
 /* chown-core.c -- core functions for changing ownership.
-   Copyright (C) 2000, 2002-2009 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/src/chown-core.h
+++ b/src/chown-core.h
@@ -1,6 +1,6 @@
 /* chown-core.h -- types and prototypes shared by chown and chgrp.

-   Copyright (C) 2000, 2003-2005, 2007-2009 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2003-2005, 2007-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/src/chown.c
+++ b/src/chown.c
@@ -1,5 +1,5 @@
 /* chown -- change user and group ownership of files
-   Copyright (C) 89, 90, 91, 1995-2009 Free Software Foundation, Inc.
+   Copyright (C) 1989-1991, 1995-2010 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -14,18 +14,7 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

-/*
-              |		              user
-              | unchanged                 explicit
- -------------|-------------------------+-------------------------|
- g unchanged  | ---                     | chown u		  |
- r            |-------------------------+-------------------------|
- o explicit   | chgrp g or chown .g     | chown u.g		  |
- u            |-------------------------+-------------------------|
- p from passwd| ---			| chown u.		  |
-              |-------------------------+-------------------------|
-
-   Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
+/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */

 #include <config.h>
 #include <stdio.h>
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .0
 .3