diff --git a/textproc/redisearch28/Makefile b/textproc/redisearch28/Makefile index 9f046fed19e7..6b779f4f4126 100644 --- a/textproc/redisearch28/Makefile +++ b/textproc/redisearch28/Makefile @@ -1,59 +1,59 @@ PORTNAME= redisearch DISTVERSIONPREFIX= v -DISTVERSION= 2.8.8 +DISTVERSION= 2.8.9 CATEGORIES= textproc PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} MAINTAINER= bofh@FreeBSD.org COMMENT= Full-text search over Redis (2.8.X) WWW= https://github.com/RediSearch/RediSearch/ LICENSE= RSALv2 SSPLv1 LICENSE_COMB= dual LICENSE_NAME_RSALv2= Redis Source Available License v2 LICENSE_NAME_SSPLv1= Server Side Public License v1 LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_FILE_RSALv2= ${WRKSRC}/licenses/RSALv2.txt LICENSE_FILE_SSPLv1= ${WRKSRC}/licenses/SSPLv1.txt LICENSE_PERMS_RSALv2= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= requires 64-bit architecture BUILD_DEPENDS= ${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs LIB_DEPENDS= libabsl_base.so:devel/abseil \ libcpu_features.so:devel/cpu_features USES= cmake compiler localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= RediSearch GH_PROJECT= RediSearch GH_TUPLE= RedisAI:VectorSimilarity:94f2fcd:vectorsimilarity/deps/VectorSimilarity \ - RedisLabsModules:readies:3b1d2f2:readies/deps/readies \ + RedisLabsModules:readies:54ecd52:readies/deps/readies \ RedisLabs:RedisModulesSDK:7ba899d:redismodulesdk/deps/RedisModulesSDK \ google:s2geometry:efb4eb8:s2geometry/deps/s2geometry CMAKE_ARGS= -DGIT_DESCRIBE_VERSION:STRING=${PKGVERSION} \ -DOS=freebsd -Wno-dev CONFLICTS_INSTALL= redisearch* PLIST_FILES= lib/${PORTNAME}${PKGNAMESUFFIX}.so CFLAGS+= -DCLOCK_MONOTONIC_RAW=CLOCK_MONOTONIC -fPIC CXXFLAGS+= -Wno-vla-cxx-extension -fPIC -I${LOCALBASE}/include/cpu_features LDFLAGS+= -lcpu_features post-patch: @${REINPLACE_CMD} -e 's|20230125.1|20250127|g' \ -e '/conan_toolchain.cmake/d' \ ${WRKSRC}/src/geometry/CMakeLists.txt ${ECHO_CMD} "find_package(CpuFeatures REQUIRED)" > ${WRKSRC}/deps/VectorSimilarity/cmake/cpu_features.cmake do-install: ${INSTALL} -m 0755 ${INSTALL_WRKSRC}/redisearch.so \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}.so .include diff --git a/textproc/redisearch28/distinfo b/textproc/redisearch28/distinfo index c8523d0c29a0..feacb2a80b84 100644 --- a/textproc/redisearch28/distinfo +++ b/textproc/redisearch28/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1784925106 -SHA256 (RediSearch-RediSearch-v2.8.8_GH0.tar.gz) = 889d67a3a57f7ba113f7c392aae1e16a6efafa603814a705f1bb77caa6a0f439 -SIZE (RediSearch-RediSearch-v2.8.8_GH0.tar.gz) = 6869391 +TIMESTAMP = 1785325403 +SHA256 (RediSearch-RediSearch-v2.8.9_GH0.tar.gz) = 680fe12f5bce5d26dd3f88e22a598e8a799458f1fec0fdcf879ba7009b99fe9a +SIZE (RediSearch-RediSearch-v2.8.9_GH0.tar.gz) = 6879956 SHA256 (RedisAI-VectorSimilarity-94f2fcd_GH0.tar.gz) = 89e7b7cbf539e81cd93d2063a776af80417ee69f1fe5239b1acd61e7bb9a9bef SIZE (RedisAI-VectorSimilarity-94f2fcd_GH0.tar.gz) = 589297 -SHA256 (RedisLabsModules-readies-3b1d2f2_GH0.tar.gz) = 91e954980dcc971aa2194eaebf921bfd5c6d91646bd0d8075bf0c593c29ae99c -SIZE (RedisLabsModules-readies-3b1d2f2_GH0.tar.gz) = 91488 +SHA256 (RedisLabsModules-readies-54ecd52_GH0.tar.gz) = 357d2e82929de9465523905303a6b905eb4bb778d8e1918914639ef0ffb8d839 +SIZE (RedisLabsModules-readies-54ecd52_GH0.tar.gz) = 93979 SHA256 (RedisLabs-RedisModulesSDK-7ba899d_GH0.tar.gz) = dd4b7e691ce013f849317f0e472f6219e86a570d3eac50bacf060ffb2b56c4b2 SIZE (RedisLabs-RedisModulesSDK-7ba899d_GH0.tar.gz) = 138229 SHA256 (google-s2geometry-efb4eb8_GH0.tar.gz) = a62ef2409c9c1fd0ef573892f3857fb73cd864b2410eecbbb104ff865ea09fa8 SIZE (google-s2geometry-efb4eb8_GH0.tar.gz) = 1170660 diff --git a/textproc/redisearch28/files/patch-deps_VectorSimilarity_src_VecSim_vec__sim__index.h b/textproc/redisearch28/files/patch-deps_VectorSimilarity_src_VecSim_vec__sim__index.h index 1182f62959ff..22de78d2ea4a 100644 --- a/textproc/redisearch28/files/patch-deps_VectorSimilarity_src_VecSim_vec__sim__index.h +++ b/textproc/redisearch28/files/patch-deps_VectorSimilarity_src_VecSim_vec__sim__index.h @@ -1,10 +1,10 @@ ---- deps/VectorSimilarity/src/VecSim/vec_sim_index.h.orig 2026-06-13 13:51:07 UTC +--- deps/VectorSimilarity/src/VecSim/vec_sim_index.h.orig 2023-08-29 09:07:42 UTC +++ deps/VectorSimilarity/src/VecSim/vec_sim_index.h @@ -9,6 +9,7 @@ #include "vec_sim_interface.h" #include "query_results.h" #include +#include #include "VecSim/memory/vecsim_base.h" #include "VecSim/utils/vec_utils.h" - #include "VecSim/spaces/spaces.h" + #include "VecSim/utils/alignment.h" diff --git a/textproc/redisearch28/files/patch-deps_thpool_thpool.c b/textproc/redisearch28/files/patch-deps_thpool_thpool.c new file mode 100644 index 000000000000..c18fbf922bfc --- /dev/null +++ b/textproc/redisearch28/files/patch-deps_thpool_thpool.c @@ -0,0 +1,11 @@ +--- deps/thpool/thpool.c.orig 2026-07-29 11:45:36 UTC ++++ deps/thpool/thpool.c +@@ -413,6 +413,8 @@ static void* thread_do(struct thread* thread_p) { + prctl(PR_SET_NAME, thread_name); + #elif defined(__APPLE__) && defined(__MACH__) + pthread_setname_np(thread_name); ++#elif defined(__FreeBSD__) ++ pthread_set_name_np(pthread_self(), thread_name); + #else + LOG_IF_EXISTS("warning", "thread_do(): pthread_setname_np is not supported on this system") + #endif diff --git a/textproc/redisearch28/files/patch-src_fork__gc.c b/textproc/redisearch28/files/patch-src_fork__gc.c index d0560f65cc13..f351b908b86e 100644 --- a/textproc/redisearch28/files/patch-src_fork__gc.c +++ b/textproc/redisearch28/files/patch-src_fork__gc.c @@ -1,21 +1,21 @@ ---- src/fork_gc.c.orig 2023-06-07 19:36:39 UTC +--- src/fork_gc.c.orig 2023-10-23 11:15:47 UTC +++ src/fork_gc.c -@@ -266,6 +266,7 @@ static void sendHeaderString(ForkGC *gc, void *arg) { +@@ -282,6 +282,7 @@ static void sendHeaderString(ForkGC *gc, void *arg) { } static void sendHeaderString(ForkGC *gc, void *arg) { + struct iovec { void *iov_base; size_t iov_len; }; struct iovec *iov = arg; FGC_sendBuffer(gc, iov->iov_base, iov->iov_len); } -@@ -282,7 +283,9 @@ static void FGC_childCollectTerms(ForkGC *gc, RedisSea +@@ -298,7 +299,9 @@ static void FGC_childCollectTerms(ForkGC *gc, RedisSea RedisModuleKey *idxKey = NULL; InvertedIndex *idx = Redis_OpenInvertedIndexEx(sctx, term, strlen(term), 1, NULL, &idxKey); if (idx) { - struct iovec iov = {.iov_base = (void *)term, termLen}; + struct iovec { void *iov_base; size_t iov_len; } iov; + iov.iov_base = term; + iov.iov_len = termLen; FGC_childRepairInvidx(gc, sctx, idx, sendHeaderString, &iov, NULL); } if (idxKey) { diff --git a/textproc/redisearch28/files/patch-src_numeric__index.c b/textproc/redisearch28/files/patch-src_numeric__index.c index d1cbc3855745..0edfc9467955 100644 --- a/textproc/redisearch28/files/patch-src_numeric__index.c +++ b/textproc/redisearch28/files/patch-src_numeric__index.c @@ -1,11 +1,11 @@ ---- src/numeric_index.c.orig 2023-05-04 07:44:04 UTC +--- src/numeric_index.c.orig 2023-10-23 11:15:47 UTC +++ src/numeric_index.c -@@ -700,7 +700,7 @@ int NumericIndexType_Register(RedisModuleCtx *ctx) { +@@ -708,7 +708,7 @@ int NumericIndexType_Register(RedisModuleCtx *ctx) { .rdb_save = NumericIndexType_RdbSave, .aof_rewrite = GenericAofRewrite_DisabledHandler, .free = NumericIndexType_Free, - .mem_usage = NumericIndexType_MemUsage}; + .mem_usage = (const void *)NumericIndexType_MemUsage}; NumericIndexType = RedisModule_CreateDataType(ctx, "numericdx", NUMERIC_INDEX_ENCVER, &tm); if (NumericIndexType == NULL) {