From 2c45f341070df2a5435607558b81c730aaa93b4825cb6c44382d1cfd16c9706e Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Wed, 10 Jun 2020 18:15:04 +0000
Subject: [PATCH] Accepting request 813274 from
 home:AndreasStieger:branches:server:database

redis 6.0.5

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

diff --git a/redis-6.0.4.tar.gz b/redis-6.0.4.tar.gz
deleted file mode 100644
index 0608cbe..0000000
--- a/redis-6.0.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3337005a1e0c3aa293c87c313467ea8ac11984921fab08807998ba765c9943de
-size 2217173
diff --git a/redis-6.0.5.tar.gz b/redis-6.0.5.tar.gz
new file mode 100644
index 0000000..9e692bc
--- /dev/null
+++ b/redis-6.0.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42cf86a114d2a451b898fcda96acd4d01062a7dbaaad2801d9164a36f898f596
+size 2217666
diff --git a/redis.changes b/redis.changes
index 85c254c..0896e16 100644
--- a/redis.changes
+++ b/redis.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jun 10 15:18:18 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- redis 6.0.5:
+  * Fix handling of speical chars in ACL LOAD
+  * Make Redis Cluster more robust about operation errors that may
+    lead to two clusters to mix together
+  * Revert the sendfile() implementation of RDB transfer
+  * Fix TLS certificate loading for chained certificates
+  * Fix AOF rewirting of KEEPTTL SET option
+  * Fix MULTI/EXEC behavior during -BUSY script errors
+
 -------------------------------------------------------------------
 Thu May 28 18:38:17 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/redis.hashes b/redis.hashes
index 8f49c67..4a522e7 100644
--- a/redis.hashes
+++ b/redis.hashes
@@ -106,3 +106,4 @@ hash redis-6.0.1.tar.gz sha256 b8756e430479edc162ba9c44dc89ac394316cd482f2dc6b91
 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
+hash redis-6.0.5.tar.gz sha256 42cf86a114d2a451b898fcda96acd4d01062a7dbaaad2801d9164a36f898f596 http://download.redis.io/releases/redis-6.0.5.tar.gz
diff --git a/redis.spec b/redis.spec
index e4983a3..babe2e7 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 6132305b4e7b98a88e6526d36190251960b6fc38
+%define redis_hashes_tree f898aabb30ab0655dc08f8f5cf900f1a8de8a803
 
 Name:           redis
-Version:        6.0.4
+Version:        6.0.5
 Release:        0
 Summary:        Persistent key-value database
 License:        BSD-3-Clause