From 8dc963f33dee63fe2100496b4ce0beee1f6543f7 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 1 Dec 2020 22:58:54 +0800 Subject: [PATCH 1/2] [patch tracking] 20201201225849750631 - https://github.com/coreutils/coreutils/commit/e361bff8a5ef97fd784a79ce789d8ac6c7e20fc7 --- ...bff8a5ef97fd784a79ce789d8ac6c7e20fc7.patch | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 e361bff8a5ef97fd784a79ce789d8ac6c7e20fc7.patch diff --git a/e361bff8a5ef97fd784a79ce789d8ac6c7e20fc7.patch b/e361bff8a5ef97fd784a79ce789d8ac6c7e20fc7.patch new file mode 100644 index 0000000..4c4bd2b --- /dev/null +++ b/e361bff8a5ef97fd784a79ce789d8ac6c7e20fc7.patch @@ -0,0 +1,90 @@ +diff --git a/src/date.c b/src/date.c +index c33fa3fc5..27a1f1335 100644 +--- a/src/date.c ++++ b/src/date.c +@@ -584,6 +584,9 @@ show_date (const char *format, struct timespec when, timezone_t tz) + { + struct tm tm; + ++ if (parse_datetime_flags & PARSE_DATETIME_DEBUG) ++ error (0, 0, _("output format: %s"), quote (format)); ++ + if (localtime_rz (tz, &when.tv_sec, &tm)) + { + if (format == rfc_email_format) +diff --git a/tests/misc/date-debug.sh b/tests/misc/date-debug.sh +index 362dc8d19..9978ab11d 100755 +--- a/tests/misc/date-debug.sh ++++ b/tests/misc/date-debug.sh +@@ -52,6 +52,7 @@ date: timezone: TZ="Asia/Tokyo" environment value + date: final: 661095000.000000000 (epoch-seconds) + date: final: (Y-M-D) 1990-12-13 13:30:00 (UTC) + date: final: (Y-M-D) 1990-12-13 22:30:00 (UTC+09) ++date: output format: '%a %b %e %T %z %Y' + Thu Dec 13 07:30:00 -0600 1990 + EOF + +@@ -102,6 +103,7 @@ date: timezone: TZ="America/Lima" environment value + date: final: 1.000000000 (epoch-seconds) + date: final: (Y-M-D) 1970-01-01 00:00:01 (UTC) + date: final: (Y-M-D) 1969-12-31 19:00:01 (UTC-05) ++date: output format: '%a %b %e %T %z %Y' + Wed Dec 31 19:00:01 -0500 1969 + EOF + +@@ -122,6 +124,7 @@ date: timezone: Universal Time + date: final: 1356998400.000000000 (epoch-seconds) + date: final: (Y-M-D) 2013-01-01 00:00:00 (UTC) + date: final: (Y-M-D) 2013-01-01 00:00:00 (UTC+00) ++date: output format: '%a %b %e %H:%M:%S %Z %Y' + Tue Jan 1 00:00:00 UTC 2013 + EOF + +@@ -149,6 +152,7 @@ date: timezone: Universal Time + date: final: 1382400000.000000000 (epoch-seconds) + date: final: (Y-M-D) 2013-10-22 00:00:00 (UTC) + date: final: (Y-M-D) 2013-10-22 00:00:00 (UTC+00) ++date: output format: '%F' + 2013-10-22 + EOF + +@@ -178,6 +182,7 @@ date: timezone: Universal Time + date: final: 1475280000.000000000 (epoch-seconds) + date: final: (Y-M-D) 2016-10-01 00:00:00 (UTC) + date: final: (Y-M-D) 2016-10-01 00:00:00 (UTC+00) ++date: output format: '%a %b %e %H:%M:%S %Z %Y' + Sat Oct 1 00:00:00 UTC 2016 + EOF + +@@ -209,6 +214,7 @@ date: timezone: TZ="America/New_York" environment value + date: final: 1480564800.000000000 (epoch-seconds) + date: final: (Y-M-D) 2016-12-01 04:00:00 (UTC) + date: final: (Y-M-D) 2016-11-30 23:00:00 (UTC-05) ++date: output format: '%F' + 2016-11-30 + EOF + +@@ -232,6 +238,7 @@ date: timezone: TZ="Europe/Helsinki" environment value + date: final: 1323554400.000000000 (epoch-seconds) + date: final: (Y-M-D) 2011-12-10 22:00:00 (UTC) + date: final: (Y-M-D) 2011-12-11 00:00:00 (UTC+02) ++date: output format: '%a %b %e %H:%M:%S %Z %Y' + Sun Dec 11 00:00:00 EET 2011 + EOF + +@@ -249,6 +256,7 @@ date: timezone: TZ="Europe/Helsinki" environment value + date: final: 1307739600.000000000 (epoch-seconds) + date: final: (Y-M-D) 2011-06-10 21:00:00 (UTC) + date: final: (Y-M-D) 2011-06-11 00:00:00 (UTC+03) ++date: output format: '%a %b %e %H:%M:%S %Z %Y' + Sat Jun 11 00:00:00 EEST 2011 + EOF + +@@ -277,6 +285,7 @@ date: timezone: Universal Time + date: final: 1302562740.000000000 (epoch-seconds) + date: final: (Y-M-D) 2011-04-11 22:59:00 (UTC) + date: final: (Y-M-D) 2011-04-11 22:59:00 (UTC+00) ++date: output format: '%a %b %e %H:%M:%S %Z %Y' + Mon Apr 11 22:59:00 UTC 2011 + EOF + -- Gitee From a17577ad860ae230b2825ed6676a333b958f76d2 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 1 Dec 2020 22:58:55 +0800 Subject: [PATCH 2/2] [patch tracking] 20201201225849750631 - update spec file --- coreutils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/coreutils.spec b/coreutils.spec index f5a08aa..14f08e7 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,7 @@ 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: e361bff8a5ef97fd784a79ce789d8ac6c7e20fc7.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -135,6 +136,9 @@ fi %{_mandir}/man*/* %changelog +* 20201201225849750631 patch-tracking 8.32-3 +- append patch file of upstream repository from to + * Wed Aug 26 2020 chenbo pan - 8.32-2 - fix patch error @@ -221,4 +225,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 -- Gitee