Merge branch 'master' into epel7

.gitignore

@@ -1,3 +1,4 @@
+clog
 /redis-2.0.3.tar.gz
 /redis-2.0.4.tar.gz
 /redis-2.2.2.tar.gz
@@ -28,3 +29,8 @@
 /redis-3.0.5.tar.gz
 /redis-3.0.6.tar.gz
 /redis-3.2.3.tar.gz
+/redis-3.2.4.tar.gz
+/redis-3.2.7.tar.gz
+/redis-3.2.8.tar.gz
+/redis-3.2.9.tar.gz
+/redis-3.2.10.tar.gz

0001-redis-3.2.3-redis-conf.patch

@@ -1,25 +1,16 @@
-From 2875336337c14d15878fcc36de83cea350fc47f1 Mon Sep 17 00:00:00 2001
+From cbd4460b0c1a8614644171904e3522ffbe001b48 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar@fedoraproject.org>
 Date: Fri, 5 Dec 2014 14:11:15 +0100
-Subject: [PATCH 1/5] redis 3.2.3: redis conf
+Subject: [PATCH 1/7] redis 3.2.3: redis conf
 
 ---
- redis.conf | 6 +++---
+ redis.conf | 4 ++--
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/redis.conf b/redis.conf
-index 22e00bc..46a0154 100644
+index 22e00bc..2bcddb8 100644
 --- a/redis.conf
 +++ b/redis.conf
-@@ -147,7 +147,7 @@ supervised no
- #
- # 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
- 
- # Specify the server verbosity level.
- # This can be one of:
 @@ -160,7 +160,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
@@ -39,5 +30,5 @@ index 22e00bc..46a0154 100644
  ################################# REPLICATION #################################
  
 -- 
-2.9.0
+2.9.3
 

0002-redis-3.2.3-deps-library-fPIC-performance-tuning.patch

@@ -1,7 +1,7 @@
-From 0a7d1df14b256dc77249f8d5d0d483b1b4a6c97d Mon Sep 17 00:00:00 2001
+From efdb3b41171d335511af511b0a0cdf43cde2144a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar@fedoraproject.org>
 Date: Mon, 8 Dec 2014 10:02:54 +0100
-Subject: [PATCH 2/5] redis 3.2.3: deps library fPIC performance tuning
+Subject: [PATCH 2/7] redis 3.2.3: deps library fPIC performance tuning
 
 ---
  deps/Makefile             | 2 +-
@@ -49,5 +49,5 @@ index 1dd894b..712f2a6 100644
  DEBUG= -g
  
 -- 
-2.9.0
+2.9.3
 

0003-redis-2.8.18-use-system-jemalloc.patch

@@ -1,14 +1,13 @@
-From d3cdf6aafbe700cd856440058e3b8a345838d326 Mon Sep 17 00:00:00 2001
+From 028b374759921656cb8a1e46198c8abbb62a4f0d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar@fedoraproject.org>
 Date: Mon, 8 Dec 2014 10:03:40 +0100
-Subject: [PATCH 3/5] redis 2.8.18: use system jemalloc
+Subject: [PATCH 3/7] redis 2.8.18: use system jemalloc
 
 ---
  src/Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index 8b3e959..af6a4fe 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -90,8 +90,8 @@ endif
@@ -16,12 +15,12 @@ index 8b3e959..af6a4fe 100644
  ifeq ($(MALLOC),jemalloc)
  	DEPENDENCY_TARGETS+= jemalloc
 -	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
--	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
+-	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
 +	FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
 +	FINAL_LIBS+= -ljemalloc -ldl
  endif
  
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
 -- 
-2.1.0
+2.9.3
 

0004-redis-2.8.18-disable-test-failed-on-slow-machine.patch

@@ -1,7 +1,7 @@
-From 851ea8154a2a8e974d1588be3d6d38262ca2ae33 Mon Sep 17 00:00:00 2001
+From a39e81c428eac6745a1aa7d87ca64d78e335b2c3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar@fedoraproject.org>
 Date: Mon, 8 Dec 2014 10:04:18 +0100
-Subject: [PATCH 4/5] redis 2.8.18: disable test failed on slow machine
+Subject: [PATCH 4/7] redis 2.8.18: disable test failed on slow machine
 
 ---
  tests/test_helper.tcl | 1 -
@@ -20,5 +20,5 @@ index 9a6e673..0891619 100644
      integration/rdb
      integration/convert-zipmap-hash-on-load
 -- 
-2.9.0
+2.9.3
 

0005-redis-2.8.18-sentinel-configuration-file-fix.patch

@@ -1,27 +1,29 @@
-From 9502fee0927389b6feb274f2778dfb0b7b4a1459 Mon Sep 17 00:00:00 2001
+From 8aa7a039b6b23f7e9fdb9a459e975f216dd8fdba Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar@fedoraproject.org>
 Date: Sat, 13 Sep 2014 14:03:04 +0200
-Subject: [PATCH 5/5] redis 2.8.18: sentinel configuration file fix
+Subject: [PATCH 5/7] redis 2.8.18: sentinel configuration file fix
 
 ---
- sentinel.conf | 5 +++++
+ sentinel.conf | 6 ++++++
- 1 file changed, 5 insertions(+)
+ 1 file changed, 6 insertions(+)
 
 diff --git a/sentinel.conf b/sentinel.conf
-index 39d1044..543d40d 100644
+index 0e1b266..428e7b6 100644
 --- a/sentinel.conf
 +++ b/sentinel.conf
-@@ -177,5 +177,10 @@ sentinel failover-timeout mymaster 180000
+@@ -130,6 +130,12 @@ sentinel parallel-syncs mymaster 1
- # Example:
+ # Default is 3 minutes.
- #
+ sentinel failover-timeout mymaster 180000
- # sentinel client-reconfig-script mymaster /var/redis/reconfig.sh
+ 
 +#
 +# 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 /var/log/redis/sentinel.log
- 
++
- 
+ # SCRIPTS EXECUTION
+ #
+ # sentinel notification-script and sentinel reconfig-script are used in order
 -- 
-2.9.0
+2.9.3
 

0006-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch

@@ -0,0 +1,652 @@
+From e1ded77b1f80a5241f2f9b5088b9063ecbeb72c9 Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora@famillecollet.com>
+Date: Thu, 8 Sep 2016 14:51:15 +0200
+Subject: [PATCH 6/7] 1st man pageis for - redis-cli - redis-benchmark -
+ redis-check-aof - redis-check-rdb - redis-server - redis.conf
+
+as redis-sentinel is a symlink to redis-server, same page can be used (also symlinked)
+redis.conf can also be used for sentinel.conf
+---
+ man/man1/redis-benchmark.1 | 132 ++++++++++++++++++++++++++++++++++
+ man/man1/redis-check-aof.1 |  60 ++++++++++++++++
+ man/man1/redis-check-rdb.1 |  53 ++++++++++++++
+ man/man1/redis-cli.1       | 171 +++++++++++++++++++++++++++++++++++++++++++++
+ man/man1/redis-server.1    | 117 +++++++++++++++++++++++++++++++
+ man/man5/redis.conf.5      |  57 +++++++++++++++
+ 6 files changed, 590 insertions(+)
+ create mode 100644 man/man1/redis-benchmark.1
+ create mode 100644 man/man1/redis-check-aof.1
+ create mode 100644 man/man1/redis-check-rdb.1
+ create mode 100644 man/man1/redis-cli.1
+ create mode 100644 man/man1/redis-server.1
+ create mode 100644 man/man5/redis.conf.5
+
+diff --git a/man/man1/redis-benchmark.1 b/man/man1/redis-benchmark.1
+new file mode 100644
+index 0000000..a3e4c62
+--- /dev/null
++++ b/man/man1/redis-benchmark.1
+@@ -0,0 +1,132 @@
++.TH REDIS-BENCHMARK 1 "2016" "Redis" "User commands"
++.SH NAME
++redis\-benchmark \- Redis benchmark
++
++.SH SYNOPSIS
++.B redis\-benchmark
++[ options ]
++.LP
++
++.SH DESCRIPTION
++\fBRedis\fP is an open source (BSD licensed), in-memory data structure store,
++used as database, cache and message broker, found at
++.B http://redis.io/
++
++The \fBredis\-benchmark\fP command is a command to benchmark redis-server.
++
++.SH OPTIONS
++.TP 15
++.B \-h \fIhostname\fP
++Server hostname (default: 127.0.0.1).
++.TP
++.B \-p \fIport\fP
++Server port (default: 6379).
++.TP
++.B \-s \fIsocket\fP
++Server socket (overrides hostname and port).
++.TP
++.B \-a \fIpassword\fP
++Password to use when connecting to the server.
++.TP
++.B \-c \fIclients\fP
++Number of parallel connections (default 50)
++.TP
++.B \-dnnum \fIdb\fP
++SELECT the specified db number (default 0)
++.TP
++.B \-k \fIboolean\fP
++1=keep alive 0=reconnect (default 1)
++.TP
++.B \-r \fIkeyspacelen\fP
++Use random keys for SET/GET/INCR, random values for SADD
++Using this option the benchmark will expand the string __rand_int__
++inside an argument with a 12 digits number in the specified range
++from 0 to keyspacelen-1. The substitution changes every time a command
++is executed. Default tests use this to hit random keys in the
++specified range.
++.TP
++.B \-P \fInumreq\fP
++Pipeline <numreq> requests. Default 1 (no pipeline).
++.TP
++.B \-e
++If server replies with errors, show them on stdout.
++(no more than 1 error per second is displayed)
++.TP
++.B \-q
++Quiet. Just show query/sec values
++.TP
++.B \-\-csv
++Output in CSV format
++.TP
++.B \-l
++Loop. Run the tests forever
++.TP
++.B \-t \fItests\fP
++Only run the comma separated list of tests. The test
++names are the same as the ones produced as output.
++.TP
++.B \-I
++Idle mode. Just open N idle connections and wait.
++
++.SH EXAMPLES
++.TP 5
++Run the benchmark with the default configuration against 127.0.0.1:6379:
++$ redis\-benchmark
++.TP
++Use 20 parallel clients, for a total of 100k requests, against 192.168.1.1:
++$ redis-benchmark \-h 192.168.1.1 \-p 6379 \-n 100000 \-c 20
++.TP
++Fill 127.0.0.1:6379 with about 1 million keys only using the SET test:
++$ redis\-benchmark \-t set \-n 1000000 \-r 100000000
++.TP
++Benchmark 127.0.0.1:6379 for a few commands producing CSV output:
++$ redis\-benchmark \-t ping,set,get \-n 100000 \-\-csv
++.TP
++Benchmark a specific command line:
++$ redis\-benchmark \-r 10000 \-n 10000 eval 'return redis.call("ping")' 0
++.TP
++Fill a list with 10000 random elements:
++$ redis\-benchmark \-r 10000 \-n 10000 lpush mylist __rand_int__
++.TP
++On user specified command lines __rand_int__ is replaced with a random integer
++with a range of values selected by the -r option.
++
++
++.SH BUGS
++See:
++.PD 0
++.B http://redis.io/support
++and
++.B https://github.com/antirez/redis/issues
++
++.SH COPYRIGHT
++Copyright \(co 2006\-2016
++Salvatore Sanfilippo
++.P
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are met:
++.TP 2
++*
++Redistributions of source code must retain the above copyright notice,
++this list of conditions and the following disclaimer.
++.TP
++*
++Redistributions in binary form must reproduce the above copyright
++notice, this list of conditions and the following disclaimer in the
++documentation and/or other materials provided with the distribution.
++.TP
++*
++Neither the name of Redis nor the names of its contributors may be used
++to endorse or promote products derived from this software without specific
++prior written permission.
++.P
++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff --git a/man/man1/redis-check-aof.1 b/man/man1/redis-check-aof.1
+new file mode 100644
+index 0000000..1569fd9
+--- /dev/null
++++ b/man/man1/redis-check-aof.1
+@@ -0,0 +1,60 @@
++.TH REDIS-CHECK-AOF 1 "2016" "Redis" "User commands"
++.SH NAME
++redis\-check\-aof \- Redis AOF file checker and repairer
++
++.SH SYNOPSIS
++.B redis\-check\-aof
++[\-\-fix]
++.IR file.aof
++
++.SH DESCRIPTION
++\fBRedis\fP is an open source (BSD licensed), in-memory data structure store,
++used as database, cache and message broker, found at
++.B http://redis.io/
++
++The \fBredis\-check\-aof\fP command to check or repair redis-server AOF files.
++
++.SH OPTIONS
++.TP 15
++.B \-\-fix
++Fix the file
++
++
++.SH BUGS
++See:
++.PD 0
++.B http://redis.io/support
++and
++.B https://github.com/antirez/redis/issues
++
++.SH COPYRIGHT
++Copyright \(co 2006\-2016
++Salvatore Sanfilippo
++.P
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are met:
++.TP 2
++*
++Redistributions of source code must retain the above copyright notice,
++this list of conditions and the following disclaimer.
++.TP
++*
++Redistributions in binary form must reproduce the above copyright
++notice, this list of conditions and the following disclaimer in the
++documentation and/or other materials provided with the distribution.
++.TP
++*
++Neither the name of Redis nor the names of its contributors may be used
++to endorse or promote products derived from this software without specific
++prior written permission.
++.P
++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff --git a/man/man1/redis-check-rdb.1 b/man/man1/redis-check-rdb.1
+new file mode 100644
+index 0000000..0e798ab
+--- /dev/null
++++ b/man/man1/redis-check-rdb.1
+@@ -0,0 +1,53 @@
++.TH REDIS-CHECK-RDB 1 "2016" "Redis" "User commands"
++.SH NAME
++redis\-check\-aof \- Redis RDB file checker
++
++.SH SYNOPSIS
++.B redis\-check\-aof
++.IR file.rdb
++
++.SH DESCRIPTION
++\fBRedis\fP is an open source (BSD licensed), in-memory data structure store,
++used as database, cache and message broker, found at
++.B http://redis.io/
++
++The \fBredis\-check\-rdb\fP command to check redis-server RDB files.
++
++.SH BUGS
++See:
++.PD 0
++.B http://redis.io/support
++and
++.B https://github.com/antirez/redis/issues
++
++.SH COPYRIGHT
++Copyright \(co 2006\-2016
++Salvatore Sanfilippo
++.P
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are met:
++.TP 2
++*
++Redistributions of source code must retain the above copyright notice,
++this list of conditions and the following disclaimer.
++.TP
++*
++Redistributions in binary form must reproduce the above copyright
++notice, this list of conditions and the following disclaimer in the
++documentation and/or other materials provided with the distribution.
++.TP
++*
++Neither the name of Redis nor the names of its contributors may be used
++to endorse or promote products derived from this software without specific
++prior written permission.
++.P
++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff --git a/man/man1/redis-cli.1 b/man/man1/redis-cli.1
+new file mode 100644
+index 0000000..14f84df
+--- /dev/null
++++ b/man/man1/redis-cli.1
+@@ -0,0 +1,171 @@
++.TH REDIS-CLI 1 "2016" "Redis" "User commands"
++.SH NAME
++redis\-cli \- Redis client
++
++.SH SYNOPSIS
++.B redis\-cli
++[ options ] [cmd [arg [arg ...]]]
++.LP
++
++.SH DESCRIPTION
++\fBRedis\fP is an open source (BSD licensed), in-memory data structure store,
++used as database, cache and message broker, found at
++.B http://redis.io/
++
++The \fBredis-cli\fP command is a command line client to redis-server.
++
++.SH OPTIONS
++.TP 15
++.B \-h \fIhostname\fP
++Server hostname (default: 127.0.0.1).
++.TP
++.B \-p \fIport\fP
++Server port (default: 6379).
++.TP
++.B \-s \fIsocket\fP
++Server socket (overrides hostname and port).
++.TP
++.B \-a \fIpassword\fP
++Password to use when connecting to the server.
++.TP
++.B \-r \fIrepeat\fP
++Execute specified command N times.
++.TP
++.B \-i \fIinterval\fP
++When -r is used, waits \fIinterval\fP seconds per command.
++It is possible to specify sub-second times like -i 0.1.
++.TP
++.B \-n \fIdb\fP
++Database number.
++.TP
++.B \-x
++Read last argument from STDIN.
++.TP
++.B \-d \fIdelimiter\fP
++Multi-bulk delimiter in for raw formatting (default: \n).
++.TP
++.B \-c
++Enable cluster mode (follow -ASK and -MOVED redirections).
++.TP
++.B \-\-raw
++Use raw formatting for replies (default when STDOUT is not a tty).
++.TP
++.B \-\-no\-raw
++Force formatted output even when STDOUT is not a tty.
++.TP
++.B \-\-csv
++Output in CSV format.
++.TP
++.B \-\-stat
++Print rolling stats about server: mem, clients, ...
++.TP
++.B \-\-latency
++Enter a special mode continuously sampling latency.
++.TP
++.B \-\-latency\-history
++Like \-\-latency but tracking latency changes over time.
++Default time interval is 15 sec. Change it using -i.
++.TP
++.B \-\-latency\-dist
++Shows latency as a spectrum, requires xterm 256 colors.
++Default time interval is 1 sec. Change it using -i.
++.TP
++.B \-\-lru\-test
++Simulate a cache workload with an 80-20 distribution.
++.TP
++.B \-\-slave
++Simulate a slave showing commands received from the master.
++.TP
++.B \-\-rdb \fIfilename\fP
++Transfer an RDB dump from remote server to local file.
++.TP
++.B \-\-pipe
++Transfer raw Redis protocol from stdin to server.
++.TP
++.B \-\-pipe-timeout \fIn\fP
++In --pipe mode, abort with error if after sending all data.
++no reply is received within \fIn\fP seconds.
++Default timeout: 30. Use 0 to wait forever.
++.TP
++.B \-\-bigkeys
++Sample Redis keys looking for big keys.
++.TP
++.B \-\-scan
++List all keys using the SCAN command.
++.TP
++.B \-\-pattern \fIpat\fP
++Useful with --scan to specify a SCAN pattern.
++.TP
++.B \-\-intrinsic-latency \fIsec\fP
++Run a test to measure intrinsic system latency.
++The test will run for the specified amount of seconds.
++.TP
++.B \-\-eval \fIfile\fP
++Send an EVAL command using the Lua script at \fIfile\fP.
++.TP
++.B \-\-ldb
++Used with --eval enable the Redis Lua debugger.
++.TP
++.B \-\-ldb-sync-mode
++Like --ldb but uses the synchronous Lua debugger, in
++this mode the server is blocked and script changes are
++are not rolled back from the server memory.
++.TP
++.B \-\-help
++Output this help and exit.
++.TP
++.B \-\-version
++Output version and exit.
++
++.SH EXAMPLES
++.TP
++cat /etc/passwd | redis-cli -x set mypasswd
++.TP
++redis-cli get mypasswd
++.TP
++redis-cli \-r 100 lpush mylist x
++.TP
++redis-cli \-r 100 \-i 1 info | grep used_memory_human:
++.TP
++redis-cli \-\-eval myscript.lua key1 key2 , arg1 arg2 arg3
++.TP
++redis-cli \-\-scan \-\-pattern '*:12345*'
++
++.SH BUGS
++See:
++.PD 0
++.B http://redis.io/support
++and
++.B https://github.com/antirez/redis/issues
++
++.SH COPYRIGHT
++Copyright \(co 2006\-2016
++Salvatore Sanfilippo
++.P
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are met:
++.TP 2
++*
++Redistributions of source code must retain the above copyright notice,
++this list of conditions and the following disclaimer.
++.TP
++*
++Redistributions in binary form must reproduce the above copyright
++notice, this list of conditions and the following disclaimer in the
++documentation and/or other materials provided with the distribution.
++.TP
++*
++Neither the name of Redis nor the names of its contributors may be used
++to endorse or promote products derived from this software without specific
++prior written permission.
++.P
++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff --git a/man/man1/redis-server.1 b/man/man1/redis-server.1
+new file mode 100644
+index 0000000..d6edd25
+--- /dev/null
++++ b/man/man1/redis-server.1
+@@ -0,0 +1,117 @@
++.TH REDIS-SERVER 1 "2016" "Redis" "User commands"
++.SH NAME
++redis\-server, redis\-sentinel \- Redis server
++
++.SH SYNOPSIS
++.B redis\-server
++[
++.IR configuration_file
++] [ options ] [ \-\-sentinel ]
++.LP
++.B redis\-sentinel
++[
++.IR configuration_file
++] [ options ]
++
++
++.SH DESCRIPTION
++\fBRedis\fP is an open source (BSD licensed), in-memory data structure store,
++used as database, cache and message broker, found at
++.B http://redis.io/
++.LP
++The \fBredis\-server\fP command is a command line to launch a Redis server.
++.LP
++The \fBredis\-sentinel\fP command is a symbolic link to the \fBredis\-server\fP
++command which imply the \fB\-\-sentionel\fP option.
++
++.SH OPTIONS
++.TP 15
++.B \-
++Read configuration from stdin.
++.TP
++.TP 15
++.B \-\-sentinel
++Run in sentinel mode
++.TP
++.B \-\-test-memory \fImegabytes\fP
++Run a memory check and exit.
++.TP
++.PD 0
++.B \-\-help
++.TP
++.PD 1
++.B \-h
++Output this help and exit.
++.TP
++.PD 0
++.B \-\-version
++.TP
++.PD 1
++.B \-v
++Output version and exit.
++.P
++All parameters described in \fBredis.conf\fR file can be passed as
++command line option, e.g.
++.B \-\-port
++.IR port
++.
++
++.SH EXAMPLES
++.TP 5
++Run the server with default conf
++redis-server
++.TP
++Run the server with a configuration file
++redis-server /etc/redis/6379.conf
++.TP
++Run the server changing some default options
++redis-server --port 7777 --slaveof 127.0.0.1 8888
++.TP
++Run the server with a configuration file and changing some options
++redis-server /etc/myredis.conf --loglevel verbose
++.TP
++Run in sentinel mode
++redis-server /etc/sentinel.conf --sentinel
++
++.SH "SEE ALSO"
++.PP
++\fBredis.conf\fR(5)
++
++.SH BUGS
++See:
++.PD 0
++.B http://redis.io/support
++and
++.B https://github.com/antirez/redis/issues
++
++.SH COPYRIGHT
++Copyright \(co 2006\-2016
++Salvatore Sanfilippo
++.P
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are met:
++.TP 2
++*
++Redistributions of source code must retain the above copyright notice,
++this list of conditions and the following disclaimer.
++.TP
++*
++Redistributions in binary form must reproduce the above copyright
++notice, this list of conditions and the following disclaimer in the
++documentation and/or other materials provided with the distribution.
++.TP
++*
++Neither the name of Redis nor the names of its contributors may be used
++to endorse or promote products derived from this software without specific
++prior written permission.
++.P
++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff --git a/man/man5/redis.conf.5 b/man/man5/redis.conf.5
+new file mode 100644
+index 0000000..1e0c9c9
+--- /dev/null
++++ b/man/man5/redis.conf.5
+@@ -0,0 +1,57 @@
++.TH REDIS.CONF 5 "2016" "Redis" "Configuration files"
++.SH NAME
++redis.conf, sentinel.conf - redis server configuration files.
++
++.SH PARAMETERS
++.TP
++All empty lines or lines beginning with '#' are ignored.
++.TP
++See inline comments for parameters description.
++
++.SH DESCRIPTION
++.TP
++\fBredis-server\fP read the configuration file passed as first argument.
++
++.SH "SEE ALSO"
++.PP
++\fBredis\-server\fR(1)
++
++
++.SH BUGS
++See:
++.PD 0
++.B http://redis.io/support
++and
++.B https://github.com/antirez/redis/issues
++
++.SH COPYRIGHT
++Copyright \(co 2006\-2016
++Salvatore Sanfilippo
++.P
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are met:
++.TP 2
++*
++Redistributions of source code must retain the above copyright notice,
++this list of conditions and the following disclaimer.
++.TP
++*
++Redistributions in binary form must reproduce the above copyright
++notice, this list of conditions and the following disclaimer in the
++documentation and/or other materials provided with the distribution.
++.TP
++*
++Neither the name of Redis nor the names of its contributors may be used
++to endorse or promote products derived from this software without specific
++prior written permission.
++.P
++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-- 
+2.9.3
+

0007-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch

@@ -0,0 +1,25 @@
+From bcd509def0d4a75f56d9d6a53eea280127803eb4 Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora@famillecollet.com>
+Date: Fri, 9 Sep 2016 17:23:27 +0200
+Subject: [PATCH 7/7] install redis-check-rdb as a symlink instead of
+ duplicating the binary
+
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 6c27dd9..2de5e3f 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -267,6 +267,6 @@ install: all
+ 	$(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN)
+ 	$(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN)
+ 	$(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN)
+-	$(REDIS_INSTALL) $(REDIS_CHECK_RDB_NAME) $(INSTALL_BIN)
+ 	$(REDIS_INSTALL) $(REDIS_CHECK_AOF_NAME) $(INSTALL_BIN)
+ 	@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME)
++	@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME)
+-- 
+2.9.3
+

redis-sentinel.init

@@ -4,13 +4,21 @@
 #
 # chkconfig:   - 21 79
 # description: Starts and stops the redis-sentinel daemon.
+#
+### BEGIN INIT INFO
+# Provides: redis-sentinel
+# Required-Start: $local_fs $remote_fs $network
+# Required-Stop: $local_fs $remote_fs $network
+# Short-Description: start and stop Sentinel server
+# Description: A persistent key-value database
+### END INIT INFO
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
 name="redis-sentinel"
 exec="/usr/bin/$name"
-shut="/usr/bin/redis-shutdown"
+shut="/usr/libexec/redis-shutdown"
 pidfile="/var/run/redis/sentinel.pid"
 SENTINEL_CONFIG="/etc/redis-sentinel.conf"
 
@@ -51,10 +59,6 @@ restart() {
     start
 }
 
-reload() {
-    false
-}
-
 rh_status() {
     status -p $pidfile $name
 }
@@ -76,13 +80,6 @@ case "$1" in
     restart)
         $1
         ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
     status)
         rh_status
         ;;

redis-sentinel.service

@@ -4,9 +4,11 @@ After=network.target
 
 [Service]
 ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --daemonize no
-ExecStop=/usr/bin/redis-shutdown redis-sentinel
+ExecStop=/usr/libexec/redis-shutdown redis-sentinel
 User=redis
 Group=redis
+RuntimeDirectory=redis
+RuntimeDirectoryMode=0755
 
 [Install]
 WantedBy=multi-user.target

redis-shutdown

@@ -15,9 +15,10 @@ fi
 CONFIG_FILE="/etc/$SERVICE_NAME.conf"
 
 # Use awk to retrieve host, port from config file
-HOST=`awk '/^[[:blank:]]*bind/ { print $2 }' $CONFIG_FILE`
+HOST=`awk '/^[[:blank:]]*bind/ { print $2 }' $CONFIG_FILE | tail -n1`
-PORT=`awk '/^[[:blank:]]*port/ { print $2 }' $CONFIG_FILE`
+PORT=`awk '/^[[:blank:]]*port/ { print $2 }' $CONFIG_FILE | tail -n1`
-PASS=`awk '/^[[:blank:]]*requirepass/ { print $2 }' $CONFIG_FILE`
+PASS=`awk '/^[[:blank:]]*requirepass/ { print $2 }' $CONFIG_FILE | tail -n1`
+SOCK=`awk '/^[[:blank:]]*unixsocket\s/ { print $2 }' $CONFIG_FILE | tail -n1`
 
 # Just in case, use default host, port
 HOST=${HOST:-127.0.0.1}
@@ -32,4 +33,8 @@ fi
 [ -z "$PASS"  ] || ADDITIONAL_PARAMS="-a $PASS"
 
 # shutdown the service properly
+if [ -e "$SOCK" ] ; then
+	$REDIS_CLI -s $SOCK $ADDITIONAL_PARAMS shutdown
+else
 	$REDIS_CLI -h $HOST -p $PORT $ADDITIONAL_PARAMS shutdown
+fi

redis.init

@@ -4,13 +4,21 @@
 #
 # chkconfig:   - 20 80
 # description: Starts and stops the redis daemon.
+#
+### BEGIN INIT INFO
+# Provides: redis-server
+# Required-Start: $local_fs $remote_fs $network
+# Required-Stop: $local_fs $remote_fs $network
+# Short-Description: start and stop Redis server
+# Description: A persistent key-value database
+### END INIT INFO
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
 name="redis-server"
 exec="/usr/bin/$name"
-shut="/usr/bin/redis-shutdown"
+shut="/usr/libexec/redis-shutdown"
 pidfile="/var/run/redis/redis.pid"
 REDIS_CONFIG="/etc/redis.conf"
 
@@ -51,10 +59,6 @@ restart() {
     start
 }
 
-reload() {
-    false
-}
-
 rh_status() {
     status -p $pidfile $name
 }
@@ -76,13 +80,6 @@ case "$1" in
     restart)
         $1
         ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
     status)
         rh_status
         ;;

redis.service

@@ -4,9 +4,11 @@ After=network.target
 
 [Service]
 ExecStart=/usr/bin/redis-server /etc/redis.conf --daemonize no
-ExecStop=/usr/bin/redis-shutdown
+ExecStop=/usr/libexec/redis-shutdown
 User=redis
 Group=redis
+RuntimeDirectory=redis
+RuntimeDirectoryMode=0755
 
 [Install]
 WantedBy=multi-user.target

redis.spec

@@ -1,6 +1,12 @@
 %global _hardened_build 1
 %global with_perftools 0
 
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+%global with_redistrib 1
+%else
+%global with_redistrib 0
+%endif
+
 %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
 %global with_systemd 1
 %else
@@ -11,8 +17,8 @@
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:              redis
-Version:           3.2.3
+Version:           3.2.10
-Release:           1%{?dist}
+Release:           2%{?dist}
 Summary:           A persistent key-value database
 License:           BSD
 URL:               http://redis.io
@@ -20,12 +26,11 @@ Source0:           http://download.redis.io/releases/%{name}-%{version}.tar.gz
 Source1:           %{name}.logrotate
 Source2:           %{name}-sentinel.service
 Source3:           %{name}.service
-Source4:           %{name}.tmpfiles
+Source4:           %{name}-sentinel.init
-Source5:           %{name}-sentinel.init
+Source5:           %{name}.init
-Source6:           %{name}.init
+Source6:           %{name}-shutdown
-Source7:           %{name}-shutdown
+Source7:           %{name}-limit-systemd
-Source8:           %{name}-limit-systemd
+Source8:           %{name}-limit-init
-Source9:           %{name}-limit-init
 # To refresh patches:
 # tar xf redis-xxx.tar.gz && cd redis-xxx && git init && git add . && git commit -m "%{version} baseline"
 # git am %{patches}
@@ -39,6 +44,10 @@ Patch0003:            0003-redis-2.8.18-use-system-jemalloc.patch
 Patch0004:         0004-redis-2.8.18-disable-test-failed-on-slow-machine.patch
 # Fix sentinel configuration to use a different log file than redis
 Patch0005:         0005-redis-2.8.18-sentinel-configuration-file-fix.patch
+# https://github.com/antirez/redis/pull/3491 - man pages
+Patch0006:         0006-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
+# https://github.com/antirez/redis/pull/3494 - symlink
+Patch0007:         0007-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch
 %if 0%{?with_perftools}
 BuildRequires:     gperftools-devel
 %else
@@ -93,6 +102,18 @@ a cache.
 
 You can use Redis from most programming languages also.
 
+%if 0%{?with_redistrib}
+%package           trib
+Summary:           Cluster management script for Redis
+BuildArch:         noarch
+Requires:          ruby
+Requires:          rubygem-redis
+
+%description       trib
+Redis cluster management utility providing cluster creation, node addition
+and removal, status checks, resharding, rebalancing, and other operations.
+%endif
+
 %prep
 %setup -q
 rm -frv deps/jemalloc
@@ -101,6 +122,8 @@ rm -frv deps/jemalloc
 %patch0003 -p1
 %patch0004 -p1
 %patch0005 -p1
+%patch0006 -p1
+%patch0007 -p1
 
 # No hidden build.
 sed -i -e 's|\t@|\t|g' deps/lua/src/Makefile
@@ -139,8 +162,8 @@ install -d %{buildroot}%{_localstatedir}/run/%{name}
 install -pDm644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
 # Install configuration files.
-install -pDm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
+install -pDm640 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
-install -pDm644 sentinel.conf %{buildroot}%{_sysconfdir}/%{name}-sentinel.conf
+install -pDm640 sentinel.conf %{buildroot}%{_sysconfdir}/%{name}-sentinel.conf
 
 # Install Systemd unit files.
 %if 0%{?with_systemd}
@@ -148,26 +171,33 @@ mkdir -p %{buildroot}%{_unitdir}
 install -pm644 %{S:3} %{buildroot}%{_unitdir}
 install -pm644 %{S:2} %{buildroot}%{_unitdir}
 
-# Install systemd tmpfiles config.
-install -pDm644 %{S:4} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 # Install systemd limit files (requires systemd >= 204)
-install -p -D -m 644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf
+install -p -D -m 644 %{S:7} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf
-install -p -D -m 644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf
+install -p -D -m 644 %{S:7} %{buildroot}%{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf
 %else # install SysV service files
-install -pDm755 %{S:5} %{buildroot}%{_initrddir}/%{name}-sentinel
+install -pDm755 %{S:4} %{buildroot}%{_initrddir}/%{name}-sentinel
-install -pDm755 %{S:6} %{buildroot}%{_initrddir}/%{name}
+install -pDm755 %{S:5} %{buildroot}%{_initrddir}/%{name}
-install -p -D -m 644 %{S:9} %{buildroot}%{_sysconfdir}/security/limits.d/95-%{name}.conf
+install -p -D -m 644 %{S:8} %{buildroot}%{_sysconfdir}/security/limits.d/95-%{name}.conf
 %endif
 
 # Fix non-standard-executable-perm error.
 chmod 755 %{buildroot}%{_bindir}/%{name}-*
 
-# create redis-sentinel command as described on
-# http://redis.io/topics/sentinel
-ln -sf %{name}-server %{buildroot}%{_bindir}/%{name}-sentinel
-
 # Install redis-shutdown
-install -pDm755 %{S:7} %{buildroot}%{_bindir}/%{name}-shutdown
+install -pDm755 %{S:6} %{buildroot}%{_libexecdir}/%{name}-shutdown
+
+%if 0%{?with_redistrib}
+# Install redis-trib
+install -pDm755 src/%{name}-trib.rb %{buildroot}%{_bindir}/%{name}-trib
+%endif
+
+# Install man pages
+man=$(dirname %{buildroot}%{_mandir})
+for page in man/man?/*; do
+    install -Dpm644 $page $man/$page
+done
+ln -s redis-server.1 %{buildroot}%{_mandir}/man1/redis-sentinel.1
+ln -s redis.conf.5   %{buildroot}%{_mandir}/man5/redis-sentinel.conf.5
 
 %check
 %if 0%{?with_tests}
@@ -221,14 +251,19 @@ fi
 %license COPYING
 %doc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%attr(0644, redis, root) %config(noreplace) %{_sysconfdir}/%{name}.conf
+%attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{name}.conf
-%attr(0644, redis, root) %config(noreplace) %{_sysconfdir}/%{name}-sentinel.conf
+%attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{name}-sentinel.conf
-%dir %attr(0755, redis, redis) %{_sharedstatedir}/%{name}
+%dir %attr(0750, redis, redis) %{_sharedstatedir}/%{name}
-%dir %attr(0755, redis, redis) %{_localstatedir}/log/%{name}
+%dir %attr(0750, redis, redis) %{_localstatedir}/log/%{name}
-%dir %attr(0755, redis, redis) %{_localstatedir}/run/%{name}
+%dir %attr(0750, redis, redis) %ghost %{_localstatedir}/run/%{name}
+%if 0%{?with_redistrib}
+%exclude %{_bindir}/%{name}-trib
+%endif
 %{_bindir}/%{name}-*
+%{_libexecdir}/%{name}-*
+%{_mandir}/man1/%{name}*
+%{_mandir}/man5/%{name}*
 %if 0%{?with_systemd}
-%{_tmpfilesdir}/%{name}.conf
 %{_unitdir}/%{name}.service
 %{_unitdir}/%{name}-sentinel.service
 %dir %{_sysconfdir}/systemd/system/%{name}.service.d
@@ -241,8 +276,60 @@ fi
 %config(noreplace) %{_sysconfdir}/security/limits.d/95-%{name}.conf
 %endif
 
+%if 0%{?with_redistrib}
+%files trib
+%license COPYING
+%{_bindir}/%{name}-trib
+%endif
+
 
 %changelog
+* Mon Aug 14 2017 Nathan Scott <nathans@redhat.com> - 3.2.10-2
+- Add redis-trib based on patch from Sebastian Saletnik.  (RHBZ #1215654)
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Mon Jul 31 2017 Nathan Scott <nathans@redhat.com> - 3.2.10-1
+- Upstream 3.2.10 release
+- Ensure both the redis and redis-sentinel service files set correct perms
+- Dropped systemd tmpfiles source, handled directly in systemd service files
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon May 29 2017 Nathan Scott <nathans@redhat.com> - 3.2.9-1
+- Upstream 3.2.9
+- Add RuntimeDirectory=redis to systemd unit file (RHBZ #1454700)
+- Mark rundir as %ghost since it may disappear (tmpfs - #1454700)
+- Fix a shutdown failure with Unix domain sockets (RHBZ #1444988)
+
+* Mon Feb 20 2017 Haïkel Guémar <hguemar@fedoraproject.org> - 3.2.8-1
+- Upstream 3.2.8
+- bugfix for #3796 (MIGRATE could cause server crash  after socket error)
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Feb  4 2017 Haïkel Guémar <hguemar@fedoraproject.org> - 3.2.7-1
+- Upstream 3.2.7 (important security fix)
+
+* Sat Nov 05 2016 Alan Pevec <apevec AT redhat.com> - 3.2.4-2
+- Install tmpfiles and /run/redis for legacy configurations
+
+* Mon Sep 26 2016 Haïkel Guémar <hguemar@fedoraproject.org> - 3.2.4-1
+- Upstream 3.2.4
+- Fix buffer overlow (TALOS-2016-0206)
+
+* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 3.2.3-2
+- add missing man pages #1374577
+  using patch from https://github.com/antirez/redis/pull/3491
+- data and configuration should not be publicly readable #1374700
+- remove /var/run/redis with systemd #1374728
+- provide redis-check-rdb as a symlink to redis-server #1374736
+  using patch from https://github.com/antirez/redis/pull/3494
+- move redis-shutdown to libexec
+
 * Thu Aug  4 2016 Haïkel Guémar <hguemar@fedoraproject.org> - 3.2.3-1
 - Upstream 3.2.3
 - Security fix for CVE-2013-7458 (redis-cli history world readable)

redis.tmpfiles

@@ -1,2 +0,0 @@
-# redis runtime directory
-d /run/redis 0755 redis redis -

sources

@@ -1 +1 @@
-138209b54dfc9819e6aea7b9503f8bd3  redis-3.2.3.tar.gz
+SHA512 (redis-3.2.10.tar.gz) = 32fd27fac8ba559ea38e3a1006b90c4117c74a8ca15399ade19834c4221521e7e3669e4e1f24d214a53bb7cde896839438dd4a273d6be6def587841dd9954aa1