Update elasticsearch 6.2.4 -> 6.4.1

ok jasper@

textproc/elasticsearch/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.55 2018/09/04 12:46:23 espie Exp $
+# $OpenBSD: Makefile,v 1.56 2018/09/25 08:50:49 pvk Exp $
 
 COMMENT =		distributed RESTful search and analytics
 
-V =			6.2.4
-DISTNAME =		elasticsearch-$V
+V =			6.4.1
+DISTNAME =		elasticsearch-oss-$V
+PKGNAME =		elasticsearch-$V
 CATEGORIES =		textproc
-REVISION =		0
 
 HOMEPAGE =		https://www.elastic.co/products/elasticsearch
 
@@ -26,11 +26,13 @@ RUN_DEPENDS =		java/javaPathHelper \
 NO_BUILD =		Yes
 NO_TEST =		Yes
 
-SUBST_VARS +=		BASESYSCONFDIR V
+WRKDIST =		${WRKDIR}/elasticsearch-$V
+
+SUBST_VARS +=		BASESYSCONFDIR V VARBASE
 ES_HOME =		${PREFIX}/elasticsearch/
 
 do-install:
-	${SUBST_CMD} ${WRKSRC}/bin/elasticsearch-env
+	${SUBST_CMD} ${WRKSRC}/bin/elasticsearch-env ${WRKSRC}/config/{elasticsearch.yml,jvm.options}
 	rm ${WRKSRC}/bin/*.{bat,beforesubst,exe,orig} ${WRKSRC}/config/*.orig
 	sed -i 's,#!/bin/bash,#!/usr/bin/env bash,' ${WRKSRC}/bin/*
 	${INSTALL_DATA_DIR} ${ES_HOME}/{bin,lib,modules,plugins}/ \

textproc/elasticsearch/distinfo

@@ -1,2 +1,2 @@
-SHA256 (elasticsearch-6.2.4.tar.gz) = kebx6h4d05AR56cD0nUcpG7jdGZbCLC/4X4MDCcADo4=
-SIZE (elasticsearch-6.2.4.tar.gz) = 29056810
+SHA256 (elasticsearch-oss-6.4.1.tar.gz) = rBZulhXeywnQs+3dfN3tVT9802z6OnZtd/hHKzY33ik=
+SIZE (elasticsearch-oss-6.4.1.tar.gz) = 33725674

textproc/elasticsearch/patches/patch-bin_elasticsearch-env

@@ -1,4 +1,4 @@
-$OpenBSD: patch-bin_elasticsearch-env,v 1.1 2018/05/17 10:22:58 pvk Exp $
+$OpenBSD: patch-bin_elasticsearch-env,v 1.2 2018/09/25 08:50:49 pvk Exp $
 
 Index: bin/elasticsearch-env
 --- bin/elasticsearch-env.orig
@@ -21,7 +21,7 @@ Index: bin/elasticsearch-env
  
  if [ -z "$ES_PATH_CONF" ]; then
    echo "ES_PATH_CONF must be set to the configuration path"
-@@ -85,6 +85,6 @@ if [ -z "$ES_TMPDIR" ]; then
+@@ -88,6 +88,6 @@ if [ -z "$ES_TMPDIR" ]; then
    if [ $mktemp_coreutils -eq 0 ]; then
      ES_TMPDIR=`mktemp -d --tmpdir "elasticsearch.XXXXXXXX"`
    else

textproc/elasticsearch/patches/patch-config_elasticsearch_yml

@@ -1,4 +1,4 @@
-$OpenBSD: patch-config_elasticsearch_yml,v 1.4 2018/05/17 10:22:58 pvk Exp $
+$OpenBSD: patch-config_elasticsearch_yml,v 1.5 2018/09/25 08:50:49 pvk Exp $
 Index: config/elasticsearch.yml
 --- config/elasticsearch.yml.orig
 +++ config/elasticsearch.yml
@@ -7,20 +7,12 @@ Index: config/elasticsearch.yml
  # Path to directory where to store the data (separate multiple locations by comma):
  #
 -#path.data: /path/to/data
-+path.data: /var/elasticsearch/
++path.data: ${VARBASE}/elasticsearch/
  #
  # Path to log files:
  #
 -#path.logs: /path/to/logs
-+path.logs: /var/log/elasticsearch/
++path.logs: ${VARBASE}/log/elasticsearch/
  #
  # ----------------------------------- Memory -----------------------------------
  #
-@@ -86,3 +86,7 @@
- # Require explicit names when deleting indices:
- #
- #action.destructive_requires_name: true
-+#
-+# X-Pack Machine Learning is not supported on OpenBSD;
-+# uncomment if running with X-Pack:
-+#xpack.ml.enabled: false

textproc/elasticsearch/patches/patch-config_jvm_options

@@ -0,0 +1,30 @@
+$OpenBSD: patch-config_jvm_options,v 1.1 2018/09/25 08:50:49 pvk Exp $
+
+Index: config/jvm.options
+--- config/jvm.options.orig
++++ config/jvm.options
+@@ -82,7 +82,7 @@
+ -XX:HeapDumpPath=data
+ 
+ # specify an alternative path for JVM fatal error logs
+--XX:ErrorFile=logs/hs_err_pid%p.log
++-XX:ErrorFile=${VARBASE}/log/elasticsearch/hs_err_pid%p.log
+ 
+ ## JDK 8 GC logging
+ 
+@@ -90,13 +90,13 @@
+ 8:-XX:+PrintGCDateStamps
+ 8:-XX:+PrintTenuringDistribution
+ 8:-XX:+PrintGCApplicationStoppedTime
+-8:-Xloggc:logs/gc.log
++8:-Xloggc:${VARBASE}/log/elasticsearch/gc.log
+ 8:-XX:+UseGCLogFileRotation
+ 8:-XX:NumberOfGCLogFiles=32
+ 8:-XX:GCLogFileSize=64m
+ 
+ # JDK 9+ GC logging
+-9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m
++9-:-Xlog:gc*,gc+age=trace,safepoint:file=${VARBASE}/log/elasticsearch/gc.log:utctime,pid,tags:filecount=32,filesize=64m
+ # due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise
+ # time/date parsing will break in an incompatible way for some date patterns and locals
+ 9-:-Djava.locale.providers=COMPAT

textproc/elasticsearch/pkg/PLIST

@@ -1,11 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.30 2018/09/04 12:46:24 espie Exp $
-@ask-update elasticsearch-<2.0.0 Make sure your existing data is backed up
+@comment $OpenBSD: PLIST,v 1.31 2018/09/25 08:50:49 pvk Exp $
 @newgroup _elasticsearch:748
 @newuser _elasticsearch:748:_elasticsearch:daemon:Elasticsearch Account:/nonexistent:/sbin/nologin
 @extraunexec rm -rf ${SYSCONFDIR}/elasticsearch/{elasticsearch.keystore,x-pack/}
 @extraunexec rm -rf ${PREFIX}/elasticsearch/{bin,plugins}/x-pack/
 @extraunexec rm -rf ${LOCALSTATEDIR}/elasticsearch/*
 @extraunexec rm -rf ${LOCALSTATEDIR}/log/elasticsearch/*
+@rcscript ${RCDIR}/elasticsearch
 elasticsearch/
 @mode 0775
 @group _elasticsearch
@@ -13,6 +13,7 @@ elasticsearch/bin/
 @mode
 @group
 elasticsearch/bin/elasticsearch
+elasticsearch/bin/elasticsearch-cli
 elasticsearch/bin/elasticsearch-env
 elasticsearch/bin/elasticsearch-keystore
 elasticsearch/bin/elasticsearch-plugin
@@ -23,39 +24,40 @@ elasticsearch/lib/elasticsearch-${V}.jar
 elasticsearch/lib/elasticsearch-cli-${V}.jar
 elasticsearch/lib/elasticsearch-core-${V}.jar
 elasticsearch/lib/elasticsearch-launchers-${V}.jar
+elasticsearch/lib/elasticsearch-secure-sm-${V}.jar
+elasticsearch/lib/elasticsearch-x-content-${V}.jar
 elasticsearch/lib/hppc-0.7.1.jar
 elasticsearch/lib/jackson-core-2.8.10.jar
 elasticsearch/lib/jackson-dataformat-cbor-2.8.10.jar
 elasticsearch/lib/jackson-dataformat-smile-2.8.10.jar
 elasticsearch/lib/jackson-dataformat-yaml-2.8.10.jar
+elasticsearch/lib/java-version-checker-${V}.jar
 elasticsearch/lib/jna-4.5.1.jar
-elasticsearch/lib/joda-time-2.9.9.jar
+elasticsearch/lib/joda-time-2.10.jar
 elasticsearch/lib/jopt-simple-5.0.2.jar
-elasticsearch/lib/jts-1.13.jar
-elasticsearch/lib/log4j-1.2-api-2.9.1.jar
-elasticsearch/lib/log4j-api-2.9.1.jar
-elasticsearch/lib/log4j-core-2.9.1.jar
-elasticsearch/lib/lucene-analyzers-common-7.2.1.jar
-elasticsearch/lib/lucene-backward-codecs-7.2.1.jar
-elasticsearch/lib/lucene-core-7.2.1.jar
-elasticsearch/lib/lucene-grouping-7.2.1.jar
-elasticsearch/lib/lucene-highlighter-7.2.1.jar
-elasticsearch/lib/lucene-join-7.2.1.jar
-elasticsearch/lib/lucene-memory-7.2.1.jar
-elasticsearch/lib/lucene-misc-7.2.1.jar
-elasticsearch/lib/lucene-queries-7.2.1.jar
-elasticsearch/lib/lucene-queryparser-7.2.1.jar
-elasticsearch/lib/lucene-sandbox-7.2.1.jar
-elasticsearch/lib/lucene-spatial-7.2.1.jar
-elasticsearch/lib/lucene-spatial-extras-7.2.1.jar
-elasticsearch/lib/lucene-spatial3d-7.2.1.jar
-elasticsearch/lib/lucene-suggest-7.2.1.jar
+elasticsearch/lib/jts-core-1.15.0.jar
+elasticsearch/lib/log4j-1.2-api-2.11.1.jar
+elasticsearch/lib/log4j-api-2.11.1.jar
+elasticsearch/lib/log4j-core-2.11.1.jar
+elasticsearch/lib/lucene-analyzers-common-7.4.0.jar
+elasticsearch/lib/lucene-backward-codecs-7.4.0.jar
+elasticsearch/lib/lucene-core-7.4.0.jar
+elasticsearch/lib/lucene-grouping-7.4.0.jar
+elasticsearch/lib/lucene-highlighter-7.4.0.jar
+elasticsearch/lib/lucene-join-7.4.0.jar
+elasticsearch/lib/lucene-memory-7.4.0.jar
+elasticsearch/lib/lucene-misc-7.4.0.jar
+elasticsearch/lib/lucene-queries-7.4.0.jar
+elasticsearch/lib/lucene-queryparser-7.4.0.jar
+elasticsearch/lib/lucene-sandbox-7.4.0.jar
+elasticsearch/lib/lucene-spatial-7.4.0.jar
+elasticsearch/lib/lucene-spatial-extras-7.4.0.jar
+elasticsearch/lib/lucene-spatial3d-7.4.0.jar
+elasticsearch/lib/lucene-suggest-7.4.0.jar
 elasticsearch/lib/plugin-classloader-${V}.jar
-elasticsearch/lib/plugin-cli-${V}.jar
-elasticsearch/lib/securesm-1.2.jar
 elasticsearch/lib/snakeyaml-1.17.jar
-elasticsearch/lib/spatial4j-0.6.jar
-elasticsearch/lib/t-digest-3.0.jar
+elasticsearch/lib/spatial4j-0.7.jar
+elasticsearch/lib/t-digest-3.2.jar
 elasticsearch/modules/
 elasticsearch/modules/aggs-matrix-stats/
 elasticsearch/modules/aggs-matrix-stats/aggs-matrix-stats-${V}.jar
@@ -64,6 +66,7 @@ elasticsearch/modules/analysis-common/
 elasticsearch/modules/analysis-common/analysis-common-${V}.jar
 elasticsearch/modules/analysis-common/plugin-descriptor.properties
 elasticsearch/modules/ingest-common/
+elasticsearch/modules/ingest-common/elasticsearch-grok-${V}.jar
 elasticsearch/modules/ingest-common/ingest-common-${V}.jar
 elasticsearch/modules/ingest-common/jcodings-1.0.12.jar
 elasticsearch/modules/ingest-common/joni-2.1.6.jar
@@ -74,7 +77,7 @@ elasticsearch/modules/lang-expression/asm-5.0.4.jar
 elasticsearch/modules/lang-expression/asm-commons-5.0.4.jar
 elasticsearch/modules/lang-expression/asm-tree-5.0.4.jar
 elasticsearch/modules/lang-expression/lang-expression-${V}.jar
-elasticsearch/modules/lang-expression/lucene-expressions-7.2.1.jar
+elasticsearch/modules/lang-expression/lucene-expressions-7.4.0.jar
 elasticsearch/modules/lang-expression/plugin-descriptor.properties
 elasticsearch/modules/lang-expression/plugin-security.policy
 elasticsearch/modules/lang-mustache/
@@ -163,7 +166,3 @@ share/examples/elasticsearch/log4j2.properties
 @group _elasticsearch
 @sample ${LOCALSTATEDIR}/elasticsearch/
 @sample ${LOCALSTATEDIR}/log/elasticsearch/
-@mode
-@owner
-@group
-@rcscript ${RCDIR}/elasticsearch

textproc/elasticsearch/pkg/README

@@ -1,9 +1,14 @@
-$OpenBSD: README,v 1.7 2018/09/04 12:46:24 espie Exp $
+$OpenBSD: README,v 1.8 2018/09/25 08:50:49 pvk Exp $
 
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
 +-----------------------------------------------------------------------
 
+OpenBSD-specific Limitations
+============================
+1. OpenBSD is not on the list of supported platforms:
+https://www.elastic.co/support/matrix
+
 Initial Node/Cluster Configuration
 ==================================
 Configuratoin files are located in ${SYSCONFDIR}/elasticsearch
@@ -24,8 +29,8 @@ Resource Limits: File Descriptors
 The minimum number of openfiles required for production Elasticsearch node
 is 65536. Elasticsearch will not start if openfiles limit is lower than this.
 
-OpenBSD's defaults are very conservative in allocation of system resources,
-in order to run Elasticsearch, the following steps required:
+OpenBSD's defaults are very conservative in allocation of system resources.
+In order to run Elasticsearch, the following steps required:
 
 1. Adjust kern.maxfiles:
 
@@ -65,12 +70,6 @@ as root, use doas(1):
 	# doas -u _elasticsearch \
 		${TRUEPREFIX}/elasticsearch/bin/elasticsearch-plugin install <plugin>
 
-Elastic X-Pack is available as separate OpenBSD package:
-
-	# pkg_add x-pack
-
-See X-Pack package README for more information.
-
 Upgrading ElasticSearch
 =======================
 Please refer to the upstream documentation when performing upgrades: