textproc/opensearch: Update to 2.11.1

ChangeLog at: https://github.com/opensearch-project/opensearch-build/blob/main/release-notes/opensearch-release-notes-2.11.1.md With hat: opensearch
freebsd · Dec 16, 2023 · c7f140c · c7f140c
1 parent 8537b92
commit c7f140c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/textproc/opensearch-dashboards/Makefile b/textproc/opensearch-dashboards/Makefile
@@ -1,27 +1,29 @@
 PORTNAME=	opensearch-dashboards
-DISTVERSION=	2.10.0
+DISTVERSION?=	2.11.1
 DISTVERSIONSUFFIX=	-linux-x64
 CATEGORIES=	textproc www
 MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
 
 MAINTAINER=	opensearch@FreeBSD.org
-COMMENT=	Visualization dashboards for OpenSearch
+COMMENT?=	Visualization dashboards for OpenSearch
 WWW=		https://opensearch.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
+CONFLICTS?=	opensearch-dashboards210
+
 BUILD_DEPENDS=	npm-node18>0:www/npm-node18
 
 USES=		nodejs:18,build,run python:build
 USE_RC_SUBR=	${PORTNAME}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-OPTIONS_DEFINE=	CHROME
+SUB_FILES=	pkg-deinstall
+SUB_LIST=	PORTNAME="${PORTNAME}" \
+		PKGNAMESUFFIX="${PKGNAMESUFFIX}" \
+		WWWDIR=${WWWDIR}
 
-CHROME_DESC=	Add dependency on www/chromium (required for PDF reports)
-CHROME_RUN_DEPENDS=chrome:www/chromium
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 NODE_VER=	18.18.0
 NO_BUILD=	yes

diff --git a/textproc/opensearch-dashboards/distinfo b/textproc/opensearch-dashboards/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695950508
-SHA256 (opensearch-dashboards-2.10.0-linux-x64.tar.gz) = df1463540f3831de79ceb03cf2d4c691ac4f63b244943fb84ca67636877bb6d1
-SIZE (opensearch-dashboards-2.10.0-linux-x64.tar.gz) = 324084481
+TIMESTAMP = 1702759604
+SHA256 (opensearch-dashboards-2.11.1-linux-x64.tar.gz) = 7ed187173faa46105c6e77bde5468b57e1f3ff9fa0302f64c2da1a97cec79d7a
+SIZE (opensearch-dashboards-2.11.1-linux-x64.tar.gz) = 326804234
diff --git a/textproc/opensearch/Makefile b/textproc/opensearch/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	opensearch
-DISTVERSION=	2.10.0
+DISTVERSION?=	2.11.1
 DISTVERSIONSUFFIX=	-linux-x64
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
 
 MAINTAINER=	opensearch@FreeBSD.org
-COMMENT=	Full-text search engine for Java
+COMMENT?=	Full-text search engine for Java
 WWW=		https://opensearch.org
 
 LICENSE=	APACHE20
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	jna>0:devel/jna
 RUN_DEPENDS=	bash>0:shells/bash \
 		jna>0:devel/jna
 
-CONFLICTS=	opensearch13
+CONFLICTS?=	opensearch13 opensearch210
 
 USES=		cpe shebangfix
 USE_JAVA=	yes
@@ -91,7 +91,7 @@ post-patch:
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/opensearch
 .for f in ${CONFIG_FILES}
-	${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
+	${INSTALL} -o ${SEARCHUSER} -g ${SEARCHGROUP} -m 640 ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/opensearch/bin
 .for f in ${BINS}
@@ -112,19 +112,19 @@ do-install-PLUGINS-on:
 		 ${STAGEDIR}${ETCDIR}/opensearch-reports-scheduler \
 		 ${STAGEDIR}${ETCDIR}/opensearch-security
 .for f in ${PLUGINS_CONFIG_FILES}
-	${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
-	${ECHO} "@sample ${ETCDIR}/${f}.sample" >> ${TMPPLIST}
+	${INSTALL} -o ${SEARCHUSER} -g ${SEARCHGROUP} -m 640 ${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} "${ETCDIR}/${f}.sample" >> ${TMPPLIST}
+	${INSTALL} -o ${SEARCHUSER} -g ${SEARCHGROUP} -m 640 ${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 ${ETCDIR}/${f}.sample" >> ${TMPPLIST}
+	${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}
@@ -133,6 +133,12 @@ post-install:
 	${ECHO} "@dir lib/opensearch/plugins" >> ${TMPPLIST}
 .endif
 	${ECHO} "@dir libexec/opensearch" >> ${TMPPLIST}
-	${ECHO} "@dir(opensearch,opensearch,0755) ${ETCDIR}" >> ${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}
+	${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-performance-analyzer" >> ${TMPPLIST}
+	${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-reports-scheduler" >> ${TMPPLIST}
+	${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-security" >> ${TMPPLIST}
+	${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/textproc/opensearch/distinfo b/textproc/opensearch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695950494
-SHA256 (opensearch-2.10.0-linux-x64.tar.gz) = a092f17571e7f9f129d804d67721516df33f41e6c05a24fb7288312302eb81fb
-SIZE (opensearch-2.10.0-linux-x64.tar.gz) = 818191376
+TIMESTAMP = 1702709850
+SHA256 (opensearch-2.11.1-linux-x64.tar.gz) = 926eb3f99f592e7518d5dc1e250ae11d1bb45ef766a90222a8df11bb2ee35a9c
+SIZE (opensearch-2.11.1-linux-x64.tar.gz) = 823592057