upgpkg: fluentd 1.12.4-1

* New upstream release
* Removed /etc/conf.d/fluentd in favour of drop-in systemd configuration
* Renamed systemd service for packaging purposes

1 files changed, 33 insertions, 37 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 92c819458ed8..34ba896a0772 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,25 +4,26 @@
 
 _gemname=fluentd
 pkgname=$_gemname
-pkgver=1.12.3
-pkgrel=2
+pkgver=1.12.4
+pkgrel=1
 pkgdesc='Open source data collector designed to scale and simplify log management'
-arch=(any)
+arch=('any')
 url='https://github.com/fluent/fluentd'
-license=(Apache)
-depends=(
-  'ruby-bundler'
-  'ruby-msgpack'
-  'ruby-yajl-ruby'
-  'ruby-cool.io'
-  'ruby-serverengine'
-  'ruby-http_parser.rb'
-  'ruby-sigdump'
-  'ruby-tzinfo'
-  'ruby-tzinfo-data'
-  'ruby-strptime'
-  'ruby-webrick'
+license=('Apache')
+_deps=(
+  'bundler'
+  'msgpack'
+  'yajl-ruby'
+  'cool.io'
+  'serverengine'
+  'http_parser.rb'
+  'sigdump'
+  'tzinfo'
+  'tzinfo-data'
+  'strptime'
+  'webrick'
 )
+depends=('ruby' "${_deps[@]/#/ruby-}")
 optdepends=(
   'jemalloc: for a more efficient malloc implementation'
   'ruby-oj: for a faster json parser'
@@ -30,17 +31,15 @@ optdepends=(
 options=(!emptydirs)
 source=(
   "https://rubygems.org/downloads/$_gemname-$pkgver.gem"
-  "$pkgname.conf"
-  "$pkgname.service"
-  "tmpfiles.conf"
-  "sysusers.conf"
+  'systemd.service'
+  'tmpfiles.conf'
+  'sysusers.conf'
 )
 install="$pkgname.install"
 noextract=("$_gemname-$pkgver.gem")
 backup=('etc/fluent/fluentd.conf')
-b2sums=('53086b43a3acb43eb6564b43152a8d83d0a5519c301891446f7156efeacddc76ea378532d7c8a2d4f7c7520370c9988a8ff07c754c17992c97d225a1d0ba0f95'
-        '3fb9859e9a73c834891211c220268b0c0808ce4de3c5f334c941e4033f93c5e0c1d1f99fd108b079f93f5ea6b5575f1a0f8d833012259114f091d8784c716491'
-        'dcabc5dd54b7b4a3b98b8ec493ee1409b887f0e89812eb8c13da7158857b4df25f20c43c75a33d492c5ad484db88ed56669cc0048afbe4d8a373b715b7d7a1a5'
+b2sums=('c9900b940d62cfb8c9d713b207376c049d2f9eb9bf70a64a132465478582f9a0e12ee98d1863afbe3e4459a19873cc7ec43e7c758d5fac445609b2e37ccf12e5'
+        '593511fb52e2d934e89bbdae7ac7687b29165a6d20a48bab223b91b2010c82811da0a79f9c51ee857b48f2fca06677ba0f9db43bb8990df723620fa3471045a9'
         '8957872f805a274a56ae9e63896033a5fe175bd4d71704e62aff18524b95bf2a611bb3a4bff3c93b6d977f209e415a7d38d806341e144919022226ab1f53247d'
         '78cf6da081b7f370bfe6b362e5f545cefcb770cc42eafd713de5befd8489c543a99e60112b09dc47b7867fdac8be91291cab68fc102f97834f248ce879782d6c')
 
@@ -52,14 +51,12 @@ package() {
     --no-document \
     --install-dir "$pkgdir/$_gemdir" \
     --bindir "$pkgdir/usr/bin" \
-    $_gemname-$pkgver.gem
+    "$_gemname-$pkgver.gem"
 
-  # delete unnecessary files
-  cd "$pkgdir/$_gemdir"
-  find extensions/ -name *.so -delete
-  rm -f "cache/$_gemname-$pkgver.gem"
+  # delete unnecessary files/folders
+  rm -vrf "$pkgdir/$_gemdir/cache"
   cd "$pkgdir/$_gemdir/gems/$_gemname-$pkgver"
-  rm -rf \
+  rm -vrf test \
     .deepsource.toml \
     .drone.yml \
     .travis.yml \
@@ -70,16 +67,15 @@ package() {
 
   # move documentation
   cd "$pkgdir/$_gemdir/gems/$_gemname-$pkgver"
-  install -dm755 "$pkgdir/usr/share/doc/$pkgname"
-  mv -t "$pkgdir/usr/share/doc/$pkgname" \
+  install -vdm755 "$pkgdir/usr/share/doc/$pkgname"
+  mv -vt "$pkgdir/usr/share/doc/$pkgname" \
     docs/SECURITY_AUDIT.pdf *.md example
 
   # configuration
-  install -Dm644 fluent.conf "$pkgdir/etc/fluent/fluentd.conf"
-  install -Dm644 -t "$pkgdir/etc/conf.d" "$srcdir/$pkgname.conf"
+  install -vDm644 fluent.conf "$pkgdir/etc/fluent/fluentd.conf"
 
-  # systemd service
-  install -Dm644 -t "$pkgdir/usr/lib/systemd/system" "$srcdir/$pkgname.service"
-  install -Dm644 "$srcdir/sysusers.conf" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-  install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+  # systemd integration
+  install -vDm644 "$srcdir/systemd.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -vDm644 "$srcdir/sysusers.conf" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+  install -vDm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
 }