I've just pushed the changes below, and expect to release diffutils-3.0 on Monday.
Any build/test failures, suggested changes or pending bugs? >From 7ea9bf381b354cbf5e05ab89e0ee2009162bc09a Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Fri, 30 Apr 2010 18:56:03 +0200 Subject: [PATCH 1/2] maint: remove now-useless #if HAVE_HEADER_H guards * src/system.h: Include <sys/wait.h> unconditionally, now that gnulib guarantees its presence. * lib/cmpbuf.c: Likewise for <unistd.h> and <inttypes.h>. --- lib/cmpbuf.c | 10 ++-------- src/system.h | 4 +--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/lib/cmpbuf.c b/lib/cmpbuf.c index 02cccf3..7413210 100644 --- a/lib/cmpbuf.c +++ b/lib/cmpbuf.c @@ -30,14 +30,8 @@ # endif #endif -#if HAVE_UNISTD_H -# include <unistd.h> -#endif - -#if HAVE_INTTYPES_H -# include <inttypes.h> -#endif - +#include <unistd.h> +#include <inttypes.h> #include <sys/types.h> #include "cmpbuf.h" #include "intprops.h" diff --git a/src/system.h b/src/system.h index f242527..8942296 100644 --- a/src/system.h +++ b/src/system.h @@ -53,9 +53,7 @@ #include <fcntl.h> #include <time.h> -#if HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif +#include <sys/wait.h> #ifndef WEXITSTATUS # define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) #endif -- 1.7.1.328.g9993c >From 5c63f4d41638b863f5c5a71401af6e1c042d223d Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Fri, 30 Apr 2010 18:46:27 +0200 Subject: [PATCH 2/2] build: update gnulib submodule to latest * bootstrap: Also update from gnulib. * tests/init.sh: Likewise --- bootstrap | 10 +++++----- gnulib | 2 +- tests/init.sh | 8 +++++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bootstrap b/bootstrap index 365a3d9..e55b3d2 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2010-02-24.17; # UTC +scriptversion=2010-04-30.16; # UTC # Bootstrap this package from checked-out sources. @@ -424,7 +424,7 @@ case ${GNULIB_SRCDIR--} in trap cleanup_gnulib 1 2 13 15 - git clone --help|grep depth > /dev/null && shallow='--depth 2' || shallow= + git clone -h|grep -- --depth > /dev/null && shallow='--depth 2' || shallow= git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" || cleanup_gnulib @@ -437,7 +437,7 @@ case ${GNULIB_SRCDIR--} in if test -d "$GNULIB_SRCDIR"/.git && \ git_modules_config submodule.gnulib.url >/dev/null; then echo "$0: getting gnulib files..." - if git submodule --help|grep reference > /dev/null; then + if git submodule -h|grep -- --reference > /dev/null; then # Prefer the one-liner available in git 1.6.4 or newer. git submodule update --init --reference "$GNULIB_SRCDIR" \ "$gnulib_path" || exit $? @@ -819,7 +819,7 @@ if test $with_gettext = yes; then a\ '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} } - ' po/Makevars.template >po/Makevars + ' po/Makevars.template >po/Makevars || exit 1 if test -d runtime-po; then # Similarly for runtime-po/Makevars, but not quite the same. @@ -833,7 +833,7 @@ if test $with_gettext = yes; then a\ '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} } - ' <po/Makevars.template >runtime-po/Makevars + ' po/Makevars.template >runtime-po/Makevars || exit 1 # Copy identical files from po to runtime-po. (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) diff --git a/gnulib b/gnulib index e764ea2..0c6cf5a 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit e764ea2fcb9a6247ae4dc0d4c0566b43d950a694 +Subproject commit 0c6cf5ab43555377b99d94febb2d6f23fc3d2cb0 diff --git a/tests/init.sh b/tests/init.sh index ee9c542..512e876 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -225,10 +225,12 @@ setup_() || fail_ "failed to create temporary directory in $initial_cwd_" cd "$test_dir_" - # This pair of trap statements ensures that the temporary directory, - # $test_dir_, is removed upon exit as well as upon catchable signal. + # These trap statements ensure that the temporary directory, $test_dir_, + # is removed upon exit as well as upon receipt of any of the listed signals. trap remove_tmp_ 0 - trap 'Exit $?' 1 2 13 15 + for sig_ in 1 2 3 13 15; do + eval "trap 'Exit $(expr $sig_ + 128)' $sig_" + done } # Create a temporary directory, much like mktemp -d does. -- 1.7.1.328.g9993c
