2 changed files with 6 additions and 72 deletions
--- a/0001-cachefilesd-fix-abort-in-decant_cull_table.patch
+++ b/0001-cachefilesd-fix-abort-in-decant_cull_table.patch
@ -1,44 +0,0 @@
-From 3349ade9c1f40c0999c722dda4cd84b9869bebe2 Mon Sep 17 00:00:00 2001
-From: lixiaokeng <lixiaokeng@huawei.com>
-Date: Mon, 29 Nov 2021 21:15:56 +0800
-Subject: [PATCH] cachefilesd: fix abort() in decant_cull_table
-
-decant_cull_table only deals data with 32 bit, we should fix it
-to support 64 bit, or it will coredump.
-
-Signed-off-by: lixiaokeng <lixiaokeng@huawei.com>
-Signed-off-by: volcanodragon <linfeilong@huawei.com>
---
- cachefilesd.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/cachefilesd.c b/cachefilesd.c
-index d4d236f..e9de4e4 100644
--- a/cachefilesd.c
-+++ b/cachefilesd.c
-@@ -1512,6 +1512,13 @@ static void decant_cull_table(void)
- {
- 	unsigned loop, avail, copy, leave, space, n;
- 
-+	long mask = 15;
-+	long illegal = 6;
-+
-+	/* 8 is bit of byte, 4 is valid bit of mask and illegal */
-+	mask = mask << (sizeof(void *) * 8 - 4);
-+	illegal = illegal << (sizeof(void *) * 8 - 4);
-+
- 	if (scan_cursor)
- 		error("Can't decant cull table whilst scanning");
- 
-@@ -1567,7 +1574,7 @@ static void decant_cull_table(void)
- 
- check:
- 	for (loop = 0; loop < nr_in_ready_table; loop++)
-		if (((long)cullready[loop] & 0xf0000000) == 0x60000000)
-+		if (((long)cullready[loop] & mask) == illegal)
- 			abort();
- }
- 
-- 
-1.8.3.1
-
--- a/cachefilesd.spec
+++ b/cachefilesd.spec
@ -1,15 +1,13 @@
 Name:           cachefilesd
 Version:        0.10.10
-Release:        11
+Release:        6
 Summary:        CacheFiles user-space management daemon
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://people.redhat.com/~dhowells/fscache/
-Source0:        https://people.redhat.com/dhowells/cachefs/cachefilesd-%{version}.tar.bz2
+Source0:        http://people.redhat.com/dhowells/fscache/cachefilesd-%{version}.tar.bz2

-Patch1: 0001-cachefilesd-fix-abort-in-decant_cull_table.patch
-
-BuildRequires:  gcc systemd-units 
+BuildRequires:  gcc systemd-units git
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@ -27,7 +25,7 @@ Summary:Files for cachefilesd help
 Files for cachefilesd help

 %prep
-%autosetup -n %{name}-%{version} -p1
+%autosetup -n %{name}-%{version} -S git -p1

 %build
 make all CFLAGS="-Wall -Werror $RPM_OPT_FLAGS $RPM_LD_FLAGS $ARCH_OPT_FLAGS"
@ -64,31 +62,11 @@ install -D -m 644 cachefilesd.service %{buildroot}%{_unitdir}/cachefilesd.servic
 %{_mandir}/*/*

 %changelog
-* Tue Jul 30 2024 zhangjian <zhangjian496@huawei.com> - 0.10.10-11
- Type:cleancode
- ID:NA
- SUG:restart
- DESC:remove space on the end of spec
-
-* Fri Nov 4 2022 zhanchengbin <zhanchengbin1@huawei.com> - 0.10.10-10
- DESC: synchronize version
-
-* Mon Nov 29 2021 volcanodragon <linfeilong@huawei.com> - 0.10.10-9
- DESC: fix decant_cull_table to support 64 bit.
-
-* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 0.10.10-8
- DESC: delete -S git from %autosetup, and delete BuildRequires git
-
-* Tue Sep 8 2020 lihaotian<lihaotian9@huawei.com> - 0.10.10-7
- Type:bugfix
- ID:NA
- SUG:restart
- DESC:Update the source0 url
-
 * Fri Sep 6 2019 sunshihao<sunshihao@huawei.com> - 0.10.10-6
 - Type:enhancemnet
 - ID:NA
 - SUG:restart
- DESC:openEuler Debranding.
+- DESCi:openEuler Debranding.
+
 - Package Init