From: Pádraig Brady <P@draigBrady.com>
Date: Sun, 25 Oct 2020 13:10:32 +0000 (+0000)
Subject: maint: sync help2man to latest version
X-Git-Tag: v9.0~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f803c0e92d7c2e1563dfaa34a91fd739bb3e40ed;p=thirdparty%2Fcoreutils.git

maint: sync help2man to latest version

* man/help2man: sync to changes from version 1.47.16.
Note this doesn't materially change the generated man pages.
Addresses https://bugs.gnu.org/44105
---

diff --git a/man/help2man b/man/help2man
index 04e4790be4..168a6b90a0 100755
--- a/man/help2man
+++ b/man/help2man
@@ -2,7 +2,8 @@
 
 # Generate a short man page from --help and --version output.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009,
-# 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
+# 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2020 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
@@ -28,7 +29,7 @@ use Text::Tabs qw(expand);
 use POSIX qw(strftime setlocale LC_ALL);
 
 my $this_program = 'help2man';
-my $this_version = '1.47.3';
+my $this_version = '1.47.16';
 
 sub _ { $_[0] }
 sub configure_locale
@@ -53,7 +54,7 @@ my $version_info = enc_user sprintf _(<<'EOT'), $this_program, $this_version;
 GNU %s %s
 
 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,
-2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2020 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -248,8 +249,8 @@ my $help_text   = get_option_value $ARGV[0], $help_option;
 $version_text ||= get_option_value $ARGV[0], $version_option;
 
 # By default the generated manual pages will include the current date.  This may
-# however be overriden by setting the environment variable $SOURCE_DATE_EPOCH
-# to an integer value of the seconds since the UNIX epoch.  This is primarily
+# however be overriden by setting the environment variable $SOURCE_DATE_EPOCH to
+# an integer value of the seconds since the UNIX epoch.  This is primarily
 # intended to support reproducible builds (wiki.debian.org/ReproducibleBuilds)
 # and will additionally ensure that the output date string is UTC.
 my $epoch_secs = time;
@@ -283,21 +284,23 @@ if ($opt_output)
 #   <version>
 #   <program> <version>
 #   {GNU,Free} <program> <version>
-#   <program> ({GNU,Free} <package>) <version>
-#   <program> - {GNU,Free} <package> <version>
+#   <program> ({GNU,Free,} <package>) <version>
+#   <program> - {GNU,Free,} <package> <version>
+#   <program> - {GNU,Free,} <package> - <version>
 #
 # and separated from any copyright/author details by a blank line.
 
 ($_, $version_text) = ((split /\n+/, $version_text, 2), '');
 
-if (/^(\S+) +\(((?:GNU|Free) +[^)]+)\) +(.*)/ or
-    /^(\S+) +- *((?:GNU|Free) +\S+) +(.*)/)
+if (/^(\S+) +\(((?:(?:GNU|Free) +)?[^)]+)\) +(\S.*)$/ or
+    /^(\S+) +- +((?:(?:GNU|Free) +)?\S.*) +- +(\S.*)$/ or
+    /^(\S+) +- +((?:(?:GNU|Free) +)?\S+) +(\S.*)$/)
 {
     $program = program_basename $1;
     $package = $2;
     $version = $3;
 }
-elsif (/^((?:GNU|Free) +)?(\S+) +(.*)/)
+elsif (/^((?:GNU|Free) +)?(\S+) +(\S.*)$/)
 {
     $program = program_basename $2;
     $package = $1 ? "$1$program" : $program;
@@ -337,7 +340,7 @@ for ($replace{_('NAME')} || ($include{_('NAME')} ||= ''))
 my $PROGRAM = uc $program;
 
 # Set default page head/footers
-$source ||= "$program $version";
+$source ||= "$package $version";
 unless ($manual)
 {
     for ($section)