automatic import of redisopeneuler24.03_LTS

1 files changed, 50 insertions, 19 deletions

diff --git a/redis.spec b/redis.spec
index 60ecf33..75da5eb 100644
--- a/redis.spec
+++ b/redis.spec
@@ -1,28 +1,30 @@
 Name:           redis
-Version:        4.0.11
-Release:        18
+Version:        5.0.4
+Release:        7
 Summary:        A persistent key-value database
-License:        BSD and MIT
+License:        BSD-3-Clause and MIT
 URL:            https://redis.io
 Source0:        http://download.redis.io/releases/%{name}-%{version}.tar.gz
 Source1:        %{name}.logrotate
 Source2:        %{name}-sentinel.service
 Source3:        %{name}.service
 
-#CVE fix
-Patch0001:      CVE-2019-10192-1.patch
-#Optimization of the above problem
-Patch0002:      CVE-2019-10192-2.patch
-Patch0003:      CVE-2020-14147.patch 
-Patch0004:      improved-HyperLogLog-cardinality-estimation.patch
-Patch0005:      Aesthetic-changes-to-PR.patch
-Patch0006:      CVE-2019-10193.patch
-Patch0007:      modify-aarch64-architecture-jemalloc-page-size-from-4k-to-64k.patch
-Patch0008:      huawei-deps-jemalloc-support-riscv.patch
-Patch0009:      CVE-2021-21309.patch
-Patch0010:      CVE-2021-3470.patch
-Patch0011:      CVE-2021-29478.patch
-Patch0012:      CVE-2021-32672.patch
+Patch0001:      CVE-2020-14147.patch 
+Patch0002:      improved-HyperLogLog-cardinality-estimation.patch
+Patch0003:      Aesthetic-changes-to-PR.patch
+Patch0004:      CVE-2019-10193.patch
+Patch0005:      modify-aarch64-architecture-jemalloc-page-size-from-4k-to-64k.patch
+Patch0006:      huawei-deps-jemalloc-support-riscv.patch
+Patch0007:      CVE-2021-21309.patch
+Patch0008:      CVE-2021-3470.patch
+Patch0009:      CVE-2021-29478.patch
+Patch0010:      CVE-2021-32672.patch
+Patch0011:      CVE-2022-36021.patch
+Patch0012:      CVE-2023-28856.patch
+Patch0013:      CVE-2022-24834.patch
+Patch0014:      CVE-2023-45145.patch
+Patch0015:      CVE-2024-31228.patch
+Patch0016:      CVE-2024-31449.patch
 
 BuildRequires:     systemd gcc
 Requires:          /bin/awk
@@ -42,16 +44,24 @@ Redis is an advanced key-value store. It is often referred to as a dattructure s
 %patch0002 -p1
 %patch0003 -p1
 %patch0004 -p1
+%ifarch aarch64
 %patch0005 -p1
+%endif
 %patch0006 -p1
-%ifarch aarch64
 %patch0007 -p1
-%endif
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
 %patch0011 -p1
 %patch0012 -p1
+%patch0013 -p1
+%patch0014 -p1
+%patch0015 -p1
+%patch0016 -p1
+%ifarch loongarch64
+%_update_config_guess
+%_update_config_sub
+%endif
 
 sed -i -e 's|^logfile .*$|logfile /var/log/redis/redis.log|g' redis.conf
 sed -i -e '$ alogfile /var/log/redis/sentinel.log' sentinel.conf
@@ -109,6 +119,27 @@ exit 0
 %{_unitdir}/%{name}-sentinel.service
 
 %changelog
+* Wed Oct 09 2024 yaoxin <yao_xin001@hoperun.com> - 4.0.14-7
+- Fix CVE-2023-45145,CVE-2024-31228 and CVE-2024-31449
+
+* Mon Jul 31 2023 wangkai <13474090681@163.com> - 4.0.14-6
+- Fix CVE-2022-24834
+
+* Mon May 15 2023 yaoxin <yao_xin001@hoperun.com> - 4.0.14-5
+- Fix CVE-2023-28856
+
+* Mon Mar 27 2023 wushaozheng<wushaozheng@ncti-gba.cn> - 4.0.14-4
+- Fix CVE-2022-36021
+
+* Tue Nov 15 2022 huajingyun<huajingyun@loongson.cn> - 4.0.14-3
+- Update config.guess and config.sub for loongarch
+
+* Tue May 10 2022 chenchen <chen_aka_jan@163.com> - 4.0.14-2
+- License compliance rectification
+
+* Wed Dec 29 2021 zhangjiapeng <zhangjiapeng9@huawei.com> - 4.0.14-1
+- Update to 4.0.14
+
 * Sat Oct 09 2021 yaoxin <yaoxin30@huawei.com> - 4.0.11-18
 - Fix CVE-2021-32672