From 6f1d9defbd273136c63f4b2da7654ef3135ff3aa Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Wed, 18 Aug 2021 19:35:18 -0400
Subject: databases/redis*: update databases/redis to 6.2.5.

Update CONFLICTS for databases/redis* ports.
Add a notice to UPDATING.
Connect databases/redis6 to build.
---
 UPDATING                                           | 14 +++++++++++
 databases/Makefile                                 |  1 +
 databases/redis-devel/Makefile                     |  2 +-
 databases/redis/Makefile                           |  4 ++--
 databases/redis/distinfo                           |  6 ++---
 databases/redis/files/extra-patch-src-Makefile.lua | 28 +++++++++++-----------
 .../redis/files/extra-patch-src-Makefile.luajit    | 28 +++++++++++-----------
 .../redis/files/extra-patch-src-Makefile.luajit-or | 28 +++++++++++-----------
 databases/redis/files/patch-deps-Makefile          | 12 +++++-----
 databases/redis/files/patch-deps-hiredis-Makefile  | 27 +++++++++++----------
 databases/redis/files/patch-deps_Makefile          | 10 ++++----
 databases/redis/files/patch-redis.conf             | 18 +++++++-------
 databases/redis5/Makefile                          |  2 +-
 databases/redis6/Makefile                          |  2 +-
 14 files changed, 99 insertions(+), 83 deletions(-)

diff --git a/UPDATING b/UPDATING
index 724c705d52a8..43cfdbe759fc 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,20 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20210818:
+  AFFECTS: users of databases/redis
+  AUTHOR: osa@FreeBSD.org
+
+  The databases/redis port has been updated to the recent stable release.
+  Users wanting to stay on v6.0 can replace databases/redis with
+  databases/redis6 with one of the following commands:
+
+  # pkg install databases/redis6
+    or
+  # portmaster -o databases/redis6 databases/redis
+    or
+  # portupgrade -o databases/redis6 databases/redis
+
 20210805:
   AFFECTS: users of sysutils/beats7
   AUTHOR: otis@FreeBSD.org
diff --git a/databases/Makefile b/databases/Makefile
index c163e597ba7a..446097a0defe 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -854,6 +854,7 @@
     SUBDIR += redis
     SUBDIR += redis-devel
     SUBDIR += redis5
+    SUBDIR += redis6
     SUBDIR += redis_exporter
     SUBDIR += redisdesktopmanager
     SUBDIR += redisjson
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index c6fb70c881b5..de6b6483b6bb 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -69,7 +69,7 @@ LDFLAGS=	-Wl,-E
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis5-5.* redis-6.*
+CONFLICTS?=	redis5-5.* redis6-6.* redis-6.*
 
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index a1ccc5d9bf8e..0bca2eb92d51 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -1,7 +1,7 @@
 # Created by: Sergey Skvortsov <skv@protey.ru>
 
 PORTNAME=	redis
-PORTVERSION=	6.0.15
+PORTVERSION=	6.2.5
 CATEGORIES=	databases
 MASTER_SITES=	https://download.redis.io/releases/
 
@@ -68,7 +68,7 @@ LDFLAGS=	-Wl,-E
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis5-5.* redis-devel-6.*
+CONFLICTS?=	redis5-5.* redis6-6.* redis-devel-6.*
 
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \
diff --git a/databases/redis/distinfo b/databases/redis/distinfo
index d8a3994a10b7..0fc14cbc2de0 100644
--- a/databases/redis/distinfo
+++ b/databases/redis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626937566
-SHA256 (redis-6.0.15.tar.gz) = 4bc295264a95bc94423c162a9eee66135a24a51eefe5f53f18fc9bde5c3a9f74
-SIZE (redis-6.0.15.tar.gz) = 2282471
+TIMESTAMP = 1629324274
+SHA256 (redis-6.2.5.tar.gz) = 4b9a75709a1b74b3785e20a6c158cab94cf52298aa381eea947a678a60d551ae
+SIZE (redis-6.2.5.tar.gz) = 2465302
diff --git a/databases/redis/files/extra-patch-src-Makefile.lua b/databases/redis/files/extra-patch-src-Makefile.lua
index bbcae4d3acc1..937eeac680a2 100644
--- a/databases/redis/files/extra-patch-src-Makefile.lua
+++ b/databases/redis/files/extra-patch-src-Makefile.lua
@@ -1,15 +1,15 @@
---- src/Makefile.orig	2020-05-15 16:29:52.000000000 -0400
-+++ src/Makefile	2020-05-16 12:20:46.728148000 -0400
+--- src/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
++++ src/Makefile	2021-01-13 11:52:33.070529000 -0500
 @@ -16,7 +16,7 @@
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
  uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
  OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
+-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
  NODEPS:=clean distclean
  
  # Default settings
-@@ -73,8 +73,8 @@
+@@ -83,8 +83,8 @@
  # Override default settings if possible
  -include .make-settings
  
@@ -20,17 +20,17 @@
  FINAL_LIBS=-lm
  DEBUG=-g -ggdb
  
-@@ -149,7 +149,7 @@
+@@ -188,7 +188,7 @@
  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
+-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram
  
  # Determine systemd support and/or build preference (defaulting to auto-detection)
  BUILD_WITH_SYSTEMD=no
-@@ -197,6 +197,9 @@
-     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
+@@ -251,6 +251,9 @@
+ 	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
  endif
  
 +FINAL_CFLAGS+=-I${PREFIX}/include/lua51
@@ -39,15 +39,15 @@
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
  REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
  REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -217,6 +220,7 @@
+@@ -271,6 +274,7 @@
  REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
  REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- 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 crcspeed.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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o mt19937-64.o
+ 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 crcspeed.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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o
 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
  REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o mt19937-64.o
+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
  REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -268,7 +272,7 @@
+@@ -324,7 +328,7 @@
  
  # redis-server
  $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
diff --git a/databases/redis/files/extra-patch-src-Makefile.luajit b/databases/redis/files/extra-patch-src-Makefile.luajit
index f81f2ac24c80..3e40ea4a77a0 100644
--- a/databases/redis/files/extra-patch-src-Makefile.luajit
+++ b/databases/redis/files/extra-patch-src-Makefile.luajit
@@ -1,15 +1,15 @@
---- src/Makefile.orig	2020-05-15 16:29:52.000000000 -0400
-+++ src/Makefile	2020-05-16 12:25:33.461058000 -0400
+--- src/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
++++ src/Makefile	2021-01-13 12:25:07.823451000 -0500
 @@ -16,7 +16,7 @@
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
  uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
  OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
+-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
  NODEPS:=clean distclean
  
  # Default settings
-@@ -73,8 +73,8 @@
+@@ -83,8 +83,8 @@
  # Override default settings if possible
  -include .make-settings
  
@@ -20,17 +20,17 @@
  FINAL_LIBS=-lm
  DEBUG=-g -ggdb
  
-@@ -149,7 +149,7 @@
+@@ -188,7 +188,7 @@
  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
+-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram
  
  # Determine systemd support and/or build preference (defaulting to auto-detection)
  BUILD_WITH_SYSTEMD=no
-@@ -197,6 +197,9 @@
-     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
+@@ -251,6 +251,9 @@
+ 	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
  endif
  
 +FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
@@ -39,15 +39,15 @@
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
  REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
  REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -217,6 +220,7 @@
+@@ -271,6 +274,7 @@
  REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
  REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- 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 crcspeed.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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o mt19937-64.o
+ 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 crcspeed.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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o
 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
  REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o mt19937-64.o
+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
  REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -268,7 +272,7 @@
+@@ -324,7 +328,7 @@
  
  # redis-server
  $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
diff --git a/databases/redis/files/extra-patch-src-Makefile.luajit-or b/databases/redis/files/extra-patch-src-Makefile.luajit-or
index 916971af2a7e..3926e8169300 100644
--- a/databases/redis/files/extra-patch-src-Makefile.luajit-or
+++ b/databases/redis/files/extra-patch-src-Makefile.luajit-or
@@ -1,15 +1,15 @@
---- src/Makefile.orig	2020-05-15 16:29:52.000000000 -0400
-+++ src/Makefile	2020-05-16 12:22:56.630826000 -0400
+--- src/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
++++ src/Makefile	2021-01-13 12:27:19.444193000 -0500
 @@ -16,7 +16,7 @@
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
  uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
  OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
+-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
  NODEPS:=clean distclean
  
  # Default settings
-@@ -73,8 +73,8 @@
+@@ -83,8 +83,8 @@
  # Override default settings if possible
  -include .make-settings
  
@@ -20,17 +20,17 @@
  FINAL_LIBS=-lm
  DEBUG=-g -ggdb
  
-@@ -149,7 +149,7 @@
+@@ -188,7 +188,7 @@
  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
+-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram
  
  # Determine systemd support and/or build preference (defaulting to auto-detection)
  BUILD_WITH_SYSTEMD=no
-@@ -197,6 +197,9 @@
-     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
+@@ -251,6 +251,9 @@
+ 	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
  endif
  
 +FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1
@@ -39,15 +39,15 @@
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
  REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
  REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -217,6 +220,7 @@
+@@ -271,6 +274,7 @@
  REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
  REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- 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 crcspeed.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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o mt19937-64.o
+ 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 crcspeed.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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o
 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
  REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o mt19937-64.o
+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
  REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -268,7 +272,7 @@
+@@ -324,7 +328,7 @@
  
  # redis-server
  $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
diff --git a/databases/redis/files/patch-deps-Makefile b/databases/redis/files/patch-deps-Makefile
index 385f0a116c6d..c2a757c59b33 100644
--- a/databases/redis/files/patch-deps-Makefile
+++ b/databases/redis/files/patch-deps-Makefile
@@ -1,15 +1,15 @@
---- deps/Makefile.orig	2019-09-25 10:40:18 UTC
-+++ deps/Makefile
-@@ -58,7 +58,7 @@ ifeq ($(uname_S),SunOS)
+--- deps/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
++++ deps/Makefile	2021-01-13 11:37:45.979445000 -0500
+@@ -69,7 +69,7 @@
  	LUA_CFLAGS= -D__C99FEATURES__=1
  endif
  
--LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS)
-+LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS)
+-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
++LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
  LUA_LDFLAGS+= $(LDFLAGS)
  # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
  # challenging to cross-compile lua (and redis).  These defines make it easier
-@@ -68,7 +68,7 @@ ARFLAGS=rcu
+@@ -79,7 +79,7 @@
  
  lua: .make-prerequisites
  	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
diff --git a/databases/redis/files/patch-deps-hiredis-Makefile b/databases/redis/files/patch-deps-hiredis-Makefile
index 1b08c4514d3d..9422ba8d3245 100644
--- a/databases/redis/files/patch-deps-hiredis-Makefile
+++ b/databases/redis/files/patch-deps-hiredis-Makefile
@@ -1,6 +1,6 @@
---- deps/hiredis/Makefile.orig	2019-11-29 16:35:59 UTC
-+++ deps/hiredis/Makefile
-@@ -21,7 +21,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
+--- deps/hiredis/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
++++ deps/hiredis/Makefile	2021-01-13 11:40:26.109827000 -0500
+@@ -21,7 +21,7 @@
  HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
  
  # Installation related variables and target
@@ -9,7 +9,7 @@
  INCLUDE_PATH?=include/hiredis
  LIBRARY_PATH?=lib
  PKGCONF_PATH?=pkgconfig
-@@ -44,10 +44,8 @@ export REDIS_TEST_CONFIG
+@@ -44,10 +44,8 @@
  # Fallback to gcc when $CC is not in $PATH.
  CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
  CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
@@ -21,11 +21,11 @@
  REAL_LDFLAGS=$(LDFLAGS)
  
  DYLIBSUFFIX=so
-@@ -82,6 +80,16 @@ endif
- ifeq ($(uname_S),SunOS)
-   REAL_LDFLAGS+= -ldl -lnsl -lsocket
-   DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
-+endif
+@@ -83,7 +81,16 @@
+   CFLAGS+=-I$(OPENSSL_PREFIX)/include
+   SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
+ endif
+-
 +ifeq ($(uname_S),FreeBSD)
 +  CFLAGS?=$(CFLAGS)
 +  CCLINK?=pthread
@@ -34,7 +34,8 @@
 +  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
 +  STLIBNAME?=libhiredis.a
 +  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
-+  SSL_LDFLAGS+=	${OPENSSL_LDFLAGS}
- endif
- ifeq ($(uname_S),Darwin)
-   DYLIBSUFFIX=dylib
++  SSL_LDFLAGS+=${OPENSSL_LDFLAGS}
++endif
+ ifeq ($(uname_S),SunOS)
+   IS_SUN_CC=$(shell sh -c '$(CC) -V 2>&1 |egrep -i -c "sun|studio"')
+   ifeq ($(IS_SUN_CC),1)
diff --git a/databases/redis/files/patch-deps_Makefile b/databases/redis/files/patch-deps_Makefile
index ab5b282c67f5..39dadb06b822 100644
--- a/databases/redis/files/patch-deps_Makefile
+++ b/databases/redis/files/patch-deps_Makefile
@@ -1,6 +1,6 @@
---- deps/Makefile.orig	2019-11-29 16:35:59 UTC
-+++ deps/Makefile
-@@ -76,12 +76,12 @@ lua: .make-prerequisites
+--- deps/Makefile.orig	2021-01-13 11:43:05.174197000 -0500
++++ deps/Makefile	2021-01-13 11:44:13.744658000 -0500
+@@ -83,12 +83,12 @@
  
  .PHONY: lua
  
@@ -10,9 +10,9 @@
  
  jemalloc: .make-prerequisites
  	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
--	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
+-	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
 -	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
-+	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
++	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
 +	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
  
  .PHONY: jemalloc
diff --git a/databases/redis/files/patch-redis.conf b/databases/redis/files/patch-redis.conf
index e70b7e609ca1..f71797d9555e 100644
--- a/databases/redis/files/patch-redis.conf
+++ b/databases/redis/files/patch-redis.conf
@@ -1,24 +1,24 @@
---- redis.conf.orig	2019-11-22 16:54:22 UTC
-+++ redis.conf
-@@ -203,7 +203,7 @@ tcp-keepalive 300
- 
+--- redis.conf.orig	2021-01-12 09:21:03.000000000 -0500
++++ redis.conf	2021-01-13 11:46:40.445746000 -0500
+@@ -244,7 +244,7 @@
  # By default Redis does not run as a daemon. Use 'yes' if you need it.
  # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+ # When Redis is supervised by upstart or systemd, this parameter has no impact.
 -daemonize no
 +daemonize yes
  
  # If you run Redis from upstart or systemd, Redis can interact with your
  # supervision tree. Options:
-@@ -225,7 +225,7 @@ supervised no
+@@ -276,7 +276,7 @@
  #
- # Creating a pid file is best effort: if Redis is not able to create it
- # nothing bad happens, the server will start and run normally.
+ # Note that on modern Linux systems "/run/redis.pid" is more conforming
+ # and should be used instead.
 -pidfile /var/run/redis_6379.pid
 +pidfile %%REDIS_RUNDIR%%/redis.pid
  
  # Specify the server verbosity level.
  # This can be one of:
-@@ -238,7 +238,7 @@ loglevel notice
+@@ -289,7 +289,7 @@
  # 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
@@ -27,7 +27,7 @@
  
  # To enable logging to the system logger, just set 'syslog-enabled' to yes,
  # and optionally update the other syslog parameters to suit your needs.
-@@ -330,7 +330,7 @@ dbfilename dump.rdb
+@@ -420,7 +420,7 @@
  # The Append Only File will also be created inside this directory.
  #
  # Note that you must specify a directory here, not a file name.
diff --git a/databases/redis5/Makefile b/databases/redis5/Makefile
index 5333fea098f8..e3e0b09d3260 100644
--- a/databases/redis5/Makefile
+++ b/databases/redis5/Makefile
@@ -71,7 +71,7 @@ USES+=		tcl:build
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis-6.* redis-devel-6.*
+CONFLICTS?=	redis-6.* redis-devel-6.* redis6-6.*
 
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \
diff --git a/databases/redis6/Makefile b/databases/redis6/Makefile
index 373cae148c65..c906c8f9cce3 100644
--- a/databases/redis6/Makefile
+++ b/databases/redis6/Makefile
@@ -69,7 +69,7 @@ LDFLAGS=	-Wl,-E
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis5-5.* redis-devel-6.*
+CONFLICTS?=	redis5-5.* redis-6.* redis-devel-6.*
 
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \
-- 
cgit v1.2.3