ElasticSearch: Update to 6.3.2

Differential Revision:	https://reviews.freebsd.org/D16597

3 files changed, 15 insertions, 15 deletions

diff --git a/textproc/elasticsearch6/Makefile b/textproc/elasticsearch6/Makefile
index d139f0ce8b27..95e92b944f9f 100644
--- a/textproc/elasticsearch6/Makefile
+++ b/textproc/elasticsearch6/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	6.2.4
+PORTVERSION=	6.3.2
 PORTREVISION=	0
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://artifacts.elastic.co/downloads/${PORTNAME}/ \
@@ -56,6 +56,8 @@ post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch
 	${RM} ${WRKSRC}/lib/jna-*.jar
+	# ML plugin not supported on FreeBSD
+	${RM} -rf ${WRKSRC}/modules/x-pack/x-pack-ml
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
@@ -90,5 +92,6 @@ post-install:
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${ECHO} "@dir lib/elasticsearch/plugins" >> ${TMPPLIST}
 	${ECHO} "@dir libexec/elasticsearch" >> ${TMPPLIST}
+	${ECHO} "@dir(elasticsearch,elasticsearch,0755) ${ETCDIR}" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/textproc/elasticsearch6/distinfo b/textproc/elasticsearch6/distinfo
index e04013ef8b8c..fa864e265226 100644
--- a/textproc/elasticsearch6/distinfo
+++ b/textproc/elasticsearch6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525976955
-SHA256 (elasticsearch-6.2.4.tar.gz) = 91e6f1ea1e1dd39011e7a703d2751ca46ee374665b08b0bfe17e0c0c27000e8e
-SIZE (elasticsearch-6.2.4.tar.gz) = 29056810
+TIMESTAMP = 1533481811
+SHA256 (elasticsearch-6.3.2.tar.gz) = d05608c6b125df4fb6c809f9c1dd457e369e6b582c2958c52da95e01cc54c024
+SIZE (elasticsearch-6.3.2.tar.gz) = 91452574
diff --git a/textproc/elasticsearch6/files/pkg-message.in b/textproc/elasticsearch6/files/pkg-message.in
index 9349221a6854..4cba88e90f3f 100644
--- a/textproc/elasticsearch6/files/pkg-message.in
+++ b/textproc/elasticsearch6/files/pkg-message.in
@@ -10,12 +10,12 @@ sysctl security.bsd.unprivileged_mlock=1
 
 !!! PLUGINS NOTICE !!!
 
-ElasticSearch plugins such as X-Pack should only be installed via the
-elasticsearch-plugin script included with this software. As we strive
-to provide a minimum semblance of security, the files installed by
-the package are owned by root:wheel. This is different than upstream
-which expects all of the files to be owned by the user and for you to
-execute the elasticsearch-plugin script as said user.
+ElasticSearch plugins should only be installed via the elasticsearch-plugin
+included with this software. As we strive to provide a minimum semblance
+of security, the files installed by the package are owned by root:wheel.
+This is different than upstream hich expects all of the files to be
+owned by the user and for you to execute the elasticsearch-plugin script
+as said user.
 
 You will encounter permissions errors with configuration files and
 directories created by plugins which you will have to manually correct.
@@ -24,11 +24,8 @@ a poorly designed security model.
 
 e.g., after installing X-Pack you will have to correct:
 
-%%ETCDIR%%/elasticsearch.keystore file to be owned by root:elasticsearch
-%%ETCDIR%%/x-pack directory/files to be owned by root:elasticsearch
-
-Also you need to add "xpack.ml.enabled: false" to your elasticsearch.yml
-configuration as this plugin does not support FreeBSD.
+%%ETCDIR%%/elasticsearch.keystore file to be owned by elasticsearch:elasticsearch
+%%ETCDIR%%/x-pack directory/files to be owned by elasticsearch:elasticsearch
 
 !!! PLUGINS NOTICE !!!