diff options
| -rw-r--r-- | redis-conf.patch | 60 | ||||
| -rw-r--r-- | redis.spec | 31 |
2 files changed, 77 insertions, 14 deletions
diff --git a/redis-conf.patch b/redis-conf.patch new file mode 100644 index 0000000..f4e297f --- /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 +@@ -153,7 +153,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) +@@ -339,7 +339,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: +@@ -353,7 +353,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. +@@ -513,7 +513,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. @@ -18,7 +18,7 @@ # Tests fail in mock, not in local build. %bcond_with tests -%global upstream_ver 8.0.2 +%global upstream_ver 8.0.3 Name: redis Version: %{upstream_ver} @@ -38,7 +38,12 @@ Source2: %{name}-sentinel.service Source3: %{name}.service Source9: macros.%{name} +# Fix default paths in configuration files for RPM layout +Patch0: %{name}-conf.patch + BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libstdc++-devel %if %{with jemalloc} BuildRequires: jemalloc-devel %else @@ -120,6 +125,7 @@ API documentation is available in the redis-doc package. %prep %setup -q -n %{name}-%{upstream_ver} +%patch -P0 -p1 %if %{with jemalloc} rm -frv deps/jemalloc @@ -136,11 +142,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 @@ -199,11 +200,6 @@ chmod 755 %{buildroot}%{_bindir}/%{name}-* # Install redis module header install -pDm644 src/%{name}module.h %{buildroot}%{_includedir}/%{name}module.h -%if %{with redistrib} -# Install redis-trib -install -pDm755 src/%{name}-trib.rb %{buildroot}%{_bindir}/%{name}-trib -%endif - # Install rpm macros for redis modules mkdir -p %{buildroot}%{_rpmmacrodir} install -pDm644 %{S:9} %{buildroot}%{_rpmmacrodir}/macros.%{name} @@ -294,9 +290,6 @@ fi %dir %{redis_modules_dir} %dir %attr(0750, redis, redis) %{_sharedstatedir}/%{name} %dir %attr(0750, redis, redis) %{_localstatedir}/log/%{name} -%if %{with redistrib} -%exclude %{_bindir}/%{name}-trib -%endif %exclude %{_rpmmacrodir} %exclude %{_includedir} %exclude %{_docdir}/%{name}/* @@ -314,6 +307,16 @@ fi %changelog +* Thu Jul 10 2025 Remi Collet <remi@remirepo.net> - 8.0.3-2 +- add missing build requirements +- use patch for config instead of sed +- fix pidfile path in /run/redis +- set unixsocket + +* Mon Jul 7 2025 Remi Collet <remi@remirepo.net> - 8.0.3-1 +- Redis 8.0.3 Released Sun 6 Jul 2025 12:00:00 IST +- Update urgency: SECURITY: CVE-2025-32023 and CVE-2025-48367 + * Thu Jun 19 2025 Remi Collet <remi@remirepo.net> - 8.0.2-2 - remove limit.conf config files |