diff options
Diffstat (limited to 'databases/redis/files')
14 files changed, 57 insertions, 264 deletions
diff --git a/databases/redis/files/extra-patch-deps_lua_src_lua__cjson.c b/databases/redis/files/extra-patch-deps_lua_src_lua__cjson.c deleted file mode 100644 index 32e322d0d490..000000000000 --- a/databases/redis/files/extra-patch-deps_lua_src_lua__cjson.c +++ /dev/null @@ -1,11 +0,0 @@ ---- deps/lua/src/lua_cjson.c.orig 2019-12-08 12:56:31 UTC -+++ deps/lua/src/lua_cjson.c -@@ -1299,7 +1299,7 @@ - * - * luaL_setfuncs() is used to create a module table where the functions have - * json_config_t as their first upvalue. Code borrowed from Lua 5.2 source. */ --static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup) -+void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup) - { - int i; - diff --git a/databases/redis/files/extra-patch-src-Makefile.lua b/databases/redis/files/extra-patch-src-Makefile.lua deleted file mode 100644 index 080bb4f8830b..000000000000 --- a/databases/redis/files/extra-patch-src-Makefile.lua +++ /dev/null @@ -1,58 +0,0 @@ ---- 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') - uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') - OPTIMIZATION?=-O2 --DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram -+DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram - NODEPS:=clean distclean - - # Default settings -@@ -115,8 +115,8 @@ - # Override default settings if possible - -include .make-settings - --FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) --FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) -+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm - DEBUG=-g -ggdb - -@@ -222,7 +222,7 @@ - endif - - # Include paths to dependencies --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 -@@ -296,6 +296,9 @@ - endef - endif - -+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) -@@ -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 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) -@@ -371,7 +375,7 @@ - - # redis-server - $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) - - # redis-sentinel - $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/databases/redis/files/extra-patch-src-Makefile.luajit b/databases/redis/files/extra-patch-src-Makefile.luajit deleted file mode 100644 index 590a6c35eaf6..000000000000 --- a/databases/redis/files/extra-patch-src-Makefile.luajit +++ /dev/null @@ -1,58 +0,0 @@ ---- 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') - uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') - OPTIMIZATION?=-O2 --DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram -+DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram - NODEPS:=clean distclean - - # Default settings -@@ -115,8 +115,8 @@ - # Override default settings if possible - -include .make-settings - --FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) --FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) -+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm - DEBUG=-g -ggdb - -@@ -222,7 +222,7 @@ - endif - - # Include paths to dependencies --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 -@@ -296,6 +296,9 @@ - endef - endif - -+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0 -+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1 -+ - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) - REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) - REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -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 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) -@@ -371,7 +375,7 @@ - - # redis-server - $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) - - # redis-sentinel - $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/databases/redis/files/extra-patch-src-Makefile.luajit-or b/databases/redis/files/extra-patch-src-Makefile.luajit-or deleted file mode 100644 index d1e161f1cb5a..000000000000 --- a/databases/redis/files/extra-patch-src-Makefile.luajit-or +++ /dev/null @@ -1,58 +0,0 @@ ---- 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') - uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') - OPTIMIZATION?=-O2 --DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram -+DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram - NODEPS:=clean distclean - - # Default settings -@@ -115,8 +115,8 @@ - # Override default settings if possible - -include .make-settings - --FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) --FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) -+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm - DEBUG=-g -ggdb - -@@ -222,7 +222,7 @@ - endif - - # Include paths to dependencies --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 -@@ -296,6 +296,9 @@ - endef - endif - -+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1 -+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1 -+ - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) - REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) - REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -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 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) -@@ -371,7 +375,7 @@ - - # redis-server - $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) - - # redis-sentinel - $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/databases/redis/files/extra-patch-src-function_lua.c b/databases/redis/files/extra-patch-src-function_lua.c deleted file mode 100644 index 29be5e28e8f5..000000000000 --- a/databases/redis/files/extra-patch-src-function_lua.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/function_lua.c.orig 2022-01-31 10:49:57 UTC -+++ src/function_lua.c -@@ -52,6 +52,10 @@ - #define LIBRARY_API_NAME "__LIBRARY_API__" - #define LOAD_TIMEOUT_MS 500 - -+#ifndef lua_unref -+#define lua_unref(L,ref) luaL_unref(L, LUA_REGISTRYINDEX, (ref)) -+#endif -+ - /* Lua engine ctx */ - typedef struct luaEngineCtx { - lua_State *lua; diff --git a/databases/redis/files/patch-deps-Makefile b/databases/redis/files/patch-deps-Makefile deleted file mode 100644 index 21331efe7d8a..000000000000 --- a/databases/redis/files/patch-deps-Makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- deps/Makefile.orig 2021-12-01 15:06:05 UTC -+++ deps/Makefile -@@ -76,7 +76,7 @@ - ifeq ($(LUA_DEBUG),yes) - LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK - else -- LUA_CFLAGS+= -O2 -+ LUA_CFLAGS+= - endif - # 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 -@@ -90,7 +90,7 @@ - - .PHONY: lua - --JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS) -+JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS) - JEMALLOC_LDFLAGS= $(LDFLAGS) - - ifneq ($(DEB_HOST_GNU_TYPE),) -@@ -99,7 +99,7 @@ - - jemalloc: .make-prerequisites - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) -- cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS) -- cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a -+ cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS) -+ cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a - - .PHONY: jemalloc diff --git a/databases/redis/files/patch-deps_Makefile b/databases/redis/files/patch-deps_Makefile new file mode 100644 index 000000000000..d0f405916a20 --- /dev/null +++ b/databases/redis/files/patch-deps_Makefile @@ -0,0 +1,21 @@ +--- deps/Makefile.orig 2025-08-04 11:05:03 UTC ++++ deps/Makefile +@@ -110,7 +110,7 @@ else + ifeq ($(LUA_DEBUG),yes) + LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK + else +- LUA_CFLAGS+= -O2 ++ LUA_CFLAGS+= + endif + ifeq ($(LUA_COVERAGE),yes) + LUA_CFLAGS += -fprofile-arcs -ftest-coverage +@@ -138,7 +138,7 @@ jemalloc: .make-prerequisites + + jemalloc: .make-prerequisites + @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) +- cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS) +- cd jemalloc && $(MAKE) lib/libjemalloc.a ++ cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS) ++ cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a + + .PHONY: jemalloc diff --git a/databases/redis/files/patch-deps-hiredis-Makefile b/databases/redis/files/patch-deps_hiredis_Makefile index aec6b29a7b2e..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 2021-01-12 14:21:03 UTC +--- deps/hiredis/Makefile.orig 2025-08-04 11:05:03 UTC +++ deps/hiredis/Makefile -@@ -21,7 +21,7 @@ +@@ -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,21 +9,21 @@ INCLUDE_PATH?=include/hiredis LIBRARY_PATH?=lib PKGCONF_PATH?=pkgconfig -@@ -44,10 +44,8 @@ +@@ -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 -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers --DEBUG_FLAGS?= -g -ggdb --REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) -+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) - REAL_LDFLAGS=$(LDFLAGS) + 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) $(HIREDIS_CFLAGS) ++REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) $(HIREDIS_CFLAGS) + REAL_LDFLAGS=$(LDFLAGS) $(HIREDIS_LDFLAGS) DYLIBSUFFIX=so -@@ -83,7 +81,16 @@ - CFLAGS+=-I$(OPENSSL_PREFIX)/include - SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto +@@ -127,7 +126,16 @@ endif + else + REAL_CFLAGS+=-pedantic endif - +ifeq ($(uname_S),FreeBSD) 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-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 index 6b3ed47b68be..40cff0e1b880 100644 --- a/databases/redis/files/patch-src-Makefile +++ b/databases/redis/files/patch-src_Makefile @@ -1,25 +1,25 @@ ---- src/Makefile.orig 2019-11-29 16:35:59 UTC +--- src/Makefile.orig 2025-08-04 11:05:03 UTC +++ src/Makefile -@@ -29,7 +29,7 @@ endif - WARN=-Wall -W -Wno-missing-field-initializers - OPT=$(OPTIMIZATION) +@@ -67,7 +67,7 @@ endif + STD+=-std=c99 + endif -PREFIX?=/usr/local +PREFIX:=$(PREFIX) INSTALL_BIN=$(PREFIX)/bin INSTALL=install - -@@ -75,7 +75,6 @@ endif + PKG_CONFIG?=pkg-config +@@ -143,7 +143,6 @@ FINAL_LIBS=-lm -lstdc++ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) - FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm + FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG) + FINAL_LIBS=-lm -lstdc++ -DEBUG=-g -ggdb - # Linux ARM needs -latomic at linking time - ifneq (,$(filter aarch64 armv,$(uname_M))) -@@ -105,6 +104,11 @@ ifeq ($(uname_S),Darwin) - OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include - OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib + # Linux ARM32 needs -latomic at linking time + ifneq (,$(findstring armv,$(uname_M))) +@@ -182,6 +181,11 @@ else + OPENSSL_PREFIX?=/usr/local/opt/openssl + endif else +ifeq ($(uname_S),FreeBSD) + # FreeBSD @@ -29,7 +29,7 @@ ifeq ($(uname_S),AIX) # AIX FINAL_LDFLAGS+= -Wl,-bexpall -@@ -131,6 +135,7 @@ else +@@ -231,6 +235,7 @@ else # All the other OSes (notably Linux) FINAL_LDFLAGS+= -rdynamic FINAL_LIBS+=-ldl -pthread -lrt diff --git a/databases/redis/files/patch-src-mkreleasehdr.sh b/databases/redis/files/patch-src_mkreleasehdr.sh index e48b3174d315..2a568628139d 100644 --- a/databases/redis/files/patch-src-mkreleasehdr.sh +++ b/databases/redis/files/patch-src_mkreleasehdr.sh @@ -1,9 +1,9 @@ ---- src/mkreleasehdr.sh.orig 2019-11-22 16:54:22 UTC +--- src/mkreleasehdr.sh.orig 2024-06-06 11:03:20 UTC +++ src/mkreleasehdr.sh @@ -1,6 +1,6 @@ #!/bin/sh -GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1` --GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l` +-GIT_DIRTY=`git diff --no-ext-diff -- ../src ../deps 2> /dev/null | wc -l` +GIT_SHA1="00000000" +GIT_DIRTY="0" BUILD_ID=`uname -n`"-"`date +%s` |