diff --git a/Fix-display-error-message.patch b/Fix-display-error-message.patch new file mode 100644 index 0000000000000000000000000000000000000000..0d0d184fcd7658acdbbc1f72397ccefbc387f0e9 --- /dev/null +++ b/Fix-display-error-message.patch @@ -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"); + } diff --git a/redis5.spec b/redis5.spec index 8ed465c716a924c7ca54bedb93286c07bfe78eba..16c0ab4b49406810ebea0270b3d9fee26b502616 100644 --- a/redis5.spec +++ b/redis5.spec @@ -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 - 5.0.14-2 +- Fix display error message + * Tue Nov 30 2021 yaoxin - 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