Update to Redis 6.0.7
Upgrade urgency for both 6.0.6 and 6.0.7 is MODERATE, see changelog for details. Notably, the fix for the sentinel crash was merged upstream. https://raw.githubusercontent.com/antirez/redis/6.0/00-RELEASENOTES There is another test that occasionally fails since 6.0.6: [err]: Piping raw protocol in tests/integration/redis-cli.tcl Tested on amd64 and macppc, build tested with clang and egcc on sparc64. Thanks to danj for testing and okaying 6.0.6. ok sthen
This commit is contained in:
tb
parent
402f002d56
commit
c38ccf8cd0
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.114 2020/06/28 10:47:15 tb Exp $
|
||||
# $OpenBSD: Makefile,v 1.115 2020/09/03 04:29:27 tb Exp $
|
||||
|
||||
COMMENT = persistent key-value database
|
||||
DISTNAME = redis-6.0.5
|
||||
DISTNAME = redis-6.0.7
|
||||
CATEGORIES = databases
|
||||
HOMEPAGE = https://redis.io/
|
||||
REVISION = 0
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (redis-6.0.5.tar.gz) = Qs+GoRTSpFG4mPzalqzU0BBip9uqrSgB2RZKNviY9ZY=
|
||||
SIZE (redis-6.0.5.tar.gz) = 2217666
|
||||
SHA256 (redis-6.0.7.tar.gz) = wqqhpMfnLHCt7fl2/dXh0005WYkoPaudeEDgowS7I5M=
|
||||
SIZE (redis-6.0.7.tar.gz) = 2240490
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-redis_conf,v 1.22 2020/06/08 07:32:47 tb Exp $
|
||||
$OpenBSD: patch-redis_conf,v 1.23 2020/09/03 04:29:27 tb Exp $
|
||||
|
||||
Redis TLSv1.3 support is conditional on TLS1_3_VERSION being public.
|
||||
This is not currently the case and the ciphersuites config is a no-op.
|
||||
@ -32,7 +32,7 @@ Index: redis.conf
|
||||
# tls-ca-cert-dir /etc/ssl/certs
|
||||
|
||||
# By default, clients (including replica servers) on a TLS port are required
|
||||
@@ -181,14 +182,14 @@ tcp-keepalive 300
|
||||
@@ -184,14 +185,14 @@ tcp-keepalive 300
|
||||
#
|
||||
# tls-protocols "TLSv1.2 TLSv1.3"
|
||||
|
||||
@ -49,7 +49,7 @@ Index: redis.conf
|
||||
# information about the syntax of this string, and specifically for TLSv1.3
|
||||
# ciphersuites.
|
||||
#
|
||||
@@ -202,8 +203,9 @@ tcp-keepalive 300
|
||||
@@ -221,8 +222,9 @@ tcp-keepalive 300
|
||||
################################# GENERAL #####################################
|
||||
|
||||
# By default Redis does not run as a daemon. Use 'yes' if you need it.
|
||||
@ -61,7 +61,7 @@ Index: redis.conf
|
||||
|
||||
# If you run Redis from upstart or systemd, Redis can interact with your
|
||||
# supervision tree. Options:
|
||||
@@ -221,11 +223,11 @@ supervised no
|
||||
@@ -240,11 +242,11 @@ supervised no
|
||||
#
|
||||
# When the server runs non daemonized, no pid file is created if none is
|
||||
# specified in the configuration. When the server is daemonized, the pid file
|
||||
@ -75,7 +75,7 @@ Index: redis.conf
|
||||
|
||||
# Specify the server verbosity level.
|
||||
# This can be one of:
|
||||
@@ -238,17 +240,18 @@ loglevel notice
|
||||
@@ -257,17 +259,18 @@ loglevel notice
|
||||
# Specify the log file name. Also the empty string can be used to force
|
||||
# Redis to log on the standard output. Note that if you use standard
|
||||
# output for logging but daemonize, logs will be sent to /dev/null
|
||||
@ -99,7 +99,7 @@ Index: redis.conf
|
||||
|
||||
# Set the number of databases. The default database is DB 0, you can select
|
||||
# a different one on a per-connection basis using SELECT <dbid> where
|
||||
@@ -343,7 +346,7 @@ rdb-del-sync-files no
|
||||
@@ -362,7 +365,7 @@ rdb-del-sync-files no
|
||||
# The Append Only File will also be created inside this directory.
|
||||
#
|
||||
# Note that you must specify a directory here, not a file name.
|
||||
@ -108,7 +108,7 @@ Index: redis.conf
|
||||
|
||||
################################# REPLICATION #################################
|
||||
|
||||
@@ -768,7 +771,7 @@ acllog-max-len 128
|
||||
@@ -786,7 +789,7 @@ acllog-max-len 128
|
||||
# AUTH <password> as usually, or more explicitly with AUTH default <password>
|
||||
# if they follow the new protocol: both will work.
|
||||
#
|
||||
@ -117,8 +117,8 @@ Index: redis.conf
|
||||
|
||||
# Command renaming (DEPRECATED).
|
||||
#
|
||||
@@ -807,6 +810,7 @@ acllog-max-len 128
|
||||
# an error 'max number of clients reached'.
|
||||
@@ -830,6 +833,7 @@ acllog-max-len 128
|
||||
# limit accordingly in case of very large clusters.
|
||||
#
|
||||
# maxclients 10000
|
||||
+maxclients 96
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-src_Makefile,v 1.33 2020/06/28 10:33:01 tb Exp $
|
||||
$OpenBSD: patch-src_Makefile,v 1.34 2020/09/03 04:29:27 tb Exp $
|
||||
|
||||
Changes in this file:
|
||||
- install redis-server and redis-sentinel into ${PREFIX}/sbin
|
||||
@ -53,7 +53,7 @@ Index: src/Makefile
|
||||
|
||||
# Determine systemd support and/or build preference (defaulting to auto-detection)
|
||||
BUILD_WITH_SYSTEMD=no
|
||||
@@ -224,6 +225,8 @@ REDIS_BENCHMARK_OBJ=ae.o anet.o redis-benchmark.o adli
|
||||
@@ -236,6 +237,8 @@ REDIS_BENCHMARK_OBJ=ae.o anet.o redis-benchmark.o adli
|
||||
REDIS_CHECK_RDB_NAME=redis-check-rdb
|
||||
REDIS_CHECK_AOF_NAME=redis-check-aof
|
||||
|
||||
@ -62,7 +62,7 @@ Index: src/Makefile
|
||||
all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME)
|
||||
@echo ""
|
||||
@echo "Hint: It's a good idea to run 'make test' ;)"
|
||||
@@ -268,7 +271,7 @@ endif
|
||||
@@ -280,7 +283,7 @@ endif
|
||||
|
||||
# redis-server
|
||||
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
|
||||
@ -71,7 +71,7 @@ Index: src/Makefile
|
||||
|
||||
# redis-sentinel
|
||||
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
|
||||
@@ -315,7 +318,7 @@ distclean: clean
|
||||
@@ -327,7 +330,7 @@ distclean: clean
|
||||
.PHONY: distclean
|
||||
|
||||
test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME)
|
||||
@ -80,7 +80,7 @@ Index: src/Makefile
|
||||
|
||||
test-sentinel: $(REDIS_SENTINEL_NAME)
|
||||
@(cd ..; ./runtest-sentinel)
|
||||
@@ -359,13 +362,14 @@ src/help.h:
|
||||
@@ -371,13 +374,14 @@ src/help.h:
|
||||
@../utils/generate-command-help.rb > help.h
|
||||
|
||||
install: all
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-src_networking_c,v 1.3 2020/06/14 07:35:36 tb Exp $
|
||||
$OpenBSD: patch-src_networking_c,v 1.4 2020/09/03 04:29:27 tb Exp $
|
||||
|
||||
time_t is long long, so use llabs to avoid truncation
|
||||
|
||||
Index: src/networking.c
|
||||
--- src/networking.c.orig
|
||||
+++ src/networking.c
|
||||
@@ -2559,7 +2559,7 @@ void securityWarningCommand(client *c) {
|
||||
@@ -2606,7 +2606,7 @@ void securityWarningCommand(client *c) {
|
||||
static time_t logged_time;
|
||||
time_t now = time(NULL);
|
||||
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
$OpenBSD: patch-src_sentinel_c,v 1.2 2020/07/02 09:27:17 tb Exp $
|
||||
|
||||
redis-sentinel out of bounds memory access from memcmp
|
||||
https://github.com/redis-io/redis/pull/7443
|
||||
|
||||
Index: src/sentinel.c
|
||||
--- src/sentinel.c.orig
|
||||
+++ src/sentinel.c
|
||||
@@ -2217,8 +2217,8 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance
|
||||
}
|
||||
|
||||
/* role:<role> */
|
||||
- if (!memcmp(l,"role:master",11)) role = SRI_MASTER;
|
||||
- else if (!memcmp(l,"role:slave",10)) role = SRI_SLAVE;
|
||||
+ if (sdslen(l) >= 11 && !memcmp(l,"role:master",11)) role = SRI_MASTER;
|
||||
+ else if (sdslen(l) >= 10 && !memcmp(l,"role:slave",10)) role = SRI_SLAVE;
|
||||
|
||||
if (role == SRI_SLAVE) {
|
||||
/* master_host:<host> */
|
||||
Loading…
x
Reference in New Issue
Block a user