Fix display error warning message
(cherry picked from commit 1ea39e4c82a3fcf926ec4cd39519172c2717b5aa)
This commit is contained in:
parent
20ec86f3a3
commit
35876a7496
13
Fix-display-error-message.patch
Normal file
13
Fix-display-error-message.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/src/server.c b/src/server.c
|
||||
index 4d5c702..4bdbf35 100644
|
||||
--- a/src/server.c
|
||||
+++ b/src/server.c
|
||||
@@ -4365,7 +4365,7 @@ int main(int argc, char **argv) {
|
||||
(int)getpid());
|
||||
|
||||
if (argc == 1) {
|
||||
- serverLog(LL_WARNING, "Warning: no config file specified, using the default config. In order to specify a config file use %s /path/to/%s.conf", argv[0], server.sentinel_mode ? "sentinel" : "redis");
|
||||
+ serverLog(LL_WARNING, "Warning: no config file specified, using the default config. In order to specify a config file use %s /path/to/%s.conf", argv[0], server.sentinel_mode ? "redis-sentinel" : "redis");
|
||||
} else {
|
||||
serverLog(LL_WARNING, "Configuration loaded");
|
||||
}
|
||||
@ -6,7 +6,7 @@
|
||||
%global Pname redis
|
||||
Name: redis5
|
||||
Version: 5.0.14
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: A persistent key-value database
|
||||
License: BSD and MIT
|
||||
URL: https://redis.io
|
||||
@ -23,6 +23,7 @@ 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-display-error-message.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
%if %{with tests}
|
||||
@ -83,6 +84,7 @@ 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
|
||||
@ -187,6 +189,9 @@ exit 0
|
||||
%{_docdir}/%{Pname}
|
||||
|
||||
%changelog
|
||||
* Sat Dec 04 2021 xu_ping <xuping33@huawei.com> - 5.0.14-2
|
||||
- Fix display error message
|
||||
|
||||
* Tue Nov 30 2021 yaoxin <yaoxin30@huawei.com> - 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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user