[arch-commits] Commit in logstash/trunk (PKGBUILD)

[Massimiliano Torromeo]

    Date: Friday, December 7, 2018 @ 13:36:29
  Author: mtorromeo
Revision: 412098

upgpkg: logstash 6.5.2-1

Modified:
  logstash/trunk/PKGBUILD

----------+
 PKGBUILD |   32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-07 12:37:39 UTC (rev 412097)
+++ PKGBUILD	2018-12-07 13:36:29 UTC (rev 412098)
@@ -2,7 +2,8 @@
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
 
 pkgname=logstash
-pkgver=6.5.1
+pkgver=6.5.2
+_commit=cfc45b7b28db42e4410f14e034e8b4754265b51e # 6.5.2 has no tag
 _jrubyver=9.1.13.0
 pkgrel=1
 pkgdesc='Tool for managing events and logs'
@@ -10,7 +11,7 @@
 arch=('x86_64')
 license=('Apache')
 depends=('java-runtime-headless>=8' 'ruby' 'ruby-bundler' 'coreutils' 'awk')
-makedepends=('java-environment>=8' 'gradle' 'git')
+makedepends=('java-environment<11' 'git')
 backup=('etc/conf.d/logstash'
         'etc/logstash/jvm.options'
         'etc/logstash/log4j2.properties'
@@ -17,7 +18,7 @@
         'etc/logstash/logstash.yml'
         'etc/logstash/pipelines.yml')
 _jrubydist=jruby-dist-${_jrubyver}-bin.tar.gz
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/elastic/logstash/archive/v${pkgver}.tar.gz
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/elastic/logstash/archive/${_commit}.tar.gz
         https://repo1.maven.org/maven2/org/jruby/jruby-dist/${_jrubyver}/${_jrubydist}
         build.patch
         logstash.service
@@ -26,7 +27,7 @@
         logstash-tmpfile.conf
         bundle.config)
 noextract=(${_jrubydist})
-sha256sums=('58fed8bc89b2a3e0265ca7e3ac4494d1d59e7ceb10e395ed321ef4f0edc35eaa'
+sha256sums=('75e72af418f8533023fe2b8e6a7ccfbeae6f463d8d26523b33d57314c6a0f072'
             '9d156646623ac2f27174721035b52572a4b05690db7c1293295aa2c04aad3908'
             '640f1c81e6c68f9d1256875db89f5439992e2b8188fb7e6e3ddcdae1c33a3af8'
             '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c'
@@ -34,7 +35,7 @@
             '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26'
             '346b630484f8a35b1a549e94e53e3e151527852a29c72cc6e529221215a7f533'
             'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1')
-sha512sums=('6ed5a7d2663d7ba3fbad59112930b55495d081f7eef2622a8d874459c4487718eee8a0af6ab19e583f58d29a954458fd654d6562915c787f1461228aaae67b81'
+sha512sums=('b2f0c65d2a4d7b3179d0965c25fcda756263cac83d04eb3412c58f88060f0e87a728e554420867f13dd91af1fd9404a47265d04f1973da0fca3950547da6f9a4'
             'ef88f613ada2665d4f63b2e2f15594739de8ba501406e76de417821f44847b0e258524687b0ae0cf5b737520aa4dd9bb59d80a4b89a81408cda638f28bebbead'
             '21adfc88d980cabb3a45ac029b5dddf8c4b4bc96ac95999ae85fa655101ff58b139bceb613c0e91c108f3f78dcb21ba6f997ee2884c58c3a55eaa7938b6959c4'
             '817097565519dc7c5eac7521339947c74c6148683ca594356dd2ceb3274a1e94f8e7318ce310e0fe5789d7ab0d4c23404f814bef31036a11ddfec08d16814c69'
@@ -44,7 +45,7 @@
             '5091aa34cc31acd50fd2865714080cf6e67c2d437424f27e001bb409c2885a0e82eabe4ce17461d60c181f460a16df0a03d53bac6015fb731b3e5225735fd4da')
 
 prepare() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${_commit}
   rm bin/*.bat
 	sed -e 's|LS_SETTINGS_DIR=.*|LS_SETTINGS_DIR="/etc/logstash"|' -i config/startup.options
   sed -e '1i [ -f /etc/profile.d/jre.sh ] && . /etc/profile.d/jre.sh' -i bin/logstash.lib.sh
@@ -55,8 +56,8 @@
 
   patch -p1 -i "$srcdir"/build.patch
 
-  # Use system gradle
-  sed 's;./gradlew;gradle;g' -i rakelib/*.rake
+  # Use system gradle (currently not working)
+  # sed 's;./gradlew;gradle;g' -i rakelib/*.rake
 
   # Skip downloadAndInstallJRuby task in the bootstrap process
   sed /downloadAndInstallJRuby/d -i rakelib/vendor.rake
@@ -67,17 +68,12 @@
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${_commit}
+  export PATH="/usr/lib/jvm/java-10-openjdk/bin:$PWD/vendor/jruby/bin:$PATH"
 
-  msg2 "Install vendored JRuby..."
-  gradle downloadAndInstallJRuby
-
-  export PATH="$PWD/vendor/jruby/bin:$PATH"
-
-  msg2 "Rake bootstrap..."
+  # gradle downloadAndInstallJRuby (system gradle currently not working)
+  ./gradlew downloadAndInstallJRuby
   rake bootstrap
-
-  msg2 "Rake plugin:install-default..."
   rake plugin:install-default
 
   rm -r vendor/_ build ci logstash-core/{build,src,spec} qa pkg spec rakelib tools vendor/bundle/jruby/*/cache .gradle
@@ -90,7 +86,7 @@
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${_commit}
 
   install -dm 755 "${pkgdir}"/usr/share "${pkgdir}"/etc/conf.d
   mv config/startup.options "${pkgdir}/etc/conf.d/logstash"