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

[Massimiliano Torromeo]

    Date: Friday, December 14, 2018 @ 10:53:07
  Author: mtorromeo
Revision: 416249

upgpkg: logstash 6.5.3-1

Modified:
  logstash/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-14 10:25:27 UTC (rev 416248)
+++ PKGBUILD	2018-12-14 10:53:07 UTC (rev 416249)
@@ -2,8 +2,7 @@
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
 
 pkgname=logstash
-pkgver=6.5.2
-_commit=cfc45b7b28db42e4410f14e034e8b4754265b51e # 6.5.2 has no tag
+pkgver=6.5.3
 _jrubyver=9.1.13.0
 pkgrel=1
 pkgdesc='Tool for managing events and logs'
@@ -18,7 +17,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/${_commit}.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
@@ -27,7 +26,7 @@
         logstash-tmpfile.conf
         bundle.config)
 noextract=(${_jrubydist})
-sha256sums=('75e72af418f8533023fe2b8e6a7ccfbeae6f463d8d26523b33d57314c6a0f072'
+sha256sums=('97d88e6c234e277f2e602577fa28d59abf6b714fa0d22bfff940d9f45381280c'
             '9d156646623ac2f27174721035b52572a4b05690db7c1293295aa2c04aad3908'
             '640f1c81e6c68f9d1256875db89f5439992e2b8188fb7e6e3ddcdae1c33a3af8'
             '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c'
@@ -35,7 +34,7 @@
             '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26'
             '346b630484f8a35b1a549e94e53e3e151527852a29c72cc6e529221215a7f533'
             'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1')
-sha512sums=('b2f0c65d2a4d7b3179d0965c25fcda756263cac83d04eb3412c58f88060f0e87a728e554420867f13dd91af1fd9404a47265d04f1973da0fca3950547da6f9a4'
+sha512sums=('7ebba7907ea72063ea6f8d2fb7fcb1bb72dbca4cb37733dfc8d3e13a80c58c75d1d8d9bf95006f226cdb53a50453369598a707b864f31548a37e42a2f6e65b56'
             'ef88f613ada2665d4f63b2e2f15594739de8ba501406e76de417821f44847b0e258524687b0ae0cf5b737520aa4dd9bb59d80a4b89a81408cda638f28bebbead'
             '21adfc88d980cabb3a45ac029b5dddf8c4b4bc96ac95999ae85fa655101ff58b139bceb613c0e91c108f3f78dcb21ba6f997ee2884c58c3a55eaa7938b6959c4'
             '817097565519dc7c5eac7521339947c74c6148683ca594356dd2ceb3274a1e94f8e7318ce310e0fe5789d7ab0d4c23404f814bef31036a11ddfec08d16814c69'
@@ -45,9 +44,9 @@
             '5091aa34cc31acd50fd2865714080cf6e67c2d437424f27e001bb409c2885a0e82eabe4ce17461d60c181f460a16df0a03d53bac6015fb731b3e5225735fd4da')
 
 prepare() {
-  cd ${pkgname}-${_commit}
+  cd ${pkgname}-${pkgver}
   rm bin/*.bat
-	sed -e 's|LS_SETTINGS_DIR=.*|LS_SETTINGS_DIR="/etc/logstash"|' -i config/startup.options
+  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
 
   # remove deprecated JVM options
@@ -68,7 +67,7 @@
 }
 
 build() {
-  cd ${pkgname}-${_commit}
+  cd ${pkgname}-${pkgver}
   export PATH="/usr/lib/jvm/java-10-openjdk/bin:$PWD/vendor/jruby/bin:$PATH"
 
   # gradle downloadAndInstallJRuby (system gradle currently not working)
@@ -86,18 +85,20 @@
 }
 
 package() {
-  cd ${pkgname}-${_commit}
+  cd ${pkgname}-${pkgver}
 
-  install -dm 755 "${pkgdir}"/usr/share "${pkgdir}"/etc/conf.d
+  install -dm 755 "${pkgdir}/usr/share/logstash" "${pkgdir}/etc/conf.d"
   mv config/startup.options "${pkgdir}/etc/conf.d/logstash"
   mv config "${pkgdir}/etc/logstash"
   chmod 750 "${pkgdir}/etc/logstash"
-  cp -a . "${pkgdir}/usr/share/logstash"
-  rm "${pkgdir}/usr/share/logstash/versions.yml"
 
+  cp -a bin data lib logstash* modules vendor Gemfile* "${pkgdir}/usr/share/logstash"
+  rm -rf "${pkgdir}/usr/share/logstash/logstash-core/"{.lock,benchmarks,*gradle*}
+  chmod -R go-w "${pkgdir}/usr/share/logstash/"
+
   install -Dm 644 "${srcdir}"/{logstash.service,logstash at .service} -t "${pkgdir}/usr/lib/systemd/system"
-	install -Dm 644 "${srcdir}/logstash-sysuser.conf" "${pkgdir}/usr/lib/sysusers.d/logstash.conf"
-	install -Dm 644 "${srcdir}/logstash-tmpfile.conf" "${pkgdir}/usr/lib/tmpfiles.d/logstash.conf"
+  install -Dm 644 "${srcdir}/logstash-sysuser.conf" "${pkgdir}/usr/lib/sysusers.d/logstash.conf"
+  install -Dm 644 "${srcdir}/logstash-tmpfile.conf" "${pkgdir}/usr/lib/tmpfiles.d/logstash.conf"
   install -Dm 644 "${srcdir}/bundle.config" "${pkgdir}/usr/share/logstash/.bundle/config"
 
   install -dm 755 "${pkgdir}/var/lib/logstash"