diff options
| -rw-r--r-- | 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch | 652 | ||||
| -rw-r--r-- | redis.spec | 143 |
2 files changed, 29 insertions, 766 deletions
diff --git a/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch b/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch deleted file mode 100644 index f7e3dd1..0000000 --- a/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch +++ /dev/null @@ -1,652 +0,0 @@ -From d68953c34d4d6987883ddf6158c3c69e7500667f Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Thu, 8 Sep 2016 14:51:15 +0200 -Subject: [PATCH 1/3] 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.24.1 - @@ -15,37 +15,21 @@ # to use system libjemalloc %bcond_with jemalloc -%if 0%{?fedora} < 30 && 0%{?rhel} < 8 -%bcond_without redistrib -%else -%bcond_with redistrib -%endif - # Tests fail in mock, not in local build. %bcond_with tests -%global upstream_ver 7.2.8 - -# Commit IDs for the (unversioned) redis-doc repository -# https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision" -# https://github.com/redis/redis-doc/commits/master -%global gh_owner redis -%global gh_project redis -%global doc_commit 3541d0e20cc4bb7873bdbf51a7717757b806577f -%global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7}) - -# %%{_rpmmacrodir} not usable on EL-6 - EL-7 (without epel-rpms-macros) -%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) +%global upstream_ver 8.0.0 Name: redis Version: %{upstream_ver} Release: 1%{?dist} Summary: A persistent key-value database -# redis, hiredis: BSD-3-Clause +# redis: RSALv2 or SSPLv1 or AGPLv3 (only AGPLv3 is OSS) +# hiredis: BSD-3-Clause # hdrhistogram, jemalloc, lzf, linenoise: BSD-2-Clause -# lua: MIT +# lua, fast_float: MIT # fpconv: BSL-1.0 -License: BSD-3-Clause AND BSD-2-Clause AND MIT AND BSL-1.0 +License: AGPL-3.0-only AND BSD-3-Clause AND BSD-2-Clause AND MIT AND BSL-1.0 URL: http://redis.io #ource0: https://download.redis.io/releases/%%{name}-%%{upstream_ver}.tar.gz Source0: https://github.com/redis/redis/archive/refs/tags/%{version}.tar.gz @@ -54,23 +38,8 @@ Source2: %{name}-sentinel.service Source3: %{name}.service 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 - -# To refresh patches: -# tar xf redis-xxx.tar.gz && cd redis-xxx && git init && git add . && git commit -m "%%{version} baseline" -# git am %%{patches} -# Then refresh your patches -# git format-patch HEAD~<number of expected patches> -# Update configuration for Fedora -# https://github.com/redis/redis/pull/3491 - man pages -Patch0001: 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch - BuildRequires: gcc -%if 0%{?rhel} == 7 -BuildRequires: devtoolset-8-toolchain -BuildRequires: devtoolset-8-libatomic-devel -%endif %if %{with jemalloc} BuildRequires: jemalloc-devel %else @@ -85,9 +54,8 @@ BuildRequires: pkgconfig(libsystemd) BuildRequires: systemd BuildRequires: openssl-devel >= 1.0.2 -%if %{without redistrib} -Obsoletes: redis-trib < %{version}-%{release} -%endif +Obsoletes: redis-trib < 8 +Obsoletes: redis-doc < 8 Requires: logrotate Requires(pre): shadow-utils @@ -95,17 +63,22 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd # from deps/hiredis/hiredis.h -Provides: bundled(hiredis) = 1.0.3 +Provides: bundled(hiredis) = 1.2.0 # from deps/lua/src/lua.h Provides: bundled(lua-libs) = 5.1.5 # from deps/linenoise/linenoise.h Provides: bundled(linenoise) = 1.0 +# unkown, see src/lzf.h Provides: bundled(lzf) # from deps/hdr_histogram/README.md Provides: bundled(hdr_histogram) = 0.11.0 +# from deps/fast_float/README.md +Provides: bundled(fast_float) = 6.1.4 # no version Provides: bundled(fpconv) +Conflicts: valkey-compat-redis + %global redis_modules_abi 1 %global redis_modules_dir %{_libdir}/%{name}/modules Provides: redis(modules_abi)%{?_isa} = %{redis_modules_abi} @@ -139,39 +112,15 @@ You can use Redis from most programming languages also. Summary: Development header for Redis module development # Header-Only Library (https://fedoraproject.org/wiki/Packaging:Guidelines) Provides: %{name}-static = %{version}-%{release} +Conflicts: valkey-compat-redis-devel %description devel Header file required for building loadable Redis modules. Detailed API documentation is available in the redis-doc package. -%package doc -Summary: Documentation for Redis including man pages -License: CC-BY-SA-4.0 -BuildArch: noarch - -# http://fedoraproject.org/wiki/Packaging:Conflicts "Splitting Packages" -Conflicts: redis < 4.0 - -%description doc -Manual pages and detailed documentation for many aspects of Redis use, -administration and development. - -%if %{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 -n %{name}-%{upstream_ver} -b 10 -mv ../%{name}-doc-%{doc_commit} doc -%patch -P0001 -p1 +%setup -q -n %{name}-%{upstream_ver} %if %{with jemalloc} rm -frv deps/jemalloc @@ -210,6 +159,7 @@ if test "$api" != "%{redis_modules_abi}"; then exit 1 fi +# not using BUILD_WITH_MODULES=yes which requires ONLINE build (git, rust, ...) %global malloc_flags MALLOC=jemalloc %global tls_flags BUILD_TLS=yes %global sysd_flags BUILD_WITH_SYSTEMD=yes @@ -218,20 +168,10 @@ fi %build -%if 0%{?rhel} == 7 -source /opt/rh/devtoolset-8/enable -g++ --version -%endif - make %{?_smp_mflags} %{make_flags} all %install -%if 0%{?rhel} == 7 -source /opt/rh/devtoolset-8/enable -g++ --version -%endif - make %{make_flags} install # Filesystem. @@ -267,27 +207,9 @@ install -pDm644 src/%{name}module.h %{buildroot}%{_includedir}/%{name}module.h 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 - -# Install documentation and html pages -doc=$(echo %{buildroot}/%{_docdir}/%{name}) -for page in 00-RELEASENOTES BUGS MANIFESTO *.md; do - install -Dpm644 $page $doc/$page -done -for page in $(find doc -name \*.md | sed -e 's|.md$||g'); do - base=$(echo $page | sed -e 's|doc/||g') - install -Dpm644 $page.md $doc/$base.md -done - # Install rpm macros for redis modules -mkdir -p %{buildroot}%{macrosdir} -install -pDm644 %{S:9} %{buildroot}%{macrosdir}/macros.%{name} +mkdir -p %{buildroot}%{_rpmmacrodir} +install -pDm644 %{S:9} %{buildroot}%{_rpmmacrodir}/macros.%{name} %check %if %{with tests} @@ -356,8 +278,9 @@ fi %files -%{!?_licensedir:%global license %%doc} -%license COPYING +%doc 00-RELEASENOTES +%doc *.md +%license LICENSE.txt %license COPYRIGHT-lua %license COPYING-hiredis %license LICENSE-hdrhistogram @@ -377,12 +300,10 @@ fi %if %{with redistrib} %exclude %{_bindir}/%{name}-trib %endif -%exclude %{macrosdir} +%exclude %{_rpmmacrodir} %exclude %{_includedir} %exclude %{_docdir}/%{name}/* %{_bindir}/%{name}-* -%{_mandir}/man1/%{name}* -%{_mandir}/man5/%{name}* %{_unitdir}/%{name}.service %{_unitdir}/%{name}-sentinel.service %dir %{_sysconfdir}/systemd/system/%{name}.service.d @@ -392,23 +313,17 @@ fi %dir %attr(0755, redis, redis) %ghost %{_localstatedir}/run/%{name} %files devel -%license COPYING +%license LICENSE.txt %{_includedir}/%{name}module.h -%{macrosdir}/* - -%files doc -%license doc/LICENSE -%docdir %{_docdir}/%{name} -%{_docdir}/%{name} - -%if %{with redistrib} -%files trib -%license COPYING -%{_bindir}/%{name}-trib -%endif +%{_rpmmacrodir}/* %changelog +* Mon May 5 2025 Remi Collet <remi@remirepo.net> - 8.0.0-1 +- Redis 8.0 GA (v8.0.0) Released Fri 2 May 2025 12:00:00 IST +- drop doc sub-package +- drop man pages + * Thu Apr 24 2025 Remi Collet <remi@remirepo.net> - 7.2.8-1 - Redis 7.2.8 Released Wed 23 Apr 2025 12:00:00 IST - Update urgency: `SECURITY`: CVE-2025-21605 |