From 2d3a1bac03d32c8b473f84fd4edd1d24383b05964f2d4fdfef834e682d4e396b Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Thu, 28 May 2020 22:43:04 +0000
Subject: [PATCH] Accepting request 810027 from
 home:AndreasStieger:branches:server:database

redis 6.0.4

OBS-URL: https://build.opensuse.org/request/show/810027
OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=148
---
 redis-6.0.3.tar.gz | 3 ---
 redis-6.0.4.tar.gz | 3 +++
 redis.changes      | 7 +++++++
 redis.hashes       | 1 +
 redis.spec         | 4 ++--
 5 files changed, 13 insertions(+), 5 deletions(-)
 delete mode 100644 redis-6.0.3.tar.gz
 create mode 100644 redis-6.0.4.tar.gz

diff --git a/redis-6.0.3.tar.gz b/redis-6.0.3.tar.gz
deleted file mode 100644
index 3f6ebd3..0000000
--- a/redis-6.0.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bca46dce81fe92f7b2de4cf8ae41fbc4b94fbd5674def7f12c87e7f9165cbb3a
-size 2210882
diff --git a/redis-6.0.4.tar.gz b/redis-6.0.4.tar.gz
new file mode 100644
index 0000000..0608cbe
--- /dev/null
+++ b/redis-6.0.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3337005a1e0c3aa293c87c313467ea8ac11984921fab08807998ba765c9943de
+size 2217173
diff --git a/redis.changes b/redis.changes
index 339f5f0..85c254c 100644
--- a/redis.changes
+++ b/redis.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 28 18:38:17 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- redis 6.0.4:
+  * fix a severe replication bug introduced in Redis 6 by the
+    "meaningful offset" feature
+
 -------------------------------------------------------------------
 Sun May 17 11:18:37 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/redis.hashes b/redis.hashes
index 04c6bd3..8f49c67 100644
--- a/redis.hashes
+++ b/redis.hashes
@@ -105,3 +105,4 @@ hash redis-6.0.0.tar.gz sha256 16d13ec1c3255206deb4818ed444dca6dda1482b551736f00
 hash redis-6.0.1.tar.gz sha256 b8756e430479edc162ba9c44dc89ac394316cd482f2dc6b91bcd5fe12593f273 http://download.redis.io/releases/redis-6.0.1.tar.gz
 hash redis-6.0.2.tar.gz sha256 9c37cd4228a57e82e7037094751c63349302b0b86c5e30b778a63a802dfd0109 http://download.redis.io/releases/redis-6.0.2.tar.gz
 hash redis-6.0.3.tar.gz sha256 bca46dce81fe92f7b2de4cf8ae41fbc4b94fbd5674def7f12c87e7f9165cbb3a http://download.redis.io/releases/redis-6.0.3.tar.gz
+hash redis-6.0.4.tar.gz sha256 3337005a1e0c3aa293c87c313467ea8ac11984921fab08807998ba765c9943de http://download.redis.io/releases/redis-6.0.4.tar.gz
diff --git a/redis.spec b/redis.spec
index 102e73e..e4983a3 100644
--- a/redis.spec
+++ b/redis.spec
@@ -19,10 +19,10 @@
 %define _data_dir       %{_localstatedir}/lib/%{name}
 %define _log_dir        %{_localstatedir}/log/%{name}
 %define _conf_dir       %{_sysconfdir}/%{name}
-%define redis_hashes_tree 360d0a38e031e3a57ea591539a8d8b690b8287f4
+%define redis_hashes_tree 6132305b4e7b98a88e6526d36190251960b6fc38
 
 Name:           redis
-Version:        6.0.3
+Version:        6.0.4
 Release:        0
 Summary:        Persistent key-value database
 License:        BSD-3-Clause