diff options
Diffstat (limited to 'textproc/opensearch')
| -rw-r--r-- | textproc/opensearch/Makefile | 26 | ||||
| -rw-r--r-- | textproc/opensearch/distinfo | 6 | ||||
| -rw-r--r-- | textproc/opensearch/files/patch-config_jvm.options | 15 |
3 files changed, 28 insertions, 19 deletions
diff --git a/textproc/opensearch/Makefile b/textproc/opensearch/Makefile index 2615dd2843a5..bee0179adbdc 100644 --- a/textproc/opensearch/Makefile +++ b/textproc/opensearch/Makefile @@ -1,7 +1,7 @@ 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?= # @@ -16,10 +16,8 @@ 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 \ @@ -31,8 +29,10 @@ SHEBANG_FILES= bin/opensearch bin/opensearch-cli \ 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 @@ -41,7 +41,7 @@ OPTIONS_DEFAULT=PLUGINS 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 @@ -55,9 +55,10 @@ PLUGINS_CONFIG_FILES+= \ 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 \ @@ -67,13 +68,12 @@ PLUGINS_CONFIG_FILES+= \ 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 \ @@ -104,7 +104,7 @@ do-install: .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 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,11 +1,11 @@ ---- 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 @@ -21,3 +21,12 @@ # 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 |