Date: Wed, 1 Oct 2025 18:16:51 GMT From: Juraj Lutter <otis@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 020b08ec7cd5 - main - textproc/opensearch: Update to 3.2.0 Message-ID: <202510011816.591IGpxc004486@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=020b08ec7cd53f441ed2ae0566293a4de7429c3e commit 020b08ec7cd53f441ed2ae0566293a4de7429c3e Author: Sven Ruediger <admin@hackacad.net> AuthorDate: 2025-09-28 14:57:41 +0000 Commit: Juraj Lutter <otis@FreeBSD.org> CommitDate: 2025-10-01 18:16:21 +0000 textproc/opensearch: Update to 3.2.0 And also: - Add opensearch_flags for temporary startup parameters - Add opensearch_env for setting environment variables - Remove AVX2 check - Bump OpenJDK to upstream supported version 24 - Regenerate distinfo for both amd64 and aarch64 distfiles Release notes: https://github.com/opensearch-project/OpenSearch/releases/tag/3.2.0 Differential review: https://reviews.freebsd.org/D52392 --- textproc/opensearch/Makefile | 78 ++++++++-------------- textproc/opensearch/distinfo | 8 ++- textproc/opensearch/files/opensearch.in | 13 ++++ .../opensearch/files/patch-config_opensearch.yml | 9 ++- 4 files changed, 53 insertions(+), 55 deletions(-) diff --git a/textproc/opensearch/Makefile b/textproc/opensearch/Makefile index 5d892d18b277..1713a5a82e9f 100644 --- a/textproc/opensearch/Makefile +++ b/textproc/opensearch/Makefile @@ -1,13 +1,11 @@ PORTNAME= opensearch -DISTVERSION?= 3.1.0 -DISTVERSIONSUFFIX= -linux-x64 -PORTREVISION?= 0 +DISTVERSION= 3.2.0 +DISTVERSIONSUFFIX= -linux-${OPENSEARCH_ARCH} CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/ -PKGNAMESUFFIX?= # MAINTAINER= opensearch@FreeBSD.org -COMMENT?= Full-text search engine for Java +COMMENT= Full-text search engine for Java WWW= https://opensearch.org LICENSE= APACHE20 @@ -20,66 +18,50 @@ USES= cpe java shebangfix JAVA_VERSION= 21+ USE_RC_SUBR= ${PORTNAME} -SHEBANG_FILES= bin/opensearch bin/opensearch-cli \ - bin/opensearch-env bin/opensearch-env-from-file \ - bin/opensearch-keystore bin/opensearch-node \ - bin/opensearch-plugin bin/opensearch-shard \ +SHEBANG_FILES= bin/opensearch bin/opensearch-cli bin/opensearch-env \ + bin/opensearch-env-from-file bin/opensearch-keystore \ + bin/opensearch-node bin/opensearch-plugin bin/opensearch-shard \ plugins/opensearch-security/tools/audit_config_migrater.sh \ plugins/opensearch-security/tools/hash.sh \ plugins/opensearch-security/tools/install_demo_configuration.sh \ plugins/opensearch-security/tools/securityadmin.sh -CONFLICTS?= opensearch13 opensearch210 opensearch213 opensearch216 +CONFLICTS_INSTALL= opensearch13 opensearch21[0369] NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} -OPTIONS_DEFINE= PLUGINS -OPTIONS_DEFAULT=PLUGINS +OPTIONS_DEFINE= PLUGINS +OPTIONS_DEFAULT= PLUGINS .include <bsd.port.options.mk> +OPENSEARCH_ARCH?= ${ARCH:S|aarch64|arm64|:S|amd64|x64|} + CONFIG_FILES= opensearch.yml jvm.options log4j2.properties -PLUGINS_CONFIG_FILES?= \ - opensearch-notifications-core/notifications-core.yml \ - opensearch-notifications/notifications.yml \ - opensearch-observability/observability.yml -.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213" || ${PKGNAMESUFFIX} == "216" -PLUGINS_CONFIG_FILES+= \ - opensearch-performance-analyzer/agent-stats-metadata \ - opensearch-performance-analyzer/log4j2.xml \ - opensearch-performance-analyzer/opensearch_security.policy \ - opensearch-performance-analyzer/performance-analyzer.properties \ - opensearch-performance-analyzer/plugin-stats-metadata \ - opensearch-performance-analyzer/rca.conf \ - opensearch-performance-analyzer/rca_idle_cluster_manager.conf \ - opensearch-performance-analyzer/rca_cluster_manager.conf \ - opensearch-performance-analyzer/supervisord.conf \ - opensearch-security/whitelist.yml -.endif -PLUGINS_CONFIG_FILES+= \ - opensearch-reports-scheduler/reports-scheduler.yml \ - opensearch-security/action_groups.yml \ - opensearch-security/allowlist.yml \ - opensearch-security/audit.yml \ - opensearch-security/config.yml \ - opensearch-security/internal_users.yml \ - opensearch-security/nodes_dn.yml \ - opensearch-security/roles.yml \ - opensearch-security/roles_mapping.yml \ - opensearch-security/tenants.yml +PLUGINS_CONFIG_FILES?= opensearch-notifications-core/notifications-core.yml \ + opensearch-notifications/notifications.yml \ + opensearch-observability/observability.yml \ + opensearch-reports-scheduler/reports-scheduler.yml \ + opensearch-security/action_groups.yml \ + opensearch-security/allowlist.yml \ + opensearch-security/audit.yml \ + opensearch-security/config.yml \ + opensearch-security/internal_users.yml \ + opensearch-security/nodes_dn.yml \ + opensearch-security/roles.yml \ + opensearch-security/roles_mapping.yml \ + opensearch-security/tenants.yml # Upstream provide some *.example files. These are also copied as sample filse # but we do not register them as @sample to avoid installing filse that needs # to be tuned a site specific way. -PLUGINS_SAMPLE_CONFIG_FILES= \ - opensearch-security/opensearch.yml +PLUGINS_SAMPLE_CONFIG_FILES= opensearch-security/opensearch.yml BINS= opensearch opensearch-cli opensearch-env \ - opensearch-env-from-file opensearch-keystore \ - opensearch-node opensearch-plugin \ - opensearch-shard + opensearch-env-from-file opensearch-keystore opensearch-node \ + opensearch-plugin opensearch-shard SEARCHUSER?= opensearch SEARCHGROUP?= ${SEARCHUSER} @@ -115,9 +97,6 @@ do-install-PLUGINS-on: ${STAGEDIR}${ETCDIR}/opensearch-observability \ ${STAGEDIR}${ETCDIR}/opensearch-reports-scheduler \ ${STAGEDIR}${ETCDIR}/opensearch-security -.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213" || ${PKGNAMESUFFIX} == "216" - ${MKDIR} ${STAGEDIR}${ETCDIR}/opensearch-performance-analyzer -.endif .for f in ${PLUGINS_CONFIG_FILES} ${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample @@ -143,9 +122,6 @@ post-install: ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-notifications-core" >> ${TMPPLIST} ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-notifications" >> ${TMPPLIST} ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-observability" >> ${TMPPLIST} -.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213" || ${PKGNAMESUFFIX} == "216" - ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-performance-analyzer" >> ${TMPPLIST} -.endif ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-reports-scheduler" >> ${TMPPLIST} ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-security" >> ${TMPPLIST} .endif diff --git a/textproc/opensearch/distinfo b/textproc/opensearch/distinfo index 631008869626..9ef9dd9ba6e7 100644 --- a/textproc/opensearch/distinfo +++ b/textproc/opensearch/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1752307580 -SHA256 (opensearch-3.1.0-linux-x64.tar.gz) = a5eb65b1fab3ff4e0befba8cf48174e8bc2daee6d85ffd5b5c4ccf5cbf427eb6 -SIZE (opensearch-3.1.0-linux-x64.tar.gz) = 1000330285 +TIMESTAMP = 1759259967 +SHA256 (opensearch-3.2.0-linux-x64.tar.gz) = 3f77e6a69925af8a18d6feaa651129027dccab4e4f8a20c23fee7873db992f44 +SIZE (opensearch-3.2.0-linux-x64.tar.gz) = 942883522 +SHA256 (opensearch-3.2.0-linux-arm64.tar.gz) = 0341d98624dcd6563d23682e6f71643c445bdb56f21c10ff029cb98e9beb370e +SIZE (opensearch-3.2.0-linux-arm64.tar.gz) = 694814003 diff --git a/textproc/opensearch/files/opensearch.in b/textproc/opensearch/files/opensearch.in index 71334ce1ee01..288959f2e9a9 100644 --- a/textproc/opensearch/files/opensearch.in +++ b/textproc/opensearch/files/opensearch.in @@ -17,6 +17,13 @@ # Set it to the config file location. # opensearch_java_home (path): Set to %%JAVA_HOME%% by default. # Set it to the root of the JDK to use. +# opensearch_flags (): Set to "" by default. +# Configure temporary startup flags +# Format: "-Enetwork.host=0.0.0.0 -Ediscovery.type=single-node" +# See: docs.opensearch.org/latest/install-and-configure/configuring-opensearch/index/ +# opensearch_env (): Set to "" by default. +# Configure environment +# Format: "OPENSEARCH_INITIAL_ADMIN_PASSWORD=Secret!Password1" # . /etc/rc.subr @@ -31,6 +38,8 @@ load_rc_config ${name} : ${opensearch_config=%%PREFIX%%/etc/opensearch} : ${opensearch_login_class=root} : ${opensearch_java_home="%%JAVA_HOME%%"} +: ${opensearch_flags=""} +: ${opensearch_env=""} required_files="${opensearch_config}/opensearch.yml" _pidprefix=/var/run/opensearch/opensearch @@ -46,6 +55,10 @@ command_args="-d --pidfile=${pidfile}" export OPENSEARCH_PATH_CONF=${opensearch_config} export JAVA_HOME=${opensearch_java_home} +if [ -n "${opensearch_env}" ]; then + export ${opensearch_env} +fi + opensearch_precmd() { /usr/bin/install -d -o ${opensearch_user} -g ${opensearch_group} -m 755 ${pidfile%/*} diff --git a/textproc/opensearch/files/patch-config_opensearch.yml b/textproc/opensearch/files/patch-config_opensearch.yml index f5aa3ed1a80e..9783498e3ef6 100644 --- a/textproc/opensearch/files/patch-config_opensearch.yml +++ b/textproc/opensearch/files/patch-config_opensearch.yml @@ -1,4 +1,4 @@ ---- config/opensearch.yml.orig 2021-07-02 23:22:08 UTC +--- config/opensearch.yml.orig 2021-07-02 23:22:08 UTC +++ config/opensearch.yml @@ -31,10 +31,12 @@ # Path to directory where to store the data (separate multiple locations by comma): @@ -13,3 +13,10 @@ # # ----------------------------------- Memory ----------------------------------- # +@@ -122,3 +124,7 @@ + # + #opensearch.experimental.optimization.datetime_formatter_caching.enabled: false ++ ++# Disable unsupported AVX2, https://github.com/opensearch-project/k-NN/issues/2788 ++knn.faiss.avx2.disabled: true ++knn.faiss.avx512_spr.disabled: truehome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510011816.591IGpxc004486>