!35 change patch file in order src.rpm is same in aarch64 and x86_64

From: @si-gui
Reviewed-by: @small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2021-03-24 16:42:25 +08:00 committed by Gitee
commit d5b14def4f

View File

@ -1,6 +1,6 @@
Name: redis
Version: 4.0.11
Release: 13
Release: 14
Summary: A persistent key-value database
License: BSD and MIT
URL: https://redis.io
@ -17,9 +17,7 @@ Patch0003: CVE-2020-14147.patch
Patch0004: improved-HyperLogLog-cardinality-estimation.patch
Patch0005: Aesthetic-changes-to-PR.patch
Patch0006: CVE-2019-10193.patch
%ifarch aarch64
Patch0007: modify-aarch64-architecture-jemalloc-page-size-from-4k-to-64k.patch
%endif
Patch0008: huawei-deps-jemalloc-support-riscv.patch
Patch0009: CVE-2021-21309.patch
BuildRequires: systemd
@ -35,7 +33,18 @@ Redis is an advanced key-value store. It is often referred to as a dattructure s
,lists, sets anorted sets.
%prep
%autosetup -p1
%setup
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
%patch0005 -p1
%patch0006 -p1
%ifarch aarch64
%patch0007 -p1
%endif
%patch0008 -p1
%patch0009 -p1
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
sed -i -e 's|^dir .*$|dir /var/lib/redis|g' redis.conf
@ -92,6 +101,9 @@ exit 0
%{_unitdir}/%{name}-sentinel.service
%changelog
* Wed 24 Mar 2021 sunguoshuai <sunguoshuai@huawei.com> - 4.0.11-14
- change patch file in order src.rpm is same in aarch64 and x86_64
* Thu Mar 11 2021 wangxiao <wangxiao65@huawei.com> - 4.0.11-13
- Fix CVE-2021-21309