[coreutils] FYI, three small patches:

[Jim Meyering]

Three small patches:

    [PATCH 1/3] .gitignore: anchor patterns
    [PATCH 2/3] maint: update bootstrap from gnulib
    [PATCH 3/3] build: enable -Werror for gnulib-tests, too


>From b1b23d894b1aeb03ac59a570b634f5d248268b8c Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 17 Oct 2010 12:47:38 +0200
Subject: [PATCH 1/3] .gitignore: anchor patterns

* .gitignore: Anchor most patterns.  Remove .tarball-version.
* doc/.gitignore: Anchor all patterns.
Remove getdate.texi and get_date.texi.
---
 .gitignore     |  139 +++++++++++++++++++++++++++----------------------------
 doc/.gitignore |   46 +++++++++----------
 2 files changed, 90 insertions(+), 95 deletions(-)

diff --git a/.gitignore b/.gitignore
index 323c676..1b8cae2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,79 +7,76 @@
 ._bootmp
 .gdb-history
 .kludge-stamp
-.tarball-version
 .version
-ABOUT-NLS
-ChangeLog
-GNUmakefile
+/ABOUT-NLS
+/ChangeLog
+/GNUmakefile
+/INSTALL
+/THANKS-to-translators
+/aclocal.m4
+/autom4te.cache
+/build-aux/.gitignore
+/build-aux/compile
+/build-aux/config.guess
+/build-aux/config.sub
+/build-aux/depcomp
+/build-aux/install-sh
+/build-aux/mdate-sh
+/build-aux/missing
+/build-aux/texinfo.tex
+/build-aux/ylwrap
+/config.cache
+/config.log
+/config.status
+/configure
+/coreutils-*.tar.gz
+/coreutils-*.tar.gz.sig
+/coreutils-*.tar.xz
+/coreutils-*.tar.xz.sig
+/gnulib-tests
+/lib/.cvsignore
+/lib/.gitignore
+/lib/arg-nonnull.h
+/lib/arpa
+/lib/binary-io.h
+/lib/c++defs.h
+/lib/charset.alias
+/lib/config.h
+/lib/config.hin
+/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
+/lib/warn-on-use.h
+/m4/.cvsignore
+/m4/.gitignore
+/maint.mk
+/man/*.1
+/po/*.gmo
+/po/*.po
+/po/.gitignore
+/po/.reference
+/po/LINGUAS
+/po/Makefile.in
+/po/Makevars
+/po/POTFILES
+/po/checksums
+/po/coreutils.pot
+/po/stamp-po
+/src/version.c
+/src/version.h
+/stamp-h1
+/tests/*/*.log
+/tests/t?
+/tests/test-suite.log
 ID
-INSTALL
 Makefile
 Makefile.in
 TAGS
-THANKS-to-translators
-aclocal.m4
-autom4te.cache
-build-aux/.gitignore
-build-aux/compile
-build-aux/config.guess
-build-aux/config.sub
-build-aux/depcomp
-build-aux/install-sh
-build-aux/mdate-sh
-build-aux/missing
-build-aux/texinfo.tex
-build-aux/ylwrap
-config.cache
-config.h
-config.hin
-config.log
-config.status
-configure
-coreutils-*.tar.bz2
-coreutils-*.tar.bz2.sig
-coreutils-*.tar.gz
-coreutils-*.tar.gz.sig
-coreutils-*.tar.xz
-coreutils-*.tar.xz.sig
-gnulib-tests
-lib/.cvsignore
-lib/.gitignore
-lib/arg-nonnull.h
-lib/arpa
-lib/binary-io.h
-lib/c++defs.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
-lib/warn-on-use.h
-m4/.cvsignore
-m4/.gitignore
-maint.mk
-man/*.1
-po/*.gmo
-po/*.po
-po/.gitignore
-po/.reference
-po/LINGUAS
-po/Makefile.in
-po/Makevars
-po/POTFILES
-po/checksums
-po/coreutils.pot
-po/stamp-po
-src/version.c
-src/version.h
-stamp-h1
-tests/*/*.log
-tests/t?
-tests/test-suite.log
diff --git a/doc/.gitignore b/doc/.gitignore
index 7eca8d1..ef55efd 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,24 +1,22 @@
-constants.texi
-coreutils.aux
-coreutils.cp
-coreutils.cps
-coreutils.dvi
-coreutils.fl
-coreutils.fn
-coreutils.html
-coreutils.info
-coreutils.ky
-coreutils.log
-coreutils.op
-coreutils.pdf
-coreutils.pg
-coreutils.toc
-coreutils.tp
-coreutils.vr
-fdl.texi
-gendocs_template
-get_date.texi
-getdate.texi
-parse-datetime.texi
-stamp-vti
-version.texi
+/constants.texi
+/coreutils.aux
+/coreutils.cp
+/coreutils.cps
+/coreutils.dvi
+/coreutils.fl
+/coreutils.fn
+/coreutils.html
+/coreutils.info
+/coreutils.ky
+/coreutils.log
+/coreutils.op
+/coreutils.pdf
+/coreutils.pg
+/coreutils.toc
+/coreutils.tp
+/coreutils.vr
+/fdl.texi
+/gendocs_template
+/parse-datetime.texi
+/stamp-vti
+/version.texi
--
1.7.3.1.526.g2ee4


>From 840e8c9cfb3f73b4274280cdeb480bda39154a36 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 17 Oct 2010 15:32:03 +0200
Subject: [PATCH 2/3] maint: update bootstrap from gnulib

* bootstrap: Update from gnulib.
---
 bootstrap |   51 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/bootstrap b/bootstrap
index 49b1e55..8c8d777 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-10-05.15; # UTC
+scriptversion=2010-10-08.16; # UTC

 # Bootstrap this package from checked-out sources.

@@ -80,6 +80,10 @@ gnulib_modules=
 # Any gnulib files needed that are not in modules.
 gnulib_files=

+# A function to be called to edit gnulib.mk right after it's created.
+# Override it via your own definition in bootstrap.conf.
+gnulib_mk_hook() { :; }
+
 # A function to be called after everything else in this script.
 # Override it via your own definition in bootstrap.conf.
 bootstrap_epilogue() { :; }
@@ -257,6 +261,21 @@ insert_sorted_if_absent() {
     || exit 1
 }

+# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
+# insert_sorted_if_absent.
+insert_vc_ignore() {
+  vc_ignore_file="$1"
+  pattern="$2"
+  case $vc_ignore_file in
+  *.gitignore)
+    # A .gitignore entry that does not start with `/' applies
+    # recursively to subdirectories, so prepend `/' to every
+    # .gitignore entry.
+    pattern=`echo "$pattern" | sed s,^,/,`;;
+  esac
+  insert_sorted_if_absent "$vc_ignore_file" "$pattern"
+}
+
 # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
 found_aux_dir=no
 grep '^[        ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
@@ -275,7 +294,7 @@ if test ! -d $build_aux; then
   mkdir $build_aux
   for dot_ig in x $vc_ignore; do
     test $dot_ig = x && continue
-    insert_sorted_if_absent $dot_ig $build_aux
+    insert_vc_ignore $dot_ig $build_aux
   done
 fi

@@ -394,7 +413,7 @@ fi
 if ! printf "$buildreq" | check_versions; then
   echo >&2
   if test -f README-prereq; then
-    echo "See README-prereq for notes on obtaining the prerequisite programs" 
>&2
+    echo "See README-prereq for how to get the prerequisite programs" >&2
   else
     echo "Please install the prerequisite programs" >&2
   fi
@@ -561,7 +580,7 @@ symlink_to_dir()
       for dot_ig in x $vc_ignore; do
         test $dot_ig = x && continue
         ig=$parent/$dot_ig
-        insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
+        insert_vc_ignore $ig `echo "$dst_dir"|sed 's,.*/,,'`
       done
     fi

@@ -678,7 +697,8 @@ slurp() {
     for file in `ls -a $1/$dir`; do
       case $file in
       .|..) continue;;
-      .*) continue;; # FIXME: should all file names starting with "." be 
ignored?
+      # FIXME: should all file names starting with "." be ignored?
+      .*) continue;;
       esac
       test -d $1/$dir/$file && continue
       for excluded_file in $excluded_files; do
@@ -687,10 +707,12 @@ slurp() {
       if test $file = Makefile.am && test "X$gnulib_mk" != XMakefile.am; then
         copied=$copied${sep}$gnulib_mk; sep=$nl
         remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
-        sed "$remove_intl" $1/$dir/$file | cmp - $dir/$gnulib_mk > /dev/null 
|| {
+        sed "$remove_intl" $1/$dir/$file |
+        cmp - $dir/$gnulib_mk > /dev/null || {
           echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
           rm -f $dir/$gnulib_mk &&
-          sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
+          sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk &&
+          gnulib_mk_hook $dir/$gnulib_mk
         }
       elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
            version_controlled_file $dir $file; then
@@ -718,18 +740,25 @@ slurp() {
       test $dot_ig = x && continue
       ig=$dir/$dot_ig
       if test -n "$copied"; then
-        insert_sorted_if_absent $ig "$copied"
+        insert_vc_ignore $ig "$copied"
         # If an ignored file name ends with .in.h, then also add
         # the name with just ".h".  Many gnulib headers are generated,
         # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
         # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
-        f=`echo "$copied"|sed 
's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
-        insert_sorted_if_absent $ig "$f"
+        f=`echo "$copied" |
+          sed '
+            s/\.in\.h$/.h/
+            s/\.sin$/.sed/
+            s/\.y$/.c/
+            s/\.gperf$/.h/
+          '
+        `
+        insert_vc_ignore $ig "$f"

         # For files like sys_stat.in.h and sys_time.in.h, record as
         # ignorable the directory we might eventually create: sys/.
         f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
-        insert_sorted_if_absent $ig "$f"
+        insert_vc_ignore $ig "$f"
       fi
     done
   done
--
1.7.3.1.526.g2ee4


>From 3c7112104daf8f7095048a3c5b2ee6f3e600521f Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 17 Oct 2010 19:08:44 +0200
Subject: [PATCH 3/3] build: enable -Werror for gnulib-tests, too

* gnulib: Update to latest for warning-free tests.
* gnulib-tests/Makefile.am (AM_CFLAGS): Uncomment $(WERROR_CFLAGS),
now that these tests are warning-free.
---
 gnulib                   |    2 +-
 gnulib-tests/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnulib b/gnulib
index 78c0415..b392a22 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 78c0415acc2ea96febfc9d68c04d765e9d2dd20d
+Subproject commit b392a22453f992de59b63b157c191d3118fb9ed7
diff --git a/gnulib-tests/Makefile.am b/gnulib-tests/Makefile.am
index 7ec0a1c..9883a77 100644
--- a/gnulib-tests/Makefile.am
+++ b/gnulib-tests/Makefile.am
@@ -1,6 +1,6 @@
 include gnulib.mk

-AM_CFLAGS = $(GNULIB_TEST_WARN_CFLAGS) # $(WERROR_CFLAGS)
+AM_CFLAGS = $(GNULIB_TEST_WARN_CFLAGS) $(WERROR_CFLAGS)

 # A few tests are inherently warning-evoking.
 # Since we require -Werror, exempt the few offenders.
--
1.7.3.1.526.g2ee4