View | Details | Raw Unified | Return to bug 286647 | Differences between
and this patch

Collapse All | Expand All

(-)b/textproc/opensearch/Makefile (-13 / +13 lines)
Lines 1-13 Link Here
1
PORTNAME=	opensearch
1
PORTNAME=	opensearch
2
DISTVERSION?=	2.17.1
2
DISTVERSION=	3.0.0
3
PORTREVISION?=	1
4
DISTVERSIONSUFFIX=	-linux-x64
3
DISTVERSIONSUFFIX=	-linux-x64
4
PORTREVISION=	0
5
CATEGORIES=	textproc java devel
5
CATEGORIES=	textproc java devel
6
MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
6
MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
7
PKGNAMESUFFIX?=	#
7
PKGNAMESUFFIX=	#
8
8
9
MAINTAINER=	opensearch@FreeBSD.org
9
MAINTAINER=	opensearch@FreeBSD.org
10
COMMENT?=	Full-text search engine for Java
10
COMMENT=	Full-text search engine for Java
11
WWW=		https://opensearch.org
11
WWW=		https://opensearch.org
12
12
13
LICENSE=	APACHE20
13
LICENSE=	APACHE20
Lines 16-25 BUILD_DEPENDS= jna>0:devel/jna Link Here
16
RUN_DEPENDS=	bash>0:shells/bash \
16
RUN_DEPENDS=	bash>0:shells/bash \
17
		jna>0:devel/jna
17
		jna>0:devel/jna
18
18
19
USES=		cpe java shebangfix
20
19
CONFLICTS?=	opensearch13 opensearch210 opensearch213 opensearch216
21
CONFLICTS?=	opensearch13 opensearch210 opensearch213 opensearch216
20
22
21
USES=		cpe java shebangfix
23
JAVA_VERSION=	21+
22
JAVA_VERSION=	17+
23
USE_RC_SUBR=	${PORTNAME}
24
USE_RC_SUBR=	${PORTNAME}
24
25
25
SHEBANG_FILES=	bin/opensearch bin/opensearch-cli \
26
SHEBANG_FILES=	bin/opensearch bin/opensearch-cli \
Lines 32-38 SHEBANG_FILES= bin/opensearch bin/opensearch-cli \ Link Here
32
		plugins/opensearch-security/tools/securityadmin.sh
33
		plugins/opensearch-security/tools/securityadmin.sh
33
34
34
NO_BUILD=	yes
35
NO_BUILD=	yes
35
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
36
WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
36
37
37
OPTIONS_DEFINE=	PLUGINS
38
OPTIONS_DEFINE=	PLUGINS
38
OPTIONS_DEFAULT=PLUGINS
39
OPTIONS_DEFAULT=PLUGINS
Lines 41-47 OPTIONS_DEFAULT=PLUGINS Link Here
41
42
42
CONFIG_FILES=	opensearch.yml jvm.options log4j2.properties
43
CONFIG_FILES=	opensearch.yml jvm.options log4j2.properties
43
44
44
PLUGINS_CONFIG_FILES?= \
45
PLUGINS_CONFIG_FILES+=	\
45
		opensearch-notifications-core/notifications-core.yml \
46
		opensearch-notifications-core/notifications-core.yml \
46
		opensearch-notifications/notifications.yml \
47
		opensearch-notifications/notifications.yml \
47
		opensearch-observability/observability.yml
48
		opensearch-observability/observability.yml
Lines 57-63 PLUGINS_CONFIG_FILES+= \ Link Here
57
		opensearch-performance-analyzer/rca_cluster_manager.conf \
58
		opensearch-performance-analyzer/rca_cluster_manager.conf \
58
		opensearch-performance-analyzer/supervisord.conf
59
		opensearch-performance-analyzer/supervisord.conf
59
.endif
60
.endif
60
PLUGINS_CONFIG_FILES+= \
61
PLUGINS_CONFIG_FILES+=	\
61
		opensearch-reports-scheduler/reports-scheduler.yml \
62
		opensearch-reports-scheduler/reports-scheduler.yml \
62
		opensearch-security/action_groups.yml \
63
		opensearch-security/action_groups.yml \
63
		opensearch-security/allowlist.yml \
64
		opensearch-security/allowlist.yml \
Lines 67-79 PLUGINS_CONFIG_FILES+= \ Link Here
67
		opensearch-security/nodes_dn.yml \
68
		opensearch-security/nodes_dn.yml \
68
		opensearch-security/roles.yml \
69
		opensearch-security/roles.yml \
69
		opensearch-security/roles_mapping.yml \
70
		opensearch-security/roles_mapping.yml \
70
		opensearch-security/tenants.yml \
71
		opensearch-security/tenants.yml
71
		opensearch-security/whitelist.yml
72
72
73
# Upstream provide some *.example files.  These are also copied as sample filse
73
# Upstream provide some *.example files.  These are also copied as sample filse
74
# but we do not register them as @sample to avoid installing filse that needs
74
# but we do not register them as @sample to avoid installing filse that needs
75
# to be tuned a site specific way.
75
# to be tuned a site specific way.
76
PLUGINS_SAMPLE_CONFIG_FILES= \
76
PLUGINS_SAMPLE_CONFIG_FILES+=	\
77
		opensearch-security/opensearch.yml
77
		opensearch-security/opensearch.yml
78
78
79
BINS=		opensearch opensearch-cli opensearch-env \
79
BINS=		opensearch opensearch-cli opensearch-env \
Lines 104-110 do-install: Link Here
104
.endfor
104
.endfor
105
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/opensearch/extensions
105
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/opensearch/extensions
106
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/opensearch/lib
106
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/opensearch/lib
107
	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "lib modules" ${STAGEDIR}${PREFIX}/lib/opensearch/)
107
	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "agent lib modules" ${STAGEDIR}${PREFIX}/lib/opensearch/)
108
	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/opensearch
108
	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/opensearch
109
	${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${PREFIX}/lib/opensearch/config
109
	${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${PREFIX}/lib/opensearch/config
110
	${LN} -s ${JAVASHAREDIR}/classes/jna.jar ${STAGEDIR}${PREFIX}/lib/opensearch/lib/jna.jar
110
	${LN} -s ${JAVASHAREDIR}/classes/jna.jar ${STAGEDIR}${PREFIX}/lib/opensearch/lib/jna.jar
(-)b/textproc/opensearch/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1728915409
1
TIMESTAMP = 1746608948
2
SHA256 (opensearch-2.17.1-linux-x64.tar.gz) = f66ed5b7ec7848f38102a54bf3c82e7d29aa86f02209c9ce8bb6cbe375f30a25
2
SHA256 (opensearch-3.0.0-linux-x64.tar.gz) = d98c60bf7d75b8b4257b2421dd22b89155e87be4b509da6a4e1136cf62e0b155
3
SIZE (opensearch-2.17.1-linux-x64.tar.gz) = 908618130
3
SIZE (opensearch-3.0.0-linux-x64.tar.gz) = 978590132
(-)b/textproc/opensearch/files/patch-config_jvm.options (-2 / +11 lines)
Lines 1-6 Link Here
1
--- config/jvm.options.orig	2021-07-30 14:01:34 UTC
1
--- config/jvm.options.orig	2025-05-08 06:53:15 UTC
2
+++ config/jvm.options
2
+++ config/jvm.options
3
@@ -61,17 +61,17 @@
3
@@ -61,20 +61,20 @@ -XX:HeapDumpPath=data
4
 -XX:HeapDumpPath=data
4
 -XX:HeapDumpPath=data
5
 
5
 
6
 # specify an alternative path for JVM fatal error logs
6
 # specify an alternative path for JVM fatal error logs
Lines 21-23 Link Here
21
 # JDK 9+ GC logging
21
 # JDK 9+ GC logging
22
-9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m
22
-9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m
23
+9-:-Xlog:gc*,gc+age=trace,safepoint:file=${OPENSEARCH_TMPDIR}/gc.log:utctime,pid,tags:filecount=32,filesize=64m
23
+9-:-Xlog:gc*,gc+age=trace,safepoint:file=${OPENSEARCH_TMPDIR}/gc.log:utctime,pid,tags:filecount=32,filesize=64m
24
 
25
 # JDK 20+ Incubating Vector Module for SIMD optimizations;
26
 # disabling may reduce performance on vector optimized lucene
27
@@ -85,4 +85,4 @@ -XX:ErrorFile=logs/hs_err_pid%p.log
28
 23:-XX:CompileCommand=dontinline,java/lang/invoke/MethodHandle.asTypeUncached
29
 
30
 21-:-javaagent:agent/opensearch-agent.jar
31
-21-:--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED
32
+21-:--add-opens=java.base/java.nio=ALL-UNNAMED

Return to bug 286647