From a20de7b7dfddfc52a008c896f3174e0600d0f664 Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Tue, 8 Sep 2026 03:00:16 -0400
Subject: [PATCH] import CS git redis-6.2.24-1.el8

---
 .gitignore       |  2 +-
 .redis.metadata  |  2 +-
 SPECS/redis.spec | 14 +++++++++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2e30217..d6cdf3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/redis-6.2.22.tar.gz
+SOURCES/redis-6.2.24.tar.gz
 SOURCES/redis-doc-8d4bf9b.tar.gz
diff --git a/.redis.metadata b/.redis.metadata
index bba321d..7a342ea 100644
--- a/.redis.metadata
+++ b/.redis.metadata
@@ -1,2 +1,2 @@
-9578ff7ac74a6d6f2d98700b108b42dfaffb6e35 SOURCES/redis-6.2.22.tar.gz
+d4db873e0761c3b90e2a6d57579b0043547073f9 SOURCES/redis-6.2.24.tar.gz
 45ec7c3b4a034891252507febace7e25ee64b4d9 SOURCES/redis-doc-8d4bf9b.tar.gz
diff --git a/SPECS/redis.spec b/SPECS/redis.spec
index 4e1b1e5..f48f684 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.22
+Version:           6.2.24
 Release:           1%{?dist}
 Summary:           A persistent key-value database
 # redis, jemalloc, linenoise, lzf, hiredis are BSD
@@ -138,6 +138,15 @@ mv deps/lua/COPYRIGHT    COPYRIGHT-lua
 mv deps/jemalloc/COPYING COPYING-jemalloc
 mv deps/hiredis/COPYING  COPYING-hiredis
 
+# See https://bugzilla.redhat.com/2240293
+# See https://src.fedoraproject.org/rpms/jemalloc/blob/rawhide/f/jemalloc.spec#_34
+%ifarch %ix86 %arm x86_64 s390x
+sed -e 's/--with-lg-quantum/--with-lg-page=12 --with-lg-quantum/' -i deps/Makefile
+%endif
+%ifarch ppc64 ppc64le aarch64
+sed -e 's/--with-lg-quantum/--with-lg-page=16 --with-lg-quantum/' -i deps/Makefile
+%endif
+
 # Configuration file changes
 sed -i -e 's|^logfile .*$|logfile /var/log/redis/redis.log|g' redis.conf
 sed -i -e 's|^logfile .*$|logfile /var/log/redis/sentinel.log|g' sentinel.conf
@@ -281,6 +290,9 @@ exit 0
 
 
 %changelog
+* Fri Aug 21 2026 Petr Khartskhaev <pkhartsk@redhat.com> - 6.2.24-1
+- rebase to 6.2.24 for CVE-2026-66373
+
 * Thu May 21 2026 Petr Khartskhaev <pkhartsk@redhat.com> - 6.2.22-1
 - rebase to 6.2.22 for CVE-2026-25243