redis update to 6.0.5

Signed-off-by: nosqlbuilder_pel7x64builder0 <nosqlbuilder@powerel.org>

SOURCES/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch

@@ -1,7 +1,7 @@
-From ae2235dab50c86480ee37f50119af6668f312ba3 Mon Sep 17 00:00:00 2001
+From d68953c34d4d6987883ddf6158c3c69e7500667f Mon Sep 17 00:00:00 2001
 From: Remi Collet <fedora@famillecollet.com>
 Date: Thu, 8 Sep 2016 14:51:15 +0200
-Subject: [PATCH 1/2] 1st man pageis for - redis-cli - redis-benchmark -
+Subject: [PATCH 1/3] 1st man pageis for - redis-cli - redis-benchmark -
  redis-check-aof - redis-check-rdb - redis-server - redis.conf
 
 as redis-sentinel is a symlink to redis-server, same page can be used (also symlinked)
@@ -648,5 +648,5 @@ index 0000000..1e0c9c9
 +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -- 
-2.20.1
+2.24.1
 

SOURCES/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch

@@ -1,7 +1,7 @@
-From 85d847361b519dca524178e3197dbb0ed24e0cb5 Mon Sep 17 00:00:00 2001
+From 79ed52edf84676786e5817cddb8914c5925144c7 Mon Sep 17 00:00:00 2001
 From: Remi Collet <fedora@famillecollet.com>
 Date: Fri, 9 Sep 2016 17:23:27 +0200
-Subject: [PATCH 2/2] install redis-check-rdb as a symlink instead of
+Subject: [PATCH 2/3] install redis-check-rdb as a symlink instead of
  duplicating the binary
 
 ---
@@ -25,5 +25,5 @@ index 2a68649..585c95b 100644
  uninstall:
  	rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME)}
 -- 
-2.20.1
+2.24.1
 

SOURCES/0003-Notify-systemd-on-sentinel-startup.patch

@@ -0,0 +1,30 @@
+diff --git a/0003-Notify-systemd-on-sentinel-startup.patch b/0003-Notify-systemd-on-sentinel-startup.patch
+new file mode 100644
+index 0000000..ee58b56
+--- /dev/null
++++ b/0003-Notify-systemd-on-sentinel-startup.patch
+@@ -0,0 +1,24 @@
++From 16dbe5168224b9f8a2b193f014f3dbf7e9604516 Mon Sep 17 00:00:00 2001
++From: Daniel Murnane <dmurnane@eitccorp.com>
++Date: Fri, 1 May 2020 08:19:28 -0400
++Subject: [PATCH] Notify systemd on sentinel startup
++
++---
++ src/server.c | 4 ++++
++ 1 file changed, 4 insertions(+)
++
++diff --git a/src/server.c b/src/server.c
++index 659604ef363..7ab7c39fd0a 100644
++--- a/src/server.c
+++++ b/src/server.c
++@@ -5111,6 +5111,10 @@ int main(int argc, char **argv) {
++     } else {
++         InitServerLast();
++         sentinelIsRunning();
+++        if (server.supervised_mode == SUPERVISED_SYSTEMD) {
+++            redisCommunicateSystemd("STATUS=Ready to accept connections\n");
+++            redisCommunicateSystemd("READY=1\n");
+++        }
++     }
++ 
++     /* Warning the user about suspicious maxmemory setting. */

SOURCES/redis-limit-systemd

@@ -1,7 +1,14 @@
 # If you need to change max open file limit
 # for example, when you change maxclient in configuration
-# you can change the LimitNOFILE value below
+# you can change the LimitNOFILE value below.
-# see "man systemd.exec" for information
+# See "man systemd.exec" for more information.
+
+# Slave nodes on large system may take lot of time to start.
+# You may need to uncomment TimeoutStartSec and TimeoutStopSec
+# directives below and raise their value.
+# See "man systemd.service" for more information.
 
 [Service]
 LimitNOFILE=10240
+#TimeoutStartSec=90s
+#TimeoutStopSec=90s

SOURCES/redis-sentinel.service

@@ -5,7 +5,7 @@ After=network-online.target
 Wants=network-online.target
 
 [Service]
-ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --supervised systemd
+ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --daemonize no --supervised systemd
 ExecStop=/usr/libexec/redis-shutdown redis-sentinel
 Type=notify
 User=redis

SOURCES/redis.service

@@ -5,7 +5,7 @@ After=network-online.target
 Wants=network-online.target
 
 [Service]
-ExecStart=/usr/bin/redis-server /etc/redis.conf --supervised systemd
+ExecStart=/usr/bin/redis-server /etc/redis.conf --daemonize no --supervised systemd
 ExecStop=/usr/libexec/redis-shutdown
 Type=notify
 User=redis

SPECS/redis.spec

@@ -12,21 +12,21 @@
 
 # Commit IDs for the (unversioned) redis-doc repository
 # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
-%global doc_commit 685cc5a4d323203d8e1eb85de3adc47830687207
+%global doc_commit f092dd3227cc74978853e379c0a7731bdaa324af
 %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7})
 
 # %%{rpmmacrodir} not usable on EL-6
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:              redis
-Version:           5.0.6
+Version:           6.0.5
 Release:           1%{?dist}
 Summary:           A persistent key-value database
 # redis, linenoise, lzf, hiredis are BSD
 # lua is MIT
 License:           BSD and MIT
 URL:               https://redis.io
-Source0:           https://download.redis.io/releases/%{name}-%{version}.tar.gz
+Source0:           http://download.redis.io/releases/%{name}-%{version}.tar.gz
 Source1:           %{name}.logrotate
 Source2:           %{name}-sentinel.service
 Source3:           %{name}.service
@@ -48,14 +48,18 @@ Source10:          https://github.com/antirez/%{name}-doc/archive/%{doc_commit}/
 Patch0001:         0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
 # https://github.com/antirez/redis/pull/3494 - symlink
 Patch0002:         0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch
+# https://github.com/antirez/redis/pull/7168 - notify systemd
+Patch0003:         0003-Notify-systemd-on-sentinel-startup.patch
 BuildRequires:     gcc
 %if 0%{?with_tests}
 BuildRequires:     procps-ng
 BuildRequires:     tcl
 %endif
-BuildRequires:     systemd
+BuildRequires:     pkgconfig(libsystemd)
+BuildRequires:     systemd-devel
+BuildRequires:     openssl-devel
 # redis-trib functionality migrated to redis-cli
-Obsoletes:         redis-trib
+Obsoletes:         redis-trib < 5
 # Required for redis-shutdown
 Requires:          /bin/awk
 Requires:          logrotate
@@ -125,6 +129,7 @@ administration and development.
 mv ../%{name}-doc-%{doc_commit} doc
 %patch0001 -p1
 %patch0002 -p1
+%patch0003 -p1
 
 mv deps/lua/COPYRIGHT    COPYRIGHT-lua
 mv deps/hiredis/COPYING  COPYING-hiredis
@@ -142,7 +147,7 @@ if test "$api" != "%{redis_modules_abi}"; then
    exit 1
 fi
 
-%global make_flags	DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix}
+%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
 
 %build
 make %{?_smp_mflags} %{make_flags} all
@@ -272,6 +277,36 @@ exit 0
 
 
 %changelog
+* Wed Jun 10 2020 Nathan Scott <nathans@redhat.com> - 6.0.5-1
+- Upstream 6.0.5 release.
+
+* Thu May 28 2020 Remi Collet <remi@remirepo.net> - 6.0.4-3
+- Add comment for TimeoutStartSec and TimeoutStopSec in limit.conf
+- Fix missing notification to systemd for sentinel
+  patch from https://github.com/antirez/redis/pull/7168
+- Upstream 6.0.4 release.
+
+* Mon May 18 2020 Nathan Scott <nathans@redhat.com> - 6.0.3-1
+- Upstream 6.0.3 release.
+
+* Wed May  6 2020 Remi Collet <rcollet@redhat.com> - 6.0.1-1
+- Upstream 6.0.1 release.
+
+* Fri May 01 2020 Nathan Scott <nathans@redhat.com> - 6.0.0-1
+- Upstream 6.0.0 release.
+
+* Fri Mar 13 2020 Nathan Scott <nathans@redhat.com> - 5.0.8-1
+- Upstream 5.0.8 release.
+
+* Wed Feb 12 2020 Nathan Scott <nathans@redhat.com> - 5.0.7-3
+- Patch extern SDS_NOINIT definition for gcc 10 (RHBZ #1799969)
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Nov 19 2019 Carl George <carl@george.computer> - 5.0.7-1
+- Latest upstream
+
 * Thu Sep 26 2019 Nathan Scott <nathans@redhat.com> - 5.0.6-1
 - Upstream 5.0.6 release and redis-doc updates.