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
14 changed files with 155 additions and 133 deletions
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-8.2
+8.3
--- a/24
+++ b/24
@@ -1,5 +1,29 @@
 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
--- a/4
+++ b/4
@@ -25,7 +25,7 @@ $PATH is set correctly, which can be done for the current shell like:

 * 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
@@ -37,7 +37,7 @@ $PATH is set correctly, which can be done for the current shell like:
  # 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
--- a/4
+++ b/4
@@ -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*.
--- a/cfg.mk
+++ b/cfg.mk
@@ -26,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 = 67237f9a765e6e1af0cb89e428ed2663
+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
--- a/2
+++ b/2
--- a/m4/xattr.m4
+++ b/m4/xattr.m4
@@ -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/src/ls.c
+++ b/src/ls.c
@@ -39,10 +39,6 @@
 #include <config.h>
 #include <sys/types.h>

-#ifdef HAVE_CAP
-# include <sys/capability.h>
-#endif
-
 #if HAVE_TERMIOS_H
 # include <termios.h>
 #endif
@@ -113,6 +109,13 @@
 #include "areadlink.h"
 #include "mbsalign.h"

+/* Include <sys/capability.h> last to avoid a clash of <sys/types.h>
+   include guards with some premature versions of libcap.
+   For more details, see <http://bugzilla.redhat.com/483548>.  */
+#ifdef HAVE_CAP
+# include <sys/capability.h>
+#endif
+
 #define PROGRAM_NAME (ls_mode == LS_LS ? "ls" \
                      : (ls_mode == LS_MULTI_COL \
                         ? "dir" : "vdir"))
--- a/tests/check.mk
+++ b/tests/check.mk
@@ -91,6 +91,7 @@ TESTS_ENVIRONMENT =				\
  PERL='$(PERL)'				\
  PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \
  REPLACE_GETCWD=$(REPLACE_GETCWD)		\
+  ; test -d /usr/xpg4/bin && PATH='/usr/xpg4/bin$(PATH_SEPARATOR)'"$$PATH"; \
  PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \
  ; shell_or_perl_

--- a/tests/ls/infloop
+++ b/tests/ls/infloop
@@ -36,8 +36,7 @@ cat <<\EOF > exp-err || framework_failure
 ls: loop/sub: not listing already-listed directory
 EOF

-
-timeout 1 ls -RL loop 2>err > out
+timeout 1 ls -RL loop >out 2>err
 # Ensure that ls exits with status 2 upon detecting a cycle
 test $? = 2 || fail=1

--- a/tests/misc/sort-version
+++ b/tests/misc/sort-version
@@ -23,87 +23,87 @@ fi

 . $srcdir/test-lib.sh

-cat > in <<- _EOF_
-        gcc-c++-10.fc9.tar.gz
-        gcc-c++-10.8.12-0.7rc2.fc9.tar.bz2
-        glibc-2-0.1.beta1.fc10.rpm
-        glibc-common-5-0.2.beta2.fc9.ebuild
-        glibc-common-5-0.2b.deb
-        glibc-common-11b.ebuild
-        glibc-common-11-0.6rc2.ebuild
-        libstdc++-0.5.8.11-0.7rc2.fc10.tar.gz
-        libstdc++-4a.fc8.tar.gz
-        libstdc++-4.10.4.20040204svn.rpm
-        libstdc++-devel-3.fc8.ebuild
-        libstdc++-devel-3a.fc9.tar.gz
-        libstdc++-devel-8.fc8.deb
-        libstdc++-devel-8.6.2-0.4b.fc8
-        nss_ldap-1-0.2b.fc9.tar.bz2
-        nss_ldap-1-0.6rc2.fc8.tar.gz
-        nss_ldap-1.0-0.1a.tar.gz
-        nss_ldap-10beta1.fc8.tar.gz
-        nss_ldap-10.11.8.6.20040204cvs.fc10.ebuild
-        string start 5.0.0 end of str
-        string start 5.1.0 end of str
-        string start 5.10.0 end of str
-        string start 5.2.0 end of str
-        string start 5.20.0 end of str
-        string start 5.3.0 end of str
-        string start 5.30.0 end of str
-        string start 5.4.0 end of str
-        string start 5.40.0 end of str
-        string start 5.5.0 end of str
-        string start 5.50.0 end of str
-        string start 5.6.0 end of str
-        string start 5.60.0 end of str
-        string start 5.7.0 end of str
-        string start 5.70.0 end of str
-        string start 5.8.0 end of str
-        string start 5.80.0 end of str
-        string start 5.9.0 end of str
-        string start 5.90.0 end of str
-        _EOF_
+cat > in << _EOF_
+gcc-c++-10.fc9.tar.gz
+gcc-c++-10.8.12-0.7rc2.fc9.tar.bz2
+glibc-2-0.1.beta1.fc10.rpm
+glibc-common-5-0.2.beta2.fc9.ebuild
+glibc-common-5-0.2b.deb
+glibc-common-11b.ebuild
+glibc-common-11-0.6rc2.ebuild
+libstdc++-0.5.8.11-0.7rc2.fc10.tar.gz
+libstdc++-4a.fc8.tar.gz
+libstdc++-4.10.4.20040204svn.rpm
+libstdc++-devel-3.fc8.ebuild
+libstdc++-devel-3a.fc9.tar.gz
+libstdc++-devel-8.fc8.deb
+libstdc++-devel-8.6.2-0.4b.fc8
+nss_ldap-1-0.2b.fc9.tar.bz2
+nss_ldap-1-0.6rc2.fc8.tar.gz
+nss_ldap-1.0-0.1a.tar.gz
+nss_ldap-10beta1.fc8.tar.gz
+nss_ldap-10.11.8.6.20040204cvs.fc10.ebuild
+string start 5.0.0 end of str
+string start 5.1.0 end of str
+string start 5.10.0 end of str
+string start 5.2.0 end of str
+string start 5.20.0 end of str
+string start 5.3.0 end of str
+string start 5.30.0 end of str
+string start 5.4.0 end of str
+string start 5.40.0 end of str
+string start 5.5.0 end of str
+string start 5.50.0 end of str
+string start 5.6.0 end of str
+string start 5.60.0 end of str
+string start 5.7.0 end of str
+string start 5.70.0 end of str
+string start 5.8.0 end of str
+string start 5.80.0 end of str
+string start 5.9.0 end of str
+string start 5.90.0 end of str
+_EOF_

-cat > exp <<- _EOF_
-        gcc-c++-10.fc9.tar.gz
-        gcc-c++-10.8.12-0.7rc2.fc9.tar.bz2
-        glibc-2-0.1.beta1.fc10.rpm
-        glibc-common-5-0.2.beta2.fc9.ebuild
-        glibc-common-5-0.2b.deb
-        glibc-common-11b.ebuild
-        glibc-common-11-0.6rc2.ebuild
-        libstdc++-0.5.8.11-0.7rc2.fc10.tar.gz
-        libstdc++-4a.fc8.tar.gz
-        libstdc++-4.10.4.20040204svn.rpm
-        libstdc++-devel-3.fc8.ebuild
-        libstdc++-devel-3a.fc9.tar.gz
-        libstdc++-devel-8.fc8.deb
-        libstdc++-devel-8.6.2-0.4b.fc8
-        nss_ldap-1-0.2b.fc9.tar.bz2
-        nss_ldap-1-0.6rc2.fc8.tar.gz
-        nss_ldap-1.0-0.1a.tar.gz
-        nss_ldap-10beta1.fc8.tar.gz
-        nss_ldap-10.11.8.6.20040204cvs.fc10.ebuild
-        string start 5.0.0 end of str
-        string start 5.1.0 end of str
-        string start 5.2.0 end of str
-        string start 5.3.0 end of str
-        string start 5.4.0 end of str
-        string start 5.5.0 end of str
-        string start 5.6.0 end of str
-        string start 5.7.0 end of str
-        string start 5.8.0 end of str
-        string start 5.9.0 end of str
-        string start 5.10.0 end of str
-        string start 5.20.0 end of str
-        string start 5.30.0 end of str
-        string start 5.40.0 end of str
-        string start 5.50.0 end of str
-        string start 5.60.0 end of str
-        string start 5.70.0 end of str
-        string start 5.80.0 end of str
-        string start 5.90.0 end of str
-        _EOF_
+cat > exp << _EOF_
+gcc-c++-10.fc9.tar.gz
+gcc-c++-10.8.12-0.7rc2.fc9.tar.bz2
+glibc-2-0.1.beta1.fc10.rpm
+glibc-common-5-0.2.beta2.fc9.ebuild
+glibc-common-5-0.2b.deb
+glibc-common-11b.ebuild
+glibc-common-11-0.6rc2.ebuild
+libstdc++-0.5.8.11-0.7rc2.fc10.tar.gz
+libstdc++-4a.fc8.tar.gz
+libstdc++-4.10.4.20040204svn.rpm
+libstdc++-devel-3.fc8.ebuild
+libstdc++-devel-3a.fc9.tar.gz
+libstdc++-devel-8.fc8.deb
+libstdc++-devel-8.6.2-0.4b.fc8
+nss_ldap-1-0.2b.fc9.tar.bz2
+nss_ldap-1-0.6rc2.fc8.tar.gz
+nss_ldap-1.0-0.1a.tar.gz
+nss_ldap-10beta1.fc8.tar.gz
+nss_ldap-10.11.8.6.20040204cvs.fc10.ebuild
+string start 5.0.0 end of str
+string start 5.1.0 end of str
+string start 5.2.0 end of str
+string start 5.3.0 end of str
+string start 5.4.0 end of str
+string start 5.5.0 end of str
+string start 5.6.0 end of str
+string start 5.7.0 end of str
+string start 5.8.0 end of str
+string start 5.9.0 end of str
+string start 5.10.0 end of str
+string start 5.20.0 end of str
+string start 5.30.0 end of str
+string start 5.40.0 end of str
+string start 5.50.0 end of str
+string start 5.60.0 end of str
+string start 5.70.0 end of str
+string start 5.80.0 end of str
+string start 5.90.0 end of str
+_EOF_

 sort --sort=version -o out in || fail=1
 compare exp out || fail=1
--- a/tests/tail-2/inotify-hash-abuse
+++ b/tests/tail-2/inotify-hash-abuse
@@ -46,23 +46,14 @@ echo a > 1 || fail=1

 # Wait up to 2s for the buggy tail to die,
 # or for the "tail: `1' has appeared;  following end of new file" output
-dead=0
 for i in $(seq 10); do
-  kill -0 $pid || { dead=1; break; }
+  kill -0 $pid || break
  grep 'has appeared;' out > /dev/null && break
  sleep .2
 done

-# Fixed tail will not have aborted.  Kill it.
-test $dead = 0 && kill -HUP $pid
-
-wait $pid
-st=$?
-
-case $st in
-  129) ;;
-  *) echo tail died via unexpected signal: $st; fail=1;;
-esac
+# Kill the working tail, or fail if it has already aborted
+kill $pid || fail=1

 cat out

--- a/tests/tail-2/inotify-hash-abuse2
+++ b/tests/tail-2/inotify-hash-abuse2
@@ -36,15 +36,7 @@ for i in $(seq 200); do
  touch f
 done

-# Fixed tail will not have aborted.  Kill it.
-kill -HUP $pid
-
-wait $pid
-st=$?
-
-case $st in
-  129) ;;
-  *) echo tail died via unexpected signal: $st; fail=1;;
-esac
+# Kill the working tail, or fail if it has already aborted
+kill $pid || fail=1

 Exit $fail
--- a/tests/touch/no-dereference
+++ b/tests/touch/no-dereference
@@ -48,8 +48,17 @@ grep '^#define HAVE_LUTIMES' "$CONFIG_HEADER" > /dev/null ||
  skip_test_ 'this system lacks the utimensat function'

 # Changing time of dangling symlink is okay.
-touch -h dangling || fail=1
-test -f nowhere && fail=1
+# Skip the test if this fails, but the error text corresponds to
+# ENOSYS (possible with old kernel but new glibc).
+touch -h dangling 2> err
+case $? in
+  0) test -f nowhere && fail=1
+     test -s err && fail=1;;
+  1) grep 'Function not implemented' err \
+       && skip_test_ 'this system lacks the utimensat function'
+     fail=1;;
+  *) fail=1;;
+esac

 # Change the mtime of a symlink.
 touch -m -h -d 2009-10-10 link || fail=1
Author	SHA1	Message	Date
Jim Meyering	954ef23ed9	version 8.4 * NEWS: Record release date.	2010-01-13 21:57:54 +01:00
Pádraig Brady	e55d882811	tests: avoid spurious failures on older shells * tests/tail-2/inotify-hash-abuse: Use kill rather than wait to determine if the tail process is still running. * tests/tail-2/inotify-hash-abuse2: Ditto.	2010-01-13 13:42:49 +01:00
Jim Meyering	f28c7d959b	tests: work around spurious test failure with OpenBSD4.5's /bin/sh * tests/ls/infloop: OpenBSD4.5's /bin/sh would mistakenly include "set -x"-output in an application's stderr stream when stderr is redirected before stdout. This was causing one spurious test failure. The work-around: redirect stdout first. Reported by Nelson Beebe.	2010-01-13 10:55:55 +01:00
Jim Meyering	3b498ba141	tests: don't silently skip the sort-version tests * tests/misc/sort-version: Don't use <<- and indented here-doc contents. s/<<-/<</ and unindent the here-document contents. Otherwise, bash would ignore the indented delimiter and use EOF, thus silently skipping this test. OpenBSD5.4's shell reported the failure: $ printf 'cat<<-x\n foo\n x\n'\|sh sh: <stdin>[4]: here document `x' unclosed [Exit 1] by contrast, bash warns but still exits successfully: $ printf 'cat<<-x\n foo\n x\n'\|bash && echo you lose bash: line 3: warning: here-document at line 1 delimited by \ end-of-file (wanted `x') foo x you lose	2010-01-13 10:21:02 +01:00
Eric Blake	39243f0ea8	tests: avoid spurious failure on old kernel * tests/touch/no-dereference: Skip test if utimensat doesn't support symlinks. Reported by Bernhard Voelker.	2010-01-12 06:00:05 -07:00
Pádraig Brady	a4da48c4f5	maint: update info about getting the prerequisite automake * README-prereq: Now that we require automake-1.11.1 update the instructions from getting it from the git repo	2010-01-12 10:32:08 +00:00
Pádraig Brady	d89755469b	maint: remove an already handled item from TODO * TODO: The question regarding printf octal escapes is answered in commit `4bcefa62`, 2003-04-21, "Fix printf POSIX compatibility bug ..."	2010-01-12 10:29:36 +00:00
Pádraig Brady	b81cdbf31e	maint: fix tests on solaris by using /usr/xpg4/bin * tests/check.mk: Prepend /usr/xpg4/bin to the $PATH if present. Using the more standard utilities allows tests such as misc/printenv, which uses the -E option to grep, to complete.	2010-01-12 10:26:27 +00:00
Jim Meyering	0a6bbb5947	build: update gnulib, to get fixed getlogin-related tests	2010-01-12 09:56:07 +01:00
Jim Meyering	6beca4248f	build: fix build failure due to missing libxattr Configure is supposed to detect insufficient XATTR support. However, if a system has the required headers, but no library, the configure script would mistakenly enable USE_XATTR. * m4/xattr.m4 (gl_FUNC_XATTR): If the attr_copy_file function is not found, don't set USE_XATTR. Nelson Beebe reported a link failure on RHEL 5.3. Also, do not let the combination of --disable-xattr and a stray LIB_XATTR environment setting perturb the build. * NEWS (Build-related): Mention it.	2010-01-12 08:06:47 +01:00
Jim Meyering	37b8bfda56	doc: mention the wchar.h vs. glibc build problem * NEWS (Build-related): Mention the wchar.h issue.	2010-01-12 06:52:14 +01:00
Pádraig Brady	21a6a7f64c	nproc: return a possibly more accurate total CPU count * gnulib: Update, for num_processors() improvement. * NEWS: Mention the fix.	2010-01-12 06:46:51 +01:00
Kamil Dudka	6454dd0f2f	ls: reorder includes to work around broken <sys/capability.h> * src/ls.c: Include <sys/capability.h> later, to avoid build failure with a header from libcap-2.16-1 or earlier. See http://bugzilla.redhat.com/483548 for details.	2010-01-12 06:31:20 +01:00
Eric Blake	d0f18197fc	maint: move coreutils specific rule into cfg.mk * gnulib: Update, for maint.mk improvement. * cfg.mk (_makefile_at_at_check_excpetions): New rule, needed for latest change to maint.mk.	2010-01-08 12:00:51 -07:00
Jim Meyering	21f4da0fb9	post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update.	2010-01-07 18:25:36 +01:00
@@ -1 +1 @@
 .2
 .3