Redis 6 was released shortly before lock. I have tested ports with the
various 6.0rc* versions since February. Right around lock was difficult
for testing due to (attempts at) clang migration. I was reluctant to
send out 6.0.2 and 6.0.3 because they had various worrying issues in my
testing. These seem to be resolved now, except for one (see below).

A tremendous amount of work happened upstream in the past months. Since
the release, 4 major bugs were found and fixed and a lot of other things
happened (several hundred commits in total).

Release notes:
https://github.com/antirez/redis/blob/6.0/00-RELEASENOTES

I know of several instances that have been running earlier versions of
this diff in heavy testing (6.0rc2) and at least of one (6.0.2) in
production.


Migration of databases from 5 should be as easy as from 4 to 5. No
issues encountered so far.


I enabled TLS support by default.  You still have to opt in to this in
the config file.  It will still use TLSv1.2 for the time being, but it
will automatically pick up 1.3 once the requisite #defines are exposed
from libcrypto/libssl.


The ugly bits in the diff below:

* the replication/integration test now consistently fails.  Up to 6.0.2
  I could tweak some things to make it pass. I disabled it to make sure
  all the other tests run.

* sparc64 now fails more often than not with this:

*** [err]: pending querybuf: check size of pending_querybuf after set a big 
value in tests/unit/pendingquerybuf.tcl
the used_memory of replica is much larger than master. Master:35666976 
Replica:69051032

* powerpc builds with the ugly hack with COMPILER below. According to
  cwen@, the __atomic_* functions should be available in base-clang,
  but even if I force the use of those (first #if branch in
  src/atomicvars.h) the base-clang build bails out with

networking.c:(.text+0x38c): undefined reference to `__sync_fetch_and_add_8'

  and frankly, I have no idea where that comes from.

On the bright side, the diff below is the fist version in the 6.0 line
that makes tests succeed on powerpc. Earlier versions ran badly into
swap or had other breaking bugs. 


Index: Makefile
===================================================================
RCS file: /var/cvs/ports/databases/redis/Makefile,v
retrieving revision 1.111
diff -u -p -r1.111 Makefile
--- Makefile    18 Apr 2020 17:42:54 -0000      1.111
+++ Makefile    28 May 2020 15:23:42 -0000
@@ -1,29 +1,44 @@
-# $OpenBSD: Makefile,v 1.111 2020/04/18 17:42:54 sthen Exp $
+# $OpenBSD: Makefile,v 1.109 2020/02/11 08:11:13 tb Exp $
 
 COMMENT =              persistent key-value database
-DISTNAME =             redis-5.0.9
+DISTNAME =             redis-6.0.4
 CATEGORIES =           databases
 HOMEPAGE =             https://redis.io/
 
 # BSD
 PERMIT_PACKAGE =       Yes
 
-WANTLIB +=             c ${MODLUA_WANTLIB} m pthread
+WANTLIB +=             c crypto ssl ${MODLUA_WANTLIB} m pthread
 
 MASTER_SITES =         http://download.redis.io/releases/
 
 DEBUG_PACKAGES =       ${BUILD_PACKAGES}
 
+# C11, 64-bit atomics
+COMPILER =             base-clang ports-gcc
+.if ${MACHINE_ARCH:Mpowerpc}
+COMPILER =             ports-gcc
+.endif
+COMPILER_LANGS =       c
+
 MODULES =              lang/lua \
                        lang/tcl
 
-MAKE_FLAGS =           CC="${CC}" \
+MAKE_FLAGS =           BUILD_TLS=yes \
+                       CC="${CC}" \
                        DEBUG="${DEBUG}" \
                        DEBUG_FLAGS="${DEBUG}" \
                        USE_JEMALLOC=no \
                        OPT="" \
                        OPTIMIZATION="" \
                        V=1
+
+# Fix "undefined reference to `__atomic_store_8, __sync_fetch_and_add_8'"
+.if ${MACHINE_ARCH:Mpowerpc} || ${MACHINE_ARCH:Mhppa}
+WANTLIB +=             atomic
+LIB_DEPENDS +=         lang/gcc/${MODGCC4_VERSION},-libs
+MAKE_FLAGS +=          LDFLAGS="${LDFLAGS} -latomic"
+.endif
 
 FAKE_FLAGS =           INSTALL="${INSTALL_PROGRAM}" \
                        INSTALL_DIR="${INSTALL_DATA_DIR}" \
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/databases/redis/distinfo,v
retrieving revision 1.86
diff -u -p -r1.86 distinfo
--- distinfo    18 Apr 2020 17:42:55 -0000      1.86
+++ distinfo    28 May 2020 15:23:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (redis-5.0.9.tar.gz) = U9CuFkzTNTbD1LcgrpoSjqYWbr8E/xrdO4XxJCCQy4U=
-SIZE (redis-5.0.9.tar.gz) = 1986574
+SHA256 (redis-6.0.4.tar.gz) = MzcAWh4MOqKTyHwxNGfqisEZhJIfqwiAeZi6dlyZQ94=
+SIZE (redis-6.0.4.tar.gz) = 2217173
Index: patches/patch-deps_Makefile
===================================================================
RCS file: /var/cvs/ports/databases/redis/patches/patch-deps_Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 patch-deps_Makefile
--- patches/patch-deps_Makefile 11 Feb 2020 08:11:13 -0000      1.11
+++ patches/patch-deps_Makefile 28 May 2020 14:49:56 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-deps_Makefile,v 1.11 202
 Index: deps/Makefile
 --- deps/Makefile.orig
 +++ deps/Makefile
-@@ -35,49 +35,16 @@ endif
+@@ -35,8 +35,6 @@ endif
  distclean:
        -(cd hiredis && $(MAKE) clean) > /dev/null || true
        -(cd linenoise && $(MAKE) clean) > /dev/null || true
@@ -11,10 +11,12 @@ Index: deps/Makefile
        -(rm -f .make-*)
  
  .PHONY: distclean
+@@ -46,42 +44,11 @@ ifeq ($(BUILD_TLS),yes)
+ endif
  
  hiredis: .make-prerequisites
 -      @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
-       cd hiredis && $(MAKE) static
+       cd hiredis && $(MAKE) static $(HIREDIS_MAKE_FLAGS)
  
  .PHONY: hiredis
  
Index: patches/patch-deps_hiredis_Makefile
===================================================================
RCS file: /var/cvs/ports/databases/redis/patches/patch-deps_hiredis_Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 patch-deps_hiredis_Makefile
--- patches/patch-deps_hiredis_Makefile 24 Apr 2018 14:35:29 -0000      1.8
+++ patches/patch-deps_hiredis_Makefile 28 May 2020 14:49:56 -0000
@@ -2,12 +2,21 @@ $OpenBSD: patch-deps_hiredis_Makefile,v 
 Index: deps/hiredis/Makefile
 --- deps/hiredis/Makefile.orig
 +++ deps/hiredis/Makefile
-@@ -181,7 +181,7 @@ $(PKGCONFNAME): hiredis.h
-       @echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@
+@@ -71,7 +71,7 @@ ifeq ($(USE_SSL),1)
+   CFLAGS+=-DHIREDIS_TEST_SSL
+ endif
+ 
+-ifeq ($(uname_S),Linux)
++ifneq (,filter Linux OpenBSD,$(uname_S))
+   SSL_LDFLAGS=-lssl -lcrypto
+ else
+   OPENSSL_PREFIX?=/usr/local/opt/openssl
+@@ -236,7 +236,7 @@ $(SSL_PKGCONFNAME): hiredis.h
+       @echo Libs.private: -lssl -lcrypto >> $@
  
  install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
--      mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
-+      $(INSTALL_DIR) $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
-       $(INSTALL) hiredis.h async.h read.h sds.h adapters 
$(INSTALL_INCLUDE_PATH)
+-      mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters 
$(INSTALL_LIBRARY_PATH)
++      $(INSTALL_DIR) $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters 
$(INSTALL_LIBRARY_PATH)
+       $(INSTALL) hiredis.h async.h read.h sds.h $(INSTALL_INCLUDE_PATH)
+       $(INSTALL) adapters/*.h $(INSTALL_INCLUDE_PATH)/adapters
        $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
-       cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)
Index: patches/patch-deps_hiredis_net_c
===================================================================
RCS file: /var/cvs/ports/databases/redis/patches/patch-deps_hiredis_net_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-deps_hiredis_net_c
--- patches/patch-deps_hiredis_net_c    9 Aug 2017 09:16:09 -0000       1.2
+++ patches/patch-deps_hiredis_net_c    28 May 2020 14:49:56 -0000
@@ -2,12 +2,12 @@ $OpenBSD: patch-deps_hiredis_net_c,v 1.2
 Index: deps/hiredis/net.c
 --- deps/hiredis/net.c.orig
 +++ deps/hiredis/net.c
-@@ -141,7 +141,7 @@ int redisKeepAlive(redisContext *c, int interval) {
+@@ -179,7 +179,7 @@ int redisKeepAlive(redisContext *c, int interval) {
          return REDIS_ERR;
      }
  #else
 -#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
 +#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && 
!defined(__OpenBSD__)
-     val = interval;
      if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
          __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+         return REDIS_ERR;
Index: patches/patch-deps_linenoise_linenoise_c
===================================================================
RCS file: 
/var/cvs/ports/databases/redis/patches/patch-deps_linenoise_linenoise_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-deps_linenoise_linenoise_c
--- patches/patch-deps_linenoise_linenoise_c    11 Feb 2020 08:11:13 -0000      
1.1
+++ patches/patch-deps_linenoise_linenoise_c    28 May 2020 14:49:56 -0000
@@ -3,10 +3,13 @@ $OpenBSD: patch-deps_linenoise_linenoise
 Fix an occurrence where char is considered signed on all platforms,
 it's not the case on powerpc and arm.
 
+https://github.com/antirez/redis/pull/7132
+https://github.com/antirez/linenoise/pull/188
+
 Index: deps/linenoise/linenoise.c
 --- deps/linenoise/linenoise.c.orig
 +++ deps/linenoise/linenoise.c
-@@ -793,7 +793,7 @@ static int linenoiseEdit(int stdin_fd, int stdout_fd, 
+@@ -819,7 +819,7 @@ static int linenoiseEdit(int stdin_fd, int stdout_fd, 
  
      if (write(l.ofd,prompt,l.plen) == -1) return -1;
      while(1) {
Index: patches/patch-redis_conf
===================================================================
RCS file: /var/cvs/ports/databases/redis/patches/patch-redis_conf,v
retrieving revision 1.21
diff -u -p -r1.21 patch-redis_conf
--- patches/patch-redis_conf    11 Feb 2020 08:11:13 -0000      1.21
+++ patches/patch-redis_conf    28 May 2020 15:31:21 -0000
@@ -1,4 +1,15 @@
 $OpenBSD: patch-redis_conf,v 1.21 2020/02/11 08:11:13 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.
+
+Main changes in this file:
+
+* Redis socket and pid files were moved to /var/run/redis
+* Suggest using the system-wide root certificates /etc/ssl/certs.pem
+* Using TLSv1.3 will currently trigger a log warning
+* redis will daemonize and use syslog
+
 Index: redis.conf
 --- redis.conf.orig
 +++ redis.conf
@@ -13,7 +24,32 @@ Index: redis.conf
  
  # Close the connection after a client is idle for N seconds (0 to disable)
  timeout 0
-@@ -132,8 +132,9 @@ tcp-keepalive 300
+@@ -154,6 +154,7 @@ tcp-keepalive 300
+ # of these, and will not implicitly use the system wide configuration.
+ #
+ # tls-ca-cert-file ca.crt
++# tls-ca-cert-file /etc/ssl/cert.pem
+ # 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
+ #
+ # tls-protocols "TLSv1.2 TLSv1.3"
+ 
+-# Configure allowed ciphers.  See the ciphers(1ssl) manpage for more 
information
++# Configure allowed ciphers.  See SSL_set_cipher_list(3) for more information
+ # about the syntax of this string.
+ #
+ # Note: this configuration applies only to <= TLSv1.2.
+ #
+ # tls-ciphers DEFAULT:!MEDIUM
+ 
+-# Configure allowed TLSv1.3 ciphersuites.  See the ciphers(1ssl) manpage for 
more
++# Configure allowed TLSv1.3 ciphersuites.  See SSL_set_cipher_list(3) for more
+ # information about the syntax of this string, and specifically for TLSv1.3
+ # ciphersuites.
+ #
+@@ -202,8 +203,9 @@ tcp-keepalive 300
  ################################# GENERAL 
#####################################
  
  # By default Redis does not run as a daemon. Use 'yes' if you need it.
@@ -25,7 +61,7 @@ Index: redis.conf
  
  # If you run Redis from upstart or systemd, Redis can interact with your
  # supervision tree. Options:
-@@ -151,11 +152,11 @@ supervised no
+@@ -221,11 +223,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
@@ -39,7 +75,7 @@ Index: redis.conf
  
  # Specify the server verbosity level.
  # This can be one of:
-@@ -168,17 +169,18 @@ loglevel notice
+@@ -238,17 +240,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
@@ -63,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
-@@ -260,7 +262,7 @@ dbfilename dump.rdb
+@@ -343,7 +346,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.
@@ -72,16 +108,16 @@ Index: redis.conf
  
  ################################# REPLICATION 
#################################
  
-@@ -504,7 +506,7 @@ replica-priority 100
- # 150k passwords per second against a good box. This means that you should
- # use a very strong password otherwise it will be very easy to break.
+@@ -768,7 +771,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.
  #
 -# requirepass foobared
 +# requirepass very-strong-password
  
- # Command renaming.
+ # Command renaming (DEPRECATED).
  #
-@@ -537,6 +539,7 @@ replica-priority 100
+@@ -807,6 +810,7 @@ acllog-max-len 128
  # an error 'max number of clients reached'.
  #
  # maxclients 10000
Index: patches/patch-sentinel_conf
===================================================================
RCS file: /var/cvs/ports/databases/redis/patches/patch-sentinel_conf,v
retrieving revision 1.7
diff -u -p -r1.7 patch-sentinel_conf
--- patches/patch-sentinel_conf 11 Feb 2020 08:11:13 -0000      1.7
+++ patches/patch-sentinel_conf 28 May 2020 14:49:56 -0000
@@ -20,7 +20,7 @@ Index: sentinel.conf
  
  # Specify the log file name. Also the empty string can be used to force
  # Sentinel to log on the standard output. Note that if you use standard
-@@ -182,7 +182,7 @@ sentinel failover-timeout mymaster 180000
+@@ -202,7 +202,7 @@ sentinel failover-timeout mymaster 180000
  #
  # Example:
  #
@@ -29,7 +29,7 @@ Index: sentinel.conf
  
  # CLIENTS RECONFIGURATION SCRIPT
  #
-@@ -207,7 +207,7 @@ sentinel failover-timeout mymaster 180000
+@@ -227,7 +227,7 @@ sentinel failover-timeout mymaster 180000
  #
  # Example:
  #
Index: patches/patch-src_Makefile
===================================================================
RCS file: /var/cvs/ports/databases/redis/patches/patch-src_Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 patch-src_Makefile
--- patches/patch-src_Makefile  17 Mar 2020 04:51:28 -0000      1.31
+++ patches/patch-src_Makefile  28 May 2020 14:49:56 -0000
@@ -1,4 +1,5 @@
-$OpenBSD: patch-src_Makefile,v 1.31 2020/03/17 04:51:28 tb Exp $
+$OpenBSD: patch-src_Makefile,v 1.30 2020/02/11 08:11:13 tb Exp $
+
 Index: src/Makefile
 --- src/Makefile.orig
 +++ src/Makefile
@@ -17,9 +18,9 @@ Index: src/Makefile
  INSTALL_BIN=$(PREFIX)/bin
 +INSTALL_SBIN=$(PREFIX)/sbin
  INSTALL=install
+ PKG_CONFIG?=pkg-config
  
- # Default allocator defaults to Jemalloc if it's not an ARM
-@@ -48,7 +49,7 @@ ifneq (,$(filter aarch64 armv,$(uname_M)))
+@@ -49,7 +50,7 @@ ifneq (,$(filter aarch64 armv,$(uname_M)))
          CFLAGS+=-funwind-tables
  else
  ifneq (,$(findstring armv,$(uname_M)))
@@ -28,7 +29,7 @@ Index: src/Makefile
  endif
  endif
  
-@@ -82,7 +83,7 @@ ifneq (,$(filter aarch64 armv,$(uname_M)))
+@@ -83,7 +84,7 @@ ifneq (,$(filter aarch64 armv,$(uname_M)))
          FINAL_LIBS+=-latomic
  else
  ifneq (,$(findstring armv,$(uname_M)))
@@ -37,24 +38,25 @@ Index: src/Makefile
  endif
  endif
  
-@@ -136,7 +137,7 @@ endif
+@@ -149,7 +150,7 @@ endif
  endif
  endif
  # Include paths to dependencies
 -FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
 +FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I${MODLUA_INCL_DIR}
  
- ifeq ($(MALLOC),tcmalloc)
-       FINAL_CFLAGS+= -DUSE_TCMALLOC
-@@ -174,6 +175,7 @@ endif
- REDIS_SERVER_NAME=redis-server
- REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o 
zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o 
networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o 
t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o 
intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o 
rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o 
blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o 
redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o 
geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o 
localtime.o lolwut.o lolwut5.o
+ # 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
+ REDIS_CHECK_RDB_NAME=redis-check-rdb
+ REDIS_CHECK_AOF_NAME=redis-check-aof
+ 
 +REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o 
lua_struct.o
- REDIS_CLI_NAME=redis-cli
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o 
ae.o crc64.o siphash.o crc16.o
- REDIS_BENCHMARK_NAME=redis-benchmark
-@@ -225,7 +227,7 @@ endif
++
+ 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
  
  # redis-server
  $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
@@ -63,7 +65,7 @@ Index: src/Makefile
  
  # redis-sentinel
  $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
-@@ -268,7 +270,7 @@ distclean: clean
+@@ -315,7 +318,7 @@ distclean: clean
  .PHONY: distclean
  
  test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME)
@@ -72,7 +74,7 @@ Index: src/Makefile
  
  test-sentinel: $(REDIS_SENTINEL_NAME)
        @(cd ..; ./runtest-sentinel)
-@@ -312,13 +314,14 @@ src/help.h:
+@@ -359,13 +362,14 @@ src/help.h:
        @../utils/generate-command-help.rb > help.h
  
  install: all
Index: patches/patch-src_config_c
===================================================================
RCS file: /var/cvs/ports/databases/redis/patches/patch-src_config_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_config_c
--- patches/patch-src_config_c  9 Aug 2017 09:16:09 -0000       1.7
+++ patches/patch-src_config_c  28 May 2020 14:49:56 -0000
@@ -13,12 +13,3 @@ Index: src/config.c
      {"user",    LOG_USER},
      {"local0",  LOG_LOCAL0},
      {"local1",  LOG_LOCAL1},
-@@ -298,7 +299,7 @@ void loadServerConfigFromString(char *config) {
-             server.syslog_facility =
-                 configEnumGetValue(syslog_facility_enum,argv[1]);
-             if (server.syslog_facility == INT_MIN) {
--                err = "Invalid log facility. Must be one of USER or between 
LOCAL0-LOCAL7";
-+                err = "Invalid log facility. Must be one of DAEMON, USER or 
between LOCAL0-LOCAL7";
-                 goto loaderr;
-             }
-         } else if (!strcasecmp(argv[0],"databases") && argc == 2) {
Index: patches/patch-src_networking_c
===================================================================
RCS file: /var/cvs/ports/databases/redis/patches/patch-src_networking_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_networking_c
--- patches/patch-src_networking_c      17 Mar 2020 04:51:28 -0000      1.1
+++ patches/patch-src_networking_c      28 May 2020 15:31:26 -0000
@@ -1,9 +1,11 @@
-$OpenBSD: patch-src_networking_c,v 1.1 2020/03/17 04:51:28 tb Exp $
+$OpenBSD$
+
+time_t is long long, so use llabs to avoid truncation
 
 Index: src/networking.c
 --- src/networking.c.orig
 +++ src/networking.c
-@@ -1939,7 +1939,7 @@ void securityWarningCommand(client *c) {
+@@ -2554,7 +2554,7 @@ void securityWarningCommand(client *c) {
      static time_t logged_time;
      time_t now = time(NULL);
  
Index: patches/patch-src_server_h
===================================================================
RCS file: /var/cvs/ports/databases/redis/patches/patch-src_server_h,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_server_h
--- patches/patch-src_server_h  11 Feb 2020 08:11:13 -0000      1.4
+++ patches/patch-src_server_h  28 May 2020 14:49:56 -0000
@@ -2,21 +2,12 @@ $OpenBSD: patch-src_server_h,v 1.4 2020/
 Index: src/server.h
 --- src/server.h.orig
 +++ src/server.h
-@@ -101,7 +101,7 @@ typedef long long ustime_t; /* microsecond time type. 
- #define AOF_READ_DIFF_INTERVAL_BYTES (1024*10)
- #define CONFIG_DEFAULT_SLOWLOG_LOG_SLOWER_THAN 10000
- #define CONFIG_DEFAULT_SLOWLOG_MAX_LEN 128
--#define CONFIG_DEFAULT_MAX_CLIENTS 10000
-+#define CONFIG_DEFAULT_MAX_CLIENTS 96
- #define CONFIG_AUTHPASS_MAX_LEN 512
- #define CONFIG_DEFAULT_SLAVE_PRIORITY 100
- #define CONFIG_DEFAULT_REPL_TIMEOUT 60
-@@ -112,7 +112,7 @@ typedef long long ustime_t; /* microsecond time type. 
- #define CONFIG_DEFAULT_REPL_BACKLOG_TIME_LIMIT (60*60)  /* 1 hour */
+@@ -106,7 +106,7 @@ typedef long long ustime_t; /* microsecond time type. 
+ #define RDB_EOF_MARK_SIZE 40
  #define CONFIG_REPL_BACKLOG_MIN_SIZE (1024*16)          /* 16k */
  #define CONFIG_BGSAVE_RETRY_DELAY 5 /* Wait a few secs before trying again. */
 -#define CONFIG_DEFAULT_PID_FILE "/var/run/redis.pid"
 +#define CONFIG_DEFAULT_PID_FILE "/var/run/redis/redis.pid"
- #define CONFIG_DEFAULT_SYSLOG_IDENT "redis"
  #define CONFIG_DEFAULT_CLUSTER_CONFIG_FILE "nodes.conf"
- #define CONFIG_DEFAULT_CLUSTER_ANNOUNCE_IP NULL         /* Auto detect. */
+ #define CONFIG_DEFAULT_UNIX_SOCKET_PERM 0
+ #define CONFIG_DEFAULT_LOGFILE ""
Index: patches/patch-src_zmalloc_c
===================================================================
RCS file: /var/cvs/ports/databases/redis/patches/patch-src_zmalloc_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_zmalloc_c
--- patches/patch-src_zmalloc_c 11 Feb 2020 08:11:13 -0000      1.1
+++ patches/patch-src_zmalloc_c 28 May 2020 14:49:56 -0000
@@ -50,12 +50,13 @@ Index: src/zmalloc.c
      if (!ptr) zmalloc_oom_handler(size);
  #ifdef HAVE_MALLOC_SIZE
      update_zmalloc_stat_alloc(zmalloc_size(ptr));
-@@ -147,6 +160,8 @@ void *zrealloc(void *ptr, size_t size) {
- #endif
-     size_t oldsize;
-     void *newptr;
+@@ -152,6 +165,9 @@ void *zrealloc(void *ptr, size_t size) {
+         zfree(ptr);
+         return NULL;
+     }
 +
 +    size = zmalloc_roundsize(size);
- 
++
      if (ptr == NULL) return zmalloc(size);
  #ifdef HAVE_MALLOC_SIZE
+     oldsize = zmalloc_size(ptr);
Index: patches/patch-tests_test_helper_tcl
===================================================================
RCS file: patches/patch-tests_test_helper_tcl
diff -N patches/patch-tests_test_helper_tcl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-tests_test_helper_tcl 28 May 2020 14:56:22 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Disable a test that now fails systematically:
+
+[err]: diskless no replicas drop during rdb pipe in 
tests/integration/replication.tcl
+rdb child didn't terminate
+
+Index: tests/test_helper.tcl
+--- tests/test_helper.tcl.orig
++++ tests/test_helper.tcl
+@@ -36,7 +36,6 @@ set ::all_tests {
+     unit/aofrw
+     unit/acl
+     integration/block-repl
+-    integration/replication
+     integration/replication-2
+     integration/replication-3
+     integration/replication-4
Index: patches/patch-utils_gen-test-certs_sh
===================================================================
RCS file: patches/patch-utils_gen-test-certs_sh
diff -N patches/patch-utils_gen-test-certs_sh
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-utils_gen-test-certs_sh       28 May 2020 14:49:56 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: utils/gen-test-certs.sh
+--- utils/gen-test-certs.sh.orig
++++ utils/gen-test-certs.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ mkdir -p tests/tls
+ openssl genrsa -out tests/tls/ca.key 4096
+ openssl req \

Reply via email to