[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-114-ge75d52b

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=e75d52b19b7c2e8ba58c0332b420980f03153503

The branch, master has been updated
       via  e75d52b19b7c2e8ba58c0332b420980f03153503 (commit)
       via  dbfabdfc6521979678367ba9df3876fa2300da59 (commit)
       via  1fd9d3935543368dbcb1481f52375e8543df0841 (commit)
       via  f5cb540e676da0eede37ac1c2b0b89230dd47882 (commit)
       via  d56acb87bb4a66c6e0baf7417166db07e4a3a95e (commit)
      from  335494d7f1baaeb1ba18c306a36e15dd71659218 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e75d52b19b7c2e8ba58c0332b420980f03153503
Merge: 335494d7f1baaeb1ba18c306a36e15dd71659218 
dbfabdfc6521979678367ba9df3876fa2300da59
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Feb 6 20:48:26 2010 +0100

    Merge branch 'maint'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                      |   25 +++++++++++++++++++++++++
 HACKING                        |    4 ++--
 NEWS                           |    3 +++
 doc/automake.texi              |    4 ++--
 lib/Automake/tests/Makefile.in |    5 +++--
 lib/am/check.am                |    7 ++++---
 lib/elisp-comp                 |   10 +++++++---
 lib/gnupload                   |   12 +++++++-----
 lib/install-sh                 |    8 ++++++--
 lib/ylwrap                     |   10 +++++++---
 tests/Makefile.in              |    5 +++--
 11 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index da01f8f..45950f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2010-02-06  Dmitry V. Levin  <address@hidden>  (tiny change)
+           Ralf Wildenhues  <address@hidden>
+
+       Fix exit status of signal handlers in shell scripts.
+       The value of `$?' on entrance to signal handlers in shell scripts
+       cannot be relied upon, so set the exit code explicitly to
+       128 + SIG<SIGNAL>.
+       * lib/am/check.am (am__check_pre): Use `exit 143' in signal handler.
+       * lib/elisp-comp: Likewise.
+       * lib/install-sh: Likewise.
+       * lib/ylwrap: Likewise.  Also, fix script to trap signal 13, not 3.
+       * NEWS, THANKS: Update.
+       Bug report, analysis, and initial patch by Dmitry V. Levin.
+
+2010-02-06  Karl Berry  <address@hidden>
+
+       Improve gnupload usage text.
+       * gnupload (usage): Shorten to make more likely to fit on a tty
+       line.  Mention CMD in the synopsis.  With ..., plural is implied.
+
+2010-01-28  Christos Kontas  <address@hidden>  (tiny change)
+
+       Fix some typos in the manual
+       * doc/automake.texi (Nested Packages, Rebuilding): Fix typos.
+
 2010-01-24  Ralf Wildenhues  <address@hidden>
 
        Fix silent-rules output for disabled dependency tracking.
diff --git a/HACKING b/HACKING
index c8ae47e..fd9f031 100644
--- a/HACKING
+++ b/HACKING
@@ -178,7 +178,7 @@
     cd doc
     wget 
"http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs.sh";
     wget 
"http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs_template";
-    sh ./gendocs.sh automake  "GNU Automake"
+    sh ./gendocs.sh --email address@hidden automake "GNU Automake"
   - copy manuals recursively to web cvs,
   - commit.
   - Check for link errors, fix them, recheck until convergence:
@@ -191,7 +191,7 @@
 
 -----
 
-Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2003, 2007, 2008, 2010 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
diff --git a/NEWS b/NEWS
index 3ea10b5..704302e 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,9 @@ Bugs fixed in 1.11a:
     in the $(PACKAGE)-$(VERSION) distdir before packing if the toplevel
     build directory was world-searchable.  This is CVE-2009-4029.
 
+  - Several scripts as well as the parallel-tests testsuite driver now
+    exit with the right exit status upon receiving a signal.
+
 
 New in 1.11:
 
diff --git a/doc/automake.texi b/doc/automake.texi
index d421e0b..1632dcd 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -1305,7 +1305,7 @@ run the @command{configure} script of B as part of its 
execution,
 building and installing A will also build and install B.  Generating a
 distribution for A will also include B.
 
-It is possible to gather several package like this.  GCC is a heavy
+It is possible to gather several packages like this.  GCC is a heavy
 user of this feature.  This gives installers a single package to
 configure, build and install, while it allows developers to work on
 subpackages independently.
@@ -8856,7 +8856,7 @@ Sometimes it is convenient to supplement the rebuild 
rules for
 @file{configure} or @file{config.status} with additional dependencies.
 The variables @code{CONFIGURE_DEPENDENCIES} and
 @code{CONFIG_STATUS_DEPENDENCIES} can be used to list these extra
-dependencies.  These variable should be defined in all
+dependencies.  These variables should be defined in all
 @file{Makefile}s of the tree (because these two rebuild rules are
 output in all them), so it is safer and easier to @code{AC_SUBST} them
 from @file{configure.ac}.  For instance, the following statement will
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index a71bcf1..4ed8c1e 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -135,8 +135,9 @@ $(am__sh_e_setup);                                  \
 $(am__vpath_adj_setup) $(am__vpath_adj)                        \
 srcdir=$(srcdir); export srcdir;                       \
 rm -f address@hidden;                                          \
-trap 'st=$$?; rm -f '\''$(abs_builddir)/address@hidden'\''; (exit $$st); exit 
$$st' \
-  1 2 13 15;                                           \
+am__trap='rm -f '\''$(abs_builddir)/address@hidden'\''; (exit $$st); exit 
$$st'; \
+trap "st=129; $$am__trap" 1; trap "st=130; $$am__trap" 2;      \
+trap "st=141; $$am__trap" 13; trap "st=143; $$am__trap" 15; \
 am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;           \
 test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?;        \
 if test -f "./$$f"; then dir=./;                       \
diff --git a/lib/am/check.am b/lib/am/check.am
index b1d1aad..755bf13 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2003, 2006, 2007, 2008, 2009 Free Software
+## Copyright (C) 2001, 2003, 2006, 2007, 2008, 2009, 2010 Free Software
 ## Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -101,8 +101,9 @@ $(am__sh_e_setup);                                  \
 $(am__vpath_adj_setup) $(am__vpath_adj)                        \
 srcdir=$(srcdir); export srcdir;                       \
 rm -f address@hidden;                                          \
-trap 'st=$$?; rm -f '\''$(abs_builddir)/address@hidden'\''; (exit $$st); exit 
$$st' \
-  1 2 13 15;                                           \
+am__trap='rm -f '\''$(abs_builddir)/address@hidden'\''; (exit $$st); exit 
$$st'; \
+trap "st=129; $$am__trap" 1; trap "st=130; $$am__trap" 2;      \
+trap "st=141; $$am__trap" 13; trap "st=143; $$am__trap" 15; \
 am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;           \
 test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?;        \
 if test -f "./$$f"; then dir=./;                       \
diff --git a/lib/elisp-comp b/lib/elisp-comp
index ce8c82c..ecc6b15 100755
--- a/lib/elisp-comp
+++ b/lib/elisp-comp
@@ -1,8 +1,8 @@
 #!/bin/sh
-# Copyright (C) 1995, 2000, 2003, 2004, 2005, 2009 Free Software
+# Copyright (C) 1995, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
 # Foundation, Inc.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2010-02-06.18; # UTC
 
 # Franc,ois Pinard <address@hidden>, 1995.
 #
@@ -65,7 +65,11 @@ tempdir=elc.$$
 
 # Cleanup the temporary directory on exit.
 trap 'ret=$?; rm -rf "$tempdir" && exit $ret' 0
-trap '(exit $?); exit' 1 2 13 15
+do_exit='(exit $ret); exit $ret'
+trap "ret=129; $do_exit" 1
+trap "ret=130; $do_exit" 2
+trap "ret=141; $do_exit" 13
+trap "ret=143; $do_exit" 15
 
 mkdir $tempdir
 cp "$@" $tempdir
diff --git a/lib/gnupload b/lib/gnupload
index bd120e8..511070a 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,9 +1,10 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2009-12-21.21; # UTC
+scriptversion=2010-02-06.18; # UTC
 
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation
 #
 # 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
@@ -32,10 +33,11 @@ delete_symlinks=
 collect_var=
 dbg=
 
-usage="Usage: $0 [OPTIONS]... [COMMAND] FILES... [[COMMAND] FILES...]
+usage="Usage: $0 [OPTION]... [CMD] FILE... [[CMD] FILE...]
 
-Sign all FILES, and upload them to selected destinations, according to
-<http://www.gnu.org/prep/maintain/html_node/Automated-FTP-Uploads.html>.
+Sign all FILES, and process them at selected destinations according to CMD.
+<http://www.gnu.org/prep/maintain/html_node/Automated-FTP-Uploads.html>
+explains further.
 
 Commands:
   --delete                 delete FILES from destination
diff --git a/lib/install-sh b/lib/install-sh
index 6781b98..3f83ce9 100755
--- a/lib/install-sh
+++ b/lib/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2010-02-06.18; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -200,7 +200,11 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
diff --git a/lib/ylwrap b/lib/ylwrap
index 84d5634..92b2011 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -1,10 +1,10 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2010-02-06.18; # UTC
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2007, 2009 Free Software Foundation, Inc.
+# 2007, 2009, 2010 Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <address@hidden>.
 #
@@ -99,7 +99,11 @@ esac
 # FIXME: add hostname here for parallel makes that run commands on
 # other machines.  But that might take us over the 14-char limit.
 dirname=ylwrap$$
-trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit 
$ret'
+trap "ret=129; $do_exit" 1
+trap "ret=130; $do_exit" 2
+trap "ret=141; $do_exit" 13
+trap "ret=143; $do_exit" 15
 mkdir $dirname || exit 1
 
 cd $dirname
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3393f06..d7e9cd5 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -138,8 +138,9 @@ $(am__sh_e_setup);                                  \
 $(am__vpath_adj_setup) $(am__vpath_adj)                        \
 srcdir=$(srcdir); export srcdir;                       \
 rm -f address@hidden;                                          \
-trap 'st=$$?; rm -f '\''$(abs_builddir)/address@hidden'\''; (exit $$st); exit 
$$st' \
-  1 2 13 15;                                           \
+am__trap='rm -f '\''$(abs_builddir)/address@hidden'\''; (exit $$st); exit 
$$st'; \
+trap "st=129; $$am__trap" 1; trap "st=130; $$am__trap" 2;      \
+trap "st=141; $$am__trap" 13; trap "st=143; $$am__trap" 15; \
 am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;           \
 test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?;        \
 if test -f "./$$f"; then dir=./;                       \


hooks/post-receive
-- 
GNU Automake