Compare commits
10 Commits
13e0a146e9
...
853d797961
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
853d797961 | ||
|
|
1a062a9e83 | ||
|
|
1ec4b23f3a | ||
|
|
082db0406c | ||
|
|
51da7e90b9 | ||
|
|
b62f20bf5a | ||
|
|
cc429760bc | ||
|
|
35876a7496 | ||
|
|
20ec86f3a3 | ||
|
|
e2d8c73d72 |
26
Add-loongarch64-support.patch
Normal file
26
Add-loongarch64-support.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
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
|
||||||
|
|
||||||
13
Fix-display-error-message.patch
Normal file
13
Fix-display-error-message.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
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");
|
||||||
|
}
|
||||||
@ -1,13 +0,0 @@
|
|||||||
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>
|
|
||||||
5423
Update-config.guess-and-config.sub.patch
Normal file
5423
Update-config.guess-and-config.sub.patch
Normal file
File diff suppressed because it is too large
Load Diff
BIN
redis-5.0.14.tar.gz
Normal file
BIN
redis-5.0.14.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
28
redis5.spec
28
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 make_flags DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix}
|
||||||
%global Pname redis
|
%global Pname redis
|
||||||
Name: redis5
|
Name: redis5
|
||||||
Version: 5.0.7
|
Version: 5.0.14
|
||||||
Release: 4
|
Release: 3
|
||||||
Summary: A persistent key-value database
|
Summary: A persistent key-value database
|
||||||
License: BSD and MIT
|
License: BSD and MIT
|
||||||
URL: https://redis.io
|
URL: https://redis.io
|
||||||
@ -23,14 +23,17 @@ Source9: macros.%{Pname}
|
|||||||
Source10: https://github.com/antirez/%{Pname}-doc/archive/%{doc_commit}/%{Pname}-doc-%{short_doc_commit}.tar.gz
|
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
|
Patch0001: Modify-aarch64-architecture-jemalloc-page-size-from-from-4k-to-64k.patch
|
||||||
Patch0002: Fix-redis5-gcc-10.patch
|
Patch0002: Fix-display-error-message.patch
|
||||||
|
|
||||||
|
Patch0003: Add-loongarch64-support.patch
|
||||||
|
Patch0004: Update-config.guess-and-config.sub.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
BuildRequires: procps-ng tcl
|
BuildRequires: procps-ng tcl
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd libatomic
|
||||||
Obsoletes: redis-trib
|
Obsoletes: redis-trib < 5
|
||||||
Requires: /bin/awk logrotate
|
Requires: /bin/awk logrotate
|
||||||
Provides: bundled(hiredis)
|
Provides: bundled(hiredis)
|
||||||
Provides: bundled(jemalloc)
|
Provides: bundled(jemalloc)
|
||||||
@ -85,6 +88,10 @@ tar -xvf %{SOURCE10}
|
|||||||
%patch0001 -p1
|
%patch0001 -p1
|
||||||
%endif
|
%endif
|
||||||
%patch0002 -p1
|
%patch0002 -p1
|
||||||
|
%ifarch loongarch64
|
||||||
|
%patch0003 -p1
|
||||||
|
%patch0004 -p1
|
||||||
|
%endif
|
||||||
mv ../%{Pname}-doc-%{doc_commit} doc
|
mv ../%{Pname}-doc-%{doc_commit} doc
|
||||||
mv deps/lua/COPYRIGHT COPYRIGHT-lua
|
mv deps/lua/COPYRIGHT COPYRIGHT-lua
|
||||||
mv deps/hiredis/COPYING COPYING-hiredis
|
mv deps/hiredis/COPYING COPYING-hiredis
|
||||||
@ -189,6 +196,17 @@ exit 0
|
|||||||
%{_docdir}/%{Pname}
|
%{_docdir}/%{Pname}
|
||||||
|
|
||||||
%changelog
|
%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
|
* Thu Sep 02 2021 lingsheng <lingsheng@huawei.com> - 5.0.7-4
|
||||||
- Fix missing patch in source package
|
- Fix missing patch in source package
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user