Import from CS git

2025-05-15 16:31:03 +00:00 · 2025-01-22 10:29:23 +00:00
3 changed files with 14 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/redis-6.2.7.tar.gz
+SOURCES/redis-6.2.18.tar.gz
 SOURCES/redis-doc-8d4bf9b.tar.gz
--- a/.redis.metadata
+++ b/.redis.metadata
@ -1,2 +1,2 @@
-b01ef3f117c9815dea41bf2609e489a03c3a5ab1 SOURCES/redis-6.2.7.tar.gz
+45f4a45a97491f260bebec02f3daa6aa26250be6 SOURCES/redis-6.2.18.tar.gz
 45ec7c3b4a034891252507febace7e25ee64b4d9 SOURCES/redis-doc-8d4bf9b.tar.gz
--- a/SPECS/redis.spec
+++ b/SPECS/redis.spec
@ -19,7 +19,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)

 Name:              redis
-Version:           6.2.7
+Version:           6.2.18
 Release:           1%{?dist}
 Summary:           A persistent key-value database
 # redis, jemalloc, linenoise, lzf, hiredis are BSD
@ -131,8 +131,8 @@ administration and development.
 %setup -q -b 10
 %setup -q
 mv ../%{name}-doc-%{doc_commit} doc
-%patch0001 -p1
-%patch0003 -p1 -b .rev
+%patch -P0001 -p1
+%patch -P0003 -p1 -b .rev

 mv deps/lua/COPYRIGHT    COPYRIGHT-lua
 mv deps/jemalloc/COPYING COPYING-jemalloc
@ -281,6 +281,15 @@ exit 0


 %changelog
+* Thu Apr 24 2025 Remi Collet <rcollet@redhat.com> - 6.2.18-1
+- rebase to 6.2.18 for CVE-2025-21605
+
+* Mon Jan 13 2025 Remi Collet <rcollet@redhat.com> - 6.2.17-1
+- rebase to 6.2.17 for CVE-2024-46981
+
+* Thu Nov  7 2024 Remi Collet <rcollet@redhat.com> - 6.2.16-1
+- rebase to 6.2.16 RHEL-66165
+
 * Mon May  9 2022 Remi Collet <rcollet@redhat.com> - 6.2.7-1
 - rebase to 6.2.7 #1999873
Author	SHA1	Message	Date
eabdullin	1d73c3dc47	Import from CS git	2025-05-15 16:31:03 +00:00
eabdullin	97be83b033	Import from CS git	2025-01-22 10:29:23 +00:00