<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8197d08aca8fb5a8f437ccd250e7e8eecaf07207">https://github.com/macports/macports-ports/commit/8197d08aca8fb5a8f437ccd250e7e8eecaf07207</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 8197d08aca8 elasticsearch: Update to version 7.16.0, log4j vulnerability mitigation
</span>8197d08aca8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8197d08aca8fb5a8f437ccd250e7e8eecaf07207
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sun Dec 12 22:39:18 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> elasticsearch: Update to version 7.16.0, log4j vulnerability mitigation
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to version 7.16.0
</span><span style='display:block; white-space:pre;color:#404040;'> * Addresses log4j vulnerability CVE-2021-44228
</span><span style='display:block; white-space:pre;color:#404040;'> * See https://github.com/elastic/elasticsearch/issues/81618#issuecomment-991254277
</span>---
databases/elasticsearch/Portfile | 10 ++++++----
databases/elasticsearch/files/patch-elasticsearch-yml.diff | 10 +++++-----
databases/elasticsearch/files/patch-jvm-options.diff | 10 +++++++---
3 files changed, 18 insertions(+), 12 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 f9568600c77..52bb89cf637 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.15.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.16.0
</span> revision 0
name elasticsearch
categories databases java
<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 380ed3230f0cd6fb4cfb3250f22f31f2968f2892 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b9a834ed68f9c67c3f65deb0c9ea78ad32ee22330f907cf2c6db7e7868aa7390 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 338667324
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4c92e5945fa7de4be714a78ddd8e9c05eafaf9dc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8d07880039aa77df9555cc847a97c364eb84ae75f4f603428ed5b2cdea82b7c0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 340752696
</span>
use_configure no
build {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +42,8 @@ java.version 11+
</span> # LTS JDK port to install if required java not found
java.fallback openjdk11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# diff -NaurdwB -I '^ *#' ./elasticsearch-orig/config/elasticsearch.yml ./elasticsearch-new/config/elasticsearch.yml | sed -E -e 's/\.\/elasticsearch-(orig|new)\//\.\//' > patch-elasticsearch-yml.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# diff -NaurdwB -I '^ *#' ./elasticsearch-orig/config/jvm.options ./elasticsearch-new/config/jvm.options | sed -E -e 's/\.\/elasticsearch-(orig|new)\//\.\//' > patch-jvm-options.diff
</span> # diff -Naur -I '^ *#' bin/elasticsearch-env bin/elasticsearch-env-patch | sed -E 's|(elasticsearch-env)-patch|\1|' > patch-elasticsearch-env.diff
patchfiles patch-elasticsearch-yml.diff \
patch-elasticsearch-env.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/elasticsearch/files/patch-elasticsearch-yml.diff b/databases/elasticsearch/files/patch-elasticsearch-yml.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 860d4cb2f60..22aa9dfdd82 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/elasticsearch/files/patch-elasticsearch-yml.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/elasticsearch/files/patch-elasticsearch-yml.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/elasticsearch.yml 2021-09-08 14:14:21.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/elasticsearch.yml 2021-09-08 14:17:47.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./config/elasticsearch.yml 2021-12-12 22:21:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./config/elasticsearch.yml 2021-12-12 22:24:52.000000000 -0500
</span> @@ -14,7 +14,7 @@
#
# Use a descriptive name for your cluster:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,10 +43,10 @@
</span> #
# By default Elasticsearch listens for HTTP traffic on the first free port it
# finds starting at 9200. Set a specific HTTP port here:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -80,3 +86,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Require explicit names when deleting indices:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,3 +100,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Refer to the following documentation for instructions.
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #action.destructive_requires_name: true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://www.elastic.co/guide/en/elasticsearch/reference/7.16/configuring-stack-security.html
</span> +#
+# Disable xpack security
+#
<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 a460f3f8d1c..ffd0441c721 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/jvm.options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/jvm.options 2020-09-02 17:16:56.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,10 +68,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./config/jvm.options 2021-12-12 22:21:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./config/jvm.options 2021-12-12 22:32:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,10 +87,14 @@
</span> 8:-XX:+PrintGCDateStamps
8:-XX:+PrintTenuringDistribution
8:-XX:+PrintGCApplicationStoppedTime
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,3 +13,7 @@
</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:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# log4j vulnerability CVE-2021-44228
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# https://github.com/elastic/elasticsearch/issues/81618#issuecomment-991254277
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-Dlog4j2.formatMsgNoLookups=true
</span></pre><pre style='margin:0'>
</pre>