small patches, e.g., update gnulib for ls -v & sort -V; fix a typo

[Jim Meyering]

>From 0df3a91b25183ea9be3cad7d899242073460e3aa Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 9 Apr 2009 15:29:59 +0200
Subject: [PATCH 1/6] tests: misc/ls-misc: avoid shadowing local decl of $e

* tests/misc/ls-misc (make_j_d): Rename latter $e to $env
---
 tests/misc/ls-misc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/misc/ls-misc b/tests/misc/ls-misc
index 93d5b91..30eb06c 100755
--- a/tests/misc/ls-misc
+++ b/tests/misc/ls-misc
@@ -240,10 +240,10 @@ $fail
   and exit 1;

 # Be careful to use the just-build dircolors.
-my $e = `$ENV{abs_top_builddir}/src/dircolors -b`;
-$e =~ s/^LS_COLORS=\'//;
-$e =~ s/\';.*//sm;
-$ENV{LS_COLORS} = $e;
+my $env = `$ENV{abs_top_builddir}/src/dircolors -b`;
+$env =~ s/^LS_COLORS=\'//;
+$env =~ s/\';.*//sm;
+$ENV{LS_COLORS} = $env;

 setuid_setup;
 $fail = run_tests ($program_name, $prog, address@hidden, $save_temps, 
$verbose);
-- 
1.6.2.rc1.285.gc5f54


>From 6a51c69b05996f803447cfb4e963521b98b2a529 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 10 Apr 2009 08:20:13 +0200
Subject: [PATCH 2/6] maint: put each module name on its own line; sort

* bootstrap.conf (gnulib_modules): List them one per line.
---
 bootstrap.conf |  300 +++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 211 insertions(+), 89 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 568ef40..e536df5 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -18,104 +18,226 @@

 # We don't need these modules.
 avoided_gnulib_modules='
-       --avoid=canonicalize-lgpl
-       --avoid=dummy
-       --avoid=lock
+  --avoid=canonicalize-lgpl
+  --avoid=dummy
+  --avoid=lock
 '

 # These modules are obsolete and can probably be removed soon,
 # but leave them in for now to minimize changes.
 obsolete_gnulib_modules='
-       atexit memchr memcmp memcpy memmove memset rename
-       strcspn strtod strtol utime
+  atexit
+  memchr
+  memcmp
+  memcpy
+  memmove
+  memset
+  rename
+  strcspn
+  strtod
+  strtol
+  utime
 '

 # gnulib modules used by this package.
 gnulib_modules="
-       $avoided_gnulib_modules
-       $obsolete_gnulib_modules
-       acl alloca announce-gen argmatch
-       argv-iter
-       assert
-       autobuild
-       backupfile base64
-       c-strcase c-strtod
-       c-strtold calloc canon-host canonicalize chown cloexec
-       config-h configmake
-       closein closeout
-       crypto/md5
-       crypto/sha1
-       crypto/sha256
-       crypto/sha512
-       cycle-check
-       d-ino d-type diacrit dirfd dirname dup2
-       error euidaccess exclude exitfail fchdir fcntl fcntl-safer fdl
-       file-type fileblocks filemode filenamecat filevercmp fnmatch-gnu
-       fopen-safer
-       fprintftime
-       fseeko
-       fsusage ftruncate
-       ftello
-       fts getdate getgroups gethrxtime
-       gendocs
-       getline getloadavg getndelim2 getopt getpagesize getpass-gnu
-       gettext gettime gettimeofday getugroups getusershell
-       git-version-gen
-       gitlog-to-changelog
-       gnu-make gnumakefile gnupload
-       group-member hard-locale hash hash-pjw host-os human idcache
-       ignore-value
-       inttostr inttypes isapipe
-       lchmod lchown lib-ignore linebuffer link-follow
-       long-options lstat malloc
-       manywarnings
-       mbrtowc
-       mbsalign
-       mbswidth
-       memcasecmp memcmp2 mempcpy
-       memrchr mgetgroups
-       mkancesdirs mkdir mkdir-p mkstemp mktime modechange
-       mountlist mpsort obstack pathmax perl physmem
-       posix-shell
-       posixtm
-       posixver
-       progname
-       propername
-       putenv
-       quote quotearg raise readlink areadlink-with-size
-       randint
-       randperm
-       readtokens
-       readtokens0 readutmp
-       realloc regex rename-dest-slash rmdir rmdir-errno
-       root-dev-ino
-       rpmatch
-       safe-read same
-       save-cwd savedir savewd
-       selinux-at
-       settime sig2str sigaction ssize_t stat-macros
-       stat-time stdbool stdlib-safer stpcpy
-       stpncpy
-       strdup
-       strftime
-       strpbrk strtoimax strtoumax strverscmp sys_stat timespec tzset
-       unicodeio unistd-safer unlink-busy unlinkdir unlocked-io
-       uptime
-       useless-if-before-free
-       userspec utimecmp utimens
-       vasprintf-posix
-       vc-list-files
-       verify version-etc-fsf verror
-       warnings
-       wcwidth winsz-ioctl winsz-termios write-any-file
-       xalloc
-       xfreopen
-       xgetcwd xgethostname
-       xmemcoll xnanosleep
-       xprintf
-       xprintf-posix
-       xstrtod xstrtoimax
-       xstrtol xstrtold xstrtoumax yesno
+  $avoided_gnulib_modules
+  $obsolete_gnulib_modules
+  acl
+  alloca
+  announce-gen
+  areadlink-with-size
+  argmatch
+  argv-iter
+  assert
+  autobuild
+  backupfile
+  base64
+  c-strcase
+  c-strtod
+  c-strtold
+  calloc
+  canon-host
+  canonicalize
+  chown
+  cloexec
+  closein
+  closeout
+  config-h
+  configmake
+  crypto/md5
+  crypto/sha1
+  crypto/sha256
+  crypto/sha512
+  cycle-check
+  d-ino
+  d-type
+  diacrit
+  dirfd
+  dirname
+  dup2
+  error
+  euidaccess
+  exclude
+  exitfail
+  fchdir
+  fcntl
+  fcntl-safer
+  fdl
+  file-type
+  fileblocks
+  filemode
+  filenamecat
+  filevercmp
+  fnmatch-gnu
+  fopen-safer
+  fprintftime
+  fseeko
+  fsusage
+  ftello
+  ftruncate
+  fts
+  gendocs
+  getdate
+  getgroups
+  gethrxtime
+  getline
+  getloadavg
+  getndelim2
+  getopt
+  getpagesize
+  getpass-gnu
+  gettext
+  gettime
+  gettimeofday
+  getugroups
+  getusershell
+  git-version-gen
+  gitlog-to-changelog
+  gnu-make
+  gnumakefile
+  gnupload
+  group-member
+  hard-locale
+  hash
+  hash-pjw
+  host-os
+  human
+  idcache
+  ignore-value
+  inttostr
+  inttypes
+  isapipe
+  lchmod
+  lchown
+  lib-ignore
+  linebuffer
+  link-follow
+  long-options
+  lstat
+  malloc
+  manywarnings
+  mbrtowc
+  mbsalign
+  mbswidth
+  memcasecmp
+  memcmp2
+  mempcpy
+  memrchr
+  mgetgroups
+  mkancesdirs
+  mkdir
+  mkdir-p
+  mkstemp
+  mktime
+  modechange
+  mountlist
+  mpsort
+  obstack
+  pathmax
+  perl
+  physmem
+  posix-shell
+  posixtm
+  posixver
+  progname
+  propername
+  putenv
+  quote
+  quotearg
+  raise
+  randint
+  randperm
+  readlink
+  readtokens
+  readtokens0
+  readutmp
+  realloc
+  regex
+  rename-dest-slash
+  rmdir
+  rmdir-errno
+  root-dev-ino
+  rpmatch
+  safe-read
+  same
+  save-cwd
+  savedir
+  savewd
+  selinux-at
+  settime
+  sig2str
+  sigaction
+  ssize_t
+  stat-macros
+  stat-time
+  stdbool
+  stdlib-safer
+  stpcpy
+  stpncpy
+  strdup
+  strftime
+  strpbrk
+  strtoimax
+  strtoumax
+  strverscmp
+  sys_stat
+  timespec
+  tzset
+  unicodeio
+  unistd-safer
+  unlink-busy
+  unlinkdir
+  unlocked-io
+  uptime
+  useless-if-before-free
+  userspec
+  utimecmp
+  utimens
+  vasprintf-posix
+  vc-list-files
+  verify
+  verror
+  version-etc-fsf
+  warnings
+  wcwidth
+  winsz-ioctl
+  winsz-termios
+  write-any-file
+  xalloc
+  xfreopen
+  xgetcwd
+  xgethostname
+  xmemcoll
+  xnanosleep
+  xprintf
+  xprintf-posix
+  xstrtod
+  xstrtoimax
+  xstrtol
+  xstrtold
+  xstrtoumax
+  yesno
 "

 # Other locale categories that need message catalogs.
-- 
1.6.2.rc1.285.gc5f54


>From 854f76ed4f1ddcd11f9fd76fa8ffe2ad6e546570 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 10 Apr 2009 08:42:10 +0200
Subject: [PATCH 3/6] maint: remove obsolete utime module

* bootstrap.conf (obsolete_gnulib_modules): Remove utime.
---
 bootstrap.conf |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index e536df5..8475892 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -36,7 +36,6 @@ obsolete_gnulib_modules='
   strcspn
   strtod
   strtol
-  utime
 '

 # gnulib modules used by this package.
-- 
1.6.2.rc1.285.gc5f54


>From 03490e3565f206a0306444e07800973aab551f68 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 10 Apr 2009 10:12:10 +0200
Subject: [PATCH 4/6] gnulib: update to latest: fix ls -v & sort -V

* NEWS (Bug fixes): Mention it.
---
 NEWS   |    3 +++
 gnulib |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index a116b64..5951bb5 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ GNU coreutils NEWS                                    -*- 
outline -*-
   ls now aligns output correctly in the presence of abbreviated month
   names from the locale database that have differing widths.

+  ls -v and sort -V now order names like "#.b#" properly
+
 ** Changes in behavior

   shred, sort, shuf: now use an internal pseudorandom generator by default.
@@ -22,6 +24,7 @@ GNU coreutils NEWS                                    -*- 
outline -*-
   [truncation introduced in coreutils-6.11]
   [infinite loop introduced in coreutils-7.1]

+
 * Noteworthy changes in release 7.2 (2009-03-31) [stable]

 ** New features
diff --git a/gnulib b/gnulib
index 9d17a13..cc96df3 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 9d17a13747f2286970948f17d8e22a81326ae023
+Subproject commit cc96df30d2b27745dca763ae41940f8a1319be4c
-- 
1.6.2.rc1.285.gc5f54


>From b571b61970376a11ae3c336f70e9dbdb0746cdef Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 10 Apr 2009 11:35:10 +0200
Subject: [PATCH 5/6] build: tight-scope test: don't build excluded programs

* src/Makefile.am (sc_tight_scope): Depend on $(bin_PROGRAMS),
not $(all_programs)
---
 src/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 08718b1..9aaf739 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -434,7 +434,7 @@ s2 = '/^\#define AUTHORS \\\\/{;n;$(sed_filter);p;q;}'
 #
 # The second nm|grep checks for file-scope variables with `extern' scope.
 .PHONY: sc_tight_scope
-sc_tight_scope: $(all_programs)
+sc_tight_scope: $(bin_PROGRAMS)
        @t=exceptions-$$$$;                                             \
        trap "s=$$?; rm -f $$t; exit $$s" 0 1 2 13 15;                  \
        src=`for f in $(SOURCES); do                                    \
-- 
1.6.2.rc1.285.gc5f54


>From 0523f45f668ae09778f171c34e4f1f0c8360be82 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 10 Apr 2009 12:50:14 +0200
Subject: [PATCH 6/6] doc: fix a typo: s/is a is a/is a/

* doc/coreutils.texi (Putting the tools together): Fix typo.
---
 doc/coreutils.texi |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 6840aff..918f44e 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -15481,7 +15481,7 @@ Putting the tools together
 The conventional location for a dictionary is @file{/usr/dict/words}.
 On my GNU/Linux system,@footnote{Redhat Linux 6.1, for the November 2000
 revision of this article.}
-this is a is a sorted, 45,402 word dictionary.
+this is a sorted, 45,402 word dictionary.

 Now, how to compare our file with the dictionary?  As before, we generate
 a sorted list of words, one per line:
-- 
1.6.2.rc1.285.gc5f54