Update to redis-6.2.1

Hi,

Here's an update for redis. Nothing fancy* in the release notes:
https://github.com/redis/redis/blob/6.2.1/00-RELEASENOTES
We can now remove the patch we backported.

Tested and make test'ed on amd64.

Comments? OK?

*another hint is that I'm the one sending the diff, not tb ;)


Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/redis/Makefile,v
retrieving revision 1.119
diff -u -p -r1.119 Makefile
--- Makefile 25 Feb 2021 15:05:23 -0000 1.119
+++ Makefile 2 Mar 2021 19:39:41 -0000
@@ -2,7 +2,7 @@

COMMENT = persistent key-value database

-DISTNAME = redis-6.2.0
+DISTNAME = redis-6.2.1
CATEGORIES = databases
HOMEPAGE = https://redis.io/

Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/redis/distinfo,v
retrieving revision 1.93
diff -u -p -r1.93 distinfo
--- distinfo 25 Feb 2021 15:05:23 -0000 1.93
+++ distinfo 2 Mar 2021 19:39:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (redis-6.2.0.tar.gz) = Z9Ykwl2WK9aK/4gSoTXfhbrQdVa4gl87zVtSKpky28o=
-SIZE (redis-6.2.0.tar.gz) = 2435539
+SHA256 (redis-6.2.1.tar.gz) = zSIlBQEsziCyVoL8qTHsk70hrpLLSr/nQs97dqqQdSA=
+SIZE (redis-6.2.1.tar.gz) = 2438367
Index: patches/patch-src_Makefile
===================================================================
RCS file: /cvs/ports/databases/redis/patches/patch-src_Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 patch-src_Makefile
--- patches/patch-src_Makefile 25 Feb 2021 15:05:23 -0000 1.37
+++ patches/patch-src_Makefile 2 Mar 2021 19:39:41 -0000
@@ -17,7 +17,7 @@ Index: src/Makefile
NODEPS:=clean distclean

# Default settings
-@@ -41,6 +41,7 @@ endif
+@@ -46,6 +46,7 @@ endif

PREFIX?=/usr/local
INSTALL_BIN=$(PREFIX)/bin
@@ -25,7 +25,7 @@ Index: src/Makefile
INSTALL=install
PKG_CONFIG?=pkg-config

-@@ -59,7 +60,7 @@ ifneq (,$(filter aarch64 armv,$(uname_M)))
+@@ -64,7 +65,7 @@ ifneq (,$(filter aarch64 armv,$(uname_M)))
CFLAGS+=-funwind-tables
else
ifneq (,$(findstring armv,$(uname_M)))
@@ -34,7 +34,7 @@ Index: src/Makefile
endif
endif

-@@ -93,7 +94,7 @@ ifneq (,$(filter aarch64 armv,$(uname_M)))
+@@ -98,7 +99,7 @@ ifneq (,$(filter aarch64 armv,$(uname_M)))
FINAL_LIBS+=-latomic
else
ifneq (,$(findstring armv,$(uname_M)))
@@ -43,7 +43,7 @@ Index: src/Makefile
endif
endif

-@@ -278,6 +279,8 @@ REDIS_BENCHMARK_OBJ=ae.o anet.o redis-benchmark.o adli
+@@ -283,6 +284,8 @@ REDIS_BENCHMARK_OBJ=ae.o anet.o redis-benchmark.o adli
REDIS_CHECK_RDB_NAME=redis-check-rdb$(PROG_SUFFIX)
REDIS_CHECK_AOF_NAME=redis-check-aof$(PROG_SUFFIX)

@@ -52,7 +52,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' ;)"
-@@ -324,7 +327,7 @@ endif
+@@ -329,7 +332,7 @@ endif

# redis-server
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
@@ -61,7 +61,7 @@ Index: src/Makefile

# redis-sentinel
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
-@@ -371,7 +374,7 @@ distclean: clean
+@@ -376,7 +379,7 @@ distclean: clean
.PHONY: distclean

test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME)
@@ -70,7 +70,7 @@ Index: src/Makefile

test-sentinel: $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME)
@(cd ..; ./runtest-sentinel)
-@@ -411,7 +414,7 @@ src/help.h:
+@@ -416,7 +419,7 @@ src/help.h:
@../utils/generate-command-help.rb > help.h

install: all
Index: patches/patch-src_debug_c
===================================================================
RCS file: /cvs/ports/databases/redis/patches/patch-src_debug_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_debug_c
--- patches/patch-src_debug_c 25 Feb 2021 15:05:23 -0000 1.4
+++ patches/patch-src_debug_c 2 Mar 2021 19:39:41 -0000
@@ -5,7 +5,7 @@ time_t is long long on OpenBSD
Index: src/debug.c
--- src/debug.c.orig
+++ src/debug.c
-@@ -469,7 +469,7 @@ NULL
+@@ -473,7 +473,7 @@ NULL
} else if (!strcasecmp(c->argv[1]->ptr,"segfault")) {
*((char*)-1) = 'x';
} else if (!strcasecmp(c->argv[1]->ptr,"panic")) {
Index: patches/patch-src_zmalloc_c
===================================================================
RCS file: patches/patch-src_zmalloc_c
diff -N patches/patch-src_zmalloc_c
--- patches/patch-src_zmalloc_c 25 Feb 2021 15:05:23 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-$OpenBSD: patch-src_zmalloc_c,v 1.4 2021/02/25 15:05:23 tb Exp $
-
-https://github.com/redis/redis/pull/8533
-
-Index: src/zmalloc.c
---- src/zmalloc.c.orig
-+++ src/zmalloc.c
-@@ -28,6 +28,7 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#include <assert.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdint.h>
-@@ -49,18 +50,14 @@ void zlibc_free(void *ptr) {
-
- #ifdef HAVE_MALLOC_SIZE
- #define PREFIX_SIZE (0)
-+#define ASSERT_NO_SIZE_OVERFLOW(sz)
- #else
- #if defined(__sun) || defined(__sparc) || defined(__sparc__)
- #define PREFIX_SIZE (sizeof(long long))
- #else
- #define PREFIX_SIZE (sizeof(size_t))
-