diff --git a/textproc/redisearch2/Makefile b/textproc/redisearch2/Makefile index cfc18cc785c1..d6c6a08582e0 100644 --- a/textproc/redisearch2/Makefile +++ b/textproc/redisearch2/Makefile @@ -1,53 +1,53 @@ PORTNAME= redisearch DISTVERSIONPREFIX= v -DISTVERSION= 2.10.0 +DISTVERSION= 2.10.1 CATEGORIES= textproc PKGNAMESUFFIX= ${DISTVERSION:R:R} MAINTAINER= bofh@FreeBSD.org COMMENT= Full-text search over Redis (2.10.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 BUILD_DEPENDS= ${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs USES= cmake compiler localbase USE_GITHUB= yes GH_ACCOUNT= RediSearch GH_PROJECT= RediSearch -GH_TUPLE= RedisAI:VectorSimilarity:94f2fcd:vectorsimilarity/deps/VectorSimilarity \ +GH_TUPLE= RedisAI:VectorSimilarity:0ca9b98:vectorsimilarity/deps/VectorSimilarity \ google:cpu_features:438a66e:cpu_features/deps/cpu_features \ - RedisLabsModules:readies:2e1bb77:readies/deps/readies \ + RedisLabsModules:readies:5771466:readies/deps/readies \ RedisLabs:RedisModulesSDK:7ba899d:redismodulesdk/deps/RedisModulesSDK \ CMAKE_ARGS= -DGIT_DESCRIBE_VERSION:STRING=${PKGVERSION} \ -DOS=freebsd -Wno-dev PLIST_FILES= lib/${PORTNAME}${PKGNAMESUFFIX}.so CFLAGS+= -DCLOCK_MONOTONIC_RAW=CLOCK_MONOTONIC -fPIC CXXFLAGS+=-Wno-vla-cxx-extension -fPIC post-patch: @${REINPLACE_CMD} -e '/conan_toolchain.cmake/d' \ ${WRKSRC}/src/geometry/CMakeLists.txt pre-configure: @${MKDIR} ${WRKDIR}/.build/_deps @${MV} ${WRKSRC}/deps/cpu_features ${WRKDIR}/.build/_deps/cpu_features-src 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/redisearch2/distinfo b/textproc/redisearch2/distinfo index 27000f97c3d1..150a96a8fc15 100644 --- a/textproc/redisearch2/distinfo +++ b/textproc/redisearch2/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1780187118 -SHA256 (RediSearch-RediSearch-v2.10.0_GH0.tar.gz) = 0afa5d18c062d589f59732f510c23893ebc4deae60502cb8be5b02a87c24108f -SIZE (RediSearch-RediSearch-v2.10.0_GH0.tar.gz) = 6877953 -SHA256 (RedisAI-VectorSimilarity-94f2fcd_GH0.tar.gz) = 89e7b7cbf539e81cd93d2063a776af80417ee69f1fe5239b1acd61e7bb9a9bef -SIZE (RedisAI-VectorSimilarity-94f2fcd_GH0.tar.gz) = 589297 +TIMESTAMP = 1780749693 +SHA256 (RediSearch-RediSearch-v2.10.1_GH0.tar.gz) = 07db47c16f381a54303f3fd7094e7c65f70c6610845a78c5ce1e125e7f31222c +SIZE (RediSearch-RediSearch-v2.10.1_GH0.tar.gz) = 4581781 +SHA256 (RedisAI-VectorSimilarity-0ca9b98_GH0.tar.gz) = 0672c0e9543a3c0ec9680c7ec05b2142c8c9df36adb33cf571c47707244690f4 +SIZE (RedisAI-VectorSimilarity-0ca9b98_GH0.tar.gz) = 596603 SHA256 (google-cpu_features-438a66e_GH0.tar.gz) = 7e99e30d5e3e572c8e4fe103c0caa937bf69fb6fe6a0bdf127511bdaab9db4e7 SIZE (google-cpu_features-438a66e_GH0.tar.gz) = 92085 -SHA256 (RedisLabsModules-readies-2e1bb77_GH0.tar.gz) = 7ec6b210e800fc8d87b165528fca0b4a5a71eb554eb00e90a01397d03a8c0680 -SIZE (RedisLabsModules-readies-2e1bb77_GH0.tar.gz) = 89668 +SHA256 (RedisLabsModules-readies-5771466_GH0.tar.gz) = e3f34460ae842db79f822a2cdd4ed4b2b155b9867317c9f7918fe87cb468ccb2 +SIZE (RedisLabsModules-readies-5771466_GH0.tar.gz) = 94121 SHA256 (RedisLabs-RedisModulesSDK-7ba899d_GH0.tar.gz) = dd4b7e691ce013f849317f0e472f6219e86a570d3eac50bacf060ffb2b56c4b2 SIZE (RedisLabs-RedisModulesSDK-7ba899d_GH0.tar.gz) = 138229 diff --git a/textproc/redisearch2/files/patch-deps_thpool_thpool.c b/textproc/redisearch2/files/patch-deps_thpool_thpool.c new file mode 100644 index 000000000000..aa142e4445c0 --- /dev/null +++ b/textproc/redisearch2/files/patch-deps_thpool_thpool.c @@ -0,0 +1,11 @@ +--- deps/thpool/thpool.c.orig 2026-06-06 14:37:50 UTC ++++ deps/thpool/thpool.c +@@ -420,6 +420,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/redisearch2/files/patch-src_fork__gc.c b/textproc/redisearch2/files/patch-src_fork__gc.c index 239d16d4ab4e..ab19a52fb823 100644 --- a/textproc/redisearch2/files/patch-src_fork__gc.c +++ b/textproc/redisearch2/files/patch-src_fork__gc.c @@ -1,21 +1,21 @@ ---- src/fork_gc.c.orig 2023-09-11 20:00:48 UTC +--- src/fork_gc.c.orig 2024-04-16 14:20:46 UTC +++ src/fork_gc.c -@@ -266,6 +266,7 @@ static void sendHeaderString(ForkGC *gc, void *arg) { +@@ -273,6 +273,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 +@@ -289,7 +290,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/redisearch2/files/patch-src_numeric__index.c b/textproc/redisearch2/files/patch-src_numeric__index.c index cdd9e122c82b..a9edb369928b 100644 --- a/textproc/redisearch2/files/patch-src_numeric__index.c +++ b/textproc/redisearch2/files/patch-src_numeric__index.c @@ -1,11 +1,11 @@ ---- src/numeric_index.c.orig 2023-09-11 20:00:48 UTC +--- src/numeric_index.c.orig 2024-04-16 14:20:46 UTC +++ src/numeric_index.c -@@ -700,7 +700,7 @@ int NumericIndexType_Register(RedisModuleCtx *ctx) { +@@ -714,7 +714,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) {