summaryrefslogtreecommitdiffstats
path: root/redis.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-07-10 11:55:47 +0200
committerRemi Collet <remi@php.net>2025-07-10 11:55:47 +0200
commit476c6a605d91124dd9cb9d6abade7990fadc4deb (patch)
treeb723186820d4cf72450da13c41744e1ec310ba98 /redis.spec
parent59b4b9053ec0ce6be0c79ee48e86c5d260958967 (diff)
use patch for config instead of sedv7.2
fix pidfile path in /run/redis set unixsocket
Diffstat (limited to 'redis.spec')
-rw-r--r--redis.spec15
1 files changed, 9 insertions, 6 deletions
diff --git a/redis.spec b/redis.spec
index 9e8beca..3317e05 100644
--- a/redis.spec
+++ b/redis.spec
@@ -39,7 +39,7 @@
Name: redis
Version: %{upstream_ver}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A persistent key-value database
# redis, hiredis: BSD-3-Clause
# hdrhistogram, jemalloc, lzf, linenoise: BSD-2-Clause
@@ -56,6 +56,8 @@ Source7: %{name}-limit-systemd
Source9: macros.%{name}
Source10: https://github.com/%{gh_owner}/%{gh_project}-doc/archive/%{doc_commit}/%{name}-doc-%{short_doc_commit}.tar.gz
+# Fix default paths in configuration files for RPM layout
+Patch0: %{name}-conf.patch
# To refresh patches:
# tar xf redis-xxx.tar.gz && cd redis-xxx && git init && git add . && git commit -m "%%{version} baseline"
# git am %%{patches}
@@ -170,6 +172,7 @@ and removal, status checks, resharding, rebalancing, and other operations.
%prep
%setup -q -n %{name}-%{upstream_ver} -b 10
+%patch -P0 -p1
mv ../%{name}-doc-%{doc_commit} doc
%patch -P0001 -p1
@@ -188,11 +191,6 @@ mv deps/hdr_histogram/LICENSE.txt LICENSE-hdrhistogram
mv deps/hdr_histogram/COPYING.txt COPYING-hdrhistogram
mv deps/fpconv/LICENSE.txt LICENSE-fpconv
-# Configuration file changes
-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
@@ -409,6 +407,11 @@ fi
%changelog
+* Thu Jul 10 2025 Remi Collet <remi@remirepo.net> - 7.2.10-2
+- use patch for config instead of sed
+- fix pidfile path in /run/redis
+- set unixsocket
+
* Mon Jul 7 2025 Remi Collet <remi@remirepo.net> - 7.2.10-1
- Redis 7.2.10 Released Sun 6 Jul 2025 12:00:00 IST
- Update urgency: SECURITY: CVE-2025-32023 and CVE-2025-48367