diff --git a/Fix-redis5-gcc-10.patch b/Fix-redis5-gcc-10.patch deleted file mode 100644 index 97ba86894310be3f029394bce48a993241ac81ae..0000000000000000000000000000000000000000 --- a/Fix-redis5-gcc-10.patch +++ /dev/null @@ -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 - #include diff --git a/redis-5.0.14.tar.gz b/redis-5.0.14.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ff4fd10e984264a6de3cb3f965e1e2e1b750bcfb Binary files /dev/null and b/redis-5.0.14.tar.gz differ diff --git a/redis-5.0.7.tar.gz b/redis-5.0.7.tar.gz deleted file mode 100644 index 41ca0e96453f08497ccca862320a0bb7a93eb91a..0000000000000000000000000000000000000000 Binary files a/redis-5.0.7.tar.gz and /dev/null differ diff --git a/redis5.spec b/redis5.spec index ae19aa51842d273b4644ac124a9f885bc74bd153..ac2e92e2b50fd21243a4ab4e475729bd35525866 100644 --- a/redis5.spec +++ b/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.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 - 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 - 5.0.7-4 - Fix missing patch in source package