Update databases/elasticsearch to 1.7.3.

Fix the plugin script.

elasticsearch 1.7.3
===================

Enhancements
  Tribe Node:
    TransportNodesAction shouldn't hold on to cluster state

Bug fixes
  Internal:
    - An inactive shard is activated by triggered synced flush
    - Pending operations in the translog prevent shard from being
      marked as inactive
  Mapping:
    - Ensure more specific analyzer is used independent of the mapping order
  REST:
    - Expose nodes operation timeout in REST API
  Snapshot/Restore:
    - Snapshot restore operations throttle more than specified
  Tribe Node:
    - Increment tribe node version on updates

Upgrades
  Network:
    - Upgrade Netty to 3.10.5.final

elasticsearch 1.7.2
===================

Enhancements
  Allocation:
    - Avoid extra reroutes of delayed shards in RoutingService
  Packaging:
    - Shade joda-convert
  Query DSL:
    - Add a check if FieldMappers exists

Bug fixes
  Allocation:
    - Take relocating shard into consideration during awareness allocation
    - Take initializing shards into consideration during awareness allocation
    - Fix messaging about delayed allocation
  Internal:
    - Fix concurrency issue in PrioritizedEsThreadPoolExecutor.
  Nested Docs:
    - Nested query should only use bitset cache for parent filter
  Packaging:
    - Fix upgrade RPM script
  Plugins:
    - Plugin script: Fix ES_HOME with spaces
  Query DSL:
    - Do not track named queries that are null
    - multi_match query applies boosts too many times.
  Recovery:
    - Rethrow exception during recovery finalization even if source is
      not broken
  Snapshot/Restore:
    - Snapshot restore request should accept indices options
  Suggesters:
    - Prevent DirectCandidateGenerator to reuse an unclosed analyzer

3 files changed, 50 insertions, 9 deletions

diff --git a/databases/elasticsearch/Makefile b/databases/elasticsearch/Makefile
index 819e7fc00d5..de2d4943955 100644
--- a/databases/elasticsearch/Makefile
+++ b/databases/elasticsearch/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2015/08/03 11:57:43 fhajny Exp $
+# $NetBSD: Makefile,v 1.12 2015/10/18 16:02:05 fhajny Exp $
 
-DISTNAME=	elasticsearch-1.7.1
+DISTNAME=	elasticsearch-1.7.3
 CATEGORIES=	textproc
 MASTER_SITES=	https://download.elasticsearch.org/elasticsearch/elasticsearch/
 
@@ -95,9 +95,9 @@ INSTALLATION_DIRS+=	${ES_LIBDIR}/sigar
 .endif
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
-SUBST_FILES.paths=	config/elasticsearch.yml
-SUBST_VARS.paths=	PKG_SYSCONFDIR ES_DBDIR ES_LIBDIR ES_LOGDIR ES_TMPDIR
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	bin/plugin config/elasticsearch.yml
+SUBST_VARS.paths=	PKG_JAVA_HOME PKG_SYSCONFDIR PREFIX ES_DBDIR ES_LIBDIR ES_LOGDIR ES_TMPDIR
 
 do-install:
 .for f in ${CONFS}
diff --git a/databases/elasticsearch/distinfo b/databases/elasticsearch/distinfo
index e513342e9d0..9f0a8ca3ab9 100644
--- a/databases/elasticsearch/distinfo
+++ b/databases/elasticsearch/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.10 2015/08/03 11:57:43 fhajny Exp $
+$NetBSD: distinfo,v 1.11 2015/10/18 16:02:05 fhajny Exp $
 
-SHA1 (elasticsearch-1.7.1.tar.gz) = 0984ae27624e57c12c33d4a559c3ebae25e74508
-RMD160 (elasticsearch-1.7.1.tar.gz) = 56ff82b4f53b3244da69befdd762553666d1b8a2
-Size (elasticsearch-1.7.1.tar.gz) = 28500556 bytes
+SHA1 (elasticsearch-1.7.3.tar.gz) = 754b089ec0a1aae5b36b39391d5385ed7428d8f5
+RMD160 (elasticsearch-1.7.3.tar.gz) = f5f87c2b5ab9975a5649b310996c56fbe4eac436
+SHA512 (elasticsearch-1.7.3.tar.gz) = 0cb6b2ebd77c3d1467f6a22f845bfbf9f4a7c9c9ddedae17aeb6bd2d2bc576171fc80e3a4963e7b890af574e9fd0b0faa152e7f2671a74254826e14fe2554c9f
+Size (elasticsearch-1.7.3.tar.gz) = 28510917 bytes
+SHA1 (patch-bin_plugin) = 348f91fc1aca0f199c2a792db5acb7484421270e
 SHA1 (patch-config_elasticsearch.yml) = 769fdd62aacdc4743979edbc986e983a5c42a7f8
diff --git a/databases/elasticsearch/patches/patch-bin_plugin b/databases/elasticsearch/patches/patch-bin_plugin
new file mode 100644
index 00000000000..c5bb0e30209
--- /dev/null
+++ b/databases/elasticsearch/patches/patch-bin_plugin
@@ -0,0 +1,39 @@
+$NetBSD: patch-bin_plugin,v 1.1 2015/10/18 16:02:05 fhajny Exp $
+
+Fix paths and improve portability.
+
+--- bin/plugin.orig	2015-10-15 09:16:10.000000000 +0000
++++ bin/plugin
+@@ -15,15 +15,20 @@ while [ -h "$SCRIPT" ] ; do
+   fi
+ done
+ 
++#set defualt JAVA_HOME
++if [ -z "$JAVA_HOME" ]; then
++  JAVA_HOME="@PKG_JAVA_HOME@"
++fi
++
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++ES_HOME="@PREFIX@"
+ 
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
+ 
+ # Sets the default values for elasticsearch variables used in this script
+ if [ -z "$CONF_DIR" ]; then
+-  CONF_DIR="$ES_HOME/config"
++  CONF_DIR="@PKG_SYSCONFDIR@"
+ 
+   if [ -z "$CONF_FILE" ]; then
+     CONF_FILE="$CONF_DIR/elasticsearch.yml"
+@@ -103,6 +108,6 @@ if [ -e "$CONF_FILE" ]; then
+   esac
+ fi
+ 
+-export HOSTNAME=`hostname -s`
++export HOSTNAME=`hostname`
+ 
+-eval "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home=\""$ES_HOME"\" $properties -cp \""$ES_HOME/lib/*"\" org.elasticsearch.plugins.PluginManager $args
+\ No newline at end of file
++eval "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home=\""$ES_HOME"\" $properties -cp \""$ES_HOME/lib/elasticsearch/*"\" org.elasticsearch.plugins.PluginManager $args