- updated to 4.0.11

diff --git a/redis.conf.patch b/redis.conf.patch
index 7c0d4eca852e2f2d95c65ce5e1ff9b6533ab6741..e4f5ea7c2b490677788964004e177bbf0b4c0f72 100644 (file)
--- a/redis.conf.patch
+++ b/redis.conf.patch
@@ -1,40 +1,34 @@
-diff -ru redis-2.6.2/redis.conf redis-2.6.2-conf/redis.conf
---- redis-2.6.2/redis.conf     2012-10-26 16:20:24.000000000 +0200
-+++ redis-2.6.2-conf/redis.conf        2012-10-30 13:16:42.576170116 +0100
-@@ -14,11 +14,11 @@
+--- redis-4.0.11/redis.conf~   2018-08-04 00:44:56.000000000 +0200
++++ redis-4.0.11/redis.conf    2018-10-14 21:39:17.266544519 +0200
+@@ -110,7 +110,7 @@
+ # unixsocketperm 700
+ 
+ # Close the connection after a client is idle for N seconds (0 to disable)
+-timeout 0
++timeout 10
+ 
+ # TCP keepalive.
+ #
+@@ -133,7 +133,7 @@
  
  # By default Redis does not run as a daemon. Use 'yes' if you need it.
  # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
 -daemonize no
 +daemonize yes
  
- # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
- # default. You can specify a custom pid file location here.
--pidfile /var/run/redis.pid
-+pidfile /var/run/redis/redis.pid
- 
- # Accept connections on the specified port, default is 6379.
- # If port 0 is specified Redis will not listen on a TCP socket.
-@@ -27,7 +27,7 @@
- # Examples:
+ # If you run Redis from upstart or systemd, Redis can interact with your
+ # supervision tree. Options:
+@@ -155,7 +155,7 @@
  #
- # bind 192.168.1.100 10.0.0.1
--# bind 127.0.0.1
-+bind 127.0.0.1
- 
- # Specify the path for the unix socket that will be used to listen for
- # incoming connections. There is no default, so Redis will not listen
-@@ -37,7 +37,7 @@
- # unixsocketperm 755
- 
- # Close the connection after a client is idle for N seconds (0 to disable)
--timeout 0
-+timeout 10
+ # Creating a pid file is best effort: if Redis is not able to create it
+ # nothing bad happens, the server will start and run normally.
+-pidfile /var/run/redis_6379.pid
++pidfile /var/run/redis/redis.pid
  
- # Set server verbosity to 'debug'
- # it can be one of:
-@@ -50,7 +50,7 @@
- # Specify the log file name. Also 'stdout' can be used to force
+ # Specify the server verbosity level.
+ # This can be one of:
+@@ -168,7 +168,7 @@
+ # 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 ""
@@ -42,9 +36,9 @@ diff -ru redis-2.6.2/redis.conf redis-2.6.2-conf/redis.conf
  
  # To enable logging to the system logger, just set 'syslog-enabled' to yes,
  # and optionally update the other syslog parameters to suit your needs.
-@@ -134,7 +134,7 @@
- # Also the Append Only File will be created inside this directory.
- # 
+@@ -260,7 +260,7 @@
+ # 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

diff --git a/redis.spec b/redis.spec
index 485a72008d9f78eb32ddded18ba84f7b6ad5e757..4e45910d2d5d7882b59c5ea5789828f7d225537f 100644 (file)
--- a/redis.spec
+++ b/redis.spec
@@ -13,12 +13,12 @@
 
 Summary:       A persistent key-value database
 Name:          redis
-Version:       2.8.24
+Version:       4.0.11
 Release:       1
 License:       BSD
 Group:         Applications/Databases
 Source0:       http://download.redis.io/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 7b6eb6e4ccc050c351df8ae83c55a035
+# Source0-md5: e62d3793f86a6a0021609c9f905cb960
 Source1:       %{name}.logrotate
 Source2:       %{name}.init
 Source3:       %{name}.tmpfiles
@@ -91,10 +91,10 @@ ln -s %{_includedir} deps/jemalloc/include
 %define specflags -std=c99 -pedantic
 %define _make_opts CC="%{__cc}" CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" OPTIMIZATION="" DEBUG="" V=1
 
-%{__make} -j1 -C src all
+%{__make} -C src all
 
 %if %{with tests}
-%{__make} -j1 test
+%{__make} test
 %endif
 
 %install
@@ -146,10 +146,10 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING 00-RELEASENOTES BUGS README
+%doc 00-RELEASENOTES BUGS CONTRIBUTING COPYING INSTALL MANIFESTO README.md
 %attr(755,root,root) %{_bindir}/redis-benchmark
 %attr(755,root,root) %{_bindir}/redis-check-aof
-%attr(755,root,root) %{_bindir}/redis-check-dump
+%attr(755,root,root) %{_bindir}/redis-check-rdb
 %attr(755,root,root) %{_bindir}/redis-cli
 
 %files server