databases/redis: Update to 7.0.2

ChangeLog:	https://github.com/redis/redis/releases/tag/7.0.1
ChangeLog:	https://github.com/redis/redis/releases/tag/7.0.2

5 files changed, 29 insertions, 30 deletions

diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index 34c1a23299d3..bf760f82430b 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -1,8 +1,7 @@
 # Created by: Sergey Skvortsov <skv@protey.ru>
 
 PORTNAME=	redis
-DISTVERSION=	7.0.0
-PORTREVISION=	1
+DISTVERSION=	7.0.2
 CATEGORIES=	databases
 MASTER_SITES=	https://download.redis.io/releases/
 
diff --git a/databases/redis/distinfo b/databases/redis/distinfo
index 3c04644edf75..4e3c04a69431 100644
--- a/databases/redis/distinfo
+++ b/databases/redis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651106632
-SHA256 (redis-7.0.0.tar.gz) = 284d8bd1fd85d6a55a05ee4e7c31c31977ad56cbf344ed83790beeb148baa720
-SIZE (redis-7.0.0.tar.gz) = 2943054
+TIMESTAMP = 1655040992
+SHA256 (redis-7.0.2.tar.gz) = 5e57eafe7d4ac5ecb6a7d64d6b61db775616dbf903293b3fcc660716dbda5eeb
+SIZE (redis-7.0.2.tar.gz) = 2956784
diff --git a/databases/redis/files/extra-patch-src-Makefile.lua b/databases/redis/files/extra-patch-src-Makefile.lua
index d4108daab4fa..080bb4f8830b 100644
--- a/databases/redis/files/extra-patch-src-Makefile.lua
+++ b/databases/redis/files/extra-patch-src-Makefile.lua
@@ -1,4 +1,4 @@
---- src/Makefile.orig	2022-01-11 16:00:14 UTC
+--- src/Makefile.orig	2022-06-08 09:56:24 UTC
 +++ src/Makefile
 @@ -16,7 +16,7 @@
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
@@ -18,9 +18,9 @@
 +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
 +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
  FINAL_LIBS=-lm
+ DEBUG=-g -ggdb
  
- # Linux ARM32 needs -latomic at linking time
-@@ -227,7 +227,7 @@
+@@ -222,7 +222,7 @@
  endif
  
  # Include paths to dependencies
@@ -29,7 +29,7 @@
  
  # Determine systemd support and/or build preference (defaulting to auto-detection)
  BUILD_WITH_SYSTEMD=no
-@@ -301,6 +301,9 @@
+@@ -296,6 +296,9 @@
      endef
  endif
  
@@ -39,15 +39,15 @@
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
  REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
  REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -322,6 +325,7 @@
+@@ -317,6 +320,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 eval.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 tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.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 eval.o bio.o rio.o rand.o memtest.o syscheck.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 tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.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 redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
  REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -375,7 +379,7 @@
+@@ -371,7 +375,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 f1a28a56f953..080bb4f8830b 100644
--- a/databases/redis/files/extra-patch-src-Makefile.luajit
+++ b/databases/redis/files/extra-patch-src-Makefile.luajit
@@ -1,4 +1,4 @@
---- src/Makefile.orig	2022-01-11 16:09:20 UTC
+--- src/Makefile.orig	2022-06-08 09:56:24 UTC
 +++ src/Makefile
 @@ -16,7 +16,7 @@
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
@@ -18,9 +18,9 @@
 +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
 +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
  FINAL_LIBS=-lm
+ DEBUG=-g -ggdb
  
- # Linux ARM32 needs -latomic at linking time
-@@ -227,7 +227,7 @@
+@@ -222,7 +222,7 @@
  endif
  
  # Include paths to dependencies
@@ -29,25 +29,25 @@
  
  # Determine systemd support and/or build preference (defaulting to auto-detection)
  BUILD_WITH_SYSTEMD=no
-@@ -301,6 +301,9 @@
+@@ -296,6 +296,9 @@
      endef
  endif
  
-+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
-+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
++FINAL_CFLAGS+=-I${PREFIX}/include/lua51
++FINAL_LIBS+= -L${PREFIX}/lib -llua-5.1
 +
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
  REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
  REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -322,6 +325,7 @@
+@@ -317,6 +320,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 eval.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 tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.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 eval.o bio.o rio.o rand.o memtest.o syscheck.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 tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.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 redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
  REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -375,7 +379,7 @@
+@@ -371,7 +375,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 5bdf59332b33..080bb4f8830b 100644
--- a/databases/redis/files/extra-patch-src-Makefile.luajit-or
+++ b/databases/redis/files/extra-patch-src-Makefile.luajit-or
@@ -1,4 +1,4 @@
---- src/Makefile.orig	2022-01-11 16:14:34 UTC
+--- src/Makefile.orig	2022-06-08 09:56:24 UTC
 +++ src/Makefile
 @@ -16,7 +16,7 @@
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
@@ -18,9 +18,9 @@
 +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
 +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
  FINAL_LIBS=-lm
+ DEBUG=-g -ggdb
  
- # Linux ARM32 needs -latomic at linking time
-@@ -227,7 +227,7 @@
+@@ -222,7 +222,7 @@
  endif
  
  # Include paths to dependencies
@@ -29,25 +29,25 @@
  
  # Determine systemd support and/or build preference (defaulting to auto-detection)
  BUILD_WITH_SYSTEMD=no
-@@ -301,6 +301,9 @@
+@@ -296,6 +296,9 @@
      endef
  endif
  
-+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1
-+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
++FINAL_CFLAGS+=-I${PREFIX}/include/lua51
++FINAL_LIBS+= -L${PREFIX}/lib -llua-5.1
 +
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
  REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
  REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -322,6 +325,7 @@
+@@ -317,6 +320,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 eval.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 tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.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 eval.o bio.o rio.o rand.o memtest.o syscheck.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 tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.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 redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
  REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -375,7 +379,7 @@
+@@ -371,7 +375,7 @@
  
  # redis-server
  $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)