From 96000efbe7576973b574da3ba4be1f3ba92d6b62 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 18 Oct 2023 11:17:50 +0200
Subject: Redis 6.2.14 Released Wed 18 Oct 2023 10:33:40 IDT

Upgrade urgency SECURITY: CVE-2023-45145
set jemalloc page size #2240293
---
 redis.spec | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/redis.spec b/redis.spec
index be63f85..d875a2f 100644
--- a/redis.spec
+++ b/redis.spec
@@ -25,7 +25,7 @@
 %bcond_with    tests
 
 # Pre-version are only available in github
-%global upstream_ver 6.2.13
+%global upstream_ver 6.2.14
 #global upstream_pre RC3
 %global gh_commit    2dba1e391d3772a8da182d95bde050ffa9d01e4d
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
@@ -35,7 +35,7 @@
 # Commit IDs for the (unversioned) redis-doc repository
 # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
 # https://github.com/redis/redis-doc/commits/master
-%global doc_commit ab025f62797f2622ddad7bad938e747bebb6ab09
+%global doc_commit 4d345ac90a0c8dbf759238478b38829e2c5e807e
 %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7})
 
 # %%{_rpmmacrodir} not usable on EL-6 - EL-7 (without epel-rpms-macros)
@@ -200,6 +200,15 @@ 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
 sed -i -e 's|^dir .*$|dir /var/lib/redis|g' redis.conf
 
+# 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
+
 # Module API version safety check
 api=`sed -n -e 's/#define REDISMODULE_APIVER_[0-9][0-9]* //p' src/redismodule.h`
 if test "$api" != "%{redis_modules_abi}"; then
@@ -408,6 +417,11 @@ fi
 
 
 %changelog
+* Wed Oct 18 2023 Remi Collet <remi@remirepo.net> - 6.2.14-1
+- Redis 6.2.14 Released Wed 18 Oct 2023 10:33:40 IDT
+- Upgrade urgency SECURITY: CVE-2023-45145
+- set jemalloc page size #2240293
+
 * Mon Jul 10 2023 Remi Collet <remi@remirepo.net> - 6.2.13-1
 - Redis 6.2.13 Released Mon July 10 12:00:00 IDT 2023
 - Upgrade urgency SECURITY
-- 
cgit