diff --git a/textproc/redisearch2/Makefile b/textproc/redisearch2/Makefile index c6ea1e4104a6..7c2b4367f650 100644 --- a/textproc/redisearch2/Makefile +++ b/textproc/redisearch2/Makefile @@ -1,54 +1,54 @@ PORTNAME= redisearch DISTVERSIONPREFIX= v -DISTVERSION= 2.10.7 +DISTVERSION= 2.10.8 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 NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= requires 64-bit architecture LIB_DEPENDS= libcpu_features.so:devel/cpu_features BUILD_DEPENDS= ${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs USES= cmake compiler localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= RediSearch GH_PROJECT= RediSearch -GH_TUPLE= RedisAI:VectorSimilarity:2986fed:vectorsimilarity/deps/VectorSimilarity \ +GH_TUPLE= RedisAI:VectorSimilarity:f45dd53:vectorsimilarity/deps/VectorSimilarity \ RedisLabsModules:readies:9f19bb2:readies/deps/readies \ RedisLabs:RedisModulesSDK:6a62be4: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 -I${LOCALBASE}/include/cpu_features LDFLAGS+= -lcpu_features post-patch: #@${REINPLACE_CMD} -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/redisearch2/distinfo b/textproc/redisearch2/distinfo index 6bfbb268b2d1..8bf9f47301fa 100644 --- a/textproc/redisearch2/distinfo +++ b/textproc/redisearch2/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1784489001 -SHA256 (RediSearch-RediSearch-v2.10.7_GH0.tar.gz) = 7288911d04a3f4c54ed11f34d2824e7b84d2ca8f7203b10193abef3a27103947 -SIZE (RediSearch-RediSearch-v2.10.7_GH0.tar.gz) = 4581762 -SHA256 (RedisAI-VectorSimilarity-2986fed_GH0.tar.gz) = acf56ea6af4d0449ae80e6ab94ed44e6e6d580137ba09b9222131a4e5d106b50 -SIZE (RedisAI-VectorSimilarity-2986fed_GH0.tar.gz) = 386793 +TIMESTAMP = 1784925247 +SHA256 (RediSearch-RediSearch-v2.10.8_GH0.tar.gz) = 2ed85d1cd5e6cd0f459c19d09ca81024463c282ad1fa4e430362db3b2922e6f1 +SIZE (RediSearch-RediSearch-v2.10.8_GH0.tar.gz) = 4581221 +SHA256 (RedisAI-VectorSimilarity-f45dd53_GH0.tar.gz) = 58efbde3b88a32d9be487fd2d95c2401f60cdbeaaeb07ee8cfa13391384cbbb5 +SIZE (RedisAI-VectorSimilarity-f45dd53_GH0.tar.gz) = 387952 SHA256 (RedisLabsModules-readies-9f19bb2_GH0.tar.gz) = 223c10233c97139eb5a4372686d45605aa85b53ca866127fbe674a69c1e0c19a SIZE (RedisLabsModules-readies-9f19bb2_GH0.tar.gz) = 94113 SHA256 (RedisLabs-RedisModulesSDK-6a62be4_GH0.tar.gz) = 92f724ae46481abcd292e318fccff6cb691c1d295e288c6efa68ed51aae75d83 SIZE (RedisLabs-RedisModulesSDK-6a62be4_GH0.tar.gz) = 138459 diff --git a/textproc/redisearch2/files/patch-deps_thpool_thpool.c b/textproc/redisearch2/files/patch-deps_thpool_thpool.c index aa142e4445c0..64a98f0e3798 100644 --- a/textproc/redisearch2/files/patch-deps_thpool_thpool.c +++ b/textproc/redisearch2/files/patch-deps_thpool_thpool.c @@ -1,11 +1,11 @@ ---- deps/thpool/thpool.c.orig 2026-06-06 14:37:50 UTC +--- deps/thpool/thpool.c.orig 2024-09-12 09:26:06 UTC +++ deps/thpool/thpool.c -@@ -420,6 +420,8 @@ static void* thread_do(struct thread* thread_p) { +@@ -651,6 +651,8 @@ static void *thread_do(redisearch_thpool_t *thpool_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 + LOG_IF_EXISTS( + "warning", diff --git a/textproc/redisearch2/files/patch-src_fork__gc.c b/textproc/redisearch2/files/patch-src_fork__gc.c index ab19a52fb823..4c2f411c2985 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 2024-04-16 14:20:46 UTC +--- src/fork_gc.c.orig 2024-09-12 09:26:06 UTC +++ src/fork_gc.c -@@ -273,6 +273,7 @@ static void sendHeaderString(ForkGC *gc, void *arg) { +@@ -278,6 +278,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); } -@@ -289,7 +290,9 @@ static void FGC_childCollectTerms(ForkGC *gc, RedisSea +@@ -294,7 +295,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_geometry_CMakeLists.txt b/textproc/redisearch2/files/patch-src_geometry_CMakeLists.txt new file mode 100644 index 000000000000..f07eb80f6436 --- /dev/null +++ b/textproc/redisearch2/files/patch-src_geometry_CMakeLists.txt @@ -0,0 +1,15 @@ +--- src/geometry/CMakeLists.txt.orig 2026-07-24 21:10:30 UTC ++++ src/geometry/CMakeLists.txt +@@ -9,7 +9,11 @@ message(STATUS "BOOST_DIR: ${BOOST_DIR}") + # include_directories(${absl_INCLUDE_DIR}) + message(STATUS "BOOST_DIR: ${BOOST_DIR}") + +-if(NOT BOOST_DIR STREQUAL "" AND EXISTS ${BOOST_DIR}) ++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ message(STATUS "FreeBSD detected, using system Boost") ++ find_package(Boost REQUIRED) ++ include_directories(${Boost_INCLUDE_DIRS}) ++elseif(NOT BOOST_DIR STREQUAL "" AND EXISTS ${BOOST_DIR}) + message(STATUS "BOOST_DIR is not empty: ${BOOST_DIR}") + include_directories(${BOOST_DIR}) + else() diff --git a/textproc/redisearch2/files/patch-src_numeric__index.c b/textproc/redisearch2/files/patch-src_numeric__index.c index a9edb369928b..844bda783d03 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 2024-04-16 14:20:46 UTC +--- src/numeric_index.c.orig 2024-09-12 09:26:06 UTC +++ src/numeric_index.c -@@ -714,7 +714,7 @@ int NumericIndexType_Register(RedisModuleCtx *ctx) { +@@ -689,7 +689,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) { diff --git a/textproc/redisearch2/files/patch-src_redis__index.c b/textproc/redisearch2/files/patch-src_redis__index.c index e046b5b2d041..55ee779c6b77 100644 --- a/textproc/redisearch2/files/patch-src_redis__index.c +++ b/textproc/redisearch2/files/patch-src_redis__index.c @@ -1,11 +1,11 @@ ---- src/redis_index.c.orig 2023-09-11 20:00:48 UTC +--- src/redis_index.c.orig 2024-09-12 09:26:06 UTC +++ src/redis_index.c -@@ -114,7 +114,7 @@ int InvertedIndex_RegisterType(RedisModuleCtx *ctx) { +@@ -121,7 +121,7 @@ int InvertedIndex_RegisterType(RedisModuleCtx *ctx) { .rdb_load = InvertedIndex_RdbLoad, .rdb_save = InvertedIndex_RdbSave, .aof_rewrite = GenericAofRewrite_DisabledHandler, - .mem_usage = InvertedIndex_MemUsage, + .mem_usage = (const void *)InvertedIndex_MemUsage, .free = InvertedIndex_Free}; InvertedIndexType = RedisModule_CreateDataType(ctx, "ft_invidx", INVERTED_INDEX_ENCVER, &tm);