Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
853d797961
!41 Update config.guess and config.sub for loongarch.
From: @huajingyun 
Reviewed-by: @wuzeyi1 
Signed-off-by: @wuzeyi1
2022-12-06 03:15:28 +00:00
Jingyun Hua
1a062a9e83 Update config.guess and config.sub for loongarch
Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
2022-11-15 11:56:16 +00:00
openeuler-ci-bot
1ec4b23f3a
!38 回滚master分支pr:fix CVE-2022-24736
From: @yuluosha 
Reviewed-by: @wuzeyi1 
Signed-off-by: @wuzeyi1
2022-08-05 06:41:57 +00:00
yangweidong
082db0406c 回滚master分支pr:fix CVE-2022-24736 2022-07-05 11:09:37 +08:00
openeuler-ci-bot
51da7e90b9
!29 fix CVE-2022-24736
From: @deng-yuyu-01 
Reviewed-by: @sinever 
Signed-off-by: @sinever
2022-06-01 02:08:05 +00:00
dengyuyu01
b62f20bf5a fix CVE-2022-24736 2022-05-19 10:25:50 +08:00
openeuler-ci-bot
cc429760bc !20 [sync] PR-19: redis-sentinel命令提示需要“sentinel.conf”与实际不符
From: @openeuler-sync-bot
Reviewed-by: @yangzhao_kl
Signed-off-by: @yangzhao_kl
2021-12-06 11:58:31 +00:00
cherry530
35876a7496 Fix display error warning message
(cherry picked from commit 1ea39e4c82a3fcf926ec4cd39519172c2717b5aa)
2021-12-06 17:08:02 +08:00
openeuler-ci-bot
20ec86f3a3 !13 Upgrade redis5 to 5.0.14 for fix cves: CVE-2021-41099 CVE-2021-32762 CVE-2021-32675 CVE-2021-32687 CVE-2021-32628 CVE-2021-32627 CVE-2021-32626
From: @starlet-dx
Reviewed-by: @sinever
Signed-off-by: @sinever
2021-11-30 12:39:13 +00:00
starlet-dx
e2d8c73d72 Upgrade redis5 to 5.0.14 for fix CVES 2021-11-30 19:05:47 +08:00
7 changed files with 5485 additions and 18 deletions

View 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

View 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");
}

View File

@ -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>

File diff suppressed because it is too large Load Diff

BIN
redis-5.0.14.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -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.7
Release: 4
Version: 5.0.14
Release: 3
Summary: A persistent key-value database
License: BSD and MIT
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
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
%if %{with tests}
BuildRequires: procps-ng tcl
%endif
BuildRequires: systemd
Obsoletes: redis-trib
BuildRequires: systemd libatomic
Obsoletes: redis-trib < 5
Requires: /bin/awk logrotate
Provides: bundled(hiredis)
Provides: bundled(jemalloc)
@ -85,6 +88,10 @@ 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
@ -189,6 +196,17 @@ 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