diff --git a/coreutils-i18n-sort-human.patch b/coreutils-i18n-sort-human.patch deleted file mode 100644 index 67524931565dd1a710938f4d5229182f6b4281ad..0000000000000000000000000000000000000000 --- a/coreutils-i18n-sort-human.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3976ef5a20369d8b490907ab2cba2d617305a5e0 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Mon, 30 May 2016 16:19:20 +0200 -Subject: [PATCH] sort: do not use static array 'blanks' in human_numcompare() - -... because the array is not initialized with MB locales. Note this is -rather a conservative fix. I plan to do more cleanup of the i18n patch -in Fedora to prevent mistakes like this in future updates of coreutils. ---- - src/sort.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/src/sort.c b/src/sort.c -index 9e07ad8..e47b039 100644 ---- a/src/sort.c -+++ b/src/sort.c -@@ -2304,12 +2304,10 @@ find_unit_order (char const *number) - < K/k < M < G < T < P < E < Z < Y */ - - static int --human_numcompare (char const *a, char const *b) -+human_numcompare (char *a, char *b) - { -- while (blanks[to_uchar (*a)]) -- a++; -- while (blanks[to_uchar (*b)]) -- b++; -+ skipblanks(&a, a + strlen(a)); -+ skipblanks(&b, b + strlen(b)); - - int diff = find_unit_order (a) - find_unit_order (b); - return (diff ? diff : strnumcmp (a, b, decimal_point, thousands_sep)); --- -2.5.5 - diff --git a/coreutils.spec b/coreutils.spec index d7ec075f1b130f65857baca9223fdc12bdc5c5a7..04837acbed2f7265ce8a582b3401f00448ea6f86 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,6 +1,6 @@ Name: coreutils Version: 8.30 -Release: 8 +Release: 9 License: GPLv3+ Summary: A set of basic GNU tools commonly used in shell scripts Url: https://www.gnu.org/software/coreutils/ @@ -29,7 +29,6 @@ Patch804: coreutils-i18n-cut-old.patch Patch803: coreutils-i18n-fix-unexpand.patch Patch805: coreutils-i18n-fix2-expand-unexpand.patch Patch806: coreutils-i18n-un-expand-BOM.patch -Patch807: coreutils-i18n-sort-human.patch Patch808: coreutils-i18n-fold-newline.patch Patch908: coreutils-getgrouplist.patch Patch950: coreutils-selinux.patch @@ -142,6 +141,9 @@ fi %{_mandir}/man*/* %changelog +* Tue Dec 31 2019 openEuler Buildteam - 8.30-9 +- Delete unneeded patch + * Wed Dec 25 2019 openEuler Buildteam - 8.30-8 - Revert last commit