Bump to 7.17

4 files changed, 35 insertions, 92 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b793b19992e..9b99a0016e27 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = elasticsearch
 	pkgdesc = Distributed RESTful search engine built on top of Lucene
-	pkgver = 7.10.2
-	pkgrel = 2
+	pkgver = 7.17.0
+	pkgrel = 1
 	url = https://www.elastic.co/products/elasticsearch
 	arch = x86_64
 	license = Apache
-	makedepends = java-environment=11
-	depends = java-runtime-headless<=16
+	makedepends = java-environment=17
+	depends = java-runtime-headless<=17
 	depends = systemd
 	depends = libxml2
 	backup = etc/elasticsearch/elasticsearch.yml
 	backup = etc/elasticsearch/log4j2.properties
 	backup = etc/elasticsearch/jvm.options
 	backup = etc/default/elasticsearch
-	source = elasticsearch-7.10.2.tar.gz::https://github.com/elastic/elasticsearch/archive/v7.10.2.tar.gz
+	source = elasticsearch-7.17.0.tar.gz::https://github.com/elastic/elasticsearch/archive/v7.17.0.tar.gz
 	source = elasticsearch.service
 	source = elasticsearch@.service
 	source = elasticsearch-keystore.service
@@ -23,8 +23,8 @@ pkgbase = elasticsearch
 	source = elasticsearch-tmpfile.conf
 	source = elasticsearch.default
 	source = remove-systemd-distribution-check.patch
-	source = patch-log4j-JAR-to-remove-JndiLookup-class-81629.patch
-	sha256sums = bdb7811882a0d9436ac202a947061b565aa71983c72e1c191e7373119a1cdd1c
+	source = remove-systemd-package-check.patch
+	sha256sums = 64392a523a534ed0d25439cc0998a20cf4ea74578b0e85cd0fb188421e0126a1
 	sha256sums = 9e1f68ff275ef2b5f2b93d2823efc5cc9643da696fcbe09a3ea7520ada35ffba
 	sha256sums = 8a76ad9a44a34eca8d6cb7ec9d8f1b01d46c114765b0a76094de8d72f0477351
 	sha256sums = bac40d87acaa5bee209ceb6dfa253009a072e9243fe3b94be42fb5cd44727d6f
@@ -34,6 +34,6 @@ pkgbase = elasticsearch
 	sha256sums = 74a772e9f73e2cecda45dcd30ade2f6114db657ed36231292bdf9a7ca04eab78
 	sha256sums = bb74e5fb8bc28f2125e015395ab05bea117b72bfc6dadbca827694b362ee0bf8
 	sha256sums = 96934e6518245a4110714c3e1c1eb7bfaf4dd0026cc917efc322f3bfa4c3b5ec
-	sha256sums = 98724575d454a49ec419eb39c53565cba5d2901eef6246d63205d02b8c6a68e2
+	sha256sums = e00c45812db63a0fa6ea4de27e8f489e38e01fafdb155e5421f5faf659c2905d
 
 pkgname = elasticsearch
diff --git a/PKGBUILD b/PKGBUILD
index cefc95989dba..7bad74825465 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@
 # Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer>
 
 pkgname=elasticsearch
-pkgver=7.10.2
-pkgrel=2
+pkgver=7.17.0
+pkgrel=1
 pkgdesc="Distributed RESTful search engine built on top of Lucene"
 arch=('x86_64')
 url="https://www.elastic.co/products/elasticsearch"
 license=('Apache')
-depends=('java-runtime-headless<=16' 'systemd' 'libxml2')
-makedepends=('java-environment=11')
+depends=('java-runtime-headless<=17' 'systemd' 'libxml2')
+makedepends=('java-environment=17')
 source=(
   $pkgname-$pkgver.tar.gz::"https://github.com/elastic/elasticsearch/archive/v${pkgver}.tar.gz"
   elasticsearch.service
@@ -23,9 +23,9 @@ source=(
   elasticsearch-tmpfile.conf
   elasticsearch.default
   remove-systemd-distribution-check.patch
-  patch-log4j-JAR-to-remove-JndiLookup-class-81629.patch
+  remove-systemd-package-check.patch
 )
-sha256sums=('bdb7811882a0d9436ac202a947061b565aa71983c72e1c191e7373119a1cdd1c'
+sha256sums=('64392a523a534ed0d25439cc0998a20cf4ea74578b0e85cd0fb188421e0126a1'
             '9e1f68ff275ef2b5f2b93d2823efc5cc9643da696fcbe09a3ea7520ada35ffba'
             '8a76ad9a44a34eca8d6cb7ec9d8f1b01d46c114765b0a76094de8d72f0477351'
             'bac40d87acaa5bee209ceb6dfa253009a072e9243fe3b94be42fb5cd44727d6f'
@@ -35,7 +35,7 @@ sha256sums=('bdb7811882a0d9436ac202a947061b565aa71983c72e1c191e7373119a1cdd1c'
             '74a772e9f73e2cecda45dcd30ade2f6114db657ed36231292bdf9a7ca04eab78'
             'bb74e5fb8bc28f2125e015395ab05bea117b72bfc6dadbca827694b362ee0bf8'
             '96934e6518245a4110714c3e1c1eb7bfaf4dd0026cc917efc322f3bfa4c3b5ec'
-            '98724575d454a49ec419eb39c53565cba5d2901eef6246d63205d02b8c6a68e2')
+            'e00c45812db63a0fa6ea4de27e8f489e38e01fafdb155e5421f5faf659c2905d')
 
 backup=('etc/elasticsearch/elasticsearch.yml'
         'etc/elasticsearch/log4j2.properties'
@@ -45,16 +45,15 @@ backup=('etc/elasticsearch/elasticsearch.yml'
 prepare() {
   cd $pkgname-$pkgver
   patch -Np1 -i "$srcdir"/remove-systemd-distribution-check.patch
-  patch -Np1 -i "$srcdir"/patch-log4j-JAR-to-remove-JndiLookup-class-81629.patch
-  sed -i 's|${versions.log4j}|2.11.1|' libs/log4j/build.gradle
+  patch -Np1 -i "$srcdir"/remove-systemd-package-check.patch
 }
 
 build() {
   cd $pkgname-$pkgver
-  export PATH=/usr/lib/jvm/java-11-openjdk/bin:$PATH
+  export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH
   export GRADLE_OPTS="-Dbuild.snapshot=false -Dlicense.key=x-pack/plugin/core/snapshot.key"
-  ./gradlew :distribution:buildSystemdModule
-  ./gradlew :distribution:archives:linux-tar:build
+  ./gradlew :modules:systemd:assemble
+  ./gradlew :distribution:archives:linux-tar:assemble
 }
 
 package() {
@@ -88,7 +87,7 @@ package() {
   install -Dm644 "$srcdir"/elasticsearch-sysctl.conf "$pkgdir"/usr/lib/sysctl.d/elasticsearch.conf
   install -Dm644 "$srcdir"/elasticsearch.default "$pkgdir"/etc/default/elasticsearch
 
-  cp -r distribution/build/outputs/systemd/modules/systemd "$pkgdir"/usr/share/elasticsearch/modules/
+  cp -r distribution/build/outputs/default/modules/systemd "$pkgdir"/usr/share/elasticsearch/modules/
 
   sed -i '2iJAVA_HOME=/usr/lib/jvm/default-runtime' "$pkgdir"/usr/share/elasticsearch/bin/elasticsearch-env
   sed -i 's/ES_BUNDLED_JDK=true/ES_BUNDLED_JDK=false/g' "$pkgdir"/usr/share/elasticsearch/bin/elasticsearch-env
diff --git a/patch-log4j-JAR-to-remove-JndiLookup-class-81629.patch b/patch-log4j-JAR-to-remove-JndiLookup-class-81629.patch
deleted file mode 100644
index b0293d2e46e0..000000000000
--- a/patch-log4j-JAR-to-remove-JndiLookup-class-81629.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 9a3422e1a6cf519e3fedce396784be2ef48dc7f9 Mon Sep 17 00:00:00 2001
-From: Mark Vieira <portugee@gmail.com>
-Date: Fri, 10 Dec 2021 15:51:38 -0800
-Subject: [PATCH] Patch log4j JAR to remove JndiLookup class (#81629)
-
-
-diff --git a/distribution/build.gradle b/distribution/build.gradle
-index feab67bfbf8..76549a83d0b 100644
---- a/distribution/build.gradle
-+++ b/distribution/build.gradle
-@@ -275,6 +275,10 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
-         }
-       }
-     }
-+    all {
-+      resolutionStrategy.dependencySubstitution {
-+        substitute module("org.apache.logging.log4j:log4j-core") using project(":libs:elasticsearch-log4j") because "patched to remove JndiLookup clas"}
-+    }
-   }
- 
-   dependencies {
-diff --git a/libs/build.gradle b/libs/build.gradle
-index 0614199b97b..952985f5aa5 100644
---- a/libs/build.gradle
-+++ b/libs/build.gradle
-@@ -6,7 +6,7 @@
-  * Side Public License, v 1.
-  */
- 
--subprojects {
-+configure(subprojects - project('elasticsearch-log4j')) {
-   /*
-    * All subprojects are java projects using Elasticsearch's standard build
-    * tools.
-diff --git a/libs/log4j/build.gradle b/libs/log4j/build.gradle
-new file mode 100644
-index 00000000000..917a9f454a1
---- /dev/null
-+++ b/libs/log4j/build.gradle
-@@ -0,0 +1,28 @@
-+plugins {
-+  id 'base'
-+  id 'elasticsearch.repositories'
-+}
-+
-+configurations {
-+  log4j {
-+    transitive = false
-+  }
-+}
-+
-+dependencies {
-+  log4j "org.apache.logging.log4j:log4j-core:${versions.log4j}"
-+}
-+
-+// Strip out JndiLookup class to avoid any possibility of exploitation of CVE-2021-44228
-+// See: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-44228
-+// See: https://issues.apache.org/jira/browse/LOG4J2-3201
-+def patchLog4j = tasks.register('patchLog4j', Zip) {
-+  archiveExtension = 'jar'
-+  from({ zipTree(configurations.log4j.singleFile) }) {
-+    exclude '**/JndiLookup.class'
-+  }
-+}
-+
-+artifacts {
-+  'default'(patchLog4j)
-+}
--- 
-2.34.1
-
diff --git a/remove-systemd-package-check.patch b/remove-systemd-package-check.patch
new file mode 100644
index 000000000000..a2e372a4198e
--- /dev/null
+++ b/remove-systemd-package-check.patch
@@ -0,0 +1,15 @@
+diff --git a/distribution/build.gradle b/distribution/build.gradle
+index 76549a83d0b..120297684e0 100644
+--- a/distribution/build.gradle
++++ b/distribution/build.gradle
+@@ -198,10 +198,6 @@ ext.restTestExpansions = [
+ // we create the buildOssModules task above but fill it here so we can do a single
+ // loop over modules to also setup cross task dependencies and increment our modules counter
+ project.rootProject.subprojects.findAll { it.parent.path == ':modules' }.each { Project module ->
+-  if (module.name == 'systemd') {
+-    // the systemd module is only included in the package distributions
+-    return
+-  }
+   File licenses = new File(module.projectDir, 'licenses')
+   if (licenses.exists()) {
+     buildDefaultNoticeTaskProvider.configure {