ElasticSearch6: Update to 6.4.2

8 files changed, 43 insertions, 10 deletions

diff --git a/textproc/elasticsearch6/Makefile b/textproc/elasticsearch6/Makefile
index 95e92b944f9f..84b950d184fc 100644
--- a/textproc/elasticsearch6/Makefile
+++ b/textproc/elasticsearch6/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	6.3.2
+PORTVERSION=	6.4.2
 PORTREVISION=	0
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://artifacts.elastic.co/downloads/${PORTNAME}/ \
diff --git a/textproc/elasticsearch6/distinfo b/textproc/elasticsearch6/distinfo
index fa864e265226..b2999cc34ebf 100644
--- a/textproc/elasticsearch6/distinfo
+++ b/textproc/elasticsearch6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1533481811
-SHA256 (elasticsearch-6.3.2.tar.gz) = d05608c6b125df4fb6c809f9c1dd457e369e6b582c2958c52da95e01cc54c024
-SIZE (elasticsearch-6.3.2.tar.gz) = 91452574
+TIMESTAMP = 1541260799
+SHA256 (elasticsearch-6.4.2.tar.gz) = 32a9c0305faed1cbd4e22c85a8c333ca2b6704f1d0006e92709fada10cec3f45
+SIZE (elasticsearch-6.4.2.tar.gz) = 97914519
diff --git a/textproc/elasticsearch6/files/patch-config_elasticsearch.yml b/textproc/elasticsearch6/files/patch-config_elasticsearch.yml
index f61a04c32b9a..a39468ea84c9 100644
--- a/textproc/elasticsearch6/files/patch-config_elasticsearch.yml
+++ b/textproc/elasticsearch6/files/patch-config_elasticsearch.yml
@@ -1,4 +1,4 @@
---- config/elasticsearch.yml.orig	2018-02-16 18:57:55 UTC
+--- config/elasticsearch.yml.orig	2018-09-26 13:30:23 UTC
 +++ config/elasticsearch.yml
 @@ -31,10 +31,12 @@
  # Path to directory where to store the data (separate multiple locations by comma):
@@ -13,3 +13,10 @@
  #
  # ----------------------------------- Memory -----------------------------------
  #
+@@ -86,3 +88,6 @@
+ # Require explicit names when deleting indices:
+ #
+ #action.destructive_requires_name: true
++
++# ml is not supported on FreeBSD
++xpack.ml.enabled: false
diff --git a/textproc/kibana6/Makefile b/textproc/kibana6/Makefile
index 529e2bb75f21..48385f42ca5e 100644
--- a/textproc/kibana6/Makefile
+++ b/textproc/kibana6/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kibana
-PORTVERSION=	6.3.2
+PORTVERSION=	6.4.2
 DISTVERSIONSUFFIX=	-linux-x86_64
 PORTREVISION=	0
 CATEGORIES=	textproc www
@@ -25,6 +25,9 @@ USE_RC_SUBR=	${PORTNAME}
 
 SUB_FILES=	pkg-deinstall
 
+post-patch:
+	${FIND} -s ${WRKSRC}/node_modules -type d -empty -delete
+
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana.yml.sample
@@ -39,7 +42,6 @@ post-install:
 	${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${ECHO} "@dir(www,www) ${WWWDIR}/data" >> ${TMPPLIST}
-	${ECHO} "@dir ${WWWDIR}/node_modules/@elastic/numeral/src" >> ${TMPPLIST}
 	${ECHO} "@dir ${WWWDIR}/plugins" >> ${TMPPLIST}
 	${ECHO} "@dir ${WWWDIR}/src/ui/public/factories" >> ${TMPPLIST}
 
diff --git a/textproc/kibana6/distinfo b/textproc/kibana6/distinfo
index 85ef3d1d6d0f..cf6922fb6efa 100644
--- a/textproc/kibana6/distinfo
+++ b/textproc/kibana6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1533489803
-SHA256 (kibana-6.3.2-linux-x86_64.tar.gz) = 605bf5e991d206b5b2799ef5210644c50192cad6a239662a8674d57fdf3b69ce
-SIZE (kibana-6.3.2-linux-x86_64.tar.gz) = 205331616
+TIMESTAMP = 1541260848
+SHA256 (kibana-6.4.2-linux-x86_64.tar.gz) = f3a69709171ea8e28da754578ec519f33c423d3e3cbed6e81381f14cb8517383
+SIZE (kibana-6.4.2-linux-x86_64.tar.gz) = 188077286
diff --git a/textproc/kibana6/files/kibana.in b/textproc/kibana6/files/kibana.in
index 731cd42bd92a..1fbc91725ac3 100644
--- a/textproc/kibana6/files/kibana.in
+++ b/textproc/kibana6/files/kibana.in
@@ -22,6 +22,9 @@ load_rc_config $name
 
 export BABEL_DISABLE_CACHE=1
 export NODE_ENV=production
+# ml and reporting modules not supported on FreeBSD
+export XPACK_ML_ENABLED=false
+export XPACK_REPORTING_ENABLED=false
 
 required_files="${kibana_config}"
 pidfile="/var/run/${name}/${name}.pid"
diff --git a/textproc/kibana6/files/patch-config_kibana.yml b/textproc/kibana6/files/patch-config_kibana.yml
new file mode 100644
index 000000000000..235e34e0dcf4
--- /dev/null
+++ b/textproc/kibana6/files/patch-config_kibana.yml
@@ -0,0 +1,10 @@
+--- config/kibana.yml.orig	2018-11-04 16:33:12 UTC
++++ config/kibana.yml
+@@ -112,3 +112,7 @@
+ # The default locale. This locale can be used in certain circumstances to substitute any missing
+ # translations.
+ #i18n.defaultLocale: "en"
++
++# ml and reporting are not supported on FreeBSD
++xpack.ml.enabled: false
++xpack.reporting.enabled: false
diff --git a/textproc/kibana6/files/patch-src_setup__node__env_index.js b/textproc/kibana6/files/patch-src_setup__node__env_index.js
new file mode 100644
index 000000000000..fb873c14ecff
--- /dev/null
+++ b/textproc/kibana6/files/patch-src_setup__node__env_index.js
@@ -0,0 +1,11 @@
+--- src/setup_node_env/index.js.orig	2018-11-04 14:48:57 UTC
++++ src/setup_node_env/index.js
+@@ -19,5 +19,5 @@
+  * under the License.
+  */
+ 
+-require('./node_version_validator');
+-require('./babel_register');
+\ No newline at end of file
++//require('./node_version_validator');
++require('./babel_register');