Compare commits
No commits in common. "imports/c8-beta-stream-5/redis-5.0.3-2.module+el8.0.0.z+3657+acb471dc" and "c8-stream-6" have entirely different histories.
imports/c8
...
c8-stream-
|
@ -1,2 +1,2 @@
|
|||
SOURCES/redis-5.0.3.tar.gz
|
||||
SOURCES/redis-doc-a1e79fc.tar.gz
|
||||
SOURCES/redis-6.2.7.tar.gz
|
||||
SOURCES/redis-doc-8d4bf9b.tar.gz
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
a43c24ea6365482323b78e21752d610756efcc39 SOURCES/redis-5.0.3.tar.gz
|
||||
f2d0dc6e21bf416d4ff32868a2f0fee415391057 SOURCES/redis-doc-a1e79fc.tar.gz
|
||||
b01ef3f117c9815dea41bf2609e489a03c3a5ab1 SOURCES/redis-6.2.7.tar.gz
|
||||
45ec7c3b4a034891252507febace7e25ee64b4d9 SOURCES/redis-doc-8d4bf9b.tar.gz
|
||||
|
|
|
@ -1,18 +1,18 @@
|
|||
From c7958ad1c0d615b81276ec2d4dbc1bf6a67dcc4d Mon Sep 17 00:00:00 2001
|
||||
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/2] 1st man pageis for - redis-cli - redis-benchmark -
|
||||
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 +++++++++++++++
|
||||
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
|
||||
|
@ -648,5 +648,5 @@ index 0000000..1e0c9c9
|
|||
+(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.13.5
|
||||
2.24.1
|
||||
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
From 992c773e70462a6fbe1536e18e673c9ab55d5901 Mon Sep 17 00:00:00 2001
|
||||
From: Remi Collet <fedora@famillecollet.com>
|
||||
Date: Fri, 9 Sep 2016 17:23:27 +0200
|
||||
Subject: [PATCH 2/2] install redis-check-rdb as a symlink instead of duplicating
|
||||
the binary
|
||||
|
||||
---
|
||||
src/Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index fdbe36a..c3083f8 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -287,6 +287,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)
|
||||
+ @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_AOF_NAME)
|
||||
--
|
||||
2.13.5
|
||||
|
|
@ -1,117 +0,0 @@
|
|||
From 9f13b2bd4967334b1701c6eccdf53760cb13f79e Mon Sep 17 00:00:00 2001
|
||||
From: John Sully <john@csquare.ca>
|
||||
Date: Thu, 14 Mar 2019 14:02:16 -0400
|
||||
Subject: [PATCH] Fix hyperloglog corruption
|
||||
|
||||
---
|
||||
src/hyperloglog.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/src/hyperloglog.c b/src/hyperloglog.c
|
||||
index fc21ea0065d..e993bf26e1d 100644
|
||||
--- a/src/hyperloglog.c
|
||||
+++ b/src/hyperloglog.c
|
||||
@@ -614,6 +614,10 @@ int hllSparseToDense(robj *o) {
|
||||
} else {
|
||||
runlen = HLL_SPARSE_VAL_LEN(p);
|
||||
regval = HLL_SPARSE_VAL_VALUE(p);
|
||||
+ if ((runlen + idx) > HLL_REGISTERS) {
|
||||
+ sdsfree(dense);
|
||||
+ return C_ERR;
|
||||
+ }
|
||||
while(runlen--) {
|
||||
HLL_DENSE_SET_REGISTER(hdr->registers,idx,regval);
|
||||
idx++;
|
||||
@@ -1088,6 +1092,8 @@ int hllMerge(uint8_t *max, robj *hll) {
|
||||
} else {
|
||||
runlen = HLL_SPARSE_VAL_LEN(p);
|
||||
regval = HLL_SPARSE_VAL_VALUE(p);
|
||||
+ if ((runlen + i) > HLL_REGISTERS)
|
||||
+ return C_ERR;
|
||||
while(runlen--) {
|
||||
if (regval > max[i]) max[i] = regval;
|
||||
i++;
|
||||
From e216ceaf0e099536fe3658a29dcb725d812364e0 Mon Sep 17 00:00:00 2001
|
||||
From: antirez <antirez@gmail.com>
|
||||
Date: Fri, 15 Mar 2019 17:16:06 +0100
|
||||
Subject: [PATCH] HyperLogLog: handle wrong offset in the base case.
|
||||
|
||||
---
|
||||
src/hyperloglog.c | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/hyperloglog.c b/src/hyperloglog.c
|
||||
index 526510b43b9..1e7ce3dceb7 100644
|
||||
--- a/src/hyperloglog.c
|
||||
+++ b/src/hyperloglog.c
|
||||
@@ -614,10 +614,7 @@ int hllSparseToDense(robj *o) {
|
||||
} else {
|
||||
runlen = HLL_SPARSE_VAL_LEN(p);
|
||||
regval = HLL_SPARSE_VAL_VALUE(p);
|
||||
- if ((runlen + idx) > HLL_REGISTERS) {
|
||||
- sdsfree(dense);
|
||||
- return C_ERR;
|
||||
- }
|
||||
+ if ((runlen + idx) > HLL_REGISTERS) break; /* Overflow. */
|
||||
while(runlen--) {
|
||||
HLL_DENSE_SET_REGISTER(hdr->registers,idx,regval);
|
||||
idx++;
|
||||
@@ -1097,8 +1094,7 @@ int hllMerge(uint8_t *max, robj *hll) {
|
||||
} else {
|
||||
runlen = HLL_SPARSE_VAL_LEN(p);
|
||||
regval = HLL_SPARSE_VAL_VALUE(p);
|
||||
- if ((runlen + i) > HLL_REGISTERS)
|
||||
- return C_ERR;
|
||||
+ if ((runlen + i) > HLL_REGISTERS) break; /* Overflow. */
|
||||
while(runlen--) {
|
||||
if (regval > max[i]) max[i] = regval;
|
||||
i++;
|
||||
From 4208666797b5831eefc022ae46ab5747200cd671 Mon Sep 17 00:00:00 2001
|
||||
From: antirez <antirez@gmail.com>
|
||||
Date: Fri, 15 Mar 2019 13:52:29 +0100
|
||||
Subject: [PATCH] HyperLogLog: dense/sparse repr parsing fuzz test.
|
||||
|
||||
---
|
||||
tests/unit/hyperloglog.tcl | 29 +++++++++++++++++++++++++++++
|
||||
1 file changed, 29 insertions(+)
|
||||
|
||||
diff --git a/tests/unit/hyperloglog.tcl b/tests/unit/hyperloglog.tcl
|
||||
index 7d36b7a351f..6a9c47b11c5 100644
|
||||
--- a/tests/unit/hyperloglog.tcl
|
||||
+++ b/tests/unit/hyperloglog.tcl
|
||||
@@ -115,6 +115,35 @@ start_server {tags {"hll"}} {
|
||||
set e
|
||||
} {*WRONGTYPE*}
|
||||
|
||||
+ test {Fuzzing dense/sparse encoding: Redis should always detect errors} {
|
||||
+ for {set j 0} {$j < 10000} {incr j} {
|
||||
+ r del hll
|
||||
+ set items {}
|
||||
+ set numitems [randomInt 3000]
|
||||
+ for {set i 0} {$i < $numitems} {incr i} {
|
||||
+ lappend items [expr {rand()}]
|
||||
+ }
|
||||
+ r pfadd hll {*}$items
|
||||
+
|
||||
+ # Corrupt it in some random way.
|
||||
+ for {set i 0} {$i < 5} {incr i} {
|
||||
+ set len [r strlen hll]
|
||||
+ set pos [randomInt $len]
|
||||
+ set byte [randstring 1 1 binary]
|
||||
+ r setrange hll $pos $byte
|
||||
+ # Don't modify more bytes 50% of times
|
||||
+ if {rand() < 0.5} break
|
||||
+ }
|
||||
+
|
||||
+ # Use the hyperloglog to check if it crashes
|
||||
+ # Redis in some way.
|
||||
+ catch {
|
||||
+ r pfcount hll
|
||||
+ r pfdebug getreg hll
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
test {PFADD, PFCOUNT, PFMERGE type checking works} {
|
||||
r set foo bar
|
||||
catch {r pfadd foo 1} e
|
|
@ -1,27 +0,0 @@
|
|||
From a4b90be9fcd5e1668ac941cabce3b1ab38dbe326 Mon Sep 17 00:00:00 2001
|
||||
From: antirez <antirez@gmail.com>
|
||||
Date: Fri, 15 Mar 2019 17:10:16 +0100
|
||||
Subject: [PATCH] HyperLogLog: enlarge reghisto variable for safety.
|
||||
|
||||
---
|
||||
src/hyperloglog.c | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/hyperloglog.c b/src/hyperloglog.c
|
||||
index e993bf26e1d..526510b43b9 100644
|
||||
--- a/src/hyperloglog.c
|
||||
+++ b/src/hyperloglog.c
|
||||
@@ -1017,7 +1017,12 @@ uint64_t hllCount(struct hllhdr *hdr, int *invalid) {
|
||||
double m = HLL_REGISTERS;
|
||||
double E;
|
||||
int j;
|
||||
- int reghisto[HLL_Q+2] = {0};
|
||||
+ /* Note that reghisto could be just HLL_Q+1, becuase this is the
|
||||
+ * maximum frequency of the "000...1" sequence the hash function is
|
||||
+ * able to return. However it is slow to check for sanity of the
|
||||
+ * input: instead we history array at a safe size: overflows will
|
||||
+ * just write data to wrong, but correctly allocated, places. */
|
||||
+ int reghisto[64] = {0};
|
||||
|
||||
/* Compute register histogram */
|
||||
if (hdr->encoding == HLL_DENSE) {
|
|
@ -0,0 +1,117 @@
|
|||
Revert to 6.0.8 behavior to save configuration file
|
||||
to fix "CONFIG REWRITE" when using /etc/redis.conf
|
||||
as new behavior expect a writable directory
|
||||
|
||||
Revert: 90555566ed5cbd3e1c3df1293ba3bbf6098e34c3
|
||||
|
||||
See discussion about this breaking change in
|
||||
https://github.com/redis/redis/issues/8051
|
||||
|
||||
diff -up ./src/config.c.rev ./src/config.c
|
||||
--- ./src/config.c.rev 2022-05-09 14:48:31.118296748 +0200
|
||||
+++ ./src/config.c 2022-05-09 14:48:41.571163767 +0200
|
||||
@@ -1605,62 +1605,60 @@ void rewriteConfigRemoveOrphaned(struct
|
||||
dictReleaseIterator(di);
|
||||
}
|
||||
|
||||
-/* This function replaces the old configuration file with the new content
|
||||
- * in an atomic manner.
|
||||
+/* This function overwrites the old configuration file with the new content.
|
||||
+ *
|
||||
+ * 1) The old file length is obtained.
|
||||
+ * 2) If the new content is smaller, padding is added.
|
||||
+ * 3) A single write(2) call is used to replace the content of the file.
|
||||
+ * 4) Later the file is truncated to the length of the new content.
|
||||
+ *
|
||||
+ * This way we are sure the file is left in a consistent state even if the
|
||||
+ * process is stopped between any of the four operations.
|
||||
*
|
||||
* The function returns 0 on success, otherwise -1 is returned and errno
|
||||
- * is set accordingly. */
|
||||
+ * set accordingly. */
|
||||
int rewriteConfigOverwriteFile(char *configfile, sds content) {
|
||||
- int fd = -1;
|
||||
- int retval = -1;
|
||||
- char tmp_conffile[PATH_MAX];
|
||||
- const char *tmp_suffix = ".XXXXXX";
|
||||
- size_t offset = 0;
|
||||
- ssize_t written_bytes = 0;
|
||||
-
|
||||
- int tmp_path_len = snprintf(tmp_conffile, sizeof(tmp_conffile), "%s%s", configfile, tmp_suffix);
|
||||
- if (tmp_path_len <= 0 || (unsigned int)tmp_path_len >= sizeof(tmp_conffile)) {
|
||||
- serverLog(LL_WARNING, "Config file full path is too long");
|
||||
- errno = ENAMETOOLONG;
|
||||
- return retval;
|
||||
+ int retval = 0;
|
||||
+ int fd = open(configfile,O_RDWR|O_CREAT,0644);
|
||||
+ int content_size = sdslen(content), padding = 0;
|
||||
+ struct stat sb;
|
||||
+ sds content_padded;
|
||||
+
|
||||
+ /* 1) Open the old file (or create a new one if it does not
|
||||
+ * exist), get the size. */
|
||||
+ if (fd == -1) return -1; /* errno set by open(). */
|
||||
+ if (fstat(fd,&sb) == -1) {
|
||||
+ close(fd);
|
||||
+ return -1; /* errno set by fstat(). */
|
||||
}
|
||||
|
||||
-#ifdef _GNU_SOURCE
|
||||
- fd = mkostemp(tmp_conffile, O_CLOEXEC);
|
||||
-#else
|
||||
- /* There's a theoretical chance here to leak the FD if a module thread forks & execv in the middle */
|
||||
- fd = mkstemp(tmp_conffile);
|
||||
-#endif
|
||||
-
|
||||
- if (fd == -1) {
|
||||
- serverLog(LL_WARNING, "Could not create tmp config file (%s)", strerror(errno));
|
||||
- return retval;
|
||||
+ /* 2) Pad the content at least match the old file size. */
|
||||
+ content_padded = sdsdup(content);
|
||||
+ if (content_size < sb.st_size) {
|
||||
+ /* If the old file was bigger, pad the content with
|
||||
+ * a newline plus as many "#" chars as required. */
|
||||
+ padding = sb.st_size - content_size;
|
||||
+ content_padded = sdsgrowzero(content_padded,sb.st_size);
|
||||
+ content_padded[content_size] = '\n';
|
||||
+ memset(content_padded+content_size+1,'#',padding-1);
|
||||
}
|
||||
|
||||
- while (offset < sdslen(content)) {
|
||||
- written_bytes = write(fd, content + offset, sdslen(content) - offset);
|
||||
- if (written_bytes <= 0) {
|
||||
- if (errno == EINTR) continue; /* FD is blocking, no other retryable errors */
|
||||
- serverLog(LL_WARNING, "Failed after writing (%zd) bytes to tmp config file (%s)", offset, strerror(errno));
|
||||
- goto cleanup;
|
||||
- }
|
||||
- offset+=written_bytes;
|
||||
+ /* 3) Write the new content using a single write(2). */
|
||||
+ if (write(fd,content_padded,strlen(content_padded)) == -1) {
|
||||
+ retval = -1;
|
||||
+ goto cleanup;
|
||||
}
|
||||
|
||||
- if (fsync(fd))
|
||||
- serverLog(LL_WARNING, "Could not sync tmp config file to disk (%s)", strerror(errno));
|
||||
- else if (fchmod(fd, 0644 & ~server.umask) == -1)
|
||||
- serverLog(LL_WARNING, "Could not chmod config file (%s)", strerror(errno));
|
||||
- else if (rename(tmp_conffile, configfile) == -1)
|
||||
- serverLog(LL_WARNING, "Could not rename tmp config file (%s)", strerror(errno));
|
||||
- else {
|
||||
- retval = 0;
|
||||
- serverLog(LL_DEBUG, "Rewritten config file (%s) successfully", configfile);
|
||||
- }
|
||||
+ /* 4) Truncate the file to the right length if we used padding. */
|
||||
+ if (padding) {
|
||||
+ if (ftruncate(fd,content_size) == -1) {
|
||||
+ /* Non critical error... */
|
||||
+ }
|
||||
+ }
|
||||
|
||||
cleanup:
|
||||
+ sdsfree(content_padded);
|
||||
close(fd);
|
||||
- if (retval) unlink(tmp_conffile);
|
||||
return retval;
|
||||
}
|
||||
|
|
@ -1,7 +1,14 @@
|
|||
# If you need to change max open file limit
|
||||
# for example, when you change maxclient in configuration
|
||||
# you can change the LimitNOFILE value below
|
||||
# see "man systemd.exec" for information
|
||||
# you can change the LimitNOFILE value below.
|
||||
# See "man systemd.exec" for more information.
|
||||
|
||||
# Slave nodes on large system may take lot of time to start.
|
||||
# You may need to uncomment TimeoutStartSec and TimeoutStopSec
|
||||
# directives below and raise their value.
|
||||
# See "man systemd.service" for more information.
|
||||
|
||||
[Service]
|
||||
LimitNOFILE=10240
|
||||
#TimeoutStartSec=90s
|
||||
#TimeoutStopSec=90s
|
||||
|
|
|
@ -3,7 +3,7 @@ Description=Redis Sentinel
|
|||
After=network.target
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --supervised systemd
|
||||
ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --daemonize no --supervised systemd
|
||||
ExecStop=/usr/libexec/redis-shutdown redis-sentinel
|
||||
Type=notify
|
||||
User=redis
|
||||
|
|
|
@ -3,7 +3,7 @@ Description=Redis persistent key-value database
|
|||
After=network.target
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/redis-server /etc/redis.conf --supervised systemd
|
||||
ExecStart=/usr/bin/redis-server /etc/redis.conf --daemonize no --supervised systemd
|
||||
ExecStop=/usr/libexec/redis-shutdown
|
||||
Type=notify
|
||||
User=redis
|
||||
|
|
|
@ -8,25 +8,25 @@
|
|||
#
|
||||
|
||||
# Tests fail in mock, not in local build.
|
||||
%global with_tests 0%{?_with_tests:1}
|
||||
%bcond_with tests
|
||||
|
||||
# Commit IDs for the (unversioned) redis-doc repository
|
||||
# https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
|
||||
%global doc_commit a1e79fc9b2f42f04a8ab59c05c3228931adcd0a6
|
||||
%global doc_commit 8d4bf9bc476829a84a055c049be72634d6e938df
|
||||
%global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7})
|
||||
|
||||
# %%{rpmmacrodir} not usable on EL-6
|
||||
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
||||
|
||||
Name: redis
|
||||
Version: 5.0.3
|
||||
Release: 2%{?dist}
|
||||
Version: 6.2.7
|
||||
Release: 1%{?dist}
|
||||
Summary: A persistent key-value database
|
||||
# redis, jemalloc, linenoise, lzf, hiredis are BSD
|
||||
# lua is MIT
|
||||
License: BSD and MIT
|
||||
URL: http://redis.io
|
||||
Source0: http://download.redis.io/releases/%{name}-%{version}.tar.gz
|
||||
URL: https://redis.io
|
||||
Source0: https://download.redis.io/releases/%{name}-%{version}.tar.gz
|
||||
Source1: %{name}.logrotate
|
||||
Source2: %{name}-sentinel.service
|
||||
Source3: %{name}.service
|
||||
|
@ -46,18 +46,19 @@ Source10: https://github.com/antirez/%{name}-doc/archive/%{doc_commit}/
|
|||
# Update configuration for Fedora
|
||||
# https://github.com/antirez/redis/pull/3491 - man pages
|
||||
Patch0001: 0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
|
||||
# https://github.com/antirez/redis/pull/3494 - symlink
|
||||
Patch0002: 0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch
|
||||
# revert BC break
|
||||
Patch0003: redis-config.patch
|
||||
|
||||
# Security patches
|
||||
Patch100: php-CVE-2019-10192.patch
|
||||
Patch101: php-CVE-2019-10193.patch
|
||||
|
||||
%if 0%{?with_tests}
|
||||
BuildRequires: gcc
|
||||
%if %{with tests}
|
||||
BuildRequires: procps-ng
|
||||
BuildRequires: tcl
|
||||
%endif
|
||||
BuildRequires: systemd
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: openssl-devel
|
||||
# Required for redis-shutdown
|
||||
Requires: /bin/awk
|
||||
Requires: logrotate
|
||||
|
@ -65,10 +66,14 @@ Requires(pre): shadow-utils
|
|||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
Provides: bundled(hiredis)
|
||||
Provides: bundled(lua-libs)
|
||||
Provides: bundled(linenoise)
|
||||
Provides: bundled(jemalloc) = 4.0.3
|
||||
# from deps/hiredis/hiredis.h
|
||||
Provides: bundled(hiredis) = 1.0.0
|
||||
# from deps/jemalloc/VERSION
|
||||
Provides: bundled(jemalloc) = 5.1.0
|
||||
# from deps/lua/src/lua.h
|
||||
Provides: bundled(lua-libs) = 5.1.5
|
||||
# from deps/linenoise/linenoise.h
|
||||
Provides: bundled(linenoise) = 1.0
|
||||
Provides: bundled(lzf)
|
||||
|
||||
%global redis_modules_abi 1
|
||||
|
@ -127,18 +132,15 @@ administration and development.
|
|||
%setup -q
|
||||
mv ../%{name}-doc-%{doc_commit} doc
|
||||
%patch0001 -p1
|
||||
%patch0002 -p1
|
||||
|
||||
%patch100 -p1 -b .cve-2019-10192
|
||||
%patch101 -p1 -b .cve-2019-10193
|
||||
%patch0003 -p1 -b .rev
|
||||
|
||||
mv deps/lua/COPYRIGHT COPYRIGHT-lua
|
||||
mv deps/jemalloc/COPYING COPYING-jemalloc
|
||||
mv deps/hiredis/COPYING COPYING-hiredis
|
||||
|
||||
# Configuration file changes and additions
|
||||
# Configuration file changes
|
||||
sed -i -e 's|^logfile .*$|logfile /var/log/redis/redis.log|g' redis.conf
|
||||
sed -i -e '$ alogfile /var/log/redis/sentinel.log' sentinel.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
|
||||
|
||||
# Module API version safety check
|
||||
|
@ -149,7 +151,7 @@ if test "$api" != "%{redis_modules_abi}"; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
%global make_flags DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix}
|
||||
%global make_flags DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix} BUILD_WITH_SYSTEMD=yes BUILD_TLS=yes
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags} %{make_flags} all
|
||||
|
@ -211,7 +213,7 @@ mkdir -p %{buildroot}%{macrosdir}
|
|||
install -pDm644 %{S:9} %{buildroot}%{macrosdir}/macros.%{name}
|
||||
|
||||
%check
|
||||
%if 0%{?with_tests}
|
||||
%if %{with tests}
|
||||
# https://github.com/antirez/redis/issues/1417 (for "taskset -c 1")
|
||||
taskset -c 1 make %{make_flags} test
|
||||
make %{make_flags} test-sentinel
|
||||
|
@ -266,16 +268,52 @@ exit 0
|
|||
%dir %attr(0755, redis, redis) %ghost %{_localstatedir}/run/%{name}
|
||||
|
||||
%files devel
|
||||
# main package is not required
|
||||
%license COPYING
|
||||
%{_includedir}/%{name}module.h
|
||||
%{macrosdir}/*
|
||||
|
||||
%files doc
|
||||
# main package is not required
|
||||
%license COPYING
|
||||
%docdir %{_docdir}/%{name}
|
||||
%{_docdir}/%{name}
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon May 9 2022 Remi Collet <rcollet@redhat.com> - 6.2.7-1
|
||||
- rebase to 6.2.7 #1999873
|
||||
|
||||
* Mon Oct 11 2021 Remi Collet <rcollet@redhat.com> - 6.0.9-5
|
||||
- fix denial of service via Redis Standard Protocol (RESP) request
|
||||
CVE-2021-32675
|
||||
|
||||
* Fri Oct 8 2021 Remi Collet <rcollet@redhat.com> - 6.0.9-4
|
||||
- fix lua scripts can overflow the heap-based Lua stack
|
||||
CVE-2021-32626
|
||||
- fix integer overflow issue with Streams
|
||||
CVE-2021-32627
|
||||
- fix integer overflow bug in the ziplist data structure
|
||||
CVE-2021-32628
|
||||
- fix integer overflow issue with intsets
|
||||
CVE-2021-32687
|
||||
- fix integer overflow issue with strings
|
||||
CVE-2021-41099
|
||||
|
||||
* Wed May 12 2021 Remi Collet <rcollet@redhat.com> - 6.0.9-3
|
||||
- fix integer overflow via STRALGO LCS command
|
||||
CVE-2021-29477
|
||||
|
||||
* Tue Nov 24 2020 Remi Collet <rcollet@redhat.com> - 6.0.9-2
|
||||
- revert "simplify config rewrite file" and keep
|
||||
configuration in /etc
|
||||
|
||||
* Thu Oct 29 2020 Remi Collet <rcollet@redhat.com> - 6.0.9-1
|
||||
- update to 6.0.9
|
||||
|
||||
* Tue Oct 20 2020 Remi Collet <rcollet@redhat.com> - 6.0.8-1
|
||||
- update to 6.0.8 for new stream #1862063
|
||||
|
||||
* Thu Jul 11 2019 Remi Collet <rcollet@redhat.com> - 5.0.3-2
|
||||
- fix Heap buffer overflow in HyperLogLog triggered by malicious client
|
||||
CVE-2019-10192
|
||||
|
|
Loading…
Reference in New Issue