Upgrade redis5 to 5.0.14 for fix CVES

This commit is contained in:
starlet-dx 2021-11-30 18:48:31 +08:00
parent 13e0a146e9
commit e2d8c73d72
4 changed files with 9 additions and 19 deletions

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>

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: 1
Summary: A persistent key-value database
License: BSD and MIT
URL: https://redis.io
@ -23,14 +23,13 @@ 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
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)
@ -84,7 +83,6 @@ tar -xvf %{SOURCE10}
%ifarch aarch64
%patch0001 -p1
%endif
%patch0002 -p1
mv ../%{Pname}-doc-%{doc_commit} doc
mv deps/lua/COPYRIGHT COPYRIGHT-lua
mv deps/hiredis/COPYING COPYING-hiredis
@ -189,6 +187,11 @@ exit 0
%{_docdir}/%{Pname}
%changelog
* 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