<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a6f767301cb440a4b385f8f78950c3a06b223286">https://github.com/macports/macports-ports/commit/a6f767301cb440a4b385f8f78950c3a06b223286</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 a6f767301cb elasticsearch: Update to version 7.14.1
</span>a6f767301cb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a6f767301cb440a4b385f8f78950c3a06b223286
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Wed Sep 1 18:01:04 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> elasticsearch: Update to version 7.14.1
</span>---
databases/elasticsearch/Portfile | 9 ++++---
.../files/patch-elasticsearch-env.diff | 29 +++++++++++++---------
2 files changed, 22 insertions(+), 16 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 a8b076d7b23..9b5fac28c9e 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.10.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.14.1
</span> revision 0
name elasticsearch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,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 bb2f9929161355f98413ce52e703b08d4f6019d1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5ca13cb82484828c58b0cf2ded314b18a2ef47b005beb70dab2a28ee5b2c7706 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 304887524
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c62e195c31085ec8c42db55f52e66e167ff086eb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ac1949836c64d4d1b1b9273400d5fd3a91bb6964ded67d2947e93324fad94028 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 342285472
</span>
use_configure no
build {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +43,7 @@ java.version 9+
</span> # LTS JDK port to install if required java not found
java.fallback openjdk11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# diff -Naur -I '^ *#' bin/elasticsearch-env bin/elasticsearch-env-patch | sed -E 's|(elasticsearch-env)-patch|\1|' > patch-elasticsearch-env.diff
</span> patchfiles patch-elasticsearch-yml.diff \
patch-elasticsearch-env.diff \
patch-jvm-options.diff
<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 dccbd8cd96d..fc69e1c2a79 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><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/elasticsearch-env
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/elasticsearch-env 2020-09-02 17:12:34.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,34 +19,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bin/elasticsearch-env 2021-09-01 12:39:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bin/elasticsearch-env 2021-09-01 12:46:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,23 +19,19 @@
</span> fi
done
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,38 +23,43 @@
</span> ES_CLASSPATH="$ES_HOME/lib/*"
# now set the path to java
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+if [ -z "$JAVA_HOME" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ -z "$ES_JAVA_HOME" ]; then
</span> + if [ -x /usr/libexec/java_home ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ export JAVA_HOME=$(/usr/libexec/java_home)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ export KEYTOOL="$JAVA_HOME"/jre/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ export ES_JAVA_HOME=$(/usr/libexec/java_home)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ export KEYTOOL="$ES_JAVA_HOME"/jre/bin
</span> + fi
+fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ ! -z "$JAVA_HOME" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ ! -z "$ES_JAVA_HOME" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JAVA="$ES_JAVA_HOME/bin/java"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JAVA_TYPE="ES_JAVA_HOME"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,15 +40,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "warning: usage of JAVA_HOME is deprecated, use ES_JAVA_HOME" >&2
</span> JAVA="$JAVA_HOME/bin/java"
JAVA_TYPE="JAVA_HOME"
-else
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- # use the bundled JDK (default)
</span> - if [ "$(uname -s)" = "Darwin" ]; then
- # macOS has a different structure
- JAVA="$ES_HOME/jdk.app/Contents/Home/bin/java"
- else
- JAVA="$ES_HOME/jdk/bin/java"
- fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- JAVA_TYPE="bundled jdk"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# MacPorts' port:elasticsearch includes port:openjdk13 as a dependency;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- JAVA_TYPE="bundled JDK"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# MacPorts' port:elasticsearch includes port:openjdk11 as a dependency;
</span> +# no need to include this bundled Elasticsearch copy of OpenJDK13
+## else
<span style='display:block; white-space:pre;background:#e0ffe0;'>++## # use the bundled JDK (default)
</span> +## if [ "$(uname -s)" = "Darwin" ]; then
+## # macOS has a different structure
+## JAVA="$ES_HOME/jdk.app/Contents/Home/bin/java"
+## else
+## JAVA="$ES_HOME/jdk/bin/java"
+## fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+## JAVA_TYPE="bundled jdk"
</span><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;'>-@@ -78,8 +77,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,8 +82,6 @@
</span>
export HOSTNAME=$HOSTNAME
</pre><pre style='margin:0'>
</pre>