new release with fixes

7 files changed, 42 insertions, 101 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 410bfd7057f7..2d0bda3af151 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = elasticsearch7
-	pkgdesc = Distributed RESTful search engine built on top of Lucene
+	pkgdesc = Free and Open, Distributed, RESTful Search Engine
 	pkgver = 7.17.8
-	pkgrel = 2
-	url = https://www.elastic.co/products/elasticsearch
+	pkgrel = 3
+	url = https://www.elastic.co/elasticsearch/
 	arch = x86_64
-	license = Apache
-	makedepends = java-environment
-	depends = java-runtime-headless
+	license = custom:SSPL+Elastic-2.0
+	makedepends = jdk17-openjdk
+	depends = jdk19-openjdk
 	depends = systemd
 	depends = libxml2
 	provides = elasticsearch=7.17.8
@@ -15,7 +15,7 @@ pkgbase = elasticsearch7
 	backup = etc/elasticsearch/log4j2.properties
 	backup = etc/elasticsearch/jvm.options
 	backup = etc/default/elasticsearch
-	source = elasticsearch-7.17.8.tar.gz::https://github.com/elastic/elasticsearch/archive/v7.17.8.tar.gz
+	source = elasticsearch7-7.17.8.tar.gz::https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.17.8-linux-x86_64.tar.gz
 	source = elasticsearch.service
 	source = elasticsearch@.service
 	source = elasticsearch-keystore.service
@@ -24,18 +24,14 @@ pkgbase = elasticsearch7
 	source = elasticsearch-user.conf
 	source = elasticsearch-tmpfile.conf
 	source = elasticsearch.default
-	source = remove-systemd-distribution-check.patch
-	source = remove-systemd-package-check.patch
-	sha256sums = f59b61de3aa985835883ab4c660d0633f62b6c12c1117f0e394cfd8feda5b827
-	sha256sums = 9e1f68ff275ef2b5f2b93d2823efc5cc9643da696fcbe09a3ea7520ada35ffba
-	sha256sums = 8a76ad9a44a34eca8d6cb7ec9d8f1b01d46c114765b0a76094de8d72f0477351
-	sha256sums = bac40d87acaa5bee209ceb6dfa253009a072e9243fe3b94be42fb5cd44727d6f
-	sha256sums = 22a78a165a810608188faea6f2b0b381f27b1e9d60126c3b3e729124540589a8
-	sha256sums = b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c
-	sha256sums = 815f6a39db6f54bb40750c382ffbdc298d2c4c187ee8ea7e2f855923e2ff354b
-	sha256sums = 74a772e9f73e2cecda45dcd30ade2f6114db657ed36231292bdf9a7ca04eab78
-	sha256sums = bb74e5fb8bc28f2125e015395ab05bea117b72bfc6dadbca827694b362ee0bf8
-	sha256sums = 96934e6518245a4110714c3e1c1eb7bfaf4dd0026cc917efc322f3bfa4c3b5ec
-	sha256sums = e00c45812db63a0fa6ea4de27e8f489e38e01fafdb155e5421f5faf659c2905d
+	b2sums = b599311a1a74b382add4cd6ed2fed807a5925b1a5f42a458ffd2907479e77dbc3a8826bd8d54046908b233d035d552565fbc57f9f3a23b7cf82355ccb123d11a
+	b2sums = c8dbd265243ae59398dd022a9ec99d72ab20f24623dafdc1d12b468b8fff541d3d54ba0db37be012a865010e04e072cfbf81793dfd85fbb42bfb7dfbf535a60c
+	b2sums = de3e45081e9f4d75c47b2d2ea4c9faabb0499153914c940faf055f34a823df1e4d244041520686fe6e6dabdb01520c3c48c9382613aeeadc3f5376bf0d1c367d
+	b2sums = 48a332da75e1d8c7624a5948c4b145ad6ec6aca7ed2da31802920fa99490cc99a354e06d635b8937217404bcb99302f8d95b7af99d6af8e3227e39cdb80fa3cd
+	b2sums = 91ca815aa29f619e74b8d735af234705aed7254e4ecdde5248ab2a971a6b13e4c3897ed54933b2d68d3f16c266cd20d6ce14377f988199c367c39b892ddf5bca
+	b2sums = 5690e288a5d288931094db9e1532737b641d9852c2dc5cf45c2853e20c6ab013b1cf056f2cd325ad0703c2075dac7bd16c99c7f1ba202f5d94aac336508f7417
+	b2sums = 21cc254940924675bd24e07f6af1f58c89530abfb075637279798bdbba80772c6a4659361e9e8e58a5b2a5ffb21e55e40c91a270ff10da5ab467f63ce34e9f76
+	b2sums = b54cc37b1e5b4f054fc14d3112bee2cbad1ba48f7f15364366473753767fa74f38874da35083f9f7d840286052d3da970cdcf509569aa8b5fff39e4941959678
+	b2sums = f346ba285e045e3982da1841adc8625ebf1a662882d20a7c69bd76911782e1bdf30883b16dffe32cd2355349738b9b6c275b9ff6b11dfdd7fd56b509bcd19c31
 
 pkgname = elasticsearch7
diff --git a/.gitignore b/.gitignore
index 952b0f08e1a6..7beb9982bc3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 !.gitignore
-elasticsearch-7*
 src/
 pkg/
+*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 61f479d6c6e3..b29332f5ece0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,18 @@
-# Maintainer: Christopher Snowhill <kode54@gmail.com>
-# Contributor: Justin Kromlinger <hashworks@archlinux.org>
-# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-# Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost>
-# Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer>
+# Maintainer:  HLFH <gaspard@dhautefeuille.eu>
 
-_pkgname=elasticsearch
 pkgname=elasticsearch7
 pkgver=7.17.8
-pkgrel=2
-pkgdesc="Distributed RESTful search engine built on top of Lucene"
+pkgrel=3
+pkgdesc="Free and Open, Distributed, RESTful Search Engine"
 arch=('x86_64')
-url="https://www.elastic.co/products/elasticsearch"
-license=('Apache')
-depends=('java-runtime-headless' 'systemd' 'libxml2')
-makedepends=('java-environment')
+url="https://www.elastic.co/elasticsearch/"
+license=('custom:SSPL+Elastic-2.0')
+depends=('jdk19-openjdk' 'systemd' 'libxml2')
+makedepends=('jdk17-openjdk')
 provides=("elasticsearch=$pkgver")
 conflicts=('elasticsearch')
 source=(
-  $_pkgname-$pkgver.tar.gz::"https://github.com/elastic/elasticsearch/archive/v${pkgver}.tar.gz"
+  $pkgname-$pkgver.tar.gz::"https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${pkgver}-linux-x86_64.tar.gz"
   elasticsearch.service
   elasticsearch@.service
   elasticsearch-keystore.service
@@ -26,50 +21,34 @@ source=(
   elasticsearch-user.conf
   elasticsearch-tmpfile.conf
   elasticsearch.default
-  remove-systemd-distribution-check.patch
-  remove-systemd-package-check.patch
 )
-sha256sums=('f59b61de3aa985835883ab4c660d0633f62b6c12c1117f0e394cfd8feda5b827'
-            '9e1f68ff275ef2b5f2b93d2823efc5cc9643da696fcbe09a3ea7520ada35ffba'
-            '8a76ad9a44a34eca8d6cb7ec9d8f1b01d46c114765b0a76094de8d72f0477351'
-            'bac40d87acaa5bee209ceb6dfa253009a072e9243fe3b94be42fb5cd44727d6f'
-            '22a78a165a810608188faea6f2b0b381f27b1e9d60126c3b3e729124540589a8'
-            'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
-            '815f6a39db6f54bb40750c382ffbdc298d2c4c187ee8ea7e2f855923e2ff354b'
-            '74a772e9f73e2cecda45dcd30ade2f6114db657ed36231292bdf9a7ca04eab78'
-            'bb74e5fb8bc28f2125e015395ab05bea117b72bfc6dadbca827694b362ee0bf8'
-            '96934e6518245a4110714c3e1c1eb7bfaf4dd0026cc917efc322f3bfa4c3b5ec'
-            'e00c45812db63a0fa6ea4de27e8f489e38e01fafdb155e5421f5faf659c2905d')
+b2sums=('b599311a1a74b382add4cd6ed2fed807a5925b1a5f42a458ffd2907479e77dbc3a8826bd8d54046908b233d035d552565fbc57f9f3a23b7cf82355ccb123d11a'
+        'c8dbd265243ae59398dd022a9ec99d72ab20f24623dafdc1d12b468b8fff541d3d54ba0db37be012a865010e04e072cfbf81793dfd85fbb42bfb7dfbf535a60c'
+        'de3e45081e9f4d75c47b2d2ea4c9faabb0499153914c940faf055f34a823df1e4d244041520686fe6e6dabdb01520c3c48c9382613aeeadc3f5376bf0d1c367d'
+        '48a332da75e1d8c7624a5948c4b145ad6ec6aca7ed2da31802920fa99490cc99a354e06d635b8937217404bcb99302f8d95b7af99d6af8e3227e39cdb80fa3cd'
+        '91ca815aa29f619e74b8d735af234705aed7254e4ecdde5248ab2a971a6b13e4c3897ed54933b2d68d3f16c266cd20d6ce14377f988199c367c39b892ddf5bca'
+        '5690e288a5d288931094db9e1532737b641d9852c2dc5cf45c2853e20c6ab013b1cf056f2cd325ad0703c2075dac7bd16c99c7f1ba202f5d94aac336508f7417'
+        '21cc254940924675bd24e07f6af1f58c89530abfb075637279798bdbba80772c6a4659361e9e8e58a5b2a5ffb21e55e40c91a270ff10da5ab467f63ce34e9f76'
+        'b54cc37b1e5b4f054fc14d3112bee2cbad1ba48f7f15364366473753767fa74f38874da35083f9f7d840286052d3da970cdcf509569aa8b5fff39e4941959678'
+        'f346ba285e045e3982da1841adc8625ebf1a662882d20a7c69bd76911782e1bdf30883b16dffe32cd2355349738b9b6c275b9ff6b11dfdd7fd56b509bcd19c31')
 
 backup=('etc/elasticsearch/elasticsearch.yml'
         'etc/elasticsearch/log4j2.properties'
         'etc/elasticsearch/jvm.options'
         'etc/default/elasticsearch')
 
-prepare() {
-  cd $_pkgname-$pkgver
-  patch -Np1 -i "$srcdir"/remove-systemd-distribution-check.patch
-  patch -Np1 -i "$srcdir"/remove-systemd-package-check.patch
-}
-
-build() {
-  cd $_pkgname-$pkgver
-  export GRADLE_OPTS="-Dbuild.snapshot=false -Dlicense.key=x-pack/plugin/core/snapshot.key"
-  ./gradlew :modules:systemd:assemble
-  ./gradlew :distribution:archives:linux-tar:assemble
-}
-
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   install -dm755 "$pkgdir"/{usr/share,var/lib,var/log}/elasticsearch
   install -dm755 "$pkgdir"/usr/bin
-
-  tar xf distribution/archives/linux-tar/build/distributions/elasticsearch-$pkgver-*linux-x86_64.tar.gz \
-      --strip 1 -C "$pkgdir"/usr/share/elasticsearch
+  
+  cp -R "${srcdir}/elasticsearch-${pkgver}/." "${pkgdir}/usr/share/elasticsearch"
   rm -r "$pkgdir"/usr/share/elasticsearch/{jdk,logs}
 
   install -dm755 "$pkgdir"/etc
+  echo 'xpack.security.enabled: false' >> "$pkgdir"/usr/share/elasticsearch/config/elasticsearch.yml
+  echo 'path.data: /var/lib/elasticsearch' >> "$pkgdir"/usr/share/elasticsearch/config/elasticsearch.yml
   mv "$pkgdir"/usr/share/elasticsearch/config "$pkgdir"/etc/elasticsearch
   chmod 2750 "$pkgdir"/etc/elasticsearch
 
@@ -79,7 +58,7 @@ package() {
 
   ln -s /etc/elasticsearch "$pkgdir"/usr/share/elasticsearch/config
   ln -s /var/log/elasticsearch "$pkgdir"/usr/share/elasticsearch/logs
-  ln -s /var/lib/elasticsearch "$pkgdir"/usr/share/elasticsearch/data
+  ln -s /usr/lib/jvm/java-19-openjdk "$pkgdir"/usr/share/elasticsearch/jdk
 
   install -Dm644 "$srcdir"/elasticsearch.service "$pkgdir"/usr/lib/systemd/system/elasticsearch.service
   install -Dm644 "$srcdir"/elasticsearch@.service "$pkgdir"/usr/lib/systemd/system/elasticsearch@.service
@@ -90,8 +69,6 @@ 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/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/elasticsearch-user.conf b/elasticsearch-user.conf
index d67b6c3fdde1..51ff7f9a7e15 100644
--- a/elasticsearch-user.conf
+++ b/elasticsearch-user.conf
@@ -1 +1 @@
-u elasticsearch - "Elasticsearch user"
+u elasticsearch - "Elasticsearch user" /var/lib/elasticsearch
diff --git a/elasticsearch.service b/elasticsearch.service
index d15fff03901d..df2e449198bf 100644
--- a/elasticsearch.service
+++ b/elasticsearch.service
@@ -7,7 +7,7 @@ After=elasticsearch-keystore.service
 After=network-online.target
 
 [Service]
-Type=notify
+Type=simple
 RuntimeDirectory=elasticsearch
 PrivateTmp=true
 Environment=ES_HOME=/usr/share/elasticsearch
diff --git a/remove-systemd-distribution-check.patch b/remove-systemd-distribution-check.patch
deleted file mode 100644
index 8c9c341ff835..000000000000
--- a/remove-systemd-distribution-check.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/modules/systemd/src/main/java/org/elasticsearch/systemd/SystemdPlugin.java b/modules/systemd/src/main/java/org/elasticsearch/systemd/SystemdPlugin.java
-index 40cc219cbb4..5b89f469da7 100644
---- a/modules/systemd/src/main/java/org/elasticsearch/systemd/SystemdPlugin.java
-+++ b/modules/systemd/src/main/java/org/elasticsearch/systemd/SystemdPlugin.java
-@@ -59,11 +59,7 @@ public class SystemdPlugin extends Plugin implements ClusterPlugin {
-     }
- 
-     SystemdPlugin(final boolean assertIsPackageDistribution, final Build.Type buildType, final String esSDNotify) {
--        final boolean isPackageDistribution = buildType == Build.Type.DEB || buildType == Build.Type.RPM;
--        if (assertIsPackageDistribution) {
--            // our build is configured to only include this module in the package distributions
--            assert isPackageDistribution : buildType;
--        }
-+        final boolean isPackageDistribution = true;
-         if (isPackageDistribution == false) {
-             logger.debug("disabling sd_notify as the build type [{}] is not a package distribution", buildType);
-             enabled = false;
diff --git a/remove-systemd-package-check.patch b/remove-systemd-package-check.patch
deleted file mode 100644
index a2e372a4198e..000000000000
--- a/remove-systemd-package-check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 {