From 48ac7fdd871ec8ac503e8ebfebb3eb03dc06cadc Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 26 Sep 2025 13:42:38 +0000 Subject: [PATCH] import CS valkey-8.0.4-2.el9 --- .fmf/version | 1 - .gitignore | 6 +----- .valkey.metadata | 1 + macros.valkey => SOURCES/macros.valkey | 0 .../migrate_redis_to_valkey.sh | 0 .../valkey-cve-2025-27151.patch | 0 .../valkey-sentinel.service | 0 valkey.logrotate => SOURCES/valkey.logrotate | 0 valkey.service => SOURCES/valkey.service | 0 valkey.sysusers => SOURCES/valkey.sysusers | 0 SOURCES/valkey.tmpfiles | 3 +++ valkey.spec => SPECS/valkey.spec | 5 +---- ci.fmf | 1 - gating.yaml | 7 ------- plans/tier1-internal.fmf | 10 ---------- sources | 1 - valkey.tmpfiles | 4 ---- 17 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 .fmf/version create mode 100644 .valkey.metadata rename macros.valkey => SOURCES/macros.valkey (100%) rename migrate_redis_to_valkey.sh => SOURCES/migrate_redis_to_valkey.sh (100%) rename valkey-cve-2025-27151.patch => SOURCES/valkey-cve-2025-27151.patch (100%) rename valkey-sentinel.service => SOURCES/valkey-sentinel.service (100%) rename valkey.logrotate => SOURCES/valkey.logrotate (100%) rename valkey.service => SOURCES/valkey.service (100%) rename valkey.sysusers => SOURCES/valkey.sysusers (100%) create mode 100644 SOURCES/valkey.tmpfiles rename valkey.spec => SPECS/valkey.spec (98%) delete mode 100644 ci.fmf delete mode 100644 gating.yaml delete mode 100644 plans/tier1-internal.fmf delete mode 100644 sources delete mode 100644 valkey.tmpfiles diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 3b3b41d..8d7e932 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +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 +SOURCES/valkey-8.0.4.tar.gz diff --git a/.valkey.metadata b/.valkey.metadata new file mode 100644 index 0000000..31b194b --- /dev/null +++ b/.valkey.metadata @@ -0,0 +1 @@ +e8c4b2736e6c1957890dd758e8617747f76399d2 SOURCES/valkey-8.0.4.tar.gz diff --git a/macros.valkey b/SOURCES/macros.valkey similarity index 100% rename from macros.valkey rename to SOURCES/macros.valkey diff --git a/migrate_redis_to_valkey.sh b/SOURCES/migrate_redis_to_valkey.sh similarity index 100% rename from migrate_redis_to_valkey.sh rename to SOURCES/migrate_redis_to_valkey.sh diff --git a/valkey-cve-2025-27151.patch b/SOURCES/valkey-cve-2025-27151.patch similarity index 100% rename from valkey-cve-2025-27151.patch rename to SOURCES/valkey-cve-2025-27151.patch diff --git a/valkey-sentinel.service b/SOURCES/valkey-sentinel.service similarity index 100% rename from valkey-sentinel.service rename to SOURCES/valkey-sentinel.service diff --git a/valkey.logrotate b/SOURCES/valkey.logrotate similarity index 100% rename from valkey.logrotate rename to SOURCES/valkey.logrotate diff --git a/valkey.service b/SOURCES/valkey.service similarity index 100% rename from valkey.service rename to SOURCES/valkey.service diff --git a/valkey.sysusers b/SOURCES/valkey.sysusers similarity index 100% rename from valkey.sysusers rename to SOURCES/valkey.sysusers diff --git a/SOURCES/valkey.tmpfiles b/SOURCES/valkey.tmpfiles new file mode 100644 index 0000000..2383ddb --- /dev/null +++ b/SOURCES/valkey.tmpfiles @@ -0,0 +1,3 @@ +D /run/valkey 0755 valkey valkey - +d /var/lib/valkey 0750 valkey valkey - +d /var/log/valkey 0750 valkey valkey - diff --git a/valkey.spec b/SPECS/valkey.spec similarity index 98% rename from valkey.spec rename to SPECS/valkey.spec index 1b5b85c..cb9d50d 100644 --- a/valkey.spec +++ b/SPECS/valkey.spec @@ -3,7 +3,7 @@ Name: valkey Version: 8.0.4 -Release: 3%{?dist} +Release: 2%{?dist} Summary: A persistent key-value database # valkey: BSD-3-Clause # hiredis: BSD-3-Clause @@ -268,9 +268,6 @@ taskset -c 1 ./runtest --clients 50 --skiptest "Active defrag - AOF loading" %changelog -* Fri Sep 8 2025 Remi Collet - 8.0.4-3 -- fix ImageMode: ensure ownership of /etc/valkey - * Fri Aug 1 2025 Remi Collet - 8.0.4-2 - fix ImageMode: add tmpfiles.d entries for directories below /var diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 7da9094..0000000 --- a/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ -#gating rhel ---- !Policy -product_versions: - - rhel-* -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional} diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf deleted file mode 100644 index 39ba722..0000000 --- a/plans/tier1-internal.fmf +++ /dev/null @@ -1,10 +0,0 @@ -summary: Internal Tier1 beakerlib tests -discover: - how: fmf - url: https://gitlab.com/redhat/rhel/tests/valkey - filter: "tier:1" -execute: - how: tmt -adjust: - enabled: false - when: distro == centos-stream-10 diff --git a/sources b/sources deleted file mode 100644 index c1b2af6..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (valkey-8.0.4.tar.gz) = 2e6969a2c791f39943fe31c9c6dc5432accc37212c586f891f997df6dc74c0329d9f7254c54842f8203c8427f903e016cd465747d221349396327649ffa340fb diff --git a/valkey.tmpfiles b/valkey.tmpfiles deleted file mode 100644 index 2c99bad..0000000 --- a/valkey.tmpfiles +++ /dev/null @@ -1,4 +0,0 @@ -Z /etc/valkey ~0750 valkey root - -D /run/valkey 0755 valkey valkey - -d /var/lib/valkey 0750 valkey valkey - -d /var/log/valkey 0750 valkey valkey -