From 766dfe113d18a2dfdbeadcba433cee46bc4fc97b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 24 Apr 2025 09:52:21 +0200
Subject: [PATCH] v8.1.1

---
 .gitignore                    |  1 +
 sources                       |  2 +-
 used_memory_thread_type.patch | 16 ----------------
 valkey.spec                   | 16 +++++++++-------
 4 files changed, 11 insertions(+), 24 deletions(-)
 delete mode 100644 used_memory_thread_type.patch

diff --git a/.gitignore b/.gitignore
index dbc0dbd..77f0970 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /valkey-doc-8.0.2.tar.gz
 /valkey-8.1.0.tar.gz
 /valkey-doc-8.1.0.tar.gz
+/valkey-8.1.1.tar.gz
diff --git a/sources b/sources
index 3fbf431..77b9efd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (valkey-8.1.0.tar.gz) = 54559ad697992611245aa92e33f976a609c44d7e3f97f4773a09a53cb55226367ac5a47a68c49f1d824b0327850f66ce3ff32e5fe42321c896ed3e33c5bcfe70
+SHA512 (valkey-8.1.1.tar.gz) = 1f84b24839856c8d6cdbe1bca5f571fc41cda2b08f495ee80e9a0a03a8ba737f0effeedcb0508195f8d30570443cbccd3c0cf8f4d93980e57f9f8ac656379327
 SHA512 (valkey-doc-8.1.0.tar.gz) = 4d378f9495ff10479ad058e826b8916eb925bef59bb8b15dfb348d828daf064aa7b0c92625623bf79da07d31c9562821093981e2b611222d2625e2af4a374c48
diff --git a/used_memory_thread_type.patch b/used_memory_thread_type.patch
deleted file mode 100644
index 29d1365..0000000
--- a/used_memory_thread_type.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naurp valkey-8.1.0.orig/src/zmalloc.c valkey-8.1.0/src/zmalloc.c
---- valkey-8.1.0.orig/src/zmalloc.c	2025-04-01 01:56:45.000000000 +1100
-+++ valkey-8.1.0/src/zmalloc.c	2025-04-04 11:39:32.762881364 +1100
-@@ -101,10 +101,11 @@ static thread_local int thread_index = -
- #if defined(__i386__) || defined(__x86_64__) || defined(__amd64__) || defined(__POWERPC__) || defined(__arm__) || \
-     defined(__arm64__)
- static __attribute__((aligned(CACHE_LINE_SIZE))) size_t used_memory_thread_padded[MAX_THREADS_NUM + PADDING_ELEMENT_NUM];
-+static size_t *used_memory_thread = &used_memory_thread_padded[PADDING_ELEMENT_NUM];
- #else
- static __attribute__((aligned(CACHE_LINE_SIZE))) _Atomic size_t used_memory_thread_padded[MAX_THREADS_NUM + PADDING_ELEMENT_NUM];
-+static _Atomic size_t *used_memory_thread = &used_memory_thread_padded[PADDING_ELEMENT_NUM];
- #endif
--static size_t *used_memory_thread = &used_memory_thread_padded[PADDING_ELEMENT_NUM];
- static atomic_int total_active_threads = 0;
- /* This is a simple protection. It's used only if some modules create a lot of threads. */
- static atomic_size_t used_memory_for_additional_threads = 0;
diff --git a/valkey.spec b/valkey.spec
index f195deb..9222962 100644
--- a/valkey.spec
+++ b/valkey.spec
@@ -4,11 +4,12 @@
 %else
 %bcond_with docs
 %endif
+%global doc_version 8.1.0
 # Tests fail in mock, not in local build.
 %bcond_with tests
 
 Name:              valkey
-Version:           8.1.0
+Version:           8.1.1
 Release:           1%{?dist}
 Summary:           A persistent key-value database
 # valkey: BSD-3-Clause
@@ -26,9 +27,7 @@ Source4:           %{name}.sysusers
 Source5:           %{name}.tmpfiles
 Source8:           macros.%{name}
 Source9:           migrate_redis_to_valkey.sh
-Source50:          https://github.com/valkey-io/%{name}-doc/archive/%{version}/%{name}-doc-%{version}.tar.gz
-
-Patch0:            used_memory_thread_type.patch
+Source50:          https://github.com/valkey-io/%{name}-doc/archive/%{doc_version}/%{name}-doc-%{doc_version}.tar.gz
 
 BuildRequires:     make
 BuildRequires:     gcc
@@ -158,7 +157,6 @@ Provides:          redis-doc = %{version}-%{release}
 %prep
 # no autosetup due to no support for multiple source extraction
 %setup -n %{name}-%{version} -a50
-%autopatch -p1
 
 mv deps/lua/COPYRIGHT             COPYRIGHT-lua
 mv deps/jemalloc/COPYING          COPYING-jemalloc
@@ -208,7 +206,7 @@ echo '# valkey-sentinel_rpm_conf' >> sentinel.conf
 
 %if %{with docs}
 # docs
-pushd %{name}-doc-%{version}
+pushd %{name}-doc-%{doc_version}
 # build man pages
 %make_build VALKEY_ROOT=../
 # build html docs
@@ -221,7 +219,7 @@ popd
 %make_install %{make_flags}
 %if %{with docs}
 # install docs
-pushd %{name}-doc-%{version}
+pushd %{name}-doc-%{doc_version}
 # man pages
 %make_install INSTALL_MAN_DIR=%{buildroot}%{_mandir} VALKEY_ROOT=../
 # install html docs
@@ -405,6 +403,10 @@ fi
 
 
 %changelog
+* Thu Apr 24 2025 Remi Collet <remi@fedoraproject.org> - 8.1.1-1
+- update to 8.1.1
+  fixes CVE-2025-21605
+
 * Fri Apr 04 2025 Nathan Scott <nathans@redhat.com> - 8.1.0-1
 - include tmpfiles.d configuration file
 - redis.log transition rhbz#2316030