Add-loongarch64-support.patch

@@ -1,26 +0,0 @@
-From 2e2eade35a9aabd1109a7f457b1da444fb0a8141 Mon Sep 17 00:00:00 2001
-From: WangQiang <wangqiang1@kylinos.cn>
-Date: Tue, 28 Jun 2022 10:38:31 +0800
-Subject: [PATCH] Add loongarch64 support
-
----
- .../include/jemalloc/internal/jemalloc_internal_types.h        | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h
-index 1b750b1..780627d 100644
---- a/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h
-+++ b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h
-@@ -107,6 +107,9 @@ typedef int malloc_cpuid_t;
- #  ifdef __tile__
- #    define LG_QUANTUM		4
- #  endif
-+#  ifdef __loongarch__
-+#    define LG_QUANTUM		4
-+#  endif
- #  ifdef __le32__
- #    define LG_QUANTUM		4
- #  endif
--- 
-2.27.0
-

Fix-display-error-message.patch

@@ -1,13 +0,0 @@
-diff --git a/src/server.c b/src/server.c
-index 4d5c702..4bdbf35 100644
---- a/src/server.c
-+++ b/src/server.c
-@@ -4365,7 +4365,7 @@ int main(int argc, char **argv) {
-             (int)getpid());
- 
-     if (argc == 1) {
--        serverLog(LL_WARNING, "Warning: no config file specified, using the default config. In order to specify a config file use %s /path/to/%s.conf", argv[0], server.sentinel_mode ? "sentinel" : "redis");
-+        serverLog(LL_WARNING, "Warning: no config file specified, using the default config. In order to specify a config file use %s /path/to/%s.conf", argv[0], server.sentinel_mode ? "redis-sentinel" : "redis");
-     } else {
-         serverLog(LL_WARNING, "Configuration loaded");
-     }

Fix-redis5-gcc-10.patch

@@ -0,0 +1,13 @@
+diff --git a/src/sds.h b/src/sds.h
+index 1bdb60d..adcc12c 100644
+--- a/src/sds.h
++++ b/src/sds.h
+@@ -34,7 +34,7 @@
+ #define __SDS_H
+ 
+ #define SDS_MAX_PREALLOC (1024*1024)
+-const char *SDS_NOINIT;
++extern const char *SDS_NOINIT;
+ 
+ #include <sys/types.h>
+ #include <stdarg.h>

redis5.spec

@@ -5,8 +5,8 @@
 %global make_flags	DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix}
 %global Pname redis
 Name:                redis5
-Version:             5.0.14
-Release:             3
+Version:             5.0.7
+Release:             4
 Summary:             A persistent key-value database
 License:             BSD and MIT
 URL:                 https://redis.io
@@ -23,17 +23,14 @@ Source9:             macros.%{Pname}
 Source10:            https://github.com/antirez/%{Pname}-doc/archive/%{doc_commit}/%{Pname}-doc-%{short_doc_commit}.tar.gz
 
 Patch0001:           Modify-aarch64-architecture-jemalloc-page-size-from-from-4k-to-64k.patch
-Patch0002:           Fix-display-error-message.patch
-
-Patch0003:           Add-loongarch64-support.patch
-Patch0004:           Update-config.guess-and-config.sub.patch
+Patch0002:           Fix-redis5-gcc-10.patch
 
 BuildRequires:       gcc
 %if %{with tests}
 BuildRequires:       procps-ng tcl
 %endif
-BuildRequires:       systemd libatomic
-Obsoletes:           redis-trib < 5
+BuildRequires:       systemd
+Obsoletes:           redis-trib
 Requires:            /bin/awk logrotate
 Provides:            bundled(hiredis)
 Provides:            bundled(jemalloc)
@@ -88,10 +85,6 @@ tar -xvf  %{SOURCE10}
 %patch0001 -p1
 %endif
 %patch0002 -p1
-%ifarch loongarch64
-%patch0003 -p1
-%patch0004 -p1
-%endif
 mv ../%{Pname}-doc-%{doc_commit} doc
 mv deps/lua/COPYRIGHT    COPYRIGHT-lua
 mv deps/hiredis/COPYING  COPYING-hiredis
@@ -196,17 +189,6 @@ exit 0
 %{_docdir}/%{Pname}
 
 %changelog
-* Tue Nov 15 2022 huajingyun <huajingyun@loongson.cn> - 5.0.14-3
-- Update config.guess and config.sub for loongarch
-
-* Sat Dec 04 2021 xu_ping <xuping33@huawei.com> - 5.0.14-2
-- Fix display error message
-
-* Tue Nov 30 2021 yaoxin <yaoxin30@huawei.com> - 5.0.14-1
-- Upgrade redis5 to 5.0.14 for fix cves: CVE-2021-41099
-  CVE-2021-32762 CVE-2021-32675 CVE-2021-32687 CVE-2021-32626
-  CVE-2021-32627 CVE-2021-32628
-
 * Thu Sep 02 2021 lingsheng <lingsheng@huawei.com> - 5.0.7-4
 - Fix missing patch in source package