Version 6.6.

* NEWS: Record release date.  Remove "-pre" suffix.
* configure.ac (AC_INIT): Remove "-pre" suffix from version string.

.prev-version

@@ -1 +1 @@
-6.4
+6.5

ChangeLog

@@ -1,5 +1,49 @@
+2006-11-22  Jim Meyering  <jim@meyering.net>
+
+	Version 6.6.
+	* NEWS: Record release date.  Remove "-pre" suffix.
+	* configure.ac (AC_INIT): Remove "-pre" suffix from version string.
+
+	* announce-gen: Remove unused --release-archive-directory option.
+	(print_news_deltas): Accept new adjective, "Noteworthy", in addition
+	to the old "Major".
+	Match version numbers in NEWS using tighter regular expressions.
+	(main): Require the --gpg-key-id=ID option.
+	* Makefile.maint (announcement): Don't use now-removed
+	--release-archive-directory=... option.
+
+	* NEWS: Mention the three noteworthy changes, all fixed via gnulib.
+
+2006-11-21  Jim Meyering  <jim@meyering.net>
+
+	* tests/rm/one-file-system: Upon setup failure (e.g., mount failure),
+	skip the test rather than failing.  Reported by Michael Deutschmann.
+
+	* tests/rm/fail-eperm: Use the "(exit N); exit N" idiom,
+	rather than just "exit N".
+
+	Arrange for "make check-root" to run the new root-only test.
+	* tests/Makefile.am (t7): New target, to run tests/ls/nameless-uid.
+	(all_t): Add t7.
+
+2006-11-20  Jim Meyering  <jim@meyering.net>
+
+	Add a root-only test for today's lib/idcache.c fix.
+	* tests/ls/nameless-uid: New file.
+	* tests/ls/Makefile.am (TESTS): Add nameless-uid.
+	(TESTS_ENVIRONMENT): Add PERL to the list.
+
 2006-11-19  Jim Meyering  <jim@meyering.net>
 
+	* tests/tail-2/assert-2: Mark as a very-expensive test, because I
+	find the 7-second sleep annoyingly long.  Besides, this test is
+	probably far too specific and timing sensitive ever to trigger again.
+	* tests/tail-2/assert: Likewise.
+
+	Post-release version change.
+	* NEWS: Add a line for 6.6-pre.
+	* configure.ac (AC_INIT): Bump to 6.6 and add "-pre" suffix.
+
 	Version 6.5.
 	* NEWS: Record release date.  Remove "-cvs" suffix.
 	* configure.ac (AC_INIT): Remove "-cvs" suffix from version string.

Makefile.maint

@@ -552,7 +552,6 @@ announcement: NEWS ChangeLog $(rel-files)
 	    --package=$(PACKAGE)					\
 	    --prev=$(PREV_VERSION)					\
 	    --curr=$(VERSION)						\
-	    --release-archive-directory=$(release_archive_dir)		\
 	    --gpg-key-id=$(gpg_key_ID)					\
 	    --news=NEWS							\
 	    $(addprefix --url-dir=, $(url_dir_list))			\

NEWS

@@ -1,5 +1,23 @@
 GNU coreutils NEWS                                    -*- outline -*-
 
+* Noteworthy changes in release 6.6 (2006-11-22) [stable]
+
+** Bug fixes
+
+  ls would segfault (dereference a NULL pointer) for a file with a
+  nameless group or owner.  This bug was introduced in coreutils-6.5.
+
+  A bug in the latest official m4/gettext.m4 (from gettext-0.15)
+  made configure fail to detect gettext support, due to the unusual
+  way in which coreutils uses AM_GNU_GETTEXT.
+
+** Improved robustness
+
+  Now, du (and the other fts clients: chmod, chgrp, chown) honor a
+  trailing slash in the name of a symlink-to-directory even on
+  Solaris 9, by working around its buggy fstatat implementation.
+
+
 * Major changes in release 6.5 (2006-11-19) [stable]
 
 ** Bug fixes

announce-gen

@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # Generate an announcement message.
 
-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006 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
@@ -78,7 +78,6 @@ OPTIONS:
    --previous-version=VER
    --current-version=VER
    --gpg-key-id=ID         The GnuPG ID of the key used to sign the tarballs
-   --release-archive-directory=DIR
    --url-directory=URL_DIR
    --news=NEWS_FILE             optional
 
@@ -192,26 +191,28 @@ sub print_news_deltas ($$$)
   # the first occurrence of $prev_version.
   my $in_items;
 
+  my $re_prefix = qr/\* (:?Noteworthy|Major) change/;
+
   open NEWS, '<', $news_file
     or die "$ME: $news_file: cannot open for reading: $!\n";
   while (defined (my $line = <NEWS>))
     {
       if ( ! $in_items)
 	{
-	  # Match lines like this one:
+	  # Match lines like these:
 	  # * Major changes in release 5.0.1:
-	  # but not any other line that starts with a space, *, or -.
-	  $line =~ /^(\* Major changes.*|[^ *-].*)\Q$curr_version\E/o
+	  # * Noteworthy changes in release 6.6 (2006-11-22) [stable]
+	  $line =~ /^$re_prefix.*(:?[^\d.]|$)\Q$curr_version\E(:?[^\d.]|$)/o
 	    or next;
 	  $in_items = 1;
 	  print $line;
 	}
       else
 	{
-	  # Be careful that this regexp cannot match version numbers
-	  # in NEWS items -- they might well say `introduced in 4.5.5',
+	  # This regexp must not match version numbers in NEWS items.
+	  # For example, they might well say `introduced in 4.5.5',
 	  # and we don't want that to match.
-	  $line =~ /^(\* Major changes.*|[^ *-].*)\Q$prev_version\E/o
+	  $line =~ /^$re_prefix.*(:?[^\d.]|$)\Q$prev_version\E(:?[^\d.]|$)/o
 	    and last;
 	  print $line;
 	}
@@ -317,7 +318,6 @@ sub print_changelog_deltas ($$)
   my $package_name;
   my $prev_version;
   my $curr_version;
-  my $release_archive_dir;
   my $gpg_key_id;
   my @url_dir_list;
   my @news_file;
@@ -329,7 +329,6 @@ sub print_changelog_deltas ($$)
      'previous-version=s' => \$prev_version,
      'current-version=s'  => \$curr_version,
      'gpg-key-id=s'       => \$gpg_key_id,
-     'release-archive-directory=s' => \$release_archive_dir,
      'url-directory=s'    => \@url_dir_list,
      'news=s'             => \@news_file,
 
@@ -347,8 +346,8 @@ sub print_changelog_deltas ($$)
     or (warn "$ME: previous version string not specified\n"), $fail = 1;
   $curr_version
     or (warn "$ME: current version string not specified\n"), $fail = 1;
-  $release_archive_dir
-    or (warn "$ME: release directory name not specified\n"), $fail = 1;
+  $gpg_key_id
+    or (warn "$ME: GnuPG key ID not specified\n"), $fail = 1;
   @url_dir_list
     or (warn "$ME: URL directory name(s) not specified\n"), $fail = 1;
 

configure.ac

@@ -20,7 +20,7 @@
 dnl Written by Jim Meyering.
 
 AC_PREREQ(2.60)
-AC_INIT([GNU coreutils],[6.5],[bug-coreutils@gnu.org])
+AC_INIT([GNU coreutils],[6.6],[bug-coreutils@gnu.org])
 AC_CONFIG_SRCDIR(src/ls.c)
 
 AC_CONFIG_AUX_DIR(build-aux)

lib/.cvsignore

@@ -89,6 +89,7 @@ fopen-safer.c
 fprintftime.c
 fprintftime.h
 free.c
+fstatat.c
 fsusage.c
 fsusage.h
 ftruncate.c

lib/.gitignore

@@ -83,6 +83,7 @@ fopen-safer.c
 fprintftime.c
 fprintftime.h
 free.c
+fstatat.c
 fsusage.c
 fsusage.h
 ftruncate.c

lib/ChangeLog

@@ -1,3 +1,7 @@
+2006-11-22  Jim Meyering  <jim@meyering.net>
+
+	* .cvsignore, .gitignore: Add fstat.c.
+
 2006-11-14  Jim Meyering  <jim@meyering.net>
 
 	* readlink-stub.c, lstat-stub.c: Remove now-unused files.

tests/Makefile.am

@@ -29,7 +29,7 @@ SUBDIRS = \
   tsort unexpand uniq wc
 ## N O T E :: Please do not add new directories.
 
-all_t = t1 t2 t3 t4 t5 t6
+all_t = t1 t2 t3 t4 t5 t6 t7
 .PHONY: check-root $(all_t)
 check-root: $(all_t)
 
@@ -45,6 +45,8 @@ t5:
 	cd tail-2 && $(MAKE) check TESTS=append-only
 t6:
 	cd rm    && $(MAKE) check TESTS=one-file-system
+t7:
+	cd ls    && $(MAKE) check TESTS=nameless-uid
 
 check-recursive: root-hint
 

tests/ls/Makefile.am

@@ -21,6 +21,7 @@
 AUTOMAKE_OPTIONS = 1.2 gnits
 
 TESTS = \
+  nameless-uid \
   color-dtype-dir \
   stat-failed \
   stat-dtype \
@@ -33,4 +34,5 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PERL="$(PERL)" \
   PROG=ls

tests/ls/nameless-uid

@@ -0,0 +1,65 @@
+#!/bin/sh
+# Ensure that ls -l works on files with nameless uid and/or gid
+
+# Copyright (C) 2006 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 2 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+if test "$VERBOSE" = yes; then
+  set -x
+  ls --version
+fi
+
+. $srcdir/../envvar-check
+. $srcdir/../lang-default
+PRIV_CHECK_ARG=require-root . $srcdir/../priv-check
+
+$PERL -e 1 > /dev/null 2>&1 || {
+  echo 1>&2 "$0: configure didn't find a usable version of Perl," \
+    "so can't run this test"
+  (exit 77); exit 77
+}
+
+nameless_uid=`$PERL -e 'foreach my $i (1000..16*1024) { getpwuid $i or (print "$i\n"), exit }'`
+
+if test x$nameless_uid = x; then
+  echo "$0: couldn't find a nameless UID" 1>&2
+  (exit 77); exit 77
+fi
+
+pwd=`pwd`
+t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
+trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0
+trap '(exit $?); exit $?' 1 2 13 15
+
+framework_failure=0
+mkdir -p $tmp || framework_failure=1
+cd $tmp || framework_failure=1
+
+touch f || framework_failure=1
+chown $nameless_uid f || framework_failure=1
+
+if test $framework_failure = 1; then
+  echo "$0: failure in testing framework" 1>&2
+  (exit 1); exit 1
+fi
+
+fail=0
+
+set -- `ls -o f` || fail=1
+test $3 = $nameless_uid || fail=1
+
+(exit $fail); exit $fail

tests/rm/fail-eperm

@@ -37,7 +37,7 @@ PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check
 $PERL -e 1 > /dev/null 2>&1 || {
   echo 1>&2 "$0: configure didn't find a usable version of Perl," \
     "so can't run this test"
-  exit 77
+  (exit 77); exit 77
 }
 
 ARGV_0=$0

tests/rm/one-file-system

@@ -51,8 +51,8 @@ rm: skipping `a/b', since it's on a different device
 EOF
 
 if test $framework_failure = 1; then
-  echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit 1
+  echo "$0: setup failed; skipping this test" 1>&2
+  (exit 77); exit 77
 fi
 
 fail=0

tests/tail-2/assert

@@ -30,6 +30,9 @@ if test "$VERBOSE" = yes; then
   tail --version
 fi
 
+# Not "expensive" per se, but sleeping for so long is annoying.
+. $srcdir/../very-expensive
+
 tmp=tail-assert.$$
 pwd=`pwd`
 trap 'cd "$pwd" && rm -rf $tmp' 0 1 2 3 15

tests/tail-2/assert-2

@@ -25,6 +25,9 @@ if test "$VERBOSE" = yes; then
   tail --version
 fi
 
+# Not "expensive" per se, but sleeping for so long is annoying.
+. $srcdir/../very-expensive
+
 tmp=tail-as2.$$
 pwd=`pwd`
 trap 'cd "$pwd" && rm -rf $tmp' 0 1 2 3 15