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

[Massimiliano Torromeo]

    Date: Thursday, March 28, 2019 @ 10:53:42
  Author: mtorromeo
Revision: 445254

upgpkg: logstash 6.7.0-1

Modified:
  logstash/trunk/PKGBUILD
  logstash/trunk/build.patch

-------------+
 PKGBUILD    |   25 ++++++++++++-------------
 build.patch |   10 +++++-----
 2 files changed, 17 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-28 10:53:27 UTC (rev 445253)
+++ PKGBUILD	2019-03-28 10:53:42 UTC (rev 445254)
@@ -2,8 +2,8 @@
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
 
 pkgname=logstash
-pkgver=6.6.2
-_jrubyver=9.1.13.0
+pkgver=6.7.0
+_jrubyver=9.2.6.0
 pkgrel=1
 pkgdesc='Tool for managing events and logs'
 url='https://www.elastic.co/products/logstash/'
@@ -26,17 +26,17 @@
         logstash-tmpfile.conf
         bundle.config)
 noextract=(${_jrubydist})
-sha256sums=('bfbd7de22693a34c33c04778823af7a2549e0df74ae9aa01b5f0ef94b59347bf'
-            '9d156646623ac2f27174721035b52572a4b05690db7c1293295aa2c04aad3908'
-            '640f1c81e6c68f9d1256875db89f5439992e2b8188fb7e6e3ddcdae1c33a3af8'
+sha256sums=('7473c78cb3a17ff46d948deb8f15319e835cf1352cef5e5427928d28dc068b5c'
+            '70a1ff0e17a98baa63ea92c91fd38ff1e55a2056e5d57ba0409c4543d29e0e3d'
+            '3e030bf1d02e3c047b4effc7d9d8f232db2e861e5eb767f0ef0ed665a0c12824'
             '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c'
             'a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876'
             '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26'
             '346b630484f8a35b1a549e94e53e3e151527852a29c72cc6e529221215a7f533'
             'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1')
-sha512sums=('7de3c50018f20617acc4881fd7fee64be98a53d2abd4867d928519c91fd028affa2e588fcec7806b0b689de4ab707e7001a60d09b13ff76ecd0f52fae7fee5b2'
-            'ef88f613ada2665d4f63b2e2f15594739de8ba501406e76de417821f44847b0e258524687b0ae0cf5b737520aa4dd9bb59d80a4b89a81408cda638f28bebbead'
-            '21adfc88d980cabb3a45ac029b5dddf8c4b4bc96ac95999ae85fa655101ff58b139bceb613c0e91c108f3f78dcb21ba6f997ee2884c58c3a55eaa7938b6959c4'
+sha512sums=('99ee3291109704c6b1f009f4597c5127cf4408f8b8a076c9f5100c0cc0cd2eb7498a58e699d6b3c9e33066dd6fa615cf6f6596e3fda60cf293a1583fb0b3d423'
+            '20c7897da0d2b585616ea5848998fe8770517e24e16955797db2e5bff4622c348082628d304240a71a97e9551ef7aa63271cfb728eb5fb7e7d19bb48aff20d4c'
+            '1da7eb18c9c7fe49d7d0e1c9952b275b9bef95e8bf57490f14516a505e1a8d992bf2cfba8a7be38d2a1033d8fb920b00822238900824e9382243fc164ea79dce'
             '817097565519dc7c5eac7521339947c74c6148683ca594356dd2ceb3274a1e94f8e7318ce310e0fe5789d7ab0d4c23404f814bef31036a11ddfec08d16814c69'
             'ce2cef4a784845b00d7c867273555811450bc459669abb5be944bfbbb02708129983e45376a9b308d6db22b2c7b4a7a212827a4826f2a27bc7e143cebc9abfe0'
             'd811dc3b18d0032b79b4669c9f6aefca49963897c309d83cbf87616c7b8cb5944c17c8072980bcd115d0fb57ef1624d98259ff1082d402d308c33e766ee89699'
@@ -70,12 +70,11 @@
   cd ${pkgname}-${pkgver}
   export PATH="/usr/lib/jvm/java-10-openjdk/bin:$PWD/vendor/jruby/bin:$PATH"
 
-  # gradle downloadAndInstallJRuby (system gradle currently not working)
-  ./gradlew downloadAndInstallJRuby
-  rake bootstrap
-  rake plugin:install-default
+  # gradle -x :logstash-core:javadoc bootstrap (system gradle currently not working)
+  ./gradlew -x :logstash-core:javadoc bootstrap
 
-  rm -r vendor/_ build ci logstash-core/{build,src,spec} qa pkg spec rakelib tools vendor/bundle/jruby/*/cache .gradle
+  rm -r build ci logstash-core/{build,src,spec} qa pkg spec rakelib tools .gradle \
+        vendor/_ vendor/bundle/jruby/*/cache vendor/jruby/lib/ruby/gems/shared/cache
 
   cd vendor/jruby/lib
   mv jni jni-temp

Modified: build.patch
===================================================================
--- build.patch	2019-03-28 10:53:27 UTC (rev 445253)
+++ build.patch	2019-03-28 10:53:42 UTC (rev 445254)
@@ -1,8 +1,8 @@
 diff --git a/build.gradle b/build.gradle
-index 3fda82e..d926183 100644
+index 04700b0..96fe48a 100644
 --- a/build.gradle
 +++ b/build.gradle
-@@ -121,7 +121,6 @@ if (versionMap["jruby-runtime-override"]) {
+@@ -122,7 +122,6 @@ if (versionMap["jruby-runtime-override"]) {
  clean {
    delete "${projectDir}/Gemfile"
    delete "${projectDir}/Gemfile.lock"
@@ -10,7 +10,7 @@
    delete "${projectDir}/.bundle"
    delete "${projectDir}/qa/integration/Gemfile.lock"
    delete "${projectDir}/qa/integration/.bundle"
-@@ -158,7 +157,7 @@ task downloadJRuby(type: Download) {
+@@ -159,7 +158,7 @@ task downloadJRuby(type: Download) {
  
  downloadJRuby.onlyIf { customJRubyDir == "" }
  
@@ -19,13 +19,13 @@
      description "Verify the SHA1 of the download JRuby artifact"
      inputs.file(jrubyTarPath)
      outputs.file(jrubyTarPath)
-@@ -169,35 +168,7 @@ task verifyFile(dependsOn: downloadJRuby, type: Verify) {
+@@ -170,35 +169,7 @@ task verifyFile(dependsOn: downloadJRuby, type: Verify) {
  
  verifyFile.onlyIf { customJRubyDir == "" }
  
 -task buildCustomJRuby(type: Exec) {
 -  description "Build tar.gz and .jar artifacts from JRuby source directory"
--  workingDir customJRubyDir
+-  workingDir (customJRubyDir == "" ? "./" : customJRubyDir)
 -  commandLine './mvnw', 'clean', 'install', '-Pdist', '-Pcomplete'
 -  standardOutput = new ByteArrayOutputStream()
 -  errorOutput = new ByteArrayOutputStream()