import CS valkey-8.1.6-1.el9

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,9 +1 @@
-/valkey-7.2.5.tar.gz
-/valkey-7.2.6.tar.gz
-/valkey-8.0.2.tar.gz
-/valkey-8.0.3.tar.gz
-/valkey-8.0.4.tar.gz
-/valkey-8.0.6.tar.gz
-/valkey-8.0.7.tar.gz
-/valkey-8.1.6.tar.gz
-/valkey-8.1.7.tar.gz
+SOURCES/valkey-8.1.6.tar.gz

.valkey.metadata

@@ -0,0 +1 @@
+0340f0a8ff1799940b5297adbf91574555739859 SOURCES/valkey-8.1.6.tar.gz

SOURCES/valkey-cve-2025-27151.patch

@@ -0,0 +1,34 @@
+From 73696bf6e2cf754acc3ec24eaf9ca6b879bfc5d7 Mon Sep 17 00:00:00 2001
+From: Madelyn Olson <madelyneolson@gmail.com>
+Date: Thu, 29 May 2025 00:06:23 +0100
+Subject: [PATCH] Incorporate Redis CVE for CVE-2025-27151 (#2146)
+
+Resolves https://github.com/valkey-io/valkey/issues/2145
+
+Incorporate the CVE patch that was sent to us by Redis Ltd.
+
+---------
+
+Signed-off-by: Madelyn Olson <madelyneolson@gmail.com>
+Co-authored-by: Ping Xie <pingxie@outlook.com>
+---
+ src/valkey-check-aof.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/valkey-check-aof.c b/src/valkey-check-aof.c
+index ed0eb2b49d..a6e4b97c6d 100644
+--- a/src/valkey-check-aof.c
++++ b/src/valkey-check-aof.c
+@@ -556,6 +556,12 @@ int redis_check_aof_main(int argc, char **argv) {
+         goto invalid_args;
+     }
+ 
++    /* Check if filepath is longer than PATH_MAX */
++    if (strnlen(filepath, PATH_MAX + 1) > PATH_MAX) {
++        printf("Error: filepath is too long (exceeds PATH_MAX)\n");
++        goto invalid_args;
++    }
++
+     /* In the glibc implementation dirname may modify their argument. */
+     memcpy(temp_filepath, filepath, strlen(filepath) + 1);
+     dirpath = dirname(temp_filepath);

SPECS/valkey.spec

@@ -2,7 +2,7 @@
 %bcond_with tests
 
 Name:              valkey
-Version:           8.1.7
+Version:           8.1.6
 Release:           1%{?dist}
 Summary:           A persistent key-value database
 # valkey: BSD-3-Clause
@@ -20,6 +20,7 @@ Source4:           %{name}.sysusers
 Source5:           %{name}.tmpfiles
 Source9:           migrate_redis_to_valkey.sh
 
+Patch1:            valkey-cve-2025-27151.patch
 # Fix default paths in configuration files for RPM layout
 Patch2:            %{name}-conf.patch
 # Workaround to https://github.com/valkey-io/valkey/issues/2678
@@ -122,6 +123,7 @@ BuildArch:         noarch
 
 %prep
 %setup -qn %{name}-%{version}
+%patch -P1 -p1
 %patch -P2 -p1 -b.rpm
 %patch -P3 -p1 -b .loadmod
 %patch -P4 -p1 -b .bindnow
@@ -173,10 +175,12 @@ loadmodule %{valkey_modules_dir}/rdma.so
 EOF
 
 %build
+%set_build_flags
 %make_build %{make_flags}
 
 
 %install
+%set_build_flags
 %make_install %{make_flags}
 
 # remove sample confs
@@ -298,9 +302,6 @@ taskset -c 1 ./runtest --clients 50 --skiptest "Active defrag - AOF loading"
 
 
 %changelog
-* Tue May 19 2026 Petr Khartskhaev <pkhartsk@redhat.com> - 8.1.7-1
-- Rebase to 8.1.7 for CVE-2026-23479 CVE-2026-25243 CVE-2026-23631
-
 * Wed Mar 04 2026 Lukas Javorsky <ljavorsk@redhat.com> - 8.1.6-1
 - Rebase to version 8.1
 - fix CONFIG REWRITE breaks configuration
@@ -319,7 +320,7 @@ taskset -c 1 ./runtest --clients 50 --skiptest "Active defrag - AOF loading"
 * Fri Oct 17 2025 Remi Collet <remi@fedoraproject.org> - 8.0.6-2
 - rebase to 8.0.6 for CVE-2025-49844 CVE-2025-46817 CVE-2025-46818 CVE-2025-46819
 
-* Mon Sep  8 2025 Remi Collet <remi@fedoraproject.org> - 8.0.4-3
+* Tue Sep  9 2025 Remi Collet <remi@fedoraproject.org> - 8.0.4-3
 - fix ImageMode: ensure ownership of /etc/valkey
 
 * Fri Aug  1 2025 Remi Collet <remi@fedoraproject.org> - 8.0.4-2

ci.fmf

@@ -1 +0,0 @@
-resultsdb-testcase: separate

gating.yaml

@@ -1,26 +0,0 @@
-# gating branched Fedora
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
-
-# gating Fedora Rawhide
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
-
-# gating rhel
---- !Policy
-product_versions:
-  - rhel-*
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}

plans/tier1-internal.fmf

@@ -1,10 +0,0 @@
-summary: Internal Tier1 tests plan
-discover:
-    how: fmf
-    url: https://pkgs.devel.redhat.com/git/tests/valkey
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream or distro == fedora
-    because: No access to internal git repositories

plans/tier1-public.fmf

@@ -1,7 +0,0 @@
-summary: Public Tier1 tests plan
-discover:
-    how: fmf
-    url: https://gitlab.com/redhat/centos-stream/tests/valkey
-    filter: 'tag:-nogating'
-execute:
-    how: tmt

sources

@@ -1 +0,0 @@
-SHA512 (valkey-8.1.7.tar.gz) = b4fc78e7315c04229b50e088884f3ce42985317a12baf43dd7afcad00956e85912eb01824ba2e8566b07e8378d3a4d5c5085e17c90018fdd5101d77f04801041