summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Snowhill2022-03-06 23:10:30 -0800
committerChristopher Snowhill2022-03-06 23:16:47 -0800
commit489ea706753aeb8dd9bcd45f4c99530ed29d5503 (patch)
tree48332e948c6c5c69c3e12a86484ee99e907009d7
parent94216a36249f7b83e36b6a39e540a7cd0beb96b5 (diff)
downloadaur-489ea706753aeb8dd9bcd45f4c99530ed29d5503.tar.gz
Bump to 7.17.1
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD20
2 files changed, 19 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9b99a0016e27..a5e0e937385f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = elasticsearch
+pkgbase = elasticsearch7
pkgdesc = Distributed RESTful search engine built on top of Lucene
- pkgver = 7.17.0
+ pkgver = 7.17.1
pkgrel = 1
url = https://www.elastic.co/products/elasticsearch
arch = x86_64
@@ -9,11 +9,13 @@ pkgbase = elasticsearch
depends = java-runtime-headless<=17
depends = systemd
depends = libxml2
+ provides = elasticsearch=7.17.1
+ conflicts = elasticsearch
backup = etc/elasticsearch/elasticsearch.yml
backup = etc/elasticsearch/log4j2.properties
backup = etc/elasticsearch/jvm.options
backup = etc/default/elasticsearch
- source = elasticsearch-7.17.0.tar.gz::https://github.com/elastic/elasticsearch/archive/v7.17.0.tar.gz
+ source = elasticsearch-7.17.1.tar.gz::https://github.com/elastic/elasticsearch/archive/v7.17.1.tar.gz
source = elasticsearch.service
source = elasticsearch@.service
source = elasticsearch-keystore.service
@@ -24,7 +26,7 @@ pkgbase = elasticsearch
source = elasticsearch.default
source = remove-systemd-distribution-check.patch
source = remove-systemd-package-check.patch
- sha256sums = 64392a523a534ed0d25439cc0998a20cf4ea74578b0e85cd0fb188421e0126a1
+ sha256sums = c4243783c90785bcf5c5854beb0bdd4e85a40d7db31c3c493f420030a89f784d
sha256sums = 9e1f68ff275ef2b5f2b93d2823efc5cc9643da696fcbe09a3ea7520ada35ffba
sha256sums = 8a76ad9a44a34eca8d6cb7ec9d8f1b01d46c114765b0a76094de8d72f0477351
sha256sums = bac40d87acaa5bee209ceb6dfa253009a072e9243fe3b94be42fb5cd44727d6f
@@ -36,4 +38,4 @@ pkgbase = elasticsearch
sha256sums = 96934e6518245a4110714c3e1c1eb7bfaf4dd0026cc917efc322f3bfa4c3b5ec
sha256sums = e00c45812db63a0fa6ea4de27e8f489e38e01fafdb155e5421f5faf659c2905d
-pkgname = elasticsearch
+pkgname = elasticsearch7
diff --git a/PKGBUILD b/PKGBUILD
index 7bad74825465..cab8c67a5c31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,12 @@
-# Maintainer: Justin Kromlinger <hashworks@archlinux.org>
+# 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>
-pkgname=elasticsearch
-pkgver=7.17.0
+_pkgname=elasticsearch
+pkgname=elasticsearch7
+pkgver=7.17.1
pkgrel=1
pkgdesc="Distributed RESTful search engine built on top of Lucene"
arch=('x86_64')
@@ -12,8 +14,10 @@ url="https://www.elastic.co/products/elasticsearch"
license=('Apache')
depends=('java-runtime-headless<=17' 'systemd' 'libxml2')
makedepends=('java-environment=17')
+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://github.com/elastic/elasticsearch/archive/v${pkgver}.tar.gz"
elasticsearch.service
elasticsearch@.service
elasticsearch-keystore.service
@@ -25,7 +29,7 @@ source=(
remove-systemd-distribution-check.patch
remove-systemd-package-check.patch
)
-sha256sums=('64392a523a534ed0d25439cc0998a20cf4ea74578b0e85cd0fb188421e0126a1'
+sha256sums=('c4243783c90785bcf5c5854beb0bdd4e85a40d7db31c3c493f420030a89f784d'
'9e1f68ff275ef2b5f2b93d2823efc5cc9643da696fcbe09a3ea7520ada35ffba'
'8a76ad9a44a34eca8d6cb7ec9d8f1b01d46c114765b0a76094de8d72f0477351'
'bac40d87acaa5bee209ceb6dfa253009a072e9243fe3b94be42fb5cd44727d6f'
@@ -43,13 +47,13 @@ backup=('etc/elasticsearch/elasticsearch.yml'
'etc/default/elasticsearch')
prepare() {
- cd $pkgname-$pkgver
+ 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
+ cd $_pkgname-$pkgver
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 :modules:systemd:assemble
@@ -57,7 +61,7 @@ build() {
}
package() {
- cd $pkgname-$pkgver
+ cd $_pkgname-$pkgver
install -dm755 "$pkgdir"/{usr/share,var/lib,var/log}/elasticsearch
install -dm755 "$pkgdir"/usr/bin