Subject: update to latest gnulib

From: Jim Meyering <[email-masked]>
Date: Mon, 29 Mar 2010 08:50:28 +0200

I've just updated coreutils to use the latest from gnulib.
To do that, I needed a few preparatory patches to:
  - adapt to new lib-ignore
  - pass one new syntax-check: sc_prohibit_test_minus_ao
  - disable another: sc_texinfo_acronym

>From 5ef03d6c5bb8d5d822a32db465894c8e051e38ac Mon Sep 17 00:00:00 2001
From: Jim Meyering <[email-masked]>
Date: Mon, 29 Mar 2010 08:21:43 +0200
Subject: [PATCH 1/4] tests: avoid spurious sc_prohibit_test_minus_ao syntax-check failures

* tests/misc/ls-time: Change comments and diagnostics.
* tests/misc/xattr: Likewise.
---
 tests/misc/ls-time |    4 ++--
 tests/misc/xattr   |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/misc/ls-time b/tests/misc/ls-time
index 427ca74..1d10abb 100755
--- a/tests/misc/ls-time
+++ b/tests/misc/ls-time
@@ -77,14 +77,14 @@ EOF
   ;;
 esac

-# Now test touch's -a option.
+# Ensure that touch's -a option works.
 set -- `ls --full -lu a`
 case "$*" in
   *" $u1:00.000000000 +0000 a") ;;
   *)
   # This might be what's making HPUX 11 systems fail this test.
   cat >&2 << EOF
-A basic test of touch -a has just failed, so the subsequent
+A fundamental touch -a test has just failed, so the subsequent
 tests in this file will not be run.

 In the output below, the date of last access for \`a' should
diff --git a/tests/misc/xattr b/tests/misc/xattr
index 5b3e049..21e0f1c 100755
--- a/tests/misc/xattr
+++ b/tests/misc/xattr
@@ -66,24 +66,24 @@ cp --preserve=xattr a b || fail=1
 getfattr -d b >out_b || skip_test_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_b || fail=1

-#test if --preserve=all option works
+# test if --preserve=all option works
 cp --preserve=all a c || fail=1
 getfattr -d c >out_c || skip_test_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_c || fail=1

-#test if -a option works without any diagnostics
+# cp's -a option must produce no diagnostics.
 cp -a a d 2>err && test -s err && fail=1
 getfattr -d d >out_d || skip_test_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_d || fail=1

-#test if --preserve=xattr works even for files without write access
+# test if --preserve=xattr works even for files without write access
 chmod a-w a || framework_failure
 rm -f e
 cp --preserve=xattr a e || fail=1
 getfattr -d e >out_e || skip_test_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_e || fail=1

-#Ensure that permission bits are preserved, too.
+# Ensure that permission bits are preserved, too.
 src_perm=$(stat --format=%a a)
 dst_perm=$(stat --format=%a e)
 test "$dst_perm" = "$src_perm" || fail=1
--
1.7.0.3.448.g82eeb

>From 0f5dc96354bf73afb84dacf79f2d1072d0fe74fe Mon Sep 17 00:00:00 2001
From: Bruno Haible <[email-masked]>
Date: Mon, 29 Mar 2010 08:25:02 +0200
Subject: [PATCH 2/4] build: update after change in gnulib's lib-ignore module

* src/Makefile.am (AM_LDFLAGS): Define.  Use gnulib's new
$(IGNORE_UNUSED_LIBRARIES_CFLAGS).
---
 src/Makefile.am |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index ecb42a8..44f1237 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -170,6 +170,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib
 noinst_LIBRARIES = libver.a
 nodist_libver_a_SOURCES = version.c version.h

+# Tell the linker to omit references to unused shared libraries.
+AM_LDFLAGS = $(IGNORE_UNUSED_LIBRARIES_CFLAGS)
+
 # Sometimes, the expansion of $(LIBINTL) includes -lc which may
 # include modules defining variables like `optind', so libcoreutils.a
 # must precede $(LIBINTL) in order to ensure we use GNU getopt.
--
1.7.0.3.448.g82eeb

>From 3f7091359a556a8229bf85ee76bd78d3d368e2e3 Mon Sep 17 00:00:00 2001
From: Jim Meyering <[email-masked]>
Date: Mon, 29 Mar 2010 08:28:25 +0200
Subject: [PATCH 3/4] tests: disable new texinfo-acronym syntax-check from gnulib

* cfg.mk (local-checks-to-skip): Add new sc_texinfo_acronym, to skip it.
---
 cfg.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 11403ac..1da4d38 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -18,7 +18,8 @@
 manual_title = Core GNU utilities

 # Tests not to run as part of "make distcheck".
-local-checks-to-skip =
+local-checks-to-skip = \
+  sc_texinfo_acronym

 # Tools used to bootstrap this package, used for "announcement".
 bootstrap-tools = autoconf,automake,gnulib,bison
--
1.7.0.3.448.g82eeb

>From a8fc4edca53c710a2c9da3c7c87a4d990df494a5 Mon Sep 17 00:00:00 2001
From: Jim Meyering <[email-masked]>
Date: Mon, 29 Mar 2010 08:07:35 +0200
Subject: [PATCH 4/4] build: update gnulib submodule to latest

---
 gnulib |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnulib b/gnulib
index 97e36f6..e936a81 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 97e36f6ef05adc30dfd860e1f245cce7b5af7462
+Subproject commit e936a81c04962903122ea0d8b6af63c5fce4beaf
--
1.7.0.3.448.g82eeb