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

[Massimiliano Torromeo]

    Date: Friday, August 24, 2018 @ 21:31:38
  Author: mtorromeo
Revision: 373859

upgpkg: logstash 6.4.0-1

Modified:
  logstash/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-24 21:29:36 UTC (rev 373858)
+++ PKGBUILD	2018-08-24 21:31:38 UTC (rev 373859)
@@ -2,7 +2,7 @@
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
 
 pkgname=logstash
-pkgver=6.3.2
+pkgver=6.4.0
 _jrubyver=9.1.13.0
 pkgrel=1
 pkgdesc='Tool for managing events and logs'
@@ -12,10 +12,14 @@
 depends=('java-runtime-headless>=8' 'ruby' 'ruby-bundler' 'coreutils' 'awk')
 makedepends=('java-environment=8' 'gradle' 'git')
 backup=('etc/conf.d/logstash'
-        'etc/logstash/logstash.yml')
+        'etc/logstash/jvm.options'
+        'etc/logstash/log4j2.properties'
+        '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
         https://repo1.maven.org/maven2/org/jruby/jruby-dist/${_jrubyver}/${_jrubydist}
+        build.patch
         logstash.service
         logstash at .service
         logstash-sysuser.conf
@@ -22,15 +26,17 @@
         logstash-tmpfile.conf
         bundle.config)
 noextract=(${_jrubydist})
-sha256sums=('f4060c2360f7af884fd8462deab8ccc1aa4e2e1f6e40a01cc99502d133ff6289'
+sha256sums=('239a4d7f17cd61fd84294dfabb221619fe90dea32b676e5c37b19942530a8e86'
             '9d156646623ac2f27174721035b52572a4b05690db7c1293295aa2c04aad3908'
+            '640f1c81e6c68f9d1256875db89f5439992e2b8188fb7e6e3ddcdae1c33a3af8'
             '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c'
             'a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876'
             '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26'
             '346b630484f8a35b1a549e94e53e3e151527852a29c72cc6e529221215a7f533'
             'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1')
-sha512sums=('794255743056de68db5291e1fd4f50d939acecbff06d9678808708bca255d6d7918c2138817aa0d983955017c8e8f9ad58cbd6027e4643877d2317b2f64d7f24'
+sha512sums=('e77d11a85d0031126ebae7faed799e39553433ba75e8e9dfe6085aba84bbba4cbffa153ed165528df391ef7f363a245a1527d8f42160df11245b5010b9bff512'
             'ef88f613ada2665d4f63b2e2f15594739de8ba501406e76de417821f44847b0e258524687b0ae0cf5b737520aa4dd9bb59d80a4b89a81408cda638f28bebbead'
+            '21adfc88d980cabb3a45ac029b5dddf8c4b4bc96ac95999ae85fa655101ff58b139bceb613c0e91c108f3f78dcb21ba6f997ee2884c58c3a55eaa7938b6959c4'
             '817097565519dc7c5eac7521339947c74c6148683ca594356dd2ceb3274a1e94f8e7318ce310e0fe5789d7ab0d4c23404f814bef31036a11ddfec08d16814c69'
             'ce2cef4a784845b00d7c867273555811450bc459669abb5be944bfbbb02708129983e45376a9b308d6db22b2c7b4a7a212827a4826f2a27bc7e143cebc9abfe0'
             'd811dc3b18d0032b79b4669c9f6aefca49963897c309d83cbf87616c7b8cb5944c17c8072980bcd115d0fb57ef1624d98259ff1082d402d308c33e766ee89699'
@@ -43,17 +49,11 @@
 	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
 
-  # Skip downloadAndInstallJRuby task in the bootstrap process
-  sed /downloadAndInstallJRuby/d -i rakelib/vendor.rake
+  patch -p1 -i "$srcdir"/build.patch
 
   # Use system gradle
   sed 's;./gradlew;gradle;g' -i rakelib/*.rake
 
-  # Do not download jruby or clean vendor
-  sed -e '/delete "${projectDir}\/vendor"/d' \
-      -e 's;dependsOn: downloadJRuby, ;;' \
-      -i build.gradle
-
   # Skip downloadAndInstallJRuby task in the bootstrap process
   sed /downloadAndInstallJRuby/d -i rakelib/vendor.rake