Subject: Re: bug#28514: Error in --help-text

From: Paul Eggert <[email-masked]>
Date: Tue, 19 Sep 2017 10:46:41 -0700

Thanks for the bug report. I installed the attached patches, which 
should fix the problem. The last patch is the actual fix; the other 
patches are merely to bring gzip up to speed (it's been a while since 
anyone built bleeding-edge gzip, apparently).
>From c1a07c679b6e640d3b48008ba769c49fb68cad8a Mon Sep 17 00:00:00 2001
From: Paul Eggert <[email-masked]>
Date: Tue, 19 Sep 2017 09:40:23 -0700
Subject: [PATCH 1/7] build: update gnulib submodule to latest

---
 gnulib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnulib b/gnulib
index b6acb8d..b86cc86 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit b6acb8db44af728e88a065526be035f7b927c0bf
+Subproject commit b86cc86ae41e68d0484c5c3957b867e4725bb986
-- 
2.13.5

>From de4fe1b52a0a3dc34860deed0ee38141f3635f52 Mon Sep 17 00:00:00 2001
From: Paul Eggert <[email-masked]>
Date: Tue, 19 Sep 2017 09:51:50 -0700
Subject: [PATCH 2/7] maint: update .gitignore for recent Gnulib

---
 lib/.gitignore | 30 ++++++++++++++++++++----------
 m4/.gitignore  | 14 ++++++++++----
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/lib/.gitignore b/lib/.gitignore
index b39c680..4df1a38 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,6 +1,7 @@
 .deps
 /Makefile
 /Makefile.in
+/_Noreturn.h
 /alloca.h
 /alloca.in.h
 /asnprintf.c
@@ -8,7 +9,6 @@
 /at-func.c
 /basename-lgpl.c
 /calloc.c
-/charset.alias
 /chdir-long.c
 /chdir-long.h
 /cloexec.c
@@ -17,7 +17,6 @@
 /closedir.c
 /config.h
 /config.hin
-/configmake.h
 /creat-safer.c
 /dirent--.h
 /dirent-private.h
@@ -28,6 +27,7 @@
 /dirname-lgpl.c
 /dirname.h
 /dosname.h
+/dup-safer-flag.c
 /dup-safer.c
 /dup.c
 /dup2.c
@@ -46,6 +46,7 @@
 /fcntl.in.h
 /fd-hook.c
 /fd-hook.h
+/fd-safer-flag.c
 /fd-safer.c
 /fdatasync.c
 /fdopendir.c
@@ -75,11 +76,18 @@
 /ftello.c
 /getcwd-lgpl.c
 /getdtablesize.c
+/getopt-cdefs.in.h
+/getopt-core.h
+/getopt-ext.h
+/getopt-pfx-core.h
+/getopt-pfx-ext.h
 /getopt.c
 /getopt.h
 /getopt.in.h
 /getopt1.c
 /getopt_int.h
+/getprogname.c
+/getprogname.h
 /gettext.h
 /gettime.c
 /gettimeofday.c
@@ -97,9 +105,15 @@
 /itold.c
 /libgzip.a
 /limits.h
+/limits.in.h
+/localtime-buffer.c
+/localtime-buffer.h
 /lseek.c
 /lstat.c
 /malloc.c
+/malloca.c
+/malloca.h
+/malloca.valgrind
 /math.c
 /math.h
 /math.in.h
@@ -135,8 +149,6 @@
 /printf.c
 /readdir.c
 /realloc.c
-/ref-add.sed
-/ref-del.sed
 /rmdir.c
 /save-cwd.c
 /save-cwd.h
@@ -149,6 +161,8 @@
 /stamp-h1
 /stat-time.c
 /stat-time.h
+/stat-w32.c
+/stat-w32.h
 /stat.c
 /statat.c
 /stdbool.h
@@ -172,9 +186,7 @@
 /string.in.h
 /stripslash.c
 /sys
-/sys_stat.h
 /sys_stat.in.h
-/sys_time.h
 /sys_time.in.h
 /sys_types.in.h
 /time.h
@@ -189,6 +201,8 @@
 /unlink.c
 /unlinkat.c
 /unused-parameter.h
+/utime.c
+/utime.in.h
 /utimens.c
 /utimens.h
 /vasnprintf.c
@@ -197,7 +211,6 @@
 /vfprintf.c
 /wchar.h
 /wchar.in.h
-/wctype.h
 /xalloc-die.c
 /xalloc-oversized.h
 /xalloc.h
@@ -206,6 +219,3 @@
 /xsize.h
 /yesno.c
 /yesno.h
-/getprogname.c
-/getprogname.h
-/limits.in.h
diff --git a/m4/.gitignore b/m4/.gitignore
index 286888d..38ebad0 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -14,6 +14,7 @@
 /double-slash-root.m4
 /dup.m4
 /dup2.m4
+/eealloc.m4
 /errno_h.m4
 /error.m4
 /exponentd.m4
@@ -49,6 +50,7 @@
 /getcwd.m4
 /getdtablesize.m4
 /getopt.m4
+/getprogname.m4
 /gettime.m4
 /gettimeofday.m4
 /gnu-make.m4
@@ -68,11 +70,15 @@
 /lib-ld.m4
 /lib-link.m4
 /lib-prefix.m4
+/limits-h.m4
+/localtime-buffer.m4
 /lock.m4
 /longlong.m4
 /lseek.m4
 /lstat.m4
 /malloc.m4
+/malloca.m4
+/manywarnings-c++.m4
 /manywarnings.m4
 /math_h.m4
 /memchr.m4
@@ -85,6 +91,7 @@
 /multiarch.m4
 /nocrash.m4
 /off_t.m4
+/open-cloexec.m4
 /open.m4
 /openat.m4
 /opendir.m4
@@ -94,6 +101,7 @@
 /printf-frexpl.m4
 /printf-posix-rpl.m4
 /printf.m4
+/pthread_rwlock_rdlock.m4
 /readdir.m4
 /realloc.m4
 /rmdir.m4
@@ -126,7 +134,8 @@
 /unistd_h.m4
 /unlink.m4
 /unlinkat.m4
-/utimbuf.m4
+/utime.m4
+/utime_h.m4
 /utimens.m4
 /utimes.m4
 /vasnprintf.m4
@@ -139,6 +148,3 @@
 /xalloc.m4
 /xsize.m4
 /yesno.m4
-/getprogname.m4
-/limits-h.m4
-/pthread_rwlock_rdlock.m4
-- 
2.13.5

>From 8d5324941f8f88f2559f93dfbfc169383c167d0a Mon Sep 17 00:00:00 2001
From: Paul Eggert <[email-masked]>
Date: Tue, 19 Sep 2017 10:00:35 -0700
Subject: [PATCH 3/7] maint: port to GCC 7.2

* configure.ac (WERROR_CFLAGS): Avoid -Wduplicated-branches.
* tailor.h (FALLTHROUGH): New macro, taken from Emacs.
* gzip.c (main): Use it.
---
 configure.ac | 1 +
 gzip.c       | 2 +-
 tailor.h     | 8 ++++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 05aa681..ca4066c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,7 @@ if test "$gl_gcc_warnings" = yes; then
   nw="$nw -Wtraditional"            # Warns on #elif which we use often
   nw="$nw -Wcast-qual"              # Too many warnings for now
   nw="$nw -Wconversion"             # Too many warnings for now
+  nw="$nw -Wduplicated-branches"    # Too many false alarms
   nw="$nw -Wsystem-headers"         # Don't let system headers trigger warnings
   nw="$nw -Wsign-conversion"        # Too many warnings for now
   nw="$nw -Wtraditional-conversion" # Too many warnings for now
diff --git a/gzip.c b/gzip.c
index 3d2aeaf..32a229c 100644
--- a/gzip.c
+++ b/gzip.c
@@ -599,7 +599,7 @@ int main (int argc, char **argv)
         case '4' + ENV_OPTION:  case '5' + ENV_OPTION:  case '6' + ENV_OPTION:
         case '7' + ENV_OPTION:  case '8' + ENV_OPTION:  case '9' + ENV_OPTION:
             optc -= ENV_OPTION;
-            /* Fall through.  */
+            FALLTHROUGH;
         case '1':  case '2':  case '3':  case '4':
         case '5':  case '6':  case '7':  case '8':  case '9':
             level = optc - '0';
diff --git a/tailor.h b/tailor.h
index 8510599..aec3029 100644
--- a/tailor.h
+++ b/tailor.h
@@ -202,3 +202,11 @@
 #ifndef SET_BINARY_MODE
 #  define SET_BINARY_MODE(fd)
 #endif
+
+#ifndef FALLTHROUGH
+# if __GNUC__ < 7
+#  define FALLTHROUGH ((void) 0)
+# else
+#  define FALLTHROUGH __attribute__ ((__fallthrough__))
+# endif
+#endif
-- 
2.13.5

>From b64b6658888772d94c1b4114a07163d46dc4bc04 Mon Sep 17 00:00:00 2001
From: Paul Eggert <[email-masked]>
Date: Tue, 19 Sep 2017 10:20:01 -0700
Subject: [PATCH 4/7] maint: copy bootstrap from Gnulib

---
 bootstrap | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootstrap b/bootstrap
index 932ff85..85b85c5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2017-01-09.19; # UTC
+scriptversion=2017-09-19.08; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -17,7 +17,7 @@ scriptversion=2017-01-09.19; # UTC
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Originally written by Paul Eggert.  The canonical version of this
 # script is maintained as build-aux/bootstrap in gnulib, however, to
@@ -141,7 +141,7 @@ po_download_command_format=\
 # Fallback for downloading .po files (if rsync fails).
 po_download_command_format2=\
 "wget --mirror -nd -q -np -A.po -P '%s' \
- http://translationproject.org/latest/%s/"
+ https://translationproject.org/latest/%s/"
 
 # Prefer a non-empty tarname (4th argument of AC_INIT if given), else
 # fall back to the package name (1st argument with munging)
@@ -699,7 +699,7 @@ download_po_files() {
   echo "$me: getting translations into $subdir for $domain..."
   cmd=$(printf "$po_download_command_format" "$domain" "$subdir")
   eval "$cmd" && return
-  # Fallback to HTTP.
+  # Fallback to HTTPS.
   cmd=$(printf "$po_download_command_format2" "$subdir" "$domain")
   eval "$cmd"
 }
@@ -792,7 +792,7 @@ symlink_to_dir()
       # aren't confused into doing unnecessary builds.  Conversely, if the
       # existing symlink's timestamp is older than the source, make it afresh,
       # so that broken tools aren't confused into skipping needed builds.  See
-      # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>.
+      # <https://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>.
       test -h "$dst" &&
       src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
       dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
-- 
2.13.5

>From ea067d0a4b25f6dea4d2cdf25839c9936c2b2f81 Mon Sep 17 00:00:00 2001
From: Paul Eggert <[email-masked]>
Date: Tue, 19 Sep 2017 10:24:05 -0700
Subject: [PATCH 5/7] maint: prefer HTTPS to HTTP, FTP in URLs

---
 ChangeLog-2007            | 50 +++++++++++++++++++++++------------------------
 NEWS                      |  2 +-
 README                    |  4 ++--
 README-hacking            |  8 ++++----
 TODO                      | 16 +++++++--------
 algorithm.doc             |  4 ++--
 bootstrap.conf            |  2 +-
 cfg.mk                    |  4 ++--
 configure.ac              |  2 +-
 doc/gzip.texi             |  4 ++--
 gunzip.in                 |  2 +-
 gzexe.in                  |  2 +-
 gzip.1                    |  4 ++--
 gzip.c                    |  2 +-
 tests/Makefile.am         |  2 +-
 tests/gzip-env            |  2 +-
 tests/helin-segv          |  2 +-
 tests/help-version        |  2 +-
 tests/hufts               |  2 +-
 tests/init.sh             |  2 +-
 tests/keep                |  2 +-
 tests/list                |  2 +-
 tests/memcpy-abuse        |  2 +-
 tests/mixed               |  2 +-
 tests/null-suffix-clobber |  2 +-
 tests/stdin               |  2 +-
 tests/timestamp           |  2 +-
 tests/trailing-nul        |  2 +-
 tests/unpack-invalid      |  2 +-
 tests/z-suffix            |  2 +-
 tests/zdiff               |  2 +-
 tests/zgrep-context       |  2 +-
 tests/zgrep-f             |  2 +-
 tests/zgrep-signal        |  2 +-
 tests/znew-k              |  2 +-
 zcat.in                   |  2 +-
 zcmp.in                   |  2 +-
 zdiff.in                  |  2 +-
 zforce.in                 |  2 +-
 zgrep.in                  |  2 +-
 zless.in                  |  2 +-
 zmore.in                  |  2 +-
 znew.in                   |  2 +-
 43 files changed, 81 insertions(+), 83 deletions(-)

diff --git a/ChangeLog-2007 b/ChangeLog-2007
index 847f7f1..19705b5 100644
--- a/ChangeLog-2007
+++ b/ChangeLog-2007
@@ -6,7 +6,7 @@
 	* gzip.c (handled_sig): Move out of install_signal_handlers, and
 	move previous to all uses of SIGPIPE, to fix a bug encountered when
 	porting to mingw32.  Reported by Robert Millan in
-	<http://lists.gnu.org/archive/html/bug-gzip/2007-11/msg00007.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2007-11/msg00007.html>.
 
 2007-10-04  Paul Eggert  <[email-masked]>
 
@@ -15,7 +15,7 @@
 	* Makefile.am (gzip.doc.gz, check-local): Depend on $(bin_PROGRAMS).
 	(gzip.doc.gz): Use our gzip, not the system-installed one.
 	Problem reported by Chris Staub in
-	<http://lists.gnu.org/archive/html/bug-gzip/2007-10/msg00000.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2007-10/msg00000.html>.
 
 2007-07-03  Paul Eggert  <[email-masked]>
 
@@ -32,14 +32,14 @@
 2007-06-04  Paul Eggert  <[email-masked]>
 
 	* gzip.c (get_method): Fix typo: "a a" -> "a" in diagnostic.  Reported
-	by Justin Pryzby in Debian bug 426965 <http://bugs.debian.org/426965>.
+	by Justin Pryzby in Debian bug 426965 <https://bugs.debian.org/426965>.
 
 2007-05-07  Paul Eggert  <[email-masked]>
 
 	* NEWS: 'gzip -f foo.gz' now works instead of complaining.
 	* gzip.c (make_ofname): Implement this.
 	Problem reported by Sven Hartrumpf in
-	<http://lists.gnu.org/archive/html/bug-gzip/2007-05/msg00003.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2007-05/msg00003.html>.
 
 	* NEWS, gzip.1: Document that case is ignored when looking at file name
 	extensions.
@@ -51,7 +51,7 @@
 	consistency with other substitutions.
 	(check-local): Use --__bindir . rather than setting GZIP_BINDIR=.,
 	to allay security concerns voiced by Joerg Lehners in
-	<http://lists.gnu.org/archive/html/bug-gzip/2007-04/msg00003.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2007-04/msg00003.html>.
 	* gunzip.in, gzexe.in, zcat.in, zcmp.in, zdiff.in, zegrep.in, zfgrep.in:
 	* zforce.in, zgrep.in, zless.in, zmore.in, znew.in:
 	Support --__bindir rather than GZIP_BINDIR.
@@ -59,13 +59,13 @@
 	* gunzip.in, zcat.in, zcmp.in: Support --help and --version
 	directly, to avoid some confusion in help and version output.
 	Problem reported by Eric Blake in
-	<http://lists.gnu.org/archive/html/bug-gzip/2007-04/msg00006.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2007-04/msg00006.html>.
 
 2007-04-28  Paul Eggert  <[email-masked]>
 
 	* m4/shell.m4 (AC_PROG_SHELL): Check for old-fashioned shells that
 	don't allow "(" in front of case labels.  Problem reported by midair
-	in <http://lists.gnu.org/archive/html/bug-gzip/2007-04/msg00004.html>.
+	in <https://lists.gnu.org/archive/html/bug-gzip/2007-04/msg00004.html>.
 	Also, check for buggy shells that require ";;" before "esac".
 
 2007-04-13  Paul Eggert  <[email-masked]>
@@ -113,7 +113,7 @@
 
 	* README (WARNING): Reword to avoid mention of no-longer-existing
 	section in INSTALL file.  Problem reported by Paul Townsend in
-	<http://lists.gnu.org/archive/html/bug-gzip/2007-03/msg00000.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2007-03/msg00000.html>.
 
 2007-02-11  Paul Eggert  <[email-masked]>
 
@@ -126,7 +126,7 @@
 	* zdiff.in: Don't use '((' in a shell script, as it's not portable
 	to some ksh implementations, e.g., Solaris 10 ksh M-11/16/88i.
 	Problem reported by Nelson H. F. Beebe in
-	<http://lists.gnu.org/archive/html/bug-gzip/2007-02/msg00005.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2007-02/msg00005.html>.
 
 2007-02-05  Paul Eggert  <[email-masked]>
 
@@ -171,21 +171,21 @@
 
 	* m4/shell.m4 (AC_PROG_SHELL): Test that $(...) works.
 	Problem reported for SGI IRIX 6 by Nelson H. F. Beebe in
-	<http://lists.gnu.org/archive/html/bug-gzip/2007-01/msg00007.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2007-01/msg00007.html>.
 
 2007-01-04  Paul Eggert  <[email-masked]>
 
 	* zdiff.in (cmp0): New var.
 	Rewrite test for /dev/fd/3 to detect bugs in Solaris 8
 	/bin/bash 2.03.  Problem reported by Nelson H. F. Beebe in
-	<http://lists.gnu.org/archive/html/bug-gzip/2007-01/msg00001.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2007-01/msg00001.html>.
 	Avoid "for file; do", which doesn't work with Solaris 8 /bin/sh.
 
 2007-01-03  Paul Eggert  <[email-masked]>
 
 	* zdiff.in: Test /dev//fd/3, not /dev/fd/3, to work around a problem
 	with Tru64 4.0F ksh M-11/16/88f reported by Thomas Koutcher in
-	<http://lists.gnu.org/archive/html/bug-gzip/2007-01/msg00000.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2007-01/msg00000.html>.
 
 2006-12-30  Paul Eggert  <[email-masked]>
 
@@ -200,11 +200,11 @@
 
 	* zless.in: Work around a bug in less 394 and earlier; it
 	mishandles $%=~ in file names.  Problem reported by
-	Sami Liedes in <http://bugs.debian.org/383358>.
+	Sami Liedes in <https://bugs.debian.org/383358>.
 
 	* doc/gzip.texi: Swap order of dircategory entries, to pacify
 	Debian install-info 1.10.28.  This should fix
-	<http://bugs.debian.org/404048>.
+	<https://bugs.debian.org/404048>.
 
 	* zgrep.in (version): Fix bug: $grep wasn't evaluated.
 
@@ -215,7 +215,7 @@
 
 2006-12-26  Paul Eggert  <[email-masked]>
 
-	Fix Debian bug 367673 <http://bugs.debian.org/367673> plus several
+	Fix Debian bug 367673 <https://bugs.debian.org/367673> plus several
 	other bugs discovered in the neighborhood.
 	* NEWS: gzip -q now exits with status 2 (not 1) on SIGPIPE.
 	zgrep has many bugs fixed with argument handling, special characters,
@@ -226,7 +226,7 @@
 2006-12-23  Paul Eggert  <[email-masked]>
 
 	* NEWS: Fix bug reported by Martin Mares in
-	<http://bugs.debian.org/177942>.
+	<https://bugs.debian.org/177942>.
 	* gzip.c (treat_stdin): Remove NO_STDIN_FSTAT and NO_PIPE_TIMESTAMP
 	stuff.  It didn't work (led to syntax errors) and was confusing.
 	Report an error if stdin cannot be statted even if !list && no_time.
@@ -237,7 +237,7 @@
 	Use the same form for timestamps that treat_stdin uses.
 
 	* zdiff.in: Fix typo that broke most usages.  Problem reported by
-	Jari Aalto in <http://bugs.debian.org/404114>.  While we're at it,
+	Jari Aalto in <https://bugs.debian.org/404114>.  While we're at it,
 	fix a bunch of other problems.  Handle "-" better.  Send
 	diagnostics to stderr, not stdout.  Use expr rather than echo |
 	sed, to handle special characters better.  Report a diagnostic in
@@ -254,7 +254,7 @@
 
 	* zdiff.1: Mention that these programs currently understand only
 	formats that gzip does.  Problem reported by Jari Aalto in
-	<http://bugs.debian.org/404099>.
+	<https://bugs.debian.org/404099>.
 
 2006-12-20  Paul Eggert  <[email-masked]>
 
@@ -338,12 +338,12 @@
 	* znew.in: Likewise.
 
 	Fix problems in porting to NSK reported by Matthew Woehlke in
-	<http://lists.gnu.org/archive/html/bug-gzip/2006-12/msg00025.html> and
-	<http://lists.gnu.org/archive/html/bug-gzip/2006-12/msg00027.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2006-12/msg00025.html> and
+	<https://lists.gnu.org/archive/html/bug-gzip/2006-12/msg00027.html>.
 	* gzip.h: Include <limits.h>, for SSIZE_MAX.
 	(INBUFSIZE): Don't make it any larger than SSIZE_MAX.
 	Problem reported by Matthew Woehlke in
-	<http://lists.gnu.org/archive/html/bug-gzip/2006-11/msg00013.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2006-11/msg00013.html>.
 	* gzip.c: Don't include <limits.h>, as gzip.h now does this.
 	* util.c: Likewise.
 	* gzip.c (main): Set exiting_signal before installing signal handlers.
@@ -368,7 +368,7 @@
 	* configure.ac (for assembler): Set ASFLAGS_config to
 	-Wa,--noexecstack if this seems advisable on this platform.
 	Problem reported by Mike Frysinger in
-	<http://lists.gnu.org/archive/html/bug-gzip/2006-12/msg00018.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2006-12/msg00018.html>.
 	* lib/Makefile.am (match.$(OBJEXT)): Use ASFLAGS_config.
 
 2006-12-07  Paul Eggert  <[email-masked]>
@@ -378,7 +378,7 @@
 
 	* deflate.c (deflate_fast, deflate): Avoid core dump.  Problem
 	originally reported by Jochen Friedrich and trivial patch supplied
-	by Anthony Towns; see <http://bugs.debian.org/184057>.
+	by Anthony Towns; see <https://bugs.debian.org/184057>.
 
 2006-12-06  Paul Eggert  <[email-masked]>
 
@@ -434,7 +434,7 @@
 
 	Port to Tandem NSK/OSS, which lacks fchdir.  Problem reported by
 	Matthew Woehlke in
-	<http://lists.gnu.org/archive/html/bug-gzip/2006-11/msg00013.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2006-11/msg00013.html>.
 	* bootstrap.conf (gnulib_modules): Remove openat, as it pulls in
 	fchdir.
 	* configure.ac: Check for fdopendir.
@@ -478,7 +478,7 @@
 	* gzexe.in: Sweep the code and fix some bugs.
 	My, what sharp teeth you have, gzexe!
 	The straw that broke this camel's back was Matthew Burgess's bug report
-	<http://lists.gnu.org/archive/html/bug-gzip/2006-11/msg00012.html>.
+	<https://lists.gnu.org/archive/html/bug-gzip/2006-11/msg00012.html>.
 
 	(IFS): Set it to the standard value, both here and in the
 	script gzexe generates.
diff --git a/NEWS b/NEWS
index 7086553..50b2e99 100644
--- a/NEWS
+++ b/NEWS
@@ -123,7 +123,7 @@ GNU gzip NEWS                                    -*- outline -*-
   gzip -d could segfault and/or clobber the stack, possibly leading to
   arbitrary code execution.  This affects x86_64 but not 32-bit systems.
   This fixes CVE-2010-0001.
-  For more details, see http://bugzilla.redhat.com/554418
+  For more details, see https://bugzilla.redhat.com/554418
 
   gzip -d would fail with a CRC error for some valid inputs.
   So far, the only valid input known to exhibit this failure was
diff --git a/README b/README
index a116df7..21504c2 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 This is the file README for the gzip distribution.
 
-The GNU gzip home page is http://www.gnu.org/software/gzip.
+The GNU gzip home page is https://www.gnu.org/software/gzip.
 
 gzip (GNU zip) is a compression utility designed to be a replacement
 for 'compress'. Its main advantages over compress are much better
@@ -64,7 +64,7 @@ provided as example (not installed by default since it relies on perl).
 gzip is free software, you can redistribute it and/or modify it under
 the terms of the GNU General Public License, a copy of which is
 provided under the name COPYING. The latest version of gzip is always
-available from ftp://ftp.gnu.org/gnu/gzip or in any of the GNU
+available from https://ftp.gnu.org/gnu/gzip or in any of the GNU
 mirror sites.
 
 Many thanks to those who provided me with bug reports and feedback.
diff --git a/README-hacking b/README-hacking
index 3650ff2..4f2279f 100644
--- a/README-hacking
+++ b/README-hacking
@@ -9,10 +9,10 @@ Only the sources are installed in the CVS repository (to ease the
 maintenance, merges etc.), therefore you will have to get the latest
 stable versions of the maintainer tools we depend upon, including:
 
-- Automake <http://www.gnu.org/software/automake/>
-- Autoconf <http://www.gnu.org/software/autoconf/>
-- Tar <http://www.gnu.org/software/tar/>
-- Wget <http://www.gnu.org/software/wget/>
+- Automake <https://www.gnu.org/software/automake/>
+- Autoconf <https://www.gnu.org/software/autoconf/>
+- Tar <https://www.gnu.org/software/tar/>
+- Wget <https://www.gnu.org/software/wget/>
 
 Valgrind <http://valgrind.org/> is also highly recommended, if
 Valgrind supports your architecture.
diff --git a/TODO b/TODO
index 268777f..604ea49 100644
--- a/TODO
+++ b/TODO
@@ -31,16 +31,14 @@ Some of the planned features include:
   should be done in chunks to reduce memory usage.)
 
 - Add a super-fast compression method, suitable for implementing
-  file systems with transparent compression. One problem is that the
-  best candidate (lzrw1) is patented twice (Waterworth 4,701,745
-  and Gibson & Graybill 5,049,881). The lzrw series of algorithms
-  are available by ftp in ftp.adelaide.edu.au:/pub/compression/lzrw*.
+  file systems with transparent compression. The lzrw series of algorithms
+  are available at http://www.ross.net/compression/.
 
 - Add a super-tight (but slow) compression method, suitable for long
-  term archives.  One problem is that the best versions of arithmetic
-  coding are patented (4,286,256 4,295,125 4,463,342 4,467,317
-  4,633,490 4,652,856 4,891,643 4,905,297 4,935,882 4,973,961
-  5,023,611 5,025,258).
+  term archives.  See, for example, US Patents 4,286,256 4,295,125
+  4,463,342 4,467,317 4,633,490 4,652,856 4,891,643 4,905,297
+  4,935,882 4,973,961 5,023,611 5,025,258, which have all expired.
+  More recent patent-free techniques may also be available.
 
   Note: I will introduce new compression methods only if they are
   significantly better in either speed or compression ratio than the
@@ -59,7 +57,7 @@ Some of the planned features include:
 
   For one possible approach to this, please see:
 
-    http://www.samba.org/netfilter/diary/gzip.rsync.patch
+    https://ozlabs.org/~rusty/gzip.rsync.patch
 
 - Use a larger window size to deal with some large redundant files that
   'compress' currently handles better than gzip.
diff --git a/algorithm.doc b/algorithm.doc
index aa46705..1091169 100644
--- a/algorithm.doc
+++ b/algorithm.doc
@@ -158,8 +158,8 @@ Compression", IEEE Transactions on Information Theory, Vol. 23, No. 3,
 May 1977, pp. 337-343.
 
 [RFC1952] Deutsch P., "GZIP file format specification version 4.3",
-Internet RFC 1952, May 1996, <http://www.ietf.org/rfc/rfc1952.txt>.
+Internet RFC 1952, May 1996, <https://www.ietf.org/rfc/rfc1952.txt>.
 
 APPNOTE.TXT documentation file in PKZIP 1.93a (October 1991).  This
 version no longer seems to be available online; the latest version is
-in <http://www.pkware.com/documents/casestudies/APPNOTE.TXT>.
+in <https://www.pkware.com/documents/casestudies/APPNOTE.TXT>.
diff --git a/bootstrap.conf b/bootstrap.conf
index 16a84ce..649b94a 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -13,7 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.

 # gzip doesn't use gettext.
diff --git a/cfg.mk b/cfg.mk
index b70ee6e..3ee7b0b 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -12,14 +12,14 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Used in maint.mk's web-manual rule
 manual_title = gzip: the data compression program
 
 # Use the direct link.  This is guaranteed to work immediately, while
 # it can take a while for the faster mirror links to become usable.
-url_dir_list = http://ftp.gnu.org/gnu/$(PACKAGE)
+url_dir_list = https://ftp.gnu.org/gnu/$(PACKAGE)
 
 # Tests not to run as part of "make distcheck".
 local-checks-to-skip =		\
diff --git a/configure.ac b/configure.ac
index ca4066c..76a82fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,7 +133,7 @@ if test "$gl_gcc_warnings" = yes; then
 
   # Using -Wstrict-overflow is a pain, but the alternative is worse.
   # For an example, see the code that provoked this report:
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33498
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=33498
   # Code like that still infloops with gcc-4.6.0 and -O2.  Scary indeed.
 
   gl_MANYWARN_ALL_GCC([ws])
diff --git a/doc/gzip.texi b/doc/gzip.texi
index 0176da4..ca1e623 100644
--- a/doc/gzip.texi
+++ b/doc/gzip.texi
@@ -172,10 +172,10 @@ ownership and timestamps of files when compressing or decompressing.
 
 The @command{gzip} file format is specified in P. Deutsch, GZIP file
 format specification version 4.3,
-@uref{http://www.ietf.org/rfc/rfc1952.txt, Internet @abbr{RFC} 1952} (May
+@uref{https://www.ietf.org/rfc/rfc1952.txt, Internet @abbr{RFC} 1952} (May
 1996).  The @command{zip} deflation format is specified in P. Deutsch,
 DEFLATE Compressed Data Format Specification version 1.3,
-@uref{http://www.ietf.org/rfc/rfc1951.txt, Internet @abbr{RFC} 1951} (May
+@uref{https://www.ietf.org/rfc/rfc1951.txt, Internet @abbr{RFC} 1951} (May
 1996).
 
 @node Sample
diff --git a/gunzip.in b/gunzip.in
index 140809c..cbb573a 100644
--- a/gunzip.in
+++ b/gunzip.in
@@ -20,7 +20,7 @@
 version="gunzip (gzip) @VERSION@
 Copyright (C) 2007, 2011-2016 Free Software Foundation, Inc.
 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>.
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Paul Eggert."
diff --git a/gzexe.in b/gzexe.in
index 371289c..1398050 100644
--- a/gzexe.in
+++ b/gzexe.in
@@ -39,7 +39,7 @@ IFS=" $tab$nl"
 version='gzexe (gzip) @VERSION@
 Copyright (C) 2007, 2011-2016 Free Software Foundation, Inc.
 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>.
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Jean-loup Gailly.'
diff --git a/gzip.1 b/gzip.1
index ffc8041..acde58a 100644
--- a/gzip.1
+++ b/gzip.1
@@ -408,13 +408,13 @@ The
 .I gzip
 file format is specified in P. Deutsch, \s-1GZIP\s0 file format
 specification version 4.3,
-.BR <http://www.ietf.org/rfc/rfc1952.txt> ,
+.BR <https://www.ietf.org/rfc/rfc1952.txt> ,
 Internet RFC 1952 (May 1996).
 The
 .I zip
 deflation format is specified in P. Deutsch, \s-1DEFLATE\s0 Compressed
 Data Format Specification version 1.3,
-.BR <http://www.ietf.org/rfc/rfc1951.txt> ,
+.BR <https://www.ietf.org/rfc/rfc1951.txt> ,
 Internet RFC 1951 (May 1996).
 .SH "DIAGNOSTICS"
 Exit status is normally 0;
diff --git a/gzip.c b/gzip.c
index 32a229c..a4717aa 100644
--- a/gzip.c
+++ b/gzip.c
@@ -32,7 +32,7 @@ static char const *const license_msg[] = {
 "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>.",
+"the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.",
 "There is NO WARRANTY, to the extent permitted by law.",
 0};
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 20ea221..df1789d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,7 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 TESTS =					\
   gzip-env				\
diff --git a/tests/gzip-env b/tests/gzip-env
index 90b3a83..eeacebf 100755
--- a/tests/gzip-env
+++ b/tests/gzip-env
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/helin-segv b/tests/helin-segv
index ed9835a..2bb86db 100755
--- a/tests/helin-segv
+++ b/tests/helin-segv
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/help-version b/tests/help-version
index aa70471..8bcfe5d 100755
--- a/tests/help-version
+++ b/tests/help-version
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Ensure that $SHELL is set to *some* value and exported.
 # This is required for dircolors, which would fail e.g., when
diff --git a/tests/hufts b/tests/hufts
index d626123..6f851b6 100755
--- a/tests/hufts
+++ b/tests/hufts
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/init.sh b/tests/init.sh
index 584194f..470605c 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -13,7 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Using this file in a test
 # =========================
diff --git a/tests/keep b/tests/keep
index dec8afa..322c60a 100755
--- a/tests/keep
+++ b/tests/keep
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/list b/tests/list
index 8b61877..b6e05ef 100755
--- a/tests/list
+++ b/tests/list
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/memcpy-abuse b/tests/memcpy-abuse
index c06172a..8abf892 100755
--- a/tests/memcpy-abuse
+++ b/tests/memcpy-abuse
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/mixed b/tests/mixed
index 05064c5..0ad93d6 100755
--- a/tests/mixed
+++ b/tests/mixed
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/null-suffix-clobber b/tests/null-suffix-clobber
index c0f62e0..e5d108a 100755
--- a/tests/null-suffix-clobber
+++ b/tests/null-suffix-clobber
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/stdin b/tests/stdin
index 897fcdd..09d08c9 100755
--- a/tests/stdin
+++ b/tests/stdin
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/timestamp b/tests/timestamp
index e538a4d..6e4e1fc 100755
--- a/tests/timestamp
+++ b/tests/timestamp
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/trailing-nul b/tests/trailing-nul
index ef19326..8c8b3d0 100755
--- a/tests/trailing-nul
+++ b/tests/trailing-nul
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/unpack-invalid b/tests/unpack-invalid
index 0e66440..d3035f1 100755
--- a/tests/unpack-invalid
+++ b/tests/unpack-invalid
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/z-suffix b/tests/z-suffix
index 5b5a860..28b0258 100755
--- a/tests/z-suffix
+++ b/tests/z-suffix
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/zdiff b/tests/zdiff
index e2ca651..8f2518a 100755
--- a/tests/zdiff
+++ b/tests/zdiff
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/zgrep-context b/tests/zgrep-context
index d767ca3..d00f9fa 100755
--- a/tests/zgrep-context
+++ b/tests/zgrep-context
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/zgrep-f b/tests/zgrep-f
index 346a805..40da9ff 100755
--- a/tests/zgrep-f
+++ b/tests/zgrep-f
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/zgrep-signal b/tests/zgrep-signal
index c45495e..f0a4d6f 100755
--- a/tests/zgrep-signal
+++ b/tests/zgrep-signal
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/tests/znew-k b/tests/znew-k
index 0b820f1..675c6a0 100755
--- a/tests/znew-k
+++ b/tests/znew-k
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ..
diff --git a/zcat.in b/zcat.in
index 7f9c99c..a93f6a8 100644
--- a/zcat.in
+++ b/zcat.in
@@ -20,7 +20,7 @@
 version="zcat (gzip) @VERSION@
 Copyright (C) 2007, 2011-2016 Free Software Foundation, Inc.
 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>.
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Paul Eggert."
diff --git a/zcmp.in b/zcmp.in
index 20fb031..7847350 100644
--- a/zcmp.in
+++ b/zcmp.in
@@ -20,7 +20,7 @@
 version="zcmp (gzip) @VERSION@
 Copyright (C) 2010 Free Software Foundation, Inc.
 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>.
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Paul Eggert."
diff --git a/zdiff.in b/zdiff.in
index d57e44d..ab76d2d 100644
--- a/zdiff.in
+++ b/zdiff.in
@@ -27,7 +27,7 @@ esac
 version="z$prog (gzip) @VERSION@
 Copyright (C) 2009, 2011-2016 Free Software Foundation, Inc.
 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>.
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Jean-loup Gailly."
diff --git a/zforce.in b/zforce.in
index 9a07bbf..47daef8 100644
--- a/zforce.in
+++ b/zforce.in
@@ -26,7 +26,7 @@
 version="zforce (gzip) @VERSION@
 Copyright (C) 2010-2016 Free Software Foundation, Inc.
 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>.
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Jean-loup Gailly."
diff --git a/zgrep.in b/zgrep.in
index 78ffbc1..6978dfa 100644
--- a/zgrep.in
+++ b/zgrep.in
@@ -27,7 +27,7 @@ grep='${GREP-'\''@GREP@'\''}'
 version='zgrep (gzip) @VERSION@
 Copyright (C) 2010-2016 Free Software Foundation, Inc.
 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>.
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Jean-loup Gailly.'
diff --git a/zless.in b/zless.in
index fdcc49a..10b9a0c 100644
--- a/zless.in
+++ b/zless.in
@@ -19,7 +19,7 @@
 version="zless (gzip) @VERSION@
 Copyright (C) 2007, 2011-2016 Free Software Foundation, Inc.
 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>.
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Paul Eggert."
diff --git a/zmore.in b/zmore.in
index 5b1c370..005b536 100644
--- a/zmore.in
+++ b/zmore.in
@@ -20,7 +20,7 @@
 version="zmore (gzip) @VERSION@
 Copyright (C) 2010-2016 Free Software Foundation, Inc.
 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>.
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Jean-loup Gailly."
diff --git a/znew.in b/znew.in
index 0f73a0a..8ba829f 100644
--- a/znew.in
+++ b/znew.in
@@ -21,7 +21,7 @@
 version="znew (gzip) @VERSION@
 Copyright (C) 2010-2016 Free Software Foundation, Inc.
 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>.
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Jean-loup Gailly."
-- 
2.13.5

>From 10f4ad5e7377bbd3aa6dbe600c32ee6ddb5aadf3 Mon Sep 17 00:00:00 2001
From: Paul Eggert <[email-masked]>
Date: Tue, 19 Sep 2017 10:38:31 -0700
Subject: [PATCH 6/7] misc: update --version copyright

* gunzip.in, gzexe.in, gzip.c, zcat.in, zdiff.in, zforce.in, zgrep.in:
* zless.in, zmore.in, znew.in: Update copyright year in --version
output to 2017.
---
 gunzip.in | 2 +-
 gzexe.in  | 2 +-
 gzip.c    | 2 +-
 zcat.in   | 2 +-
 zdiff.in  | 2 +-
 zforce.in | 2 +-
 zgrep.in  | 2 +-
 zless.in  | 2 +-
 zmore.in  | 2 +-
 znew.in   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gunzip.in b/gunzip.in
index cbb573a..a5dfb89 100644
--- a/gunzip.in
+++ b/gunzip.in
@@ -18,7 +18,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 version="gunzip (gzip) @VERSION@
-Copyright (C) 2007, 2011-2016 Free Software Foundation, Inc.
+Copyright (C) 2007, 2011-2017 Free Software Foundation, Inc.
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/gzexe.in b/gzexe.in
index 1398050..1977b1c 100644
--- a/gzexe.in
+++ b/gzexe.in
@@ -37,7 +37,7 @@ nl='
 IFS=" $tab$nl"
 
 version='gzexe (gzip) @VERSION@
-Copyright (C) 2007, 2011-2016 Free Software Foundation, Inc.
+Copyright (C) 2007, 2011-2017 Free Software Foundation, Inc.
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/gzip.c b/gzip.c
index a4717aa..09a1650 100644
--- a/gzip.c
+++ b/gzip.c
@@ -29,7 +29,7 @@
  */
 
 static char const *const license_msg[] = {
-"Copyright (C) 2016 Free Software Foundation, Inc.",
+"Copyright (C) 2017 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 <https://www.gnu.org/licenses/gpl.html>.",
diff --git a/zcat.in b/zcat.in
index a93f6a8..524ac51 100644
--- a/zcat.in
+++ b/zcat.in
@@ -18,7 +18,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 version="zcat (gzip) @VERSION@
-Copyright (C) 2007, 2011-2016 Free Software Foundation, Inc.
+Copyright (C) 2007, 2011-2017 Free Software Foundation, Inc.
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/zdiff.in b/zdiff.in
index ab76d2d..e1efc1e 100644
--- a/zdiff.in
+++ b/zdiff.in
@@ -25,7 +25,7 @@ case $1 in
 esac
 
 version="z$prog (gzip) @VERSION@
-Copyright (C) 2009, 2011-2016 Free Software Foundation, Inc.
+Copyright (C) 2009, 2011-2017 Free Software Foundation, Inc.
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/zforce.in b/zforce.in
index 47daef8..1770af3 100644
--- a/zforce.in
+++ b/zforce.in
@@ -24,7 +24,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 version="zforce (gzip) @VERSION@
-Copyright (C) 2010-2016 Free Software Foundation, Inc.
+Copyright (C) 2010-2017 Free Software Foundation, Inc.
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/zgrep.in b/zgrep.in
index 6978dfa..2ed007b 100644
--- a/zgrep.in
+++ b/zgrep.in
@@ -25,7 +25,7 @@
 grep='${GREP-'\''@GREP@'\''}'
 
 version='zgrep (gzip) @VERSION@
-Copyright (C) 2010-2016 Free Software Foundation, Inc.
+Copyright (C) 2010-2017 Free Software Foundation, Inc.
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/zless.in b/zless.in
index 10b9a0c..9a3f399 100644
--- a/zless.in
+++ b/zless.in
@@ -17,7 +17,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 version="zless (gzip) @VERSION@
-Copyright (C) 2007, 2011-2016 Free Software Foundation, Inc.
+Copyright (C) 2007, 2011-2017 Free Software Foundation, Inc.
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/zmore.in b/zmore.in
index 005b536..1c9cebb 100644
--- a/zmore.in
+++ b/zmore.in
@@ -18,7 +18,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 version="zmore (gzip) @VERSION@
-Copyright (C) 2010-2016 Free Software Foundation, Inc.
+Copyright (C) 2010-2017 Free Software Foundation, Inc.
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/znew.in b/znew.in
index 8ba829f..29038df 100644
--- a/znew.in
+++ b/znew.in
@@ -19,7 +19,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 version="znew (gzip) @VERSION@
-Copyright (C) 2010-2016 Free Software Foundation, Inc.
+Copyright (C) 2010-2017 Free Software Foundation, Inc.
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
-- 
2.13.5

>From 15f37e1c2c1bebfb085c09ae297008060178765e Mon Sep 17 00:00:00 2001
From: Paul Eggert <[email-masked]>
Date: Tue, 19 Sep 2017 10:43:13 -0700
Subject: [PATCH 7/7] gzexe: improve usage diagnostic

* gzexe.in (usage): Reword for clarity (Bug#28514).
---
 gzexe.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gzexe.in b/gzexe.in
index 1977b1c..87413a3 100644
--- a/gzexe.in
+++ b/gzexe.in
@@ -45,7 +45,8 @@ There is NO WARRANTY, to the extent permitted by law.
 Written by Jean-loup Gailly.'
 
 usage="Usage: $0 [OPTION] FILE...
-Rename each FILE with a compressed version of itself, renaming FILE to FILE~.
+Replace each executable FILE with a compressed version of itself.
+Make a backup FILE~ of the old version of FILE.
 
   -d             Decompress each FILE instead of compressing it.
       --help     display this help and exit
-- 
2.13.5