diff --git a/textproc/opensearch/Makefile b/textproc/opensearch/Makefile index 2615dd2843a5..bee0179adbdc 100644 --- a/textproc/opensearch/Makefile +++ b/textproc/opensearch/Makefile @@ -1,154 +1,154 @@ PORTNAME= opensearch -DISTVERSION?= 2.17.1 -PORTREVISION?= 1 +DISTVERSION?= 3.0.0 DISTVERSIONSUFFIX= -linux-x64 +PORTREVISION?= 0 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 WWW= https://opensearch.org LICENSE= APACHE20 BUILD_DEPENDS= jna>0:devel/jna RUN_DEPENDS= bash>0:shells/bash \ jna>0:devel/jna -CONFLICTS?= opensearch13 opensearch210 opensearch213 opensearch216 - USES= cpe java shebangfix -JAVA_VERSION= 17+ +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 \ 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 + NO_BUILD= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} OPTIONS_DEFINE= PLUGINS OPTIONS_DEFAULT=PLUGINS .include CONFIG_FILES= opensearch.yml jvm.options log4j2.properties -PLUGINS_CONFIG_FILES?= \ +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-performance-analyzer/supervisord.conf \ + opensearch-security/whitelist.yml .endif -PLUGINS_CONFIG_FILES+= \ +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 \ - opensearch-security/whitelist.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= \ +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 SEARCHUSER?= opensearch SEARCHGROUP?= ${SEARCHUSER} USERS= ${SEARCHUSER} GROUPS= ${SEARCHGROUP} SUB_FILES= pkg-message SUB_LIST= ETCDIR=${ETCDIR} \ JAVA_HOME=${JAVA_HOME} post-patch: ${RM} ${WRKSRC}/lib/jna-*.jar do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/opensearch .for f in ${CONFIG_FILES} ${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/lib/opensearch/bin .for f in ${BINS} ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/lib/opensearch/bin .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/lib/opensearch/extensions ${MKDIR} ${STAGEDIR}${PREFIX}/lib/opensearch/lib - (cd ${WRKSRC}/ && ${COPYTREE_SHARE} "lib modules" ${STAGEDIR}${PREFIX}/lib/opensearch/) + (cd ${WRKSRC}/ && ${COPYTREE_SHARE} "agent lib modules" ${STAGEDIR}${PREFIX}/lib/opensearch/) ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/opensearch ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${PREFIX}/lib/opensearch/config ${LN} -s ${JAVASHAREDIR}/classes/jna.jar ${STAGEDIR}${PREFIX}/lib/opensearch/lib/jna.jar do-install-PLUGINS-on: ${MKDIR} ${STAGEDIR}${ETCDIR}/opensearch-notifications-core \ ${STAGEDIR}${ETCDIR}/opensearch-notifications \ ${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 ${ECHO} "@sample(opensearch,opensearch,640) ${ETCDIR}/${f}.sample" >> ${TMPPLIST} .endfor .for f in ${PLUGINS_SAMPLE_CONFIG_FILES} ${INSTALL} ${WRKSRC}/config/${f}.example ${STAGEDIR}${ETCDIR}/${f}.sample ${ECHO} "@(opensearch,opensearch,640) ${ETCDIR}/${f}.sample" >> ${TMPPLIST} .endfor (cd ${WRKSRC}/ && ${COPYTREE_SHARE} "plugins" ${STAGEDIR}${PREFIX}/lib/opensearch/) (cd ${WRKSRC}/plugins/opensearch-security/tools && ${COPYTREE_BIN} "*.sh" ${STAGEDIR}${PREFIX}/lib/opensearch/plugins/opensearch-security/tools) post-install: .for f in ${CONFIG_FILES} ${ECHO} "@sample(opensearch,opensearch,640) ${ETCDIR}/${f}.sample" >> ${TMPPLIST} .endfor ${FIND} -s ${STAGEDIR}${PREFIX}/lib/opensearch -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir lib/opensearch/extensions" >> ${TMPPLIST} ${ECHO} "@dir libexec/opensearch" >> ${TMPPLIST} .if ${PORT_OPTIONS:MPLUGINS} ${ECHO} "@dir lib/opensearch/plugins" >> ${TMPPLIST} ${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 ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/" >> ${TMPPLIST} .include diff --git a/textproc/opensearch/distinfo b/textproc/opensearch/distinfo index 41da8f234109..78f252967ed2 100644 --- a/textproc/opensearch/distinfo +++ b/textproc/opensearch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728915409 -SHA256 (opensearch-2.17.1-linux-x64.tar.gz) = f66ed5b7ec7848f38102a54bf3c82e7d29aa86f02209c9ce8bb6cbe375f30a25 -SIZE (opensearch-2.17.1-linux-x64.tar.gz) = 908618130 +TIMESTAMP = 1746608948 +SHA256 (opensearch-3.0.0-linux-x64.tar.gz) = d98c60bf7d75b8b4257b2421dd22b89155e87be4b509da6a4e1136cf62e0b155 +SIZE (opensearch-3.0.0-linux-x64.tar.gz) = 978590132 diff --git a/textproc/opensearch/files/patch-config_jvm.options b/textproc/opensearch/files/patch-config_jvm.options index f6276944b6db..38426701b1ea 100644 --- a/textproc/opensearch/files/patch-config_jvm.options +++ b/textproc/opensearch/files/patch-config_jvm.options @@ -1,23 +1,32 @@ ---- config/jvm.options.orig 2021-07-30 14:01:34 UTC +--- config/jvm.options.orig 2025-04-30 02:05:24 UTC +++ config/jvm.options -@@ -61,17 +61,17 @@ +@@ -61,20 +61,20 @@ -XX:HeapDumpPath=data -XX:HeapDumpPath=data # specify an alternative path for JVM fatal error logs --XX:ErrorFile=logs/hs_err_pid%p.log -+-XX:ErrorFile=/hs_err_pid%p.log ++-XX:ErrorFile=${OPENSEARCH_TMPDIR}/hs_err_pid%p.log ## JDK 8 GC logging 8:-XX:+PrintGCDetails 8:-XX:+PrintGCDateStamps 8:-XX:+PrintTenuringDistribution 8:-XX:+PrintGCApplicationStoppedTime -8:-Xloggc:logs/gc.log +8:-Xloggc:${OPENSEARCH_TMPDIR}/gc.log 8:-XX:+UseGCLogFileRotation 8:-XX:NumberOfGCLogFiles=32 8:-XX:GCLogFileSize=64m # JDK 9+ GC logging -9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m +9-:-Xlog:gc*,gc+age=trace,safepoint:file=${OPENSEARCH_TMPDIR}/gc.log:utctime,pid,tags:filecount=32,filesize=64m + + # JDK 20+ Incubating Vector Module for SIMD optimizations; + # disabling may reduce performance on vector optimized lucene +@@ -85,4 +85,4 @@ -XX:ErrorFile=logs/hs_err_pid%p.log + 23:-XX:CompileCommand=dontinline,java/lang/invoke/MethodHandle.asTypeUncached + + 21-:-javaagent:agent/opensearch-agent.jar +-21-:--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED ++21-:--add-opens=java.base/java.nio=ALL-UNNAMED