From 838372be687ea51319abf42cd528838a6db0d89d Mon Sep 17 00:00:00 2001 From: hanzj0122_admin <961123325@gmail.com> Date: Fri, 10 Apr 2020 16:51:09 +0800 Subject: [PATCH] remove S_MAGIC_XFS to fix coredump --- 0001-remove-S_MAGIC_XFS-fix-coredump.patch | 11 +++++++++++ findutils.spec | 10 ++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 0001-remove-S_MAGIC_XFS-fix-coredump.patch diff --git a/0001-remove-S_MAGIC_XFS-fix-coredump.patch b/0001-remove-S_MAGIC_XFS-fix-coredump.patch new file mode 100644 index 0000000..c0c13d3 --- /dev/null +++ b/0001-remove-S_MAGIC_XFS-fix-coredump.patch @@ -0,0 +1,11 @@ +diff -Nur findutils-4.7.0.old/gl/lib/fts.c findutils-4.7.0/gl/lib/fts.c +--- findutils-4.7.0.old/gl/lib/fts.c 2020-04-10 15:42:01.861626687 +0800 ++++ findutils-4.7.0/gl/lib/fts.c 2020-04-10 15:42:33.482245911 +0800 +@@ -800,7 +800,6 @@ + /* List here the file system types that may lack usable dirent.d_type + info, yet for which the optimization does apply. */ + case S_MAGIC_REISERFS: +- case S_MAGIC_XFS: /* XFS lacked it until 2013-08-22 commit. */ + return NOSTAT_LEAF_OPTIMIZATION; + + case 0: diff --git a/findutils.spec b/findutils.spec index ccc2a0d..34c9943 100644 --- a/findutils.spec +++ b/findutils.spec @@ -1,7 +1,7 @@ Name: findutils Epoch: 2 Version: 4.7.0 -Release: 4 +Release: 5 Summary: The GNU Find Utilities License: GPLv3+ URL: http://www.gnu.org/software/findutils/ @@ -13,7 +13,7 @@ Patch0: 0001-tests-avoid-FP-when-run-as-root.patch Patch1: 0001-findutils-xautofs.patch # rhbz #1252549 #1299169 Patch2: 0001-findutils-leaf-opt.patch - +Patch3: 0001-remove-S_MAGIC_XFS-fix-coredump.patch Buildrequires: gcc autoconf gettext-devel texinfo libselinux-devel dejagnu automake gdb Requires(post): info @@ -93,6 +93,12 @@ fi %exclude %{_mandir}/man5/locatedb.5* %changelog +* Fri Apr 10 2020 openEuler Buildteam - 2:4.7.0-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:remove S_MAGIC_XFS fix coredump + * Tue Feb 11 2020 openEuler Buildteam - 2:4.7.0-4 - Type:enhancement - ID:NA -- Gitee