From d52d385e37bcefc8d4f01709601fc008c14d6eb4 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Thu, 22 Jul 2021 15:14:54 +1000
Subject: [PATCH] v6.2.5

---
 .gitignore | 2 ++
 redis.spec | 8 ++++++--
 sources    | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 476e8ab..595af8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,3 +91,5 @@ clog
 /redis-doc-6fca484.tar.gz
 /redis-6.2.4.tar.gz
 /redis-doc-9fe1f36.tar.gz
+/redis-6.2.5.tar.gz
+/redis-doc-6a9c631.tar.gz
diff --git a/redis.spec b/redis.spec
index 68ae91a..cfdcc4e 100644
--- a/redis.spec
+++ b/redis.spec
@@ -12,14 +12,14 @@
 
 # Commit IDs for the (unversioned) redis-doc repository
 # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
-%global doc_commit 9fe1f36dd716ea982b8917f2bdb70ec4bfc3219b
+%global doc_commit 6a9c6310b7291d802cf2fbc45b742e97e2804413
 %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:           6.2.4
+Version:           6.2.5
 Release:           1%{?dist}
 Summary:           A persistent key-value database
 # redis, jemalloc, linenoise, lzf, hiredis are BSD
@@ -296,6 +296,10 @@ fi
 
 
 %changelog
+* Thu Jul 22 2021 Nathan Scott <nathans@redhat.com> - 6.2.5-1
+- Upstream 6.2.5 release (RHBZ #1984631).
+- Fix CVE-2021-32761: 32-bit systems BITFIELD command integer overflow.
+
 * Wed Jun  2 2021 Remi Collet <remi@remirepo.net> - 6.2.4-1
 - Upstream 6.2.4 release.
 
diff --git a/sources b/sources
index 419257a..e75e0c8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (redis-6.2.4.tar.gz) = 22db5b64de20a4823fd219b559c05f329e37fc86ce32099c64655dc50e60228706c99bffeae8d7080d8689910879318ec6621388bde23bf1486aefb881f33cb0
-SHA512 (redis-doc-9fe1f36.tar.gz) = 515976937182acf5d76efb16cdd9fe8fe4d9996306459ca6b1a80a89d877719a174014cffec2c6fe25b407c4356b4337ad8bae05c63b3d9449ee5d68d0f34e59
+SHA512 (redis-6.2.5.tar.gz) = 8c54451032cbb627ec2827251556cba2010e56544baca7ea117b5afd2c2add484acbedd3baf21bdb8fd10672602cf52294a4e26b135c1406d7a723c048275e3a
+SHA512 (redis-doc-6a9c631.tar.gz) = 9882c19fad9efd38e999b036b7372a0c445c8d09512706f16e43ab5ac1c7c93380489a12b94028750386f0b553e8e10ec82db60e505c3645ed0cbd07b9305ed9