From 17a3564e6a2696744ed011aab73ce3593245c225 Mon Sep 17 00:00:00 2001
From: panxiaohe <panxh.life@foxmail.com>
Date: Tue, 22 Mar 2022 11:25:37 +0800
Subject: [PATCH] diff3: set flagging to true in -X option and fix changelog

---
 diff3-set-flagging-to-true-in-X-option.patch | 27 ++++++++++++++++++++
 diffutils.spec                               | 20 ++++++++++-----
 2 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 diff3-set-flagging-to-true-in-X-option.patch

diff --git a/diff3-set-flagging-to-true-in-X-option.patch b/diff3-set-flagging-to-true-in-X-option.patch
new file mode 100644
index 0000000..24dafd8
--- /dev/null
+++ b/diff3-set-flagging-to-true-in-X-option.patch
@@ -0,0 +1,27 @@
+From 0c3b6966fec92957c9d0e0ed0d83bc0716641d66 Mon Sep 17 00:00:00 2001
+From: panxiaohe <panxh.life@foxmail.com>
+Date: Tue, 22 Mar 2022 10:46:34 +0800
+Subject: [PATCH] diff3: set flagging to true in -X option
+
+The logic of diff3 -X option was changed because
+commit 4c92a4 changed "FALLTHROUGH" to "break".
+
+---
+ src/diff3.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/diff3.c b/src/diff3.c
+index 6be7e3c..fc4adbc 100644
+--- a/src/diff3.c
++++ b/src/diff3.c
+@@ -304,6 +304,7 @@ main (int argc, char **argv)
+           break;
+         case 'X':
+           overlap_only = true;
++          flagging = true;
+           incompat |= 1 << OPTION_X;
+           break;
+         case 'E':
+-- 
+1.8.3.1
+
diff --git a/diffutils.spec b/diffutils.spec
index e76093d..5a0fd72 100644
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -1,11 +1,13 @@
 Name: diffutils
 Version: 3.8
-Release: 1
+Release: 2
 Summary: A GNU collection of diff utilities
 URL: http://www.gnu.org/software/diffutils/diffutils.html
 Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
 Patch1: diffutils-cmp-s-empty.patch
 Patch2: diffutils-i18n.patch
+Patch3: diff3-set-flagging-to-true-in-X-option.patch
+
 License: GPLv3+
 Provides: bundled(gnulib)
 BuildRequires: gcc, help2man, gettext-devel
@@ -53,31 +55,37 @@ cat tests/test-suite.log
 %exclude %{_infodir}/dir
 
 %changelog
-* Wed Dec 29 2021 zoulin<zoulin13@huawei.com> 3.8-1
+* Tue Mar 22 2022 panxiaohe<panxh.life@foxmail.com> - 3.8-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:set flagging to true in diff3 -X option
+
+* Wed Dec 29 2021 zoulin<zoulin13@huawei.com> - 3.8-1
 - Type:enhancement
 - ID:NA
 - SUG:NA
 - DESC:update version to 3.8
 
-* Wed Aug 11 2021 wangjie<wangjie375@huawei.com> 3.7-5
+* Wed Aug 11 2021 wangjie<wangjie375@huawei.com> - 3.7-5
 - Type:bugfix
 - ID:NA
 - SUG:NA
 - DESC:fix missing binary operator before token "("
 
-* Wed Mar 24 2021 zoulin<zoulin13@huawei.com> 3.7-4
+* Wed Mar 24 2021 zoulin<zoulin13@huawei.com> - 3.7-4
 - Type:enhancement
 - ID:NA
 - SUG:NA
 - DESC:add -fsign-char for aarch64 for test-localeconv
 
-* Mon Nov 11 2019 shenyangyang<shenyangyang4@huawei.com> 3.7-3
+* Mon Nov 11 2019 shenyangyang<shenyangyang4@huawei.com> - 3.7-3
 - Type:enhancement
 - ID:NA
 - SUG:NA
 - DESC:delete unneeded comments
 
-* Thu Oct 24 2019 shenyangyang<shenyangyang4@huawei.com> 3.7-2
+* Thu Oct 24 2019 shenyangyang<shenyangyang4@huawei.com> - 3.7-2
 - Type:enhancement
 - ID:NA
 - SUG:NA