11 files changed, 68 insertions, 58 deletions
diff --git a/databases/redis/files/patch-deps-Makefile b/databases/redis/files/patch-deps_Makefile
index 33e36467dbca..ff2007910cb6 100644
--- a/databases/redis/files/patch-deps-Makefile
+++ b/databases/redis/files/patch-deps_Makefile
@@ -1,6 +1,6 @@
---- deps/Makefile.orig	2023-07-10 11:55:20 UTC
+--- deps/Makefile.orig	2025-11-18 14:58:24 UTC
 +++ deps/Makefile
-@@ -84,7 +84,7 @@ LUA_LDFLAGS+= $(LDFLAGS)
+@@ -117,7 +117,7 @@ else
  ifeq ($(LUA_DEBUG),yes)
  	LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK
  else
@@ -9,7 +9,7 @@
  endif
  ifeq ($(LUA_COVERAGE),yes)
  	LUA_CFLAGS += -fprofile-arcs -ftest-coverage
-@@ -112,7 +112,7 @@ endif
+@@ -145,7 +145,7 @@ jemalloc: .make-prerequisites
  
  jemalloc: .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 76e3ea96245d..6bb5418e44d6 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	2023-08-15 09:38:36 UTC
+--- deps/hiredis/Makefile.orig	2025-08-04 11:05:03 UTC
 +++ deps/hiredis/Makefile
-@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
+@@ -15,7 +15,7 @@ HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h |
  HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
  
  # Installation related variables and target
@@ -9,19 +9,19 @@
  INCLUDE_PATH?=include/hiredis
  LIBRARY_PATH?=lib
  PKGCONF_PATH?=pkgconfig
-@@ -38,10 +38,9 @@ export REDIS_TEST_CONFIG
+@@ -43,10 +43,9 @@ CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev
  # 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++')
 -OPTIMIZATION?=-O3
  WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
  DEBUG_FLAGS?= -g -ggdb
--REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS)
-+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS)
- REAL_LDFLAGS=$(LDFLAGS)
+-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) $(HIREDIS_CFLAGS)
++REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) $(HIREDIS_CFLAGS)
+ REAL_LDFLAGS=$(LDFLAGS) $(HIREDIS_LDFLAGS)
  
  DYLIBSUFFIX=so
-@@ -122,7 +121,16 @@ ifeq ($(uname_S),FreeBSD)
+@@ -127,7 +126,16 @@ endif
  else
    REAL_CFLAGS+=-pedantic
  endif
diff --git a/databases/redis/files/patch-deps-hiredis-net.c b/databases/redis/files/patch-deps_hiredis_net.c
index 0dfde3135238..84dbe39e16e6 100644
--- a/databases/redis/files/patch-deps-hiredis-net.c
+++ b/databases/redis/files/patch-deps_hiredis_net.c
@@ -1,6 +1,6 @@
---- deps/hiredis/net.c.orig	2019-11-28 19:32:05 UTC
+--- deps/hiredis/net.c.orig	2025-08-04 11:05:03 UTC
 +++ deps/hiredis/net.c
-@@ -178,14 +178,34 @@
+@@ -185,14 +185,34 @@ int redisKeepAlive(redisContext *c, int interval) {
          __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
          return REDIS_ERR;
      }
diff --git a/databases/redis/files/patch-deps-linenoise-Makefile b/databases/redis/files/patch-deps_linenoise_Makefile
index aef0f10966af..aef0f10966af 100644
--- a/databases/redis/files/patch-deps-linenoise-Makefile
+++ b/databases/redis/files/patch-deps_linenoise_Makefile
diff --git a/databases/redis/files/patch-deps_lua_src_lua__cjson.c b/databases/redis/files/patch-deps_lua_src_lua__cjson.c
index 0bb150504c67..9303727b7868 100644
--- a/databases/redis/files/patch-deps_lua_src_lua__cjson.c
+++ b/databases/redis/files/patch-deps_lua_src_lua__cjson.c
@@ -1,6 +1,6 @@
---- deps/lua/src/lua_cjson.c.orig	2019-09-25 10:40:18 UTC
+--- deps/lua/src/lua_cjson.c.orig	2025-08-04 11:05:03 UTC
 +++ deps/lua/src/lua_cjson.c
-@@ -46,7 +46,9 @@
+@@ -47,7 +47,9 @@
  #include "strbuf.h"
  #include "fpconv.h"
  
diff --git a/databases/redis/files/patch-deps_xxhash_Makefile b/databases/redis/files/patch-deps_xxhash_Makefile
new file mode 100644
index 000000000000..f7dc31588e8f
--- /dev/null
+++ b/databases/redis/files/patch-deps_xxhash_Makefile
@@ -0,0 +1,16 @@
+--- deps/xxhash/Makefile.orig	2025-12-02 07:19:06 UTC
++++ deps/xxhash/Makefile
+@@ -186,11 +186,12 @@ clean:
+	$(RM) xxhsum.wasm xxhsum.js xxhsum.html
+	$(RM) xxh32sum$(EXT) xxh64sum$(EXT) xxh128sum$(EXT) xxh3sum$(EXT)
+	$(RM) fuzzer
++ifneq	($(wildcard tests/*),)
+	$(MAKE) -C tests clean
+	$(MAKE) -C tests/bench clean
+	$(MAKE) -C tests/collisions clean
+	@echo cleaning completed
+-
++endif
+
+ # =================================================
+ # tests
diff --git a/databases/redis/files/patch-redis.conf b/databases/redis/files/patch-redis.conf
index b653f89a3211..201091ce2885 100644
--- a/databases/redis/files/patch-redis.conf
+++ b/databases/redis/files/patch-redis.conf
@@ -1,6 +1,6 @@
---- redis.conf.orig	2021-01-12 14:21:03 UTC
+--- redis.conf.orig	2025-08-04 11:05:03 UTC
 +++ redis.conf
-@@ -244,7 +244,7 @@
+@@ -307,7 +307,7 @@ tcp-keepalive 300
  # 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.
@@ -9,7 +9,7 @@
  
  # If you run Redis from upstart or systemd, Redis can interact with your
  # supervision tree. Options:
-@@ -276,7 +276,7 @@
+@@ -339,7 +339,7 @@ daemonize no
  #
  # Note that on modern Linux systems "/run/redis.pid" is more conforming
  # and should be used instead.
@@ -18,7 +18,7 @@
  
  # Specify the server verbosity level.
  # This can be one of:
-@@ -289,7 +289,7 @@
+@@ -353,7 +353,7 @@ 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
@@ -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.
-@@ -420,7 +420,7 @@
+@@ -513,7 +513,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.
diff --git a/databases/redis/files/patch-src-Makefile b/databases/redis/files/patch-src-Makefile
deleted file mode 100644
index 63339db6505a..000000000000
--- a/databases/redis/files/patch-src-Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/Makefile.orig	2025-05-02 11:15:06 UTC
-+++ src/Makefile
-@@ -67,7 +67,7 @@ endif
- 	STD+=-std=c99
- endif
- 
--PREFIX?=/usr/local
-+PREFIX:=$(PREFIX)
- INSTALL_BIN=$(PREFIX)/bin
- INSTALL=install
- PKG_CONFIG?=pkg-config
-@@ -131,7 +131,6 @@ FINAL_LIBS=-lm -lstdc++
- FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
- FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm -lstdc++
--DEBUG=-g -ggdb
- 
- # Linux ARM32 needs -latomic at linking time
- ifneq (,$(findstring armv,$(uname_M)))
-@@ -170,6 +169,11 @@ else
- 	OPENSSL_PREFIX?=/usr/local/opt/openssl
- endif
- else
-+ifeq ($(uname_S),FreeBSD)
-+        # FreeBSD
-+        FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
-+        FINAL_LDFLAGS= $(LDFLAGS) -pthread
-+else
- ifeq ($(uname_S),AIX)
-         # AIX
-         FINAL_LDFLAGS+= -Wl,-bexpall
-@@ -219,6 +223,7 @@ else
- 	# All the other OSes (notably Linux)
- 	FINAL_LDFLAGS+= -rdynamic
- 	FINAL_LIBS+=-ldl -pthread -lrt
-+endif
- endif
- endif
- endif
diff --git a/databases/redis/files/patch-src_Makefile b/databases/redis/files/patch-src_Makefile
new file mode 100644
index 000000000000..396ffc148099
--- /dev/null
+++ b/databases/redis/files/patch-src_Makefile
@@ -0,0 +1,19 @@
+--- src/Makefile.orig	2025-11-28 10:22:14 UTC
++++ src/Makefile
+@@ -67,7 +67,7 @@ endif
+ 	STD+=-std=c99
+ endif
+ 
+-PREFIX?=/usr/local
++PREFIX:=$(PREFIX)
+ INSTALL_BIN=$(PREFIX)/bin
+ INSTALL=install
+ PKG_CONFIG?=pkg-config
+@@ -150,7 +150,6 @@ FINAL_LIBS=-lm -lstdc++
+ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+ FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG)
+ FINAL_LIBS=-lm -lstdc++
+-DEBUG=-g -ggdb
+ 
+ # Linux ARM32 needs -latomic at linking time
+ ifneq (,$(findstring armv,$(uname_M)))
diff --git a/databases/redis/files/patch-src-mkreleasehdr.sh b/databases/redis/files/patch-src_mkreleasehdr.sh
index 2a568628139d..2a568628139d 100644
--- a/databases/redis/files/patch-src-mkreleasehdr.sh
+++ b/databases/redis/files/patch-src_mkreleasehdr.sh
diff --git a/databases/redis/files/patch-tests_modules_Makefile b/databases/redis/files/patch-tests_modules_Makefile
new file mode 100644
index 000000000000..b91426ed4d1b
--- /dev/null
+++ b/databases/redis/files/patch-tests_modules_Makefile
@@ -0,0 +1,14 @@
+--- tests/modules/Makefile.orig	2025-12-02 10:24:24 UTC
++++ tests/modules/Makefile
+@@ -34,6 +34,11 @@ endif
+ endif
+ endif
+
++ifeq ($(uname_S),FreeBSD)
++	LD = cc
++	CC = cc
++endif
++
+ # OS X 11.x doesn't have /usr/lib/libSystem.dylib and needs an explicit setting.
+ ifeq ($(uname_S),Darwin)
+ ifeq ("$(wildcard /usr/lib/libSystem.dylib)","")