diff --git a/175c7c6a60c562e1972199ae980a1bcd7027105e.patch b/175c7c6a60c562e1972199ae980a1bcd7027105e.patch new file mode 100644 index 0000000000000000000000000000000000000000..c5843d004cfc6b9ae743d50490c129d93859acb6 --- /dev/null +++ b/175c7c6a60c562e1972199ae980a1bcd7027105e.patch @@ -0,0 +1,12 @@ +diff --git a/.gitignore b/.gitignore +index 318c02617..e1abcdfb7 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -79,6 +79,7 @@ + /lib/netdb.h + /lib/netinet/in.h + /lib/parse-datetime.c ++/lib/parse-datetime-gen.h + /lib/printf.c + /lib/pthread.h + /lib/ref-add.sed diff --git a/coreutils.spec b/coreutils.spec index f5a08aa750f6eecebb0afdb66bc44e9d689578f4..403cee43a323a14868a463b15592bc30a9f016d1 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,6 +1,6 @@ Name: coreutils Version: 8.32 -Release: 2 +Release: 3 License: GPLv3+ Summary: A set of basic GNU tools commonly used in shell scripts Url: https://www.gnu.org/software/coreutils/ @@ -25,6 +25,8 @@ Patch8: skip-the-tests-that-require-selinux-if-selinux-is-di.patch Patch9: coreutils-8.32-ls-removed-dir.patch Patch10: coreutils-8.32-leaf-opt-xfs.patch +Patch6000: f803c0e92d7c2e1563dfaa34a91fd739bb3e40ed.patch +Patch6001: 175c7c6a60c562e1972199ae980a1bcd7027105e.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -135,6 +137,9 @@ fi %{_mandir}/man*/* %changelog +* 20201025223007649638 patch-tracking 8.32-3 +- append patch file of upstream repository from to <175c7c6a60c562e1972199ae980a1bcd7027105e> + * Wed Aug 26 2020 chenbo pan - 8.32-2 - fix patch error @@ -221,4 +226,4 @@ fi - reintroduce very old Provides (mktemp, sh-utils, textwrap, fileutils, stat) * Thu Jul 12 2018 hexiaowen - 8.30-1 -- Pacakge init +- Pacakge init \ No newline at end of file diff --git a/f803c0e92d7c2e1563dfaa34a91fd739bb3e40ed.patch b/f803c0e92d7c2e1563dfaa34a91fd739bb3e40ed.patch new file mode 100644 index 0000000000000000000000000000000000000000..1818074c2b6379d4620e0395a6734e9dd1c23ad6 --- /dev/null +++ b/f803c0e92d7c2e1563dfaa34a91fd739bb3e40ed.patch @@ -0,0 +1,81 @@ +diff --git a/man/help2man b/man/help2man +index 04e4790be..168a6b90a 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) + # + # + # {GNU,Free} +-# ({GNU,Free} ) +-# - {GNU,Free} ++# ({GNU,Free,} ) ++# - {GNU,Free,} ++# - {GNU,Free,} - + # + # 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)