From 1d73c3dc47854d458ceb3398dcd251271193ad7e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 15 May 2025 16:31:03 +0000 Subject: [PATCH] Import from CS git --- .gitignore | 2 +- .redis.metadata | 2 +- SPECS/redis.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ba4f7b6..21372ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/redis-6.2.17.tar.gz +SOURCES/redis-6.2.18.tar.gz SOURCES/redis-doc-8d4bf9b.tar.gz diff --git a/.redis.metadata b/.redis.metadata index 448a677..edfa9bf 100644 --- a/.redis.metadata +++ b/.redis.metadata @@ -1,2 +1,2 @@ -8406690e53c15d103862bb9dd25efca586835cbd SOURCES/redis-6.2.17.tar.gz +45f4a45a97491f260bebec02f3daa6aa26250be6 SOURCES/redis-6.2.18.tar.gz 45ec7c3b4a034891252507febace7e25ee64b4d9 SOURCES/redis-doc-8d4bf9b.tar.gz diff --git a/SPECS/redis.spec b/SPECS/redis.spec index 1c9bcc3..e424956 100644 --- 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.17 +Version: 6.2.18 Release: 1%{?dist} Summary: A persistent key-value database # redis, jemalloc, linenoise, lzf, hiredis are BSD @@ -281,6 +281,9 @@ exit 0 %changelog +* Thu Apr 24 2025 Remi Collet - 6.2.18-1 +- rebase to 6.2.18 for CVE-2025-21605 + * Mon Jan 13 2025 Remi Collet - 6.2.17-1 - rebase to 6.2.17 for CVE-2024-46981