From 34a372f85e2ffe6501a2b1b867ae0920346e0560 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 20 Oct 2020 03:30:11 +0800 Subject: [PATCH 1/2] [patch tracking] 20201020033007632984 - https://github.com/coreutils/coreutils/commit/00ea4bacf6063ccc125209d5186f8f2382c6f0d4 --- ...4bacf6063ccc125209d5186f8f2382c6f0d4.patch | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 00ea4bacf6063ccc125209d5186f8f2382c6f0d4.patch diff --git a/00ea4bacf6063ccc125209d5186f8f2382c6f0d4.patch b/00ea4bacf6063ccc125209d5186f8f2382c6f0d4.patch new file mode 100644 index 0000000..328a667 --- /dev/null +++ b/00ea4bacf6063ccc125209d5186f8f2382c6f0d4.patch @@ -0,0 +1,92 @@ +diff --git a/gl/lib/randperm.c b/gl/lib/randperm.c +index e9f46cd8c..400c7b33b 100644 +--- a/gl/lib/randperm.c ++++ b/gl/lib/randperm.c +@@ -119,8 +119,8 @@ sparse_new (size_t size_hint) + static void + sparse_swap (sparse_map *sv, size_t* v, size_t i, size_t j) + { +- struct sparse_ent_ *v1 = hash_delete (sv, &(struct sparse_ent_) {i,0}); +- struct sparse_ent_ *v2 = hash_delete (sv, &(struct sparse_ent_) {j,0}); ++ struct sparse_ent_ *v1 = hash_remove (sv, &(struct sparse_ent_) {i,0}); ++ struct sparse_ent_ *v2 = hash_remove (sv, &(struct sparse_ent_) {j,0}); + + /* FIXME: reduce the frequency of these mallocs. */ + if (!v1) +diff --git a/gnulib b/gnulib +index 0b93877fc..2d386f229 160000 +--- a/gnulib ++++ b/gnulib +@@ -1 +1 @@ +-Subproject commit 0b93877fc4bdcd84b78805e5917e4ab94684b9bc ++Subproject commit 2d386f229aba9ecda85736b931e2964d7922d90e +diff --git a/src/cp-hash.c b/src/cp-hash.c +index 10ab2cd05..339071667 100644 +--- a/src/cp-hash.c ++++ b/src/cp-hash.c +@@ -88,7 +88,7 @@ forget_created (ino_t ino, dev_t dev) + probe.st_dev = dev; + probe.name = NULL; + +- ent = hash_delete (src_to_dest, &probe); ++ ent = hash_remove (src_to_dest, &probe); + if (ent) + src_to_dest_free (ent); + } +diff --git a/src/ls.c b/src/ls.c +index a69f9d6e4..1f6afbc0e 100644 +--- a/src/ls.c ++++ b/src/ls.c +@@ -1766,7 +1766,7 @@ main (int argc, char **argv) + Use its dev/ino numbers to remove the corresponding + entry from the active_dir_set hash table. */ + struct dev_ino di = dev_ino_pop (); +- struct dev_ino *found = hash_delete (active_dir_set, &di); ++ struct dev_ino *found = hash_remove (active_dir_set, &di); + /* ASSERT_MATCHING_DEV_INO (thispend->realname, di); */ + assert (found); + dev_ino_free (found); +diff --git a/src/sort.c b/src/sort.c +index 242bf66d1..0163ba18a 100644 +--- a/src/sort.c ++++ b/src/sort.c +@@ -757,7 +757,7 @@ delete_proc (pid_t pid) + struct tempnode test; + + test.pid = pid; +- struct tempnode *node = hash_delete (proctab, &test); ++ struct tempnode *node = hash_remove (proctab, &test); + if (! node) + return false; + node->state = REAPED; +diff --git a/src/tail.c b/src/tail.c +index 18e52b1bf..016690b6e 100644 +--- a/src/tail.c ++++ b/src/tail.c +@@ -1771,7 +1771,7 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files, + if (0 <= fspec->wd) + { + inotify_rm_watch (wd, fspec->wd); +- hash_delete (wd_to_name, fspec); ++ hash_remove (wd_to_name, fspec); + } + + fspec->wd = new_wd; +@@ -1782,7 +1782,7 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files, + /* If the file was moved then inotify will use the source file wd + for the destination file. Make sure the key is not present in + the table. */ +- struct File_spec *prev = hash_delete (wd_to_name, fspec); ++ struct File_spec *prev = hash_remove (wd_to_name, fspec); + if (prev && prev != fspec) + { + if (follow_mode == Follow_name) +@@ -1817,7 +1817,7 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files, + if (ev->mask & IN_DELETE_SELF) + { + inotify_rm_watch (wd, fspec->wd); +- hash_delete (wd_to_name, fspec); ++ hash_remove (wd_to_name, fspec); + } + + /* Note we get IN_ATTRIB for unlink() as st_nlink decrements. -- Gitee From 1bf8b9407e89be41e3b4159c0a5048b178af4d57 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 20 Oct 2020 03:30:12 +0800 Subject: [PATCH 2/2] [patch tracking] 20201020033007632984 - update spec file --- coreutils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/coreutils.spec b/coreutils.spec index f5a08aa..89897ca 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: 00ea4bacf6063ccc125209d5186f8f2382c6f0d4.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -135,6 +136,9 @@ fi %{_mandir}/man*/* %changelog +* 20201020033007632984 patch-tracking 8.32-3 +- append patch file of upstream repository from <00ea4bacf6063ccc125209d5186f8f2382c6f0d4> to <00ea4bacf6063ccc125209d5186f8f2382c6f0d4> + * 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