maint: update copyright year, bootstrap, init.sh

Run "make update-copyright" and then...

* gzip.c: Transform the copyright notice via s/2015/2016/.
* gnulib: Update to latest.
* tests/init.sh: Update from gnulib.
* bootstrap: Likewise.

diff --git a/ChangeLog-2007 b/ChangeLog-2007
index fed66c55d7f5157e1f2591a8d4d1041275346684..0b4a51ac716ce5a5e82ffdb004d20e6af2d4163d 100644 (file)
--- a/ChangeLog-2007
+++ b/ChangeLog-2007
@@ -1776,7 +1776,7 @@ Sat Oct 31 12:46:00 1992  Jean-loup Gailly  (jloup@chorus.fr)
 
        -----
 
-       Copyright (C) 1997-2002, 2006-2015 Free Software Foundation, Inc.
+       Copyright (C) 1997-2002, 2006-2016 Free Software Foundation, Inc.
        Copyright (C) 1992, 1993 Jean-loup Gailly
 
        Copying and distribution of this file, with or without

diff --git a/Makefile.am b/Makefile.am
index d8aa38e27b1f6994ff6e23d94e648c5fe91c21a6..9d06d98baaa36b8f543dff5d2afe29f37275c53a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Make gzip (GNU zip).
 
-# Copyright (C) 1999, 2001-2002, 2006-2007, 2009-2015 Free Software Foundation,
+# Copyright (C) 1999, 2001-2002, 2006-2007, 2009-2016 Free Software Foundation,
 # Inc.
 
 # This program is free software; you can redistribute it and/or modify

diff --git a/NEWS b/NEWS
index 120fb9339c2622a409093fb54e40e4074a857a8e..a1c668f77dad62d2f89560d0c918911a21f83ce7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -444,7 +444,7 @@ Major changes form 0.5 to 0.6:
 
 ========================================================================
 
-Copyright (C) 1999, 2001-2002, 2006-2007, 2009-2015 Free Software Foundation,
+Copyright (C) 1999, 2001-2002, 2006-2007, 2009-2016 Free Software Foundation,
 Inc.
 Copyright (C) 1992, 1993 Jean-loup Gailly
 

diff --git a/README b/README
index 8db3356660b770f2e0ef84f95d380658351c9811..11e6b55db6b64b9d66c6d7429387eec53e57bf6f 100644 (file)
--- a/README
+++ b/README
@@ -129,7 +129,7 @@ note that the range specifies every single year in that closed interval.
 
 ========================================================================
 
-Copyright (C) 1999, 2001-2002, 2006-2007, 2009-2015 Free Software Foundation,
+Copyright (C) 1999, 2001-2002, 2006-2007, 2009-2016 Free Software Foundation,
 Inc.
 Copyright (C) 1992, 1993 Jean-loup Gailly
 

diff --git a/README-hacking b/README-hacking
index f55253d7269c6b51dfff3d0fe05f94b71c55d5a1..cce32ea332978ffcb29b9ed7df6de81a02895396 100644 (file)
--- a/README-hacking
+++ b/README-hacking
@@ -45,7 +45,7 @@ Enjoy!
 
 -----
 
-Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc.
+Copyright (C) 2002-2006, 2009-2016 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/TODO b/TODO
index 3a9c1719819aa07abf9693eb949eea3d40bdd3c3..3a3e76bae9192015399aef8ab6cb7e84044fef24 100644 (file)
--- a/TODO
+++ b/TODO
@@ -73,7 +73,7 @@ Send comments to <bug-gzip@gnu.org>.
 
 ========================================================================
 
-Copyright (C) 1999, 2001, 2006, 2009-2015 Free Software Foundation, Inc.
+Copyright (C) 1999, 2001, 2006, 2009-2016 Free Software Foundation, Inc.
 Copyright (C) 1992, 1993 Jean-loup Gailly
 
 Permission is granted to copy, distribute and/or modify this document

diff --git a/bits.c b/bits.c
index a6dc4dee4746733c862bcd171fab5ff2cf94cc1d..374b49b032d1af8a5f5c865531878130f33daca7 100644 (file)
--- a/bits.c
+++ b/bits.c
@@ -1,6 +1,6 @@
 /* bits.c -- output variable-length bit strings
 
-   Copyright (C) 1999, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2009-2016 Free Software Foundation, Inc.
    Copyright (C) 1992-1993 Jean-loup Gailly
 
    This program is free software; you can redistribute it and/or modify

diff --git a/bootstrap b/bootstrap
index 9dc6e29d0448b8770f32e99a8ee3342998f0fbae..294c0bce447935103ab493ca7c3ee2d30a48d44a 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2013-12-05.23; # UTC
+scriptversion=2014-12-08.12; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2016 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
@@ -42,6 +42,9 @@ export LC_ALL
 
 local_gl_dir=gl
 
+# Honour $PERL, but work even if there is none
+PERL="${PERL-perl}"
+
 me=$0
 
 usage() {
@@ -456,6 +459,7 @@ check_versions() {
     test "$appvar" = TAR && appvar=AMTAR
     case $appvar in
         GZIP) ;; # Do not use $GZIP:  it contains gzip options.
+        PERL::*) ;; # Keep perl modules as-is
         *) eval "app=\${$appvar-$app}" ;;
     esac
 
@@ -473,6 +477,17 @@ check_versions() {
           ret=1
           continue
         } ;;
+      # Another check is for perl modules.  These can be written as
+      # e.g. perl::XML::XPath in case of XML::XPath module, etc.
+      perl::*)
+        # Extract module name
+        app="${app#perl::}"
+        if ! $PERL -m"$app" -e 'exit 0' >/dev/null 2>&1; then
+          warn_ "Error: perl module '$app' not found"
+          ret=1
+        fi
+        continue
+        ;;
     esac
     if [ "$req_ver" = "-" ]; then
       # Merely require app to exist; not all prereq apps are well-behaved
@@ -900,7 +915,8 @@ if test $use_libtool = 1; then
   esac
 fi
 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
-$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
+$gnulib_tool $gnulib_tool_options --import $gnulib_modules \
+  || die "gnulib-tool failed"
 
 for file in $gnulib_files; do
   symlink_to_dir "$GNULIB_SRCDIR" $file \

diff --git a/bootstrap.conf b/bootstrap.conf
index 1387106c4e4f93d10be1957b10f02d5dd6f4e43a..13a485dc3cdc5c5d32e4afb6c174c1145755ccae 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2016 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/cfg.mk b/cfg.mk
index 1fffb58cb4813806a7df0ddb063fa270d2102748..8ba07dbaba0b219b8f6c106a6826e32c094892b6 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk                           -*- makefile -*-
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2016 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/configure.ac b/configure.ac
index 1a9cce6e045c0b56c778c5215b934474ba61b093..f64df6b3444ed105835e7b02eabf4c8347a28b55 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Configure template for gzip.
 
-# Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
 
 # Copyright (C) 1992-1993 Jean-loup Gailly
 

diff --git a/deflate.c b/deflate.c
index ecf02c3bf5643af35c943fb4684c521515662c5c..020810d6e9edf70e7da57297460955ecd6cf9d34 100644 (file)
--- a/deflate.c
+++ b/deflate.c
@@ -1,6 +1,6 @@
 /* deflate.c -- compress data using the deflation algorithm
 
-   Copyright (C) 1999, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2006, 2009-2016 Free Software Foundation, Inc.
    Copyright (C) 1992-1993 Jean-loup Gailly
 
    This program is free software; you can redistribute it and/or modify

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6dff33382e478496ef99824d7bf58e3d23d35f27..76e1767aa0bd8dd9cfbf5d117ecb3af6113ad173 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 # Make gzip documentation.                             -*-Makefile-*-
 
-# Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009-2016 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/doc/gzip.texi b/doc/gzip.texi
index 5754aae8cb5c37c72b4bb4cf433dce30c2f2968e..978b9198da00a93a03124a9a628162a35d8895f8 100644 (file)
--- a/doc/gzip.texi
+++ b/doc/gzip.texi
@@ -12,8 +12,8 @@ This manual is for GNU Gzip
 (version @value{VERSION}, @value{UPDATED}),
 and documents commands for compressing and decompressing data.
 
-Copyright @copyright{} 1998-1999, 2001-2002, 2006-2007, 2009-2015
-Free Software Foundation, Inc.
+Copyright @copyright{} 1998-1999, 2001-2002, 2006-2007, 2009-2016 Free Software
+Foundation, Inc.
 
 Copyright @copyright{} 1992, 1993 Jean-loup Gailly
 

diff --git a/gnulib b/gnulib
index ffe64673c36168b0e62224429a4870427f2c68c4..271dfe37985ff3a6e9cf9d08ab67e8ea3e239162 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit ffe64673c36168b0e62224429a4870427f2c68c4
+Subproject commit 271dfe37985ff3a6e9cf9d08ab67e8ea3e239162

diff --git a/gunzip.in b/gunzip.in
index cba0a35746bd6f124eb5d53e4c709740fe2aa3d1..12968340ceeb7e8a01c11bd9833aefd86a7e0241 100644 (file)
--- a/gunzip.in
+++ b/gunzip.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Uncompress files.  This is the inverse of gzip.
 
-# Copyright (C) 2007, 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2010-2016 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/gzexe.in b/gzexe.in
index 183a36ad381c2a185fbea897d3bea2c32d521514..d5b82a2986bd67e09a87abfdf5e5d6be40927024 100644 (file)
--- a/gzexe.in
+++ b/gzexe.in
@@ -13,7 +13,7 @@
 # On Ultrix, /bin/sh is too buggy, change the first line to: #!/bin/sh5
 
 
-# Copyright (C) 1998, 2002, 2004, 2006-2007, 2010-2015 Free Software
+# Copyright (C) 1998, 2002, 2004, 2006-2007, 2010-2016 Free Software
 # Foundation, Inc.
 # Copyright (C) 1993 Jean-loup Gailly
 

diff --git a/gzip.1 b/gzip.1
index 23987e20382866c524c80b7f78dd471d5db847a9..255adaab214cad391a8e66d1037110ec71e2f6b0 100644 (file)
--- a/gzip.1
+++ b/gzip.1
@@ -493,7 +493,8 @@ the default compression level (-6). On some highly redundant files,
 compresses better than
 .IR gzip .
 .SH "COPYRIGHT NOTICE"
-Copyright \(co 1998-1999, 2001-2002, 2012, 2015 Free Software Foundation, Inc.
+Copyright \(co 1998-1999, 2001-2002, 2012, 2015-2016 Free Software Foundation,
+Inc.
 .br
 Copyright \(co 1992, 1993 Jean-loup Gailly
 .PP

diff --git a/gzip.c b/gzip.c
index 40fee3584cd6fe93ef57516195e0cd58fd2638c8..a013540c4960609e3dae62f9741afaba4ac00da3 100644 (file)
--- a/gzip.c
+++ b/gzip.c
@@ -1,6 +1,6 @@
 /* gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface
 
-   Copyright (C) 1999, 2001-2002, 2006-2007, 2009-2015 Free Software
+   Copyright (C) 1999, 2001-2002, 2006-2007, 2009-2016 Free Software
    Foundation, Inc.
    Copyright (C) 1992-1993 Jean-loup Gailly
 
@@ -29,7 +29,7 @@
  */
 
 static char const *const license_msg[] = {
-"Copyright (C) 2015 Free Software Foundation, Inc.",
+"Copyright (C) 2016 Free Software Foundation, Inc.",
 "Copyright (C) 1993 Jean-loup Gailly.",
 "This is free software.  You may redistribute copies of it under the terms of",
 "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.",

diff --git a/gzip.h b/gzip.h
index cb0ef662ccf169d6aa94cc1b186b3decd13370ae..bb4000abce89e0a316b67dab22f80097062562e2 100644 (file)
--- a/gzip.h
+++ b/gzip.h
@@ -1,6 +1,6 @@
 /* gzip.h -- common declarations for all gzip modules
 
-   Copyright (C) 1997-1999, 2001, 2006-2007, 2009-2015 Free Software
+   Copyright (C) 1997-1999, 2001, 2006-2007, 2009-2016 Free Software
    Foundation, Inc.
 
    Copyright (C) 1992-1993 Jean-loup Gailly.

diff --git a/inflate.c b/inflate.c
index c81879f2b3304b2bd699088d2dc8c72661a3b137..b9201bbfb4dad55acb052d947ff5098e05ed69a4 100644 (file)
--- a/inflate.c
+++ b/inflate.c
@@ -1,6 +1,6 @@
 /* Inflate deflated data
 
-   Copyright (C) 1997-1999, 2002, 2006, 2009-2015 Free Software Foundation,
+   Copyright (C) 1997-1999, 2002, 2006, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software; you can redistribute it and/or modify

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3cdb4a1505db528da9f222fa3413feb92339b6ef..9de622d94b00e2c8c061f602056e06224ed0b40d 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 # Make gzip/lib                                -*-Makefile-*-
 
-# Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009-2016 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/lib/match.c b/lib/match.c
index 345bc5acc1e2bccb92aa4baa87fd138575b29f75..884603873cfb5ea65642c86f4a259630d4faf205 100644 (file)
--- a/lib/match.c
+++ b/lib/match.c
@@ -1,6 +1,6 @@
 /* match.s -- optional optimized asm version of longest match in deflate.c
 
-   Copyright (C) 2002, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2016 Free Software Foundation, Inc.
    Copyright (C) 1992-1993 Jean-loup Gailly
 
    This program is free software; you can redistribute it and/or modify

diff --git a/lzw.h b/lzw.h
index 3fc64077ce908090987b176ce55c54512048b81c..db9739855e5bbfa7a1d67445d9cdcdd0071a5bbd 100644 (file)
--- a/lzw.h
+++ b/lzw.h
@@ -1,6 +1,6 @@
 /* lzw.h -- define the lzw functions.
 
-   Copyright (C) 1994-2015 Free Software Foundation, Inc.
+   Copyright (C) 1994-2016 Free Software Foundation, Inc.
    Copyright (C) 1992-1993 Jean-loup Gailly.
 
    This program is free software; you can redistribute it and/or modify

diff --git a/m4/shell.m4 b/m4/shell.m4
index 206fde54d7935a24746b241e6fb56c121f3d6e62..3027aea46535ed225f317204f28aebb51dd416c5 100644 (file)
--- a/m4/shell.m4
+++ b/m4/shell.m4
@@ -1,6 +1,6 @@
 # Check for a working shell.
 
-# Copyright (C) 2000-2001, 2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2007, 2009-2016 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
 # the Free Software Foundation; either version 3, or (at your option)

diff --git a/revision.h b/revision.h
index 44d1201639722fe2f94f61c38450023ab26a909b..15f41bedf83eadb6bcf288a23167a9e14afef9c7 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -1,6 +1,6 @@
 /* revision.h -- define the version number
 
-   Copyright (C) 1998-1999, 2001-2002, 2006, 2009-2015 Free Software
+   Copyright (C) 1998-1999, 2001-2002, 2006, 2009-2016 Free Software
    Foundation, Inc.
    Copyright (C) 1992-1993 Jean-loup Gailly.
 

diff --git a/tailor.h b/tailor.h
index cabe27f1a6b0de5d46ae723ef2b7a550374bba66..9d2399db7dd3b4bffc0c9f83bd3eb0065e182ad9 100644 (file)
--- a/tailor.h
+++ b/tailor.h
@@ -1,6 +1,6 @@
 /* tailor.h -- target dependent definitions
 
-   Copyright (C) 1997-1999, 2002, 2006, 2009-2015 Free Software Foundation,
+   Copyright (C) 1997-1999, 2002, 2006, 2009-2016 Free Software Foundation,
    Inc.
    Copyright (C) 1992-1993 Jean-loup Gailly
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 82526709ddbb1298ee275b06782e31b4742ea5ef..d9f8fd07d7ea242dd4a903d429bc9bd2b552f611 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to create Makefile.in
-# Copyright 2010-2015 Free Software Foundation, Inc.
+# Copyright 2010-2016 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/tests/gzip-env b/tests/gzip-env
index 90ceab3dc293ad8493f43b77c9c20be75689656b..873d716dca5015764dd1b2e3941049330b787fd4 100755 (executable)
--- a/tests/gzip-env
+++ b/tests/gzip-env
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test the obsolescent GZIP environment variable.
 
-# Copyright 2015 Free Software Foundation, Inc.
+# Copyright 2015-2016 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/tests/helin-segv b/tests/helin-segv
index c71210f3fc15362978f5c86881d837bfa5c3c5f2..0182db33d1f0fecc0e28e5642d16b0ce2c2a22fc 100755 (executable)
--- a/tests/helin-segv
+++ b/tests/helin-segv
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Before gzip-1.4, gzip -d would segfault on some inputs.
 
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2016 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/tests/help-version b/tests/help-version
index b03891ba13868290a0d44314b323d9f095aa071e..00b4c3491db56b4741bcb35549c6af51d0b00a0d 100755 (executable)
--- a/tests/help-version
+++ b/tests/help-version
@@ -2,7 +2,7 @@
 # Make sure all these programs work properly
 # when invoked with --help or --version.
 
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2016 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/tests/hufts b/tests/hufts
index 8173b6d9d1184a29f0f1fd4dd062eee48151ed41..5832a21845455402498530aeaa4b16fff87ba011 100755 (executable)
--- a/tests/hufts
+++ b/tests/hufts
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise a bug whereby an invalid input could make gzip -d misbehave.
 
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2016 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/tests/init.sh b/tests/init.sh
index a886daa3e1e99bd7a37dee7d43299f34e48c17ff..ee0802241ff56f137e770c9a2b3e8339f0f0cdd1 100644 (file)
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -1,6 +1,6 @@
 # source this file; set up for tests
 
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2016 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
@@ -93,6 +93,27 @@ skip_ () { warn_ "$ME_: skipped test: $@"; Exit 77; }
 fatal_ () { warn_ "$ME_: hard error: $@"; Exit 99; }
 framework_failure_ () { warn_ "$ME_: set-up failure: $@"; Exit 99; }
 
+# This is used to simplify checking of the return value
+# which is useful when ensuring a command fails as desired.
+# I.e., just doing `command ... &&fail=1` will not catch
+# a segfault in command for example.  With this helper you
+# instead check an explicit exit code like
+#   returns_ 1 command ... || fail
+returns_ () {
+  # Disable tracing so it doesn't interfere with stderr of the wrapped command
+  { set +x; } 2>/dev/null
+
+  local exp_exit="$1"
+  shift
+  "$@"
+  test $? -eq $exp_exit && ret_=0 || ret_=1
+
+  if test "$VERBOSE" = yes && test "$gl_set_x_corrupts_stderr_" = false; then
+    set -x
+  fi
+  { return $ret_; } 2>/dev/null
+}
+
 # Sanitize this shell to POSIX mode, if possible.
 DUALCASE=1; export DUALCASE
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -129,6 +150,7 @@ fi
 #  ? - not ok
 gl_shell_test_script_='
 test $(echo y) = y || exit 1
+f_local_() { local v=1; }; f_local_ || exit 1
 score_=10
 if test "$VERBOSE" = yes; then
   test -n "$( (exec 3>&1; set -x; P=1 true 2>&3) 2> /dev/null)" && score_=9
@@ -201,6 +223,8 @@ else
       *x*) opts_=-x ;;
       *) opts_= ;;
     esac
+    re_shell=$re_shell_
+    export re_shell
     exec "$re_shell_" $opts_ "$0" --no-reexec "$@"
     echo "$ME_: exec failed" 1>&2
     exit 127
@@ -303,7 +327,7 @@ elif diff_out_=`exec 2>/dev/null; diff -c "$0" "$0" < /dev/null`; then
       fi
     }
   fi
-elif ( cmp --version < /dev/null 2>&1 | grep GNU ) > /dev/null 2>&1; then
+elif cmp -s /dev/null /dev/null 2>/dev/null; then
   compare_ () { cmp -s "$@"; }
 else
   compare_ () { cmp "$@"; }

diff --git a/tests/keep b/tests/keep
index 3ab5ec0ad859a17ed4a7c10c9f0688397f44883e..105d43e643d015655f7a779d43b942a189a80b45 100755 (executable)
--- a/tests/keep
+++ b/tests/keep
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise the --keep option.
 
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2016 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/tests/memcpy-abuse b/tests/memcpy-abuse
index 1ae3e621553937a76a1edfc464f04970217d60e5..970b885235d20f7b8dc6c3fa0faf4990c648a243 100755 (executable)
--- a/tests/memcpy-abuse
+++ b/tests/memcpy-abuse
@@ -2,7 +2,7 @@
 # Before gzip-1.4, this the use of memcpy in inflate_codes could
 # mistakenly operate on overlapping regions.  Exercise that code.
 
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2016 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/tests/mixed b/tests/mixed
index d4d5bc185dafc0b04aaebd1f86164e0505be602f..50e2537a2c9f6784fc5ca189ff0e2097e77fbd48 100755 (executable)
--- a/tests/mixed
+++ b/tests/mixed
@@ -2,7 +2,7 @@
 # Ensure that gzip -cdf handles mixed compressed/not-compressed data
 # Before gzip-1.5, it would produce invalid output.
 
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2016 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/tests/null-suffix-clobber b/tests/null-suffix-clobber
index b627e556b02d47b96c028d06eddb332157f090c0..903864ce641586da7de40d0b07e87a08cd1b65fb 100755 (executable)
--- a/tests/null-suffix-clobber
+++ b/tests/null-suffix-clobber
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Before gzip-1.5, gzip -d -S '' k.gz would delete F.gz and not create "F"
 
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2016 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/tests/stdin b/tests/stdin
index 0697d7ed1b6671f22e4e8c364a124eea60e74a97..190687f9696c7741d2e30e687c042a999e72b56e 100755 (executable)
--- a/tests/stdin
+++ b/tests/stdin
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that gzip interprets "-" as stdin.
 
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2016 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/tests/trailing-nul b/tests/trailing-nul
index cabe8897e27cb7adf242bd30d0fa755e5ce59a52..b21f76fdcf067052f4baaeb3eb4a538f87e83bdb 100755 (executable)
--- a/tests/trailing-nul
+++ b/tests/trailing-nul
@@ -2,7 +2,7 @@
 # gzip accepts trailing NUL bytes; don't fail if there is exactly one.
 # Before gzip-1.4, this would fail.
 
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2016 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/tests/unpack-invalid b/tests/unpack-invalid
index b6053ea04aadcf6239deb8280ea2f27334c0c45c..acea97e83b75d4df9f133f9d1140c27157f4a2a5 100755 (executable)
--- a/tests/unpack-invalid
+++ b/tests/unpack-invalid
@@ -2,7 +2,7 @@
 # gzip should report invalid 'unpack' input when uncompressing.
 # With gzip-1.5, it would output invalid data instead.
 
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2016 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/tests/z-suffix b/tests/z-suffix
index f7ca93d4e8710f0f8e11eac9109b05d275c9bc0b..470932060c006a9804d2714815109878ce78e6bc 100755 (executable)
--- a/tests/z-suffix
+++ b/tests/z-suffix
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Check that -Sz works.
 
-# Copyright 2014-2015 Free Software Foundation, Inc.
+# Copyright 2014-2016 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/tests/zdiff b/tests/zdiff
index 91efd82a89b35bf8accaf1ae5317790da4761267..0bb7c7dfdcf93ecd2614521a941a962871465907 100755 (executable)
--- a/tests/zdiff
+++ b/tests/zdiff
@@ -2,7 +2,7 @@
 # Exercise zdiff with two compressed inputs.
 # Before gzip-1.4, this would fail.
 
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2016 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/tests/zgrep-context b/tests/zgrep-context
index 88e8fb3096de503902690da90b53d75427e97c9e..089d2563971dd6f06bd0eb0a41176bfd0ccae71b 100755 (executable)
--- a/tests/zgrep-context
+++ b/tests/zgrep-context
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that zgrep -15 works.  Before gzip-1.5, it would fail.
 
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2016 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/tests/zgrep-f b/tests/zgrep-f
index ed719ddaf182dc08ff1bc10e743c1e07a55d72cf..a8eb746f692d7f9c0816f5fff5eb1e12130cdc74 100755 (executable)
--- a/tests/zgrep-f
+++ b/tests/zgrep-f
@@ -2,7 +2,7 @@
 # Ensure that zgrep -f - works like grep -f -
 # Before gzip-1.4, it would fail.
 
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2016 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/tests/zgrep-signal b/tests/zgrep-signal
index 35f2be235774962f768a3aa8463f0c178134849f..13783ef1001cecacbfb087b12cce643867e2e71c 100755 (executable)
--- a/tests/zgrep-signal
+++ b/tests/zgrep-signal
@@ -2,7 +2,7 @@
 # Check that zgrep is terminated gracefully by signal when
 # its grep/sed pipeline is terminated by a signal.
 
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2016 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/tests/znew-k b/tests/znew-k
index f9d7be2c2151a37f22d96626e4f9e56cef093c38..98e7fa1f8e3553284fb2510e42d1bb5c8bafb9ae 100755 (executable)
--- a/tests/znew-k
+++ b/tests/znew-k
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Check that znew -K works without compress(1).
 
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2016 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/trees.c b/trees.c
index af72c0801b218ff16ea084b0fff6b30f7181a519..f314e574639125a77b5f7f243848bfec441edc44 100644 (file)
--- a/trees.c
+++ b/trees.c
@@ -1,6 +1,6 @@
 /* trees.c -- output deflated data using Huffman coding
 
-   Copyright (C) 1997-1999, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1997-1999, 2009-2016 Free Software Foundation, Inc.
    Copyright (C) 1992-1993 Jean-loup Gailly
 
    This program is free software; you can redistribute it and/or modify

diff --git a/unpack.c b/unpack.c
index 2f532e9d9ab4823d2252e5988c9f334875c243bf..477e4ac86a1448d3f08ff4c23d0dc30b55689e75 100644 (file)
--- a/unpack.c
+++ b/unpack.c
@@ -1,6 +1,6 @@
 /* unpack.c -- decompress files in pack format.
 
-   Copyright (C) 1997, 1999, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2006, 2009-2016 Free Software Foundation, Inc.
    Copyright (C) 1992-1993 Jean-loup Gailly
 
    This program is free software; you can redistribute it and/or modify

diff --git a/unzip.c b/unzip.c
index 50cdf5d6da34fabc514b00b0daab93a480c3e87b..38759f04000f40f1828ba81737e3afe4815a4385 100644 (file)
--- a/unzip.c
+++ b/unzip.c
@@ -1,6 +1,6 @@
 /* unzip.c -- decompress files in gzip or pkzip format.
 
-   Copyright (C) 1997-1999, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1997-1999, 2009-2016 Free Software Foundation, Inc.
    Copyright (C) 1992-1993 Jean-loup Gailly
 
    This program is free software; you can redistribute it and/or modify

diff --git a/util.c b/util.c
index f84dfc951716f811a2db068e248bb06b60f269a9..522d6ef14196a05e30b34f14b143b75ea3adcf5f 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,6 +1,6 @@
 /* util.c -- utility functions for gzip support
 
-   Copyright (C) 1997-1999, 2001-2002, 2006, 2009-2015 Free Software
+   Copyright (C) 1997-1999, 2001-2002, 2006, 2009-2016 Free Software
    Foundation, Inc.
    Copyright (C) 1992-1993 Jean-loup Gailly
 

diff --git a/zcat.in b/zcat.in
index 29d3046861e71006b135a0a5f16e4982adac2eab..be6577f5c9c5fc8676cd4759f5d0581296b2a3e8 100644 (file)
--- a/zcat.in
+++ b/zcat.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Uncompress files to standard output.
 
-# Copyright (C) 2007, 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2010-2016 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/zcmp.in b/zcmp.in
index 34637f2bdcc2b63ed14b4c33e625962d0aa68ad9..d099223bc3f2f2b6d0f8d8edb5ffd11e486741fe 100644 (file)
--- a/zcmp.in
+++ b/zcmp.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Compare the uncompressed contents of compressed files, byte by byte.
 
-# Copyright (C) 2007, 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2010-2016 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/zdiff.in b/zdiff.in
index 2bd235224754b1d560001064f38048c883dc8392..60905d5e01a58474f8a4760f0b56f5a0d5f42975 100644 (file)
--- a/zdiff.in
+++ b/zdiff.in
@@ -1,8 +1,7 @@
 #!/bin/sh
 # sh is buggy on RS/6000 AIX 3.2. Replace above line with #!/bin/ksh
 
-# Copyright (C) 1998, 2002, 2006-2007, 2009-2015 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998, 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
 # Copyright (C) 1993 Jean-loup Gailly
 
 # This program is free software; you can redistribute it and/or modify

diff --git a/zforce.in b/zforce.in
index 128b54912836850a7cfee28d2478059730a4aa59..e5d66ad44a1cbe5a6052736bddd429b46a4a88cf 100644 (file)
--- a/zforce.in
+++ b/zforce.in
@@ -6,7 +6,7 @@
 # 12345678901234 is renamed to 12345678901.gz
 
 
-# Copyright (C) 2002, 2007, 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2007, 2010-2016 Free Software Foundation, Inc.
 # Copyright (C) 1993 Jean-loup Gailly
 
 # This program is free software; you can redistribute it and/or modify

diff --git a/zgrep.in b/zgrep.in
index a2f4201afbfb41f065e9400868015018a5204559..9668faef806c87c53e0aad9397cf68042e0aa8e4 100644 (file)
--- a/zgrep.in
+++ b/zgrep.in
@@ -3,8 +3,8 @@
 # zgrep -- a wrapper around a grep program that decompresses files as needed
 # Adapted from a version sent by Charles Levert <charles@comm.polymtl.ca>
 
-# Copyright (C) 1998, 2001-2002, 2006-2007, 2009-2015 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998, 2001-2002, 2006-2007, 2009-2016 Free Software Foundation,
+# Inc.
 
 # Copyright (C) 1993 Jean-loup Gailly
 

diff --git a/zip.c b/zip.c
index 63a7a2fb284d533b29f2853c92f9242b9d109312..7f1117c5d23b35c328df395a1d09116d5920f782 100644 (file)
--- a/zip.c
+++ b/zip.c
@@ -1,6 +1,6 @@
 /* zip.c -- compress files to the gzip or pkzip format
 
-   Copyright (C) 1997-1999, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1997-1999, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Copyright (C) 1992-1993 Jean-loup Gailly
 
    This program is free software; you can redistribute it and/or modify

diff --git a/zless.1 b/zless.1
index c75bc0b3bc4c0c9da9d93ee3df7e5bd25c87c147..93a443ebbfa2b192c1e21c320fb7aa468aa1574f 100644 (file)
--- a/zless.1
+++ b/zless.1
@@ -28,7 +28,7 @@ To read compressed data from a pipe, you can use
 instead of
 .RB ".\|.\|." "|zless" .
 .SH "COPYRIGHT NOTICE"
-Copyright \(co 2006-2007, 2015 Free Software Foundation, Inc.
+Copyright \(co 2006-2007, 2015-2016 Free Software Foundation, Inc.
 .br
 Copyright \(co 1992, 1993 Jean-loup Gailly
 .PP

diff --git a/zless.in b/zless.in
index 9bc2989fcf512819c1878eef9451f4725a0e5400..9c7d163945484763a22c34114626207f43d522ed 100644 (file)
--- a/zless.in
+++ b/zless.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 1998, 2002, 2006-2007, 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2002, 2006-2007, 2010-2016 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/zmore.in b/zmore.in
index 4ef34c327f4bfde4e8ab8d92218eeda38fe66911..5f5bb26c3a3f137f3e7e75481672559983dec058 100644 (file)
--- a/zmore.in
+++ b/zmore.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2001-2002, 2007, 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2002, 2007, 2010-2016 Free Software Foundation, Inc.
 # Copyright (C) 1992, 1993 Jean-loup Gailly
 
 # This program is free software; you can redistribute it and/or modify

diff --git a/znew.in b/znew.in
index 8d161922be94d8d07ecc672f45626b9032cb351e..7f4a8ebc68a03973a1d52aaa90945c812b44b373 100644 (file)
--- a/znew.in
+++ b/znew.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 1998, 2002, 2004, 2007, 2010-2015 Free Software Foundation,
+# Copyright (C) 1998, 2002, 2004, 2007, 2010-2016 Free Software Foundation,
 # Inc.
 # Copyright (C) 1993 Jean-loup Gailly