From 766fd9d907f818248eaac169a6b856ec351d4eb1 Mon Sep 17 00:00:00 2001
From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
Date: Tue, 6 Dec 2022 19:32:57 -0500
Subject: [PATCH] security/wazuh-*: Make compatible with opensearch and
 dashboards 2.4.0

- Bump PORTREVISION
---
 security/wazuh-dashboard/Makefile  |  6 ++++--
 security/wazuh-dashboard/distinfo  |  6 +++---
 security/wazuh-dashboard/pkg-plist | 20 ++++++++++----------
 security/wazuh-indexer/Makefile    |  1 +
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/security/wazuh-dashboard/Makefile b/security/wazuh-dashboard/Makefile
index e920969f3c86..bbd962e570f2 100644
--- a/security/wazuh-dashboard/Makefile
+++ b/security/wazuh-dashboard/Makefile
@@ -1,10 +1,11 @@
 PORTNAME=	wazuh
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.3.10
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	LOCAL/acm/${PORTNAME}/
 PKGNAMESUFFIX=  -dashboard
-DISTFILES=	${PORTNAME}-kibana-app-${DISTVERSION}${EXTRACT_SUFX} \
+DISTFILES=	${PORTNAME}-kibana-app-${DISTVERSION}-${OPENSEARCH_VERSION}${EXTRACT_SUFX} \
 		opensearch_dashboards.yml
 DIST_SUBDIR=	${PORTNAME}-${DISTVERSION}
 
@@ -20,12 +21,13 @@ NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 
+OPENSEARCH_VERSION=	2.4.0
 ETCDIR=		${PREFIX}/etc/wazuh-dashboard
 WRKSRC=		${WRKDIR}/${PORTNAME}-kibana-app-${DISTVERSION}
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
-	@cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${PORTNAME}-kibana-app-${DISTVERSION}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS}
+	@cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${PORTNAME}-kibana-app-${DISTVERSION}-${OPENSEARCH_VERSION}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS}
 	${CP} ${_DISTDIR}/opensearch_dashboards.yml ${WRKDIR}
 
 do-install:
diff --git a/security/wazuh-dashboard/distinfo b/security/wazuh-dashboard/distinfo
index f1011be6f406..73d05c93be35 100644
--- a/security/wazuh-dashboard/distinfo
+++ b/security/wazuh-dashboard/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1668741129
-SHA256 (wazuh-4.3.10/wazuh-kibana-app-4.3.10.tar.gz) = 2ce5d0283807cdd88441f294b952d4fd6272b42f6f6bf8ba6cd37a47d28b1eff
-SIZE (wazuh-4.3.10/wazuh-kibana-app-4.3.10.tar.gz) = 28508702
+TIMESTAMP = 1670370975
+SHA256 (wazuh-4.3.10/wazuh-kibana-app-4.3.10-2.4.0.tar.gz) = 7b54cff257af011b4db2ece7562c903ee174dd681de7d2d6b186a49915d4fb4e
+SIZE (wazuh-4.3.10/wazuh-kibana-app-4.3.10-2.4.0.tar.gz) = 28305542
 SHA256 (wazuh-4.3.10/opensearch_dashboards.yml) = 88affe6dab2e1299b6f8b5264e6dd9ea1aa42885f3aefb8822fe559f2b6bb5d5
 SIZE (wazuh-4.3.10/opensearch_dashboards.yml) = 806
diff --git a/security/wazuh-dashboard/pkg-plist b/security/wazuh-dashboard/pkg-plist
index 50aab07f46df..03397216a506 100644
--- a/security/wazuh-dashboard/pkg-plist
+++ b/security/wazuh-dashboard/pkg-plist
@@ -5714,16 +5714,16 @@ www/opensearch-dashboards/plugins/wazuh/server/start/queue/index.js
 www/opensearch-dashboards/plugins/wazuh/server/start/tryCatchForIndexPermissionError.js
 www/opensearch-dashboards/plugins/wazuh/server/types.js
 www/opensearch-dashboards/plugins/wazuh/target/public/.osd-optimizer-cache
-www/opensearch-dashboards/plugins/wazuh/target/public/1dc35d25e61d819a9c357074014867ab.ttf
-www/opensearch-dashboards/plugins/wazuh/target/public/25a32416abee198dd821b0b17a198a8f.eot
-www/opensearch-dashboards/plugins/wazuh/target/public/674f50d287a8c48dc19ba404d20fe713.eot
-www/opensearch-dashboards/plugins/wazuh/target/public/912ec66d7572ff821749319396470bde.svg
-www/opensearch-dashboards/plugins/wazuh/target/public/af7ae505a9eed503f8b8e6982036873e.woff2
-www/opensearch-dashboards/plugins/wazuh/target/public/b06871f281fee6b241d60582ae9369b9.ttf
-www/opensearch-dashboards/plugins/wazuh/target/public/c8ddf1e5e5bf3682bc7bebf30f394148.woff
-www/opensearch-dashboards/plugins/wazuh/target/public/d7c639084f684d66a1bc66855d193ed8.svg
-www/opensearch-dashboards/plugins/wazuh/target/public/e6cf7c6ec7c2d6f670ae9d762604cb0b.woff2
-www/opensearch-dashboards/plugins/wazuh/target/public/fee66e712a8a08eef5805a46892932ad.woff
+www/opensearch-dashboards/plugins/wazuh/target/public/0317d582b93c20f68e059e389aecab33.woff2
+www/opensearch-dashboards/plugins/wazuh/target/public/09b9015b1ecaf95655b11efd67d00e1f.eot
+www/opensearch-dashboards/plugins/wazuh/target/public/1e59d2330b4c6deb84b340635ed36249.ttf
+www/opensearch-dashboards/plugins/wazuh/target/public/20fd1704ea223900efa9fd4e869efb08.woff2
+www/opensearch-dashboards/plugins/wazuh/target/public/8b43027f47b20503057dfbbaa9401fef.eot
+www/opensearch-dashboards/plugins/wazuh/target/public/c1e38fd9e0e74ba58f7a2b77ef29fdd3.svg
+www/opensearch-dashboards/plugins/wazuh/target/public/ed6298903ae1554c7f3e1a668c39fdcc.svg
+www/opensearch-dashboards/plugins/wazuh/target/public/f0af1680f082547a7aae4af9d841d693.ttf
+www/opensearch-dashboards/plugins/wazuh/target/public/f691f37e57f04c152e2315ab7dbad881.woff
+www/opensearch-dashboards/plugins/wazuh/target/public/f7f1738ca345185e01856ac55885b089.woff
 www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.0.js
 www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.0.js.br
 www/opensearch-dashboards/plugins/wazuh/target/public/wazuh.chunk.0.js.gz
diff --git a/security/wazuh-indexer/Makefile b/security/wazuh-indexer/Makefile
index 1c8d085e4645..88c5b1c65b00 100644
--- a/security/wazuh-indexer/Makefile
+++ b/security/wazuh-indexer/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	wazuh
 PORTVERSION=	4.3.10
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	LOCAL/acm/${PORTNAME}/
 PKGNAMESUFFIX=	-indexer