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

Levente Polyak anthraxx at archlinux.org
Tue Sep 19 19:54:20 UTC 2017


    Date: Tuesday, September 19, 2017 @ 19:54:19
  Author: anthraxx
Revision: 258848

upgpkg: logstash 5.6.1-1

Modified:
  logstash/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-19 19:06:48 UTC (rev 258847)
+++ PKGBUILD	2017-09-19 19:54:19 UTC (rev 258848)
@@ -2,7 +2,7 @@
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
 
 pkgname=logstash
-pkgver=5.6.0
+pkgver=5.6.1
 pkgrel=1
 pkgdesc='Tool for managing events and logs'
 url='https://www.elastic.co/products/logstash/'
@@ -9,22 +9,26 @@
 arch=('i686' 'x86_64')
 license=('Apache')
 depends=('java-runtime-headless>=8' 'ruby' 'ruby-bundler')
-makedepends=('java-environment>=8' 'gradle' 'git')
+# TODO: switch to up-to-date rake when 6.x arrives
+makedepends=('java-environment>=8' 'gradle' 'git' 'ruby2.3')
 backup=('etc/conf.d/logstash'
         'etc/logstash/logstash.yml')
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/elastic/logstash/archive/v${pkgver}.tar.gz
+        ${pkgname}-5.6.1-fix-jruby.patch::https://github.com/elastic/logstash/commit/d2cde417d9dd0151c9d1b1dad050a38b14a18c6f.patch
         logstash.service
         logstash at .service
         logstash-sysuser.conf
         logstash-tmpfile.conf
         bundle.config)
-sha256sums=('c0dbb175773af340c6079a8fe69a1c080835e0e66e6cb92706611beac13d1d67'
+sha256sums=('7d911858c18484cc290aa71a7ae6401a6bd067313d6c220abf85d3c68072c8a9'
+            '6821843a34cfbd940e95934ea6f7e6a67e4466e5732dc759706d1a7653d0776a'
             '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c'
             'a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876'
             '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26'
             'b0c334b9f6f5450d0d6e801dbe43972bf32ead92705a389df891a32aa803a55f'
             'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1')
-sha512sums=('fa80d7d01a7b1bce786f918147ebfe0417251f9ffb130431f59a700f5bcb98f50e14692b6e7987bae45fd5a8f1b0a0f2f2017837a90397d42c6f743a26cccc20'
+sha512sums=('9026af2f4eae2c43a0c0bc20f694980a0dde420e5b81024d913f4348ebdd8c58597e6bdeea41019ebc4bb2d0926996890de0bb7fed466c76d842455001d57f8d'
+            '97a699e3c33d67e8eaeb8a41f4803c3311f02e9f063eb96820a886fe5537a82c66f1e320b5fea6ba01a4a2075e0f3aef5cc651ca6f46a972add9dc54d78c5ee2'
             '817097565519dc7c5eac7521339947c74c6148683ca594356dd2ceb3274a1e94f8e7318ce310e0fe5789d7ab0d4c23404f814bef31036a11ddfec08d16814c69'
             'ce2cef4a784845b00d7c867273555811450bc459669abb5be944bfbbb02708129983e45376a9b308d6db22b2c7b4a7a212827a4826f2a27bc7e143cebc9abfe0'
             'd811dc3b18d0032b79b4669c9f6aefca49963897c309d83cbf87616c7b8cb5944c17c8072980bcd115d0fb57ef1624d98259ff1082d402d308c33e766ee89699'
@@ -40,10 +44,12 @@
 
 build() {
   cd ${pkgname}-${pkgver}
-  rake bootstrap
-  rake plugin:install-default
+  msg "Rake bootstrap..."
+  /opt/ruby2.3/bin/rake bootstrap
+  msg "Rake plugin:install-default..."
+  /opt/ruby2.3/bin/rake plugin:install-default
 
-  rm -r vendor/_ build ci logstash-core/{build,src,spec} qa pkg spec rakelib tools vendor/bundle/jruby/*/cache
+  rm -r vendor/_ build ci logstash-core/{build,src,spec} qa pkg spec rakelib tools vendor/bundle/jruby/*/cache .gradle
   cd vendor/jruby/lib/jni
   rm -r *Darwin *Windows *SunOS *FreeBSD arm-* ppc64*
 }



More information about the arch-commits mailing list