From 7d88323e8b1e221289e3bf376d827562705d4736 Mon Sep 17 00:00:00 2001
From: Stuart Cardall <developer@it-offshore.co.uk>
Date: Mon, 10 Jun 2019 22:47:01 +0000
Subject: testing/logstash: upgrade to 7.1.1

* https://www.elastic.co/guide/en/logstash/current/releasenotes.html
---
 testing/logstash/APKBUILD | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/testing/logstash/APKBUILD b/testing/logstash/APKBUILD
index bb12977651..28be49b00d 100644
--- a/testing/logstash/APKBUILD
+++ b/testing/logstash/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Steeve Chailloux <steeve@chaahk.com>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=logstash
-pkgver=6.4.1
+pkgver=7.1.1
 pkgrel=0
 pkgdesc="A flexible, open source, data collection, parsing and enrichment pipeline"
 url="http://logstash.net"
 arch="noarch"
-license="Apache"
+license="Apache-2.0"
 depends="openjdk8-jre-base java-jffi-native libc6-compat bash"
 makedepends="$depends_dev"
 install="$pkgname.pre-install"
@@ -19,38 +19,31 @@ source="$pkgname-$pkgver.tar.gz::https://artifacts.elastic.co/downloads/$pkgname
 	$pkgname.conf
 	$pkgname.profile
 	"
-builddir="${srcdir}/${pkgname}-${pkgver}"
-
-build() {
-	return 0
-}
 
 package() {
 	local datadir=/var/lib/logstash logdir=$datadir/logs confdir=/etc/logstash
 	local homedir=/usr/share/logstash heapsize=150m
 
-	cd "$builddir"
-
 	# create the necessary dirs
-	install -dm755 "$pkgdir/$homedir" || return 1
-	install -dm755 "$pkgdir/$logdir" || return 1
-	install -dm755 "$pkgdir/$datadir" || return 1
-	install -dm755 "$pkgdir/$confdir" || return 1
-	install -dm755 "$pkgdir/$confdir/conf.d" || return 1
+	install -dm755 "$pkgdir/$homedir"
+	install -dm755 "$pkgdir/$logdir"
+	install -dm755 "$pkgdir/$datadir"
+	install -dm755 "$pkgdir/$confdir"
+	install -dm755 "$pkgdir/$confdir/conf.d"
 
 	# install scripts
 	install -m755 -D "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname || return 1
+		"$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd \
-		"$pkgdir"/etc/conf.d/$pkgname || return 1
+		"$pkgdir"/etc/conf.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.conf \
-		"$pkgdir/$confdir"/conf.d/ || return 1
+		"$pkgdir/$confdir"/conf.d/
 	install -m644 -D "$srcdir"/$pkgname.profile \
-		"$pkgdir"/etc/profile.d/logstash.sh || return 1
+		"$pkgdir"/etc/profile.d/logstash.sh
 
 	# copy files
-	cp -r * "$pkgdir/$homedir/" || return 1
-	cp config/* "$pkgdir/$confdir/" || return 1
+	cp -r * "$pkgdir/$homedir/"
+	cp config/* "$pkgdir/$confdir/"
 
 	# move docs
 	mkdir -p "$pkgdir"/usr/share/doc/logstash && cd "$pkgdir"
@@ -63,17 +56,17 @@ package() {
 	find usr/share/logstash -type f -name *Win32* -exec rm -f {} \;
 
 	# remove bundled libjffi (we use Alpine's java-jffi-native)
-	rm -rf "$pkgdir"/usr/share/logstash/vendor/jruby/lib/jni || return 1
+	rm -rf "$pkgdir"/usr/share/logstash/vendor/jruby/lib/jni
 
 	# set default paths
 	sed -i \
 	  -e "s|# path.config:|path.config: $confdir/conf.d|" \
 	  -e "s|# path.logs:|path.logs: $logdir|" \
 	  -e "s|# path.data:|path.data: $datadir|" \
-	"$pkgdir/$confdir"/logstash.yml || return 1
+	"$pkgdir/$confdir"/logstash.yml
 
 	# symlink so manual commands without -path.settings works
-	rmdir "$pkgdir/$homedir"/data || return 1
+	rmdir "$pkgdir/$homedir"/data
 	ln -s "$datadir" "$pkgdir/$homedir"/data
 	ln -s "$logdir" "$pkgdir/$homedir"/logs
 
@@ -81,10 +74,10 @@ package() {
 	sed -i \
 	  -e "s|^-Xms.*|-Xms$heapsize|" \
 	  -e "s|^-Xmx.*|-Xmx$heapsize|" \
-	"$pkgdir/$confdir"/jvm.options || return 1
+	"$pkgdir/$confdir"/jvm.options
 }
 
-sha512sums="b496ed0746ee38a375a3efc5eb93677accb61c3482550a75cf9ad5e7b8e104eb8560bce79325ce85a27d22b664299edf1970452837189fcfa9310798c58825c1  logstash-6.4.1.tar.gz
+sha512sums="11b0678342b70a8665b5143ba200edde911efb70a72eed64f22e20da91e53548bb1952f8cabdf9bff5ead89a0a83c24ab0a21907b5117973fdd298c660cdbbcb  logstash-7.1.1.tar.gz
 94b18da3f0ef40f68118b27654563e7aa6dd4a3b90f0d8ad61a8be579d4be62c2bf1b192a32ee6140b81224343eeb442687539f6def1e725787b8cb96c0c70d1  logstash.confd
 828684ea0b9faa53ac51f7fb22bf73d862dc058d605f27958db6a8efbd10f5463a0837fa88b62a3964582c72fdd7ece434057a540b0924eae1fae17b9d5887b4  logstash.initd
 21609c8f44b31a5f298573be4b5c0fdcdc165e603a95c3626570fb6dd44dad114a74ee3f10fbd518f72b537a3d6bdcdbad09798c4bead0ee16f2a3b8e2b00ed3  logstash.conf
-- 
cgit v1.2.3