<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b16770b0ed5bc3eedfe522a451e0fb43d0416ce7">https://github.com/macports/macports-ports/commit/b16770b0ed5bc3eedfe522a451e0fb43d0416ce7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b16770b0ed5 elasticsearch: update to 7.9.0
</span>b16770b0ed5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b16770b0ed5bc3eedfe522a451e0fb43d0416ce7
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Wed Sep 2 15:45:40 2020 +0900
<span style='display:block; white-space:pre;color:#404040;'> elasticsearch: update to 7.9.0
</span>---
databases/elasticsearch/Portfile | 14 ++++++++------
.../elasticsearch/files/patch-elasticsearch-env.diff | 17 ++++++++++-------
databases/elasticsearch/files/patch-jvm-options.diff | 18 ++----------------
3 files changed, 20 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/elasticsearch/Portfile b/databases/elasticsearch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ac18fffbca5..a144f86c2de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/elasticsearch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/elasticsearch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup java 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.9.0
</span> revision 0
name elasticsearch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +29,9 @@ master_sites https://artifacts.elastic.co/downloads/${name}/
</span> worksrcdir ${distname}
distname ${name}-${version}-darwin-x86_64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f6c8a5214a60391c39c04db66ae0fc7b6b180375 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ce819d92b889ac36608aff3bc7226741e1fe599328ef3221344933725286f1e3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 279571527
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8480d269c7920c7d263823bf8f235e65ec378443 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ee913bd0b4e57a0b327165474fa3b45d2b48e189cd8b9816ffa600df8ea361e4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 301717601
</span>
use_configure no
build {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,8 +123,8 @@ curl -XPUT \"http://localhost:9200/my_first_index\" \\
</span> {
\"settings\" : {
\"index\" : {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- \"number_of_shards\" : 5,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \"number_of_replicas\" : 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \"number_of_shards\" : 5,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \"number_of_replicas\" : 2
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,3 +154,5 @@ startupitem.create yes
</span> startupitem.logfile ${logdir}/daemon.log
startupitem.executable \
sudo -u elasticsearch ${prefix}/bin/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://www.elastic.co/downloads/elasticsearch
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/elasticsearch/files/patch-elasticsearch-env.diff b/databases/elasticsearch/files/patch-elasticsearch-env.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ad6b9c40c64..dccbd8cd96d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/elasticsearch/files/patch-elasticsearch-env.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/elasticsearch/files/patch-elasticsearch-env.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- bin/elasticsearch-env
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/elasticsearch-env 2019-05-09 13:57:05.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,32 +19,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bin/elasticsearch-env 2020-09-02 17:12:34.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,34 +19,33 @@
</span> fi
done
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,26 +32,29 @@
</span> +
if [ ! -z "$JAVA_HOME" ]; then
JAVA="$JAVA_HOME/bin/java"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ JAVA_TYPE="JAVA_HOME"
</span> -else
- if [ "$(uname -s)" = "Darwin" ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- # OSX has a different structure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- JAVA="$ES_HOME/jdk/Contents/Home/bin/java"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # macOS has a different structure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JAVA="$ES_HOME/jdk.app/Contents/Home/bin/java"
</span> - else
- JAVA="$ES_HOME/jdk/bin/java"
- fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- JAVA_TYPE="bundled jdk"
</span> +# MacPorts' port:elasticsearch includes port:openjdk13 as a dependency;
+# no need to include this bundled Elasticsearch copy of OpenJDK13
+## else
+## if [ "$(uname -s)" = "Darwin" ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+## # OSX has a different structure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## JAVA="$ES_HOME/jdk/Contents/Home/bin/java"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## # macOS has a different structure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## JAVA="$ES_HOME/jdk.app/Contents/Home/bin/java"
</span> +## else
+## JAVA="$ES_HOME/jdk/bin/java"
+## fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>++## JAVA_TYPE="bundled jdk"
</span> fi
if [ ! -x "$JAVA" ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,8 +69,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,8 +77,6 @@
</span>
export HOSTNAME=$HOSTNAME
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/elasticsearch/files/patch-jvm-options.diff b/databases/elasticsearch/files/patch-jvm-options.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1cdb49553fc..a460f3f8d1c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/elasticsearch/files/patch-jvm-options.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/elasticsearch/files/patch-jvm-options.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,6 @@
</span> --- config/jvm.options
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/jvm.options 2019-05-09 15:01:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,8 +19,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xms represents the initial size of total heap space
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xmx represents the maximum size of total heap space
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---Xms1g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---Xmx1g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+-Xms1g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+-Xmx1g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Expert settings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,13 +107,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/jvm.options 2020-09-02 17:16:56.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,10 +68,10 @@
</span> 8:-XX:+PrintGCDateStamps
8:-XX:+PrintTenuringDistribution
8:-XX:+PrintGCApplicationStoppedTime
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,6 +13,3 @@
</span> # 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=@PREFIX_LOGDIR@/gc.log:utctime,pid,tags:filecount=32,filesize=64m
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # time/date parsing will break in an incompatible way for some date patterns and locals
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9-:-Djava.locale.providers=COMPAT
</span></pre><pre style='margin:0'>
</pre>