!26 [sync] PR-25: fix help info

From: @openeuler-sync-bot
Reviewed-by: @yangzhao_kl
Signed-off-by: @yangzhao_kl
This commit is contained in:
openeuler-ci-bot 2021-12-06 11:52:05 +00:00 committed by Gitee
commit d08e582164
2 changed files with 30 additions and 1 deletions

24
fix-help-info.patch Normal file
View File

@ -0,0 +1,24 @@
From 366e91df66de2157d4b36be99e20ad49584dc2bf Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 6 Dec 2021 17:25:47 +0800
Subject: [PATCH] fix-help-info
---
src/server.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/server.c b/src/server.c
index 2cabb2e..a009981 100644
--- a/src/server.c
+++ b/src/server.c
@@ -4989,7 +4989,7 @@ void usage(void) {
fprintf(stderr," ./redis-server --port 7777 --replicaof 127.0.0.1 8888\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);
}
--
2.27.0

View File

@ -6,7 +6,7 @@
%global Pname redis
Name: redis6
Version: 6.0.11
Release: 5
Release: 6
Summary: A persistent key-value database
License: BSD and MIT
URL: https://redis.io
@ -27,6 +27,7 @@ Patch0004: CVE-2021-32628-and-CVE-2021-32627.patch
Patch0005: CVE-2021-32675.patch
Patch0006: CVE-2021-41099.patch
Patch0007: CVE-2021-32762.patch
Patch0008: fix-help-info.patch
BuildRequires: make gcc
%if %{with tests}
BuildRequires: procps-ng tcl
@ -92,6 +93,7 @@ tar -xvf %{SOURCE10}
%patch0006 -p1
%patch0007 -p1
%endif
%patch0008 -p1
mv ../%{Pname}-doc-%{doc_commit} doc
mv deps/lua/COPYRIGHT COPYRIGHT-lua
mv deps/jemalloc/COPYING COPYING-jemalloc
@ -220,6 +222,9 @@ fi
%{_docdir}/%{Pname}
%changelog
* 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