diff options
| -rw-r--r-- | redis-conf.patch | 60 | ||||
| -rw-r--r-- | redis.spec | 15 |
2 files changed, 69 insertions, 6 deletions
diff --git a/redis-conf.patch b/redis-conf.patch new file mode 100644 index 0000000..eb33e32 --- /dev/null +++ b/redis-conf.patch @@ -0,0 +1,60 @@ +diff -up ./redis.conf.rpm ./redis.conf +--- ./redis.conf.rpm 2025-07-10 11:31:26.588797534 +0200 ++++ ./redis.conf 2025-07-10 11:31:26.590823030 +0200 +@@ -152,7 +152,7 @@ tcp-backlog 511 + # incoming connections. There is no default, so Redis will not listen + # on a unix socket when not specified. + # +-# unixsocket /run/redis.sock ++unixsocket /run/redis/redis.sock + # unixsocketperm 700 + + # Close the connection after a client is idle for N seconds (0 to disable) +@@ -338,7 +338,7 @@ daemonize no + # + # Note that on modern Linux systems "/run/redis.pid" is more conforming + # and should be used instead. +-pidfile /var/run/redis_6379.pid ++pidfile /run/redis/redis.pid + + # Specify the server verbosity level. + # This can be one of: +@@ -352,7 +352,7 @@ loglevel notice + # Specify the log file name. Also the empty string can be used to force + # Redis to log on the standard output. Note that if you use standard + # output for logging but daemonize, logs will be sent to /dev/null +-logfile "" ++logfile /var/log/redis/redis.log + + # To enable logging to the system logger, just set 'syslog-enabled' to yes, + # and optionally update the other syslog parameters to suit your needs. +@@ -507,7 +507,7 @@ rdb-del-sync-files no + # The Append Only File will also be created inside this directory. + # + # Note that you must specify a directory here, not a file name. +-dir ./ ++dir /var/lib/redis + + ################################# REPLICATION ################################# + +diff -up ./sentinel.conf.rpm ./sentinel.conf +--- ./sentinel.conf.rpm 2025-07-10 11:31:26.589683845 +0200 ++++ ./sentinel.conf 2025-07-10 11:31:26.592442565 +0200 +@@ -17,7 +17,7 @@ daemonize no + # When running daemonized, Redis Sentinel writes a pid file in + # /var/run/redis-sentinel.pid by default. You can specify a custom pid file + # location here. +-pidfile /var/run/redis-sentinel.pid ++pidfile /run/redis/sentinel.pid + + # Specify the server verbosity level. + # This can be one of: +@@ -31,7 +31,7 @@ loglevel notice + # Specify the log file name. Also the empty string can be used to force + # Sentinel to log on the standard output. Note that if you use standard + # output for logging but daemonize, logs will be sent to /dev/null +-logfile "" ++logfile /var/log/redis/sentinel.log + + # To enable logging to the system logger, just set 'syslog-enabled' to yes, + # and optionally update the other syslog parameters to suit your needs. @@ -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 |