From f18115aaf2d003effcc0d196f6a2c7fad1214837 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 23 Jun 2026 07:38:36 +0000
Subject: [PATCH] import OL redis-6.2.22-1.0.1.module+el8.10.0+90916+da0c6127

---
 .gitignore                  |  2 +-
 .redis.metadata             |  2 +-
 SOURCES/redis-sentinel.init |  0
 SOURCES/redis-shutdown      |  0
 SOURCES/redis.init          |  0
 SPECS/redis.spec            | 14 ++++++++++++--
 6 files changed, 14 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 SOURCES/redis-sentinel.init
 mode change 100644 => 100755 SOURCES/redis-shutdown
 mode change 100644 => 100755 SOURCES/redis.init

diff --git a/.gitignore b/.gitignore
index bb961cb..2e30217 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/redis-6.2.20.tar.gz
+SOURCES/redis-6.2.22.tar.gz
 SOURCES/redis-doc-8d4bf9b.tar.gz
diff --git a/.redis.metadata b/.redis.metadata
index 6a81e78..bba321d 100644
--- a/.redis.metadata
+++ b/.redis.metadata
@@ -1,2 +1,2 @@
-b402148e645aa3a461ff85f31877c9ddc9fcc5cd SOURCES/redis-6.2.20.tar.gz
+9578ff7ac74a6d6f2d98700b108b42dfaffb6e35 SOURCES/redis-6.2.22.tar.gz
 45ec7c3b4a034891252507febace7e25ee64b4d9 SOURCES/redis-doc-8d4bf9b.tar.gz
diff --git a/SOURCES/redis-sentinel.init b/SOURCES/redis-sentinel.init
old mode 100644
new mode 100755
diff --git a/SOURCES/redis-shutdown b/SOURCES/redis-shutdown
old mode 100644
new mode 100755
diff --git a/SOURCES/redis.init b/SOURCES/redis.init
old mode 100644
new mode 100755
diff --git a/SPECS/redis.spec b/SPECS/redis.spec
index 3b49bf2..9a7c7f7 100644
--- a/SPECS/redis.spec
+++ b/SPECS/redis.spec
@@ -19,8 +19,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:              redis
-Version:           6.2.20
-Release:           1%{?dist}
+Version:           6.2.22
+Release:           1.0.1%{?dist}
 Summary:           A persistent key-value database
 # redis, jemalloc, linenoise, lzf, hiredis are BSD
 # lua is MIT
@@ -153,6 +153,10 @@ fi
 
 %global make_flags	DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix} BUILD_WITH_SYSTEMD=yes BUILD_TLS=yes
 
+# Oracle patches:
+# Build with 64k pages to support redis on both UEK6 and UEK7 on aarch64
+sed -i 's/--with-jemalloc-prefix=je_/& --with-lg-page=16 /' deps/Makefile
+
 %build
 make %{?_smp_mflags} %{make_flags} all
 
@@ -281,6 +285,12 @@ exit 0
 
 
 %changelog
+* Mon Jun 15 2026 EL Errata <el-errata_ww@oracle.com> - 6.2.22-1.0.1
+- Build with 64k pages to support redis on both UEK6 and UEK7 on aarch64
+
+* Thu May 21 2026 Petr Khartskhaev <pkhartsk@redhat.com> - 6.2.22-1
+- rebase to 6.2.22 for CVE-2026-25243
+
 * Tue Oct  7 2025 Remi Collet <rcollet@redhat.com> - 6.2.20-1
 - rebase to 6.2.20 for CVE-2025-49844 CVE-2025-46817 CVE-2025-46818 CVE-2025-46819