8.6.0 release

5 files changed, 12 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 135ce3b1fa2c..2d8353cb04b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = elasticsearch
 	pkgdesc = Distributed RESTful search engine built on top of Lucene
-	pkgver = 8.5.3
-	pkgrel = 2
+	pkgver = 8.6.0
+	pkgrel = 1
 	url = https://www.elastic.co/products/elasticsearch
 	arch = x86_64
 	license = custom:SSPL+Elastic-2.0
@@ -13,7 +13,7 @@ pkgbase = elasticsearch
 	backup = etc/elasticsearch/log4j2.properties
 	backup = etc/elasticsearch/jvm.options
 	backup = etc/default/elasticsearch
-	source = elasticsearch-8.5.3.tar.gz::https://github.com/elastic/elasticsearch/archive/v8.5.3.tar.gz
+	source = elasticsearch-8.6.0.tar.gz::https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.6.0-linux-x86_64.tar.gz
 	source = elasticsearch.service
 	source = elasticsearch@.service
 	source = elasticsearch-keystore.service
@@ -22,9 +22,7 @@ pkgbase = elasticsearch
 	source = elasticsearch-user.conf
 	source = elasticsearch-tmpfile.conf
 	source = elasticsearch.default
-	source = remove-systemd-distribution-check.patch
-	source = remove-systemd-package-check.patch
-	b2sums = b058aea27dd2b3c8c072fe80d2d16102297efd3f684d88b9fd608d119dbaeff2dd2f961a4aa42c948bf66780a0b28f5fea65907804486eadedfbd02458670d79
+	b2sums = bc2ea9f10345dd78c1a58da4955d2ff21addca055e33efb77b734f2851f9a00e86a758a404e6ca8abe5fc7894558646b7891f4fefaaa41e6169a38a236c7ff49
 	b2sums = 069bc68cec0d4638a90205ddf61e36224c73898b219e14d36e8340fb4ff8a5e9f6bbb7c12c0e69ad0f245db7ee67c2c0afac241484f4a9c5595c22ab4e575e55
 	b2sums = de3e45081e9f4d75c47b2d2ea4c9faabb0499153914c940faf055f34a823df1e4d244041520686fe6e6dabdb01520c3c48c9382613aeeadc3f5376bf0d1c367d
 	b2sums = 48a332da75e1d8c7624a5948c4b145ad6ec6aca7ed2da31802920fa99490cc99a354e06d635b8937217404bcb99302f8d95b7af99d6af8e3227e39cdb80fa3cd
@@ -33,7 +31,5 @@ pkgbase = elasticsearch
 	b2sums = 21cc254940924675bd24e07f6af1f58c89530abfb075637279798bdbba80772c6a4659361e9e8e58a5b2a5ffb21e55e40c91a270ff10da5ab467f63ce34e9f76
 	b2sums = b54cc37b1e5b4f054fc14d3112bee2cbad1ba48f7f15364366473753767fa74f38874da35083f9f7d840286052d3da970cdcf509569aa8b5fff39e4941959678
 	b2sums = f346ba285e045e3982da1841adc8625ebf1a662882d20a7c69bd76911782e1bdf30883b16dffe32cd2355349738b9b6c275b9ff6b11dfdd7fd56b509bcd19c31
-	b2sums = 67790af829e62fdb224b8725e64757c592d34690fd726a1ccd654621ccf973b732e1032bcd046c724ecd20ab5d0ba76067af081fdf483f87283df907fc8745f8
-	b2sums = 1b03079b6937c9c2d5bf23f43a82870e38d62515e08a20f1300999c06fbe66deb8f3b8c6274807aa805cd464801cb56bf0aab356093319b89b2ceac08ed43ab9
 
 pkgname = elasticsearch
diff --git a/PKGBUILD b/PKGBUILD
index 04f489449082..b33f9eef33f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost>
 
 pkgname=elasticsearch
-pkgver=8.5.3
-pkgrel=2
+pkgver=8.6.0
+pkgrel=1
 pkgdesc="Distributed RESTful search engine built on top of Lucene"
 arch=('x86_64')
 url="https://www.elastic.co/products/elasticsearch"
@@ -13,7 +13,7 @@ license=('custom:SSPL+Elastic-2.0')
 depends=('jdk19-openjdk' 'systemd' 'libxml2')
 makedepends=('jdk17-openjdk')
 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
@@ -22,10 +22,8 @@ source=(
   elasticsearch-user.conf
   elasticsearch-tmpfile.conf
   elasticsearch.default
-  remove-systemd-distribution-check.patch
-  remove-systemd-package-check.patch
 )
-b2sums=('b058aea27dd2b3c8c072fe80d2d16102297efd3f684d88b9fd608d119dbaeff2dd2f961a4aa42c948bf66780a0b28f5fea65907804486eadedfbd02458670d79'
+b2sums=('bc2ea9f10345dd78c1a58da4955d2ff21addca055e33efb77b734f2851f9a00e86a758a404e6ca8abe5fc7894558646b7891f4fefaaa41e6169a38a236c7ff49'
         '069bc68cec0d4638a90205ddf61e36224c73898b219e14d36e8340fb4ff8a5e9f6bbb7c12c0e69ad0f245db7ee67c2c0afac241484f4a9c5595c22ab4e575e55'
         'de3e45081e9f4d75c47b2d2ea4c9faabb0499153914c940faf055f34a823df1e4d244041520686fe6e6dabdb01520c3c48c9382613aeeadc3f5376bf0d1c367d'
         '48a332da75e1d8c7624a5948c4b145ad6ec6aca7ed2da31802920fa99490cc99a354e06d635b8937217404bcb99302f8d95b7af99d6af8e3227e39cdb80fa3cd'
@@ -33,38 +31,20 @@ b2sums=('b058aea27dd2b3c8c072fe80d2d16102297efd3f684d88b9fd608d119dbaeff2dd2f961
         '5690e288a5d288931094db9e1532737b641d9852c2dc5cf45c2853e20c6ab013b1cf056f2cd325ad0703c2075dac7bd16c99c7f1ba202f5d94aac336508f7417'
         '21cc254940924675bd24e07f6af1f58c89530abfb075637279798bdbba80772c6a4659361e9e8e58a5b2a5ffb21e55e40c91a270ff10da5ab467f63ce34e9f76'
         'b54cc37b1e5b4f054fc14d3112bee2cbad1ba48f7f15364366473753767fa74f38874da35083f9f7d840286052d3da970cdcf509569aa8b5fff39e4941959678'
-        'f346ba285e045e3982da1841adc8625ebf1a662882d20a7c69bd76911782e1bdf30883b16dffe32cd2355349738b9b6c275b9ff6b11dfdd7fd56b509bcd19c31'
-        '67790af829e62fdb224b8725e64757c592d34690fd726a1ccd654621ccf973b732e1032bcd046c724ecd20ab5d0ba76067af081fdf483f87283df907fc8745f8'
-        '1b03079b6937c9c2d5bf23f43a82870e38d62515e08a20f1300999c06fbe66deb8f3b8c6274807aa805cd464801cb56bf0aab356093319b89b2ceac08ed43ab9')
+        '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 PATH=/usr/lib/jvm/`archlinux-java get`/bin:$PATH
-  export GRADLE_OPTS="-Dbuild.snapshot=false -Dlicense.key=x-pack/plugin/core/snapshot.key"
-  export JAVA_HOME='/usr/lib/jvm/java-17-openjdk'
-  ./gradlew :modules:systemd:assemble
-  ./gradlew :distribution:archives:linux-tar:assemble
-}
-
 package() {
   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
@@ -90,8 +70,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.service b/elasticsearch.service
index 28aab1226eff..df2e449198bf 100644
--- a/elasticsearch.service
+++ b/elasticsearch.service
@@ -7,9 +7,7 @@ After=elasticsearch-keystore.service
 After=network-online.target
 
 [Service]
-Type=notify
-NotifyAccess=all
-TimeoutStartSec=60
+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 {