Update databases/elasticsearch to 2.4.0.

=== Breaking changes

Network::
- Single comma-delimited response header for multiple values

=== Deprecations

Geo::
- Deprecate optimize_bbox on geodistance queries
- Deprecate geohash parameters for geo_point parser

Mapping::
- Add deprecation logging for '_timestamp' and '_ttl'.

Query DSL::
- Deprecate soon-to-be-unsupported queries.

REST::
- Deprecate camelCase usages

Search::
- Deprecate sort option reverse.

Settings::
- Deprecate bootstrap.mlockall
- Deprecate camelCase settings magic

Snapshot/Restore::
- Adds deprecation notices on removed BlobContainer methods

=== New features

Geo::
- Add CONTAINS relation to geo_shape query

Plugin Cloud AWS::
- Add support for path_style_access

Reindex API::
- Backport: Reindex's throttling

=== Enhancements

Circuit Breakers::
- Limit request size

Cluster::
- Batch process node left and node failure 2.x

Core::
- Improve performance of applyDeletedShards
- Sliced lock contention 2.x
- Kill thread local leak
- Remove hostname from NetworkAddress.format (2.x)

Dates::
- Improve TimeUnitRounding for edge cases and DST transitions

Internal::
- Turn RestChannel into an interface
- Require executor name when calling scheduleWithFixedDelay
- Implement available for all StreamInput classes

Java API::
- Add created flag to IndexingOperationListener#postIndex

Logging::
- Add shardId and node name in search slow log

Mapping::
- Mappings: Allow to force dots in field names

Network::
- Exclude admin / diagnostic requests from HTTP request limiting
- Netty request/response tracer should wait for send
- Exclude specific transport actions from request size limit check
- Provide better error message when an incompatible node connects
  to a node

Packaging::
- Increase default max open files to 65536
- Allow configuring Windows service name, description and user

Parent/Child::
- Allow adding additional child types that point to an existing
  parent type

Query DSL::
- Fixed QueryParsingException in multi match query

REST::
- CORS handling triggered whether User-Agent is a browser or not

Reindex API::
- Switch default batch size for reindex to 1000

Scripting::
-  Mustache: Add util functions to render JSON and join array
   values
- Compile each Groovy script in its own classloader

=== Bug fixes

Aggregations::
- Fix potential AssertionError with include/exclude on terms
  aggregations.
- Pass resolved extended bounds to unmapped histogram aggregator
- Fix "key_as_string" for date histogram and
  epoch_millis/epoch_second format with time zone
- Fix TimeUnitRounding for hour, minute and second units
- Adds serialisation of sigma to extended_stats_bucket pipeline
  aggregation
- ExtendedStatsAggregator should also pass sigma to emtpy aggs.
- Prevents exception being raised when ordering by an aggregation
  which wasn't collected
- Setting 'other' bucket on empty aggregation

Allocation::
- Rebalancing policy shouldn't prevent hard allocation decisions

Analysis::
- Add 'Character.MODIFIER_SYMBOL' to the list of symbol
  categories.

Bulk::
- Copy headers and context to individual requests inside a bulk

CAT API::
- Fix merge stats rendering in RestIndicesAction
- Expand wildcards to closed indices in '/_cat/indices'
- Fix column aliases in '_cat/indices', '_cat/nodes' and
  '_cat/shards' APIs

CRUD::
- Prevent TransportReplicationAction to route request based on
  stale local routing table

Cluster::
- Fix block checks when no indices are specified
- Cluster stats: fix memory available that is always set to 0

Core::
- Throw exception if using a closed transport client
- Fix misplaced cast when parsing seconds
- Don't try to compute completion stats on a reader after we
  already closed it

Dates::
- Make sure TimeIntervalRounding is monotonic for increasing dates
- Fix invalid rounding value for TimeIntervalRounding close to DST
  transitions
- Fix problem with TimeIntervalRounding on DST end

Highlighting::
- Plain highlighter should ignore parent/child queries
- Let fast vector highlighter also extract terms from the nested
  query's inner query.
- Skip all geo point queries in plain highlighter
- Exclude all but string fields from highlighting if wildcards are
  used

Indexed Scripts/Templates::
- Don't ignore custom sharding settings in create index request
  for '.scripts' index

Internal::
- Fix filtering of node ids for TransportNodesAction

Logging::
- Add missing index name to search slow log.

Mapping::
- Mapping updates on objects should propagate 'include_an_all'.
- Mappings: Fix detection of metadata fields in documents
- Fix not_analyzed string fields to error when
  position_increment_gap is set
- Automatically created indices should honor
  'index.mapper.dynamic'.
- Process dynamic templates in order.
- Fix cross type mapping updates for 'boolean' fields.
- Fail if an object is added after a field with the same name.

Packaging::
- RESTART_ON_UPGRADE incorrectly named ES_RESTART_ON_UPGRADE in
  sysconfig

Percolator::
- Set the SC and QPC type always to '.percolator' in percolate api
- Fixed NPE when percolator filter option is "empty".

Plugin Analysis Kuromoji::
- Prebuild Japanese Stop Words Token Filter

Plugin Cloud AWS::
- Support specific key/secret for EC2
- Add missing permission for S3 repository

Plugin Cloud Azure::
-  Make discovery-azure work again on 2.4 branch
- Fix remove of azure files

Plugin Cloud GCE::
- Fix NPE when GCE region is empty

Query DSL::
- Make parsing of bool queries stricter
- Fix NullPointerException in SimpleQueryParser when analyzing
  text produces a null query
- Apply the default operator on analyzed wildcard in
  simple_query_string builder
- Apply the default operator on analyzed wildcard in query_string
  builder

REST::
- Do not decode path when sending error
- CORS should permit same origin requests
- Allow CORS requests to work with HTTP compression enabled
- Fixes reading of CORS pre-flight headers and methods
- Fix OOM in AbstractXContentParser

Recovery::
- Backports Notify GatewayRecoveryListener on failure

Reindex API::
- Make reindex and lang-javascript compatible

Search::
- AllTermQuery must implement equals/hashCode.
- Add ref-counting to SearchContext to prevent accessing already
  closed readers
- Fix '_only_nodes' preferences
- Speed up named queries.

Snapshot/Restore::
- Handle 'indices=["_all"]' when restoring a snapshot
- On restore, selecting concrete indices can select wrong index

Stats::
- Fix sync flush total shards statistics

Translog::
- Translog can delete valid .ckp file when views are closed after
  the translog
- Call ensureOpen on Translog#newView() to prevent
  IllegalStateException

=== Upgrades

Core::
- Update jackson to version 2.8.1 (on 2.4 branch)
- Upgrade lucene to 5.5.2

Dates::
- Upgrade joda-time to 2.9.4

Internal::
- Update Jackson 2.6.2 -> 2.6.6 (latest and final 2.6 patch)

Network::
- Upgrade to netty 3.10.6.Final

Plugin Cloud AWS::
- Update aws sdk to 1.10.69 and add throttle_retries repository
  setting

4 files changed, 31 insertions, 31 deletions

diff --git a/databases/elasticsearch/Makefile b/databases/elasticsearch/Makefile
index cb7e72523d1..641260f1f1e 100644
--- a/databases/elasticsearch/Makefile
+++ b/databases/elasticsearch/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2016/08/19 10:09:11 fhajny Exp $
+# $NetBSD: Makefile,v 1.18 2016/09/19 12:28:31 fhajny Exp $
 
-DISTNAME=	elasticsearch-2.3.5
+DISTNAME=	elasticsearch-2.4.0
 CATEGORIES=	textproc
 MASTER_SITES=	https://download.elasticsearch.org/elasticsearch/elasticsearch/
 
diff --git a/databases/elasticsearch/PLIST b/databases/elasticsearch/PLIST
index b6bb12cf0bc..e52ea5e3eda 100644
--- a/databases/elasticsearch/PLIST
+++ b/databases/elasticsearch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2016/08/19 10:09:11 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/09/19 12:28:31 fhajny Exp $
 lib/elasticsearch/HdrHistogram-2.1.6.jar
 lib/elasticsearch/apache-log4j-extras-1.2.17.jar
 lib/elasticsearch/commons-cli-1.3.1.jar
@@ -7,31 +7,31 @@ lib/elasticsearch/compress-lzf-1.0.2.jar
 lib/elasticsearch/${PKGNAME}.jar
 lib/elasticsearch/guava-18.0.jar
 lib/elasticsearch/hppc-0.7.1.jar
-lib/elasticsearch/jackson-core-2.6.6.jar
-lib/elasticsearch/jackson-dataformat-cbor-2.6.6.jar
-lib/elasticsearch/jackson-dataformat-smile-2.6.6.jar
-lib/elasticsearch/jackson-dataformat-yaml-2.6.6.jar
+lib/elasticsearch/jackson-core-2.8.1.jar
+lib/elasticsearch/jackson-dataformat-cbor-2.8.1.jar
+lib/elasticsearch/jackson-dataformat-smile-2.8.1.jar
+lib/elasticsearch/jackson-dataformat-yaml-2.8.1.jar
 lib/elasticsearch/jna-4.1.0.jar
 lib/elasticsearch/joda-convert-1.2.jar
 lib/elasticsearch/joda-time-2.9.4.jar
 lib/elasticsearch/jsr166e-1.1.0.jar
 lib/elasticsearch/jts-1.13.jar
 lib/elasticsearch/log4j-1.2.17.jar
-lib/elasticsearch/lucene-analyzers-common-5.5.0.jar
-lib/elasticsearch/lucene-backward-codecs-5.5.0.jar
-lib/elasticsearch/lucene-core-5.5.0.jar
-lib/elasticsearch/lucene-grouping-5.5.0.jar
-lib/elasticsearch/lucene-highlighter-5.5.0.jar
-lib/elasticsearch/lucene-join-5.5.0.jar
-lib/elasticsearch/lucene-memory-5.5.0.jar
-lib/elasticsearch/lucene-misc-5.5.0.jar
-lib/elasticsearch/lucene-queries-5.5.0.jar
-lib/elasticsearch/lucene-queryparser-5.5.0.jar
-lib/elasticsearch/lucene-sandbox-5.5.0.jar
-lib/elasticsearch/lucene-spatial-5.5.0.jar
-lib/elasticsearch/lucene-spatial3d-5.5.0.jar
-lib/elasticsearch/lucene-suggest-5.5.0.jar
-lib/elasticsearch/netty-3.10.5.Final.jar
+lib/elasticsearch/lucene-analyzers-common-5.5.2.jar
+lib/elasticsearch/lucene-backward-codecs-5.5.2.jar
+lib/elasticsearch/lucene-core-5.5.2.jar
+lib/elasticsearch/lucene-grouping-5.5.2.jar
+lib/elasticsearch/lucene-highlighter-5.5.2.jar
+lib/elasticsearch/lucene-join-5.5.2.jar
+lib/elasticsearch/lucene-memory-5.5.2.jar
+lib/elasticsearch/lucene-misc-5.5.2.jar
+lib/elasticsearch/lucene-queries-5.5.2.jar
+lib/elasticsearch/lucene-queryparser-5.5.2.jar
+lib/elasticsearch/lucene-sandbox-5.5.2.jar
+lib/elasticsearch/lucene-spatial-5.5.2.jar
+lib/elasticsearch/lucene-spatial3d-5.5.2.jar
+lib/elasticsearch/lucene-suggest-5.5.2.jar
+lib/elasticsearch/netty-3.10.6.Final.jar
 lib/elasticsearch/securesm-1.0.jar
 lib/elasticsearch/snakeyaml-1.15.jar
 lib/elasticsearch/spatial4j-0.5.jar
diff --git a/databases/elasticsearch/distinfo b/databases/elasticsearch/distinfo
index 391ec63e1f2..bb90d858cb8 100644
--- a/databases/elasticsearch/distinfo
+++ b/databases/elasticsearch/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2016/08/19 10:09:11 fhajny Exp $
+$NetBSD: distinfo,v 1.19 2016/09/19 12:28:31 fhajny Exp $
 
-SHA1 (elasticsearch-2.3.5.tar.gz) = ba8842e4ff35370b9ae6a1a12b7f1d12aa9b5c66
-RMD160 (elasticsearch-2.3.5.tar.gz) = 1641528611e9c3caf0f0a7e01dd523e75c20b966
-SHA512 (elasticsearch-2.3.5.tar.gz) = 9c0cc8a9ae0fa2b52db583a5c006b05a84c1f84e1b8dbbafa88bec111190d056a23bd384d4241ce00dc8b56a6840857b296e4c0d2bf911f352ef67f128a87ca7
-Size (elasticsearch-2.3.5.tar.gz) = 27547995 bytes
-SHA1 (patch-bin_elasticsearch.in.sh) = 996cd326fdab47b4a9ebfc9f42c9687e18034ccb
+SHA1 (elasticsearch-2.4.0.tar.gz) = 5150c33ccd104a9ce8b7040eeb5b68cb9ee32a70
+RMD160 (elasticsearch-2.4.0.tar.gz) = 291398c95235b966147ee7114ad4b7af39bef0df
+SHA512 (elasticsearch-2.4.0.tar.gz) = 931f4d42cba43131718ec7480439b5fda0b9222a51cf9639d99ab4c00bdbedbe7e8da7a6016d88b848772cd416bc49fe7af09202160cecf839e39d803b45e869
+Size (elasticsearch-2.4.0.tar.gz) = 27364449 bytes
+SHA1 (patch-bin_elasticsearch.in.sh) = 0d2b864361902126ba0a66aff2be614d0723012b
 SHA1 (patch-bin_plugin) = 5ddd9b55797305c2c1e77b174ae410c00ecb7b89
 SHA1 (patch-config_elasticsearch.yml) = 7729dfb1ed106f0a34e6daaf7a46d0352d42f1f1
diff --git a/databases/elasticsearch/patches/patch-bin_elasticsearch.in.sh b/databases/elasticsearch/patches/patch-bin_elasticsearch.in.sh
index ee725296176..656ce26f2d5 100644
--- a/databases/elasticsearch/patches/patch-bin_elasticsearch.in.sh
+++ b/databases/elasticsearch/patches/patch-bin_elasticsearch.in.sh
@@ -1,4 +1,4 @@
-$NetBSD: patch-bin_elasticsearch.in.sh,v 1.5 2016/08/19 10:09:11 fhajny Exp $
+$NetBSD: patch-bin_elasticsearch.in.sh,v 1.6 2016/09/19 12:28:31 fhajny Exp $
 
 Fix paths.
 
@@ -8,8 +8,8 @@ Fix paths.
      exit 1
  fi
  
--ES_CLASSPATH="$ES_HOME/lib/elasticsearch-2.3.5.jar:$ES_HOME/lib/*"
-+ES_CLASSPATH="@ES_LIBDIR@/elasticsearch-2.3.5.jar:@ES_LIBDIR@/*"
+-ES_CLASSPATH="$ES_HOME/lib/elasticsearch-2.4.0.jar:$ES_HOME/lib/*"
++ES_CLASSPATH="@ES_LIBDIR@/elasticsearch-2.4.0.jar:@ES_LIBDIR@/*"
  
  if [ "x$ES_MIN_MEM" = "x" ]; then
      ES_MIN_MEM=256m