diff --git a/textproc/redisearch28/Makefile b/textproc/redisearch28/Makefile index 44fae2853c39..d3553f89d75f 100644 --- a/textproc/redisearch28/Makefile +++ b/textproc/redisearch28/Makefile @@ -1,58 +1,58 @@ PORTNAME= redisearch DISTVERSIONPREFIX= v -DISTVERSION= 2.8.1 +DISTVERSION= 2.8.2 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 BUILD_DEPENDS= ${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs LIB_DEPENDS= libabsl_base.so:devel/abseil USES= cmake compiler localbase USE_GITHUB= yes GH_ACCOUNT= RediSearch GH_PROJECT= RediSearch -GH_TUPLE= RedisAI:VectorSimilarity:9f38780:vectorsimilarity/deps/VectorSimilarity \ +GH_TUPLE= RedisAI:VectorSimilarity:e134c63:vectorsimilarity/deps/VectorSimilarity \ google:cpu_features:438a66e:cpu_features/deps/cpu_features \ - RedisLabsModules:readies:0e32e28:readies/deps/readies \ + RedisLabsModules:readies:185fd0d: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 post-patch: @${REINPLACE_CMD} -e 's|20230125.1|20250127|g' \ -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/redisearch28/distinfo b/textproc/redisearch28/distinfo index 45b12eb2f8e2..3e25d5f7ee63 100644 --- a/textproc/redisearch28/distinfo +++ b/textproc/redisearch28/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1780749519 -SHA256 (RediSearch-RediSearch-v2.8.1_GH0.tar.gz) = 1ebf8f42fbd356872adaed11ec81e642ebcf256e4d711d1ad6cf40988a7dc735 -SIZE (RediSearch-RediSearch-v2.8.1_GH0.tar.gz) = 6806380 -SHA256 (RedisAI-VectorSimilarity-9f38780_GH0.tar.gz) = b90b6d5d7c5521a363cf39d5c164434514c262c95b49b0285425837f9987edf9 -SIZE (RedisAI-VectorSimilarity-9f38780_GH0.tar.gz) = 519191 +TIMESTAMP = 1781358293 +SHA256 (RediSearch-RediSearch-v2.8.2_GH0.tar.gz) = d265c353313bdb9542c8f7829e3337573d7576a052d988c7f59748ccd79a0c8e +SIZE (RediSearch-RediSearch-v2.8.2_GH0.tar.gz) = 6832780 +SHA256 (RedisAI-VectorSimilarity-e134c63_GH0.tar.gz) = b32cd1eda89f7a30ffe3be7106f60550e0e64ea9b46c9db70ed72f66368ff4ab +SIZE (RedisAI-VectorSimilarity-e134c63_GH0.tar.gz) = 593084 SHA256 (google-cpu_features-438a66e_GH0.tar.gz) = 7e99e30d5e3e572c8e4fe103c0caa937bf69fb6fe6a0bdf127511bdaab9db4e7 SIZE (google-cpu_features-438a66e_GH0.tar.gz) = 92085 -SHA256 (RedisLabsModules-readies-0e32e28_GH0.tar.gz) = d2b34cd86dd4e250d380f170804426df0e180a6002ab3c131f936db705e89a0c -SIZE (RedisLabsModules-readies-0e32e28_GH0.tar.gz) = 86439 +SHA256 (RedisLabsModules-readies-185fd0d_GH0.tar.gz) = f78a3f9f389ed519e94f4f08029f78bf2ff87ada5d32343c1adb31e7a85766c0 +SIZE (RedisLabsModules-readies-185fd0d_GH0.tar.gz) = 86580 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_info__iterator.h b/textproc/redisearch28/files/patch-deps_VectorSimilarity_src_VecSim_info__iterator.h index 806f1a23141f..efe4fc3e2e6b 100644 --- a/textproc/redisearch28/files/patch-deps_VectorSimilarity_src_VecSim_info__iterator.h +++ b/textproc/redisearch28/files/patch-deps_VectorSimilarity_src_VecSim_info__iterator.h @@ -1,19 +1,19 @@ ---- deps/VectorSimilarity/src/VecSim/info_iterator.h.orig 2026-05-30 23:32:41 UTC +--- deps/VectorSimilarity/src/VecSim/info_iterator.h.orig 2023-05-24 22:12:35 UTC +++ deps/VectorSimilarity/src/VecSim/info_iterator.h @@ -6,6 +6,7 @@ #pragma once #include +#include #ifdef __cplusplus extern "C" { #endif -@@ -27,7 +28,7 @@ typedef union { +@@ -28,7 +29,7 @@ typedef union { typedef union { - double floatingPointValue; // Floating point value. 64 bits float. - int64_t integerValue; // Integer value. Signed 64 bits integer. -- u_int64_t uintegerValue; // Unsigned value. Unsigned 64 buts integer. -+ uint64_t uintegerValue; // Unsigned value. Unsigned 64 buts integer. - const char *stringValue; // String value. + double floatingPointValue; // Floating point value. 64 bits float. + int64_t integerValue; // Integer value. Signed 64 bits integer. +- u_int64_t uintegerValue; // Unsigned value. Unsigned 64 buts integer. ++ uint64_t uintegerValue; // Unsigned value. Unsigned 64 buts integer. + const char *stringValue; // String value. + VecSimInfoIterator *iteratorValue; // Iterator value. } FieldValue; - 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 new file mode 100644 index 000000000000..1182f62959ff --- /dev/null +++ b/textproc/redisearch28/files/patch-deps_VectorSimilarity_src_VecSim_vec__sim__index.h @@ -0,0 +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 +@@ -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" diff --git a/textproc/redisearch28/files/patch-src_fork__gc.c b/textproc/redisearch28/files/patch-src_fork__gc.c index fd39972024ca..d0560f65cc13 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-05-04 07:44:04 UTC +--- src/fork_gc.c.orig 2023-06-07 19:36:39 UTC +++ src/fork_gc.c -@@ -265,6 +265,7 @@ static void sendHeaderString(ForkGC *gc, void *arg) { +@@ -266,6 +266,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); } -@@ -281,7 +282,9 @@ static void FGC_childCollectTerms(ForkGC *gc, RedisSea +@@ -282,7 +283,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) {