!67 add conflicts with reid and redis5

From: @xiexing01 
Reviewed-by: @macchen1 
Signed-off-by: @macchen1

Modify-aarch64-architecture-jemalloc-page-size-from-from-4k-to-64k.patch

@@ -1,25 +1,12 @@
-From 8c4c3730d69ea1e3352d35e18999d42dca4c07e5 Mon Sep 17 00:00:00 2001
-From: lingsheng <lingsheng@huawei.com>
-Date: Mon, 29 Mar 2021 17:37:06 +0800
-Subject: [PATCH] Modify aarch64 architecture jemalloc page size from 4k to 64k
-
----
- deps/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deps/Makefile b/deps/Makefile
-index eb35c1e..2ba6ae3 100644
---- a/deps/Makefile
-+++ b/deps/Makefile
-@@ -81,7 +81,7 @@ JEMALLOC_LDFLAGS= $(LDFLAGS)
+diff -Naru redis-6.2.7/deps/Makefile redis-6.2.7-new/deps/Makefile
+--- redis-6.2.7/deps/Makefile	2022-04-27 21:31:52.000000000 +0800
++++ redis-6.2.7-new/deps/Makefile	2022-06-14 15:21:56.254108000 +0800
+@@ -88,7 +88,7 @@
  
  jemalloc: .make-prerequisites
  	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
--	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
-+	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" --with-lg-page=16
+-	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
++	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" --with-lg-page=16
  	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
  
  .PHONY: jemalloc
--- 
-2.23.0
-

fix-help-info.patch

@@ -0,0 +1,12 @@
+diff -Naru redis-6.2.7/src/server.c redis-6.2.7-new/src/server.c
+--- redis-6.2.7/src/server.c	2022-04-27 21:31:52.000000000 +0800
++++ redis-6.2.7-new/src/server.c	2022-06-14 15:16:01.860899000 +0800
+@@ -5656,7 +5656,7 @@
+     fprintf(stderr,"       ./redis-server /etc/myredis.conf --loglevel verbose -\n");
+     fprintf(stderr,"       ./redis-server /etc/myredis.conf --loglevel verbose\n\n");
+     fprintf(stderr,"Sentinel mode:\n");
+-    fprintf(stderr,"       ./redis-server /etc/sentinel.conf --sentinel\n");
++    fprintf(stderr,"       ./redis-server /etc/redis/sentinel.conf --sentinel\n");
+     exit(1);
+ }
+ 

redis6.spec

@@ -5,7 +5,7 @@
 %global make_flags	DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix} BUILD_WITH_SYSTEMD=yes BUILD_TLS=yes
 %global Pname redis
 Name:                redis6
-Version:             6.0.11
+Version:             6.2.7
 Release:             2
 Summary:             A persistent key-value database
 License:             BSD and MIT
@@ -18,9 +18,10 @@ Source6:             %{Pname}-shutdown
 Source7:             %{Pname}-limit-systemd
 Source9:             macros.%{Pname}
 Source10:            https://github.com/%{Pname}/%{Pname}-doc/archive/%{doc_commit}/%{Pname}-doc-%{short_doc_commit}.tar.gz
-%ifarch aarch64
+
 Patch0001:           Modify-aarch64-architecture-jemalloc-page-size-from-from-4k-to-64k.patch
-%endif
+
+Patch0002:           fix-help-info.patch
 BuildRequires:       make gcc
 %if %{with tests}
 BuildRequires:       procps-ng tcl
@@ -38,6 +39,7 @@ Requires(post):    systemd
 Requires(preun):   systemd
 Requires(postun):  systemd
 Provides:            redis(modules_abi)%{?_isa} = 1
+Conflicts:           redis redis5
 %description
 Redis is an advanced key-value store. It is often referred to as a data
 structure server since keys can contain strings, hashes, lists, sets and
@@ -61,6 +63,7 @@ You can use Redis from most programming languages also.
 %package           devel
 Summary:             Development header for Redis module development
 Provides:            %{Pname}-static = %{version}-%{release}
+Conflicts:           redis redis5
 %description       devel
 Header file required for building loadable Redis modules. Detailed
 API documentation is available in the redis-doc package.
@@ -69,14 +72,18 @@ API documentation is available in the redis-doc package.
 Summary:             Documentation for Redis
 License:             CC-BY-SA
 BuildArch:           noarch
-Conflicts:           redis < 4.0
+Conflicts:           redis redis5
 %description       doc
 Detailed documentation for many aspects of Redis use,
 administration and development.
 
 %prep
 tar -xvf  %{SOURCE10}
-%autosetup -n %{Pname}-%{version} -p1
+%setup -n %{Pname}-%{version}
+%ifarch aarch64
+%patch0001 -p1
+%patch0002 -p1
+%endif
 mv ../%{Pname}-doc-%{doc_commit} doc
 mv deps/lua/COPYRIGHT    COPYRIGHT-lua
 mv deps/jemalloc/COPYING COPYING-jemalloc
@@ -205,6 +212,25 @@ fi
 %{_docdir}/%{Pname}
 
 %changelog
+* Wed Dec 20 2023 xiexing <xiexing4@h-partners.com> - 6.2.7-2
+- add Conflicts with redis and redis5
+
+* Tue Jun 14 2022 yangweidong <yangweidong9@huawei.com> - 6.2.7-1
+- Fix CVE-2022-24735 CVE-2022-24736 CVE-2021-29477 CVE-2021-32672
+
+* Mon Dec 06 2021 caodongxia <caodongxia@huawei.com> - 6.0.11-6
+- Fix help info 
+
+* Mon Nov 29 2021 liwu <liwu13@huawei.com> - 6.0.11-5
+- Fix CVE-2021-32687 CVE-2021-32628 CVE-2021-32627 
+  CVE-2021-41099 CVE-2021-32675 CVE-2021-32762
+
+* Thu Nov 04 2021 liwu <liwu13@huawei.com> - 6.0.11-4
+- Fix CVE-2021-32626
+
+* Thu Sep 02 2021 lingsheng <lingsheng@huawei.com> - 6.0.11-3
+- Fix missing patch in source package
+
 * Mon Mar 29 2021 lingsheng <lingsheng@huawei.com> - 6.0.11-2
 - Modify aarch64 architecture jemalloc page size from 4k to 64k