upgpkg: 1.16.3-1

5 files changed, 198 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e222cb968d2..7b295d7e6a14 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,48 @@
 pkgbase = fluentd
 	pkgdesc = Data collector designed to scale and simplify log management
-	pkgver = 1.16.2
+	pkgver = 1.16.3
 	pkgrel = 1
-	url = https://www.fluentd.org
+	url = https://github.com/fluent/fluentd
 	install = fluentd.install
 	arch = any
-	license = Apache
+	license = Apache-2.0
+	checkdepends = inetutils
+	checkdepends = procps-ng
+	checkdepends = ruby-async
+	checkdepends = ruby-async-http
+	checkdepends = ruby-flexmock
+	checkdepends = ruby-oj
+	checkdepends = ruby-rake
+	checkdepends = ruby-rr
+	checkdepends = ruby-test-unit-rr
+	checkdepends = ruby-timecop
+	makedepends = git
+	makedepends = rubygems
 	depends = ruby
-	depends = ruby-bundler
-	depends = ruby-msgpack
-	depends = ruby-yajl-ruby
+	depends = ruby-console
 	depends = ruby-cool.io
-	depends = ruby-serverengine
 	depends = ruby-http_parser.rb
+	depends = ruby-msgpack
+	depends = ruby-serverengine
 	depends = ruby-sigdump
+	depends = ruby-strptime
 	depends = ruby-tzinfo
 	depends = ruby-tzinfo-data
-	depends = ruby-strptime
 	depends = ruby-webrick
+	depends = ruby-yajl-ruby
 	optdepends = jemalloc: for a more efficient malloc implementation
 	optdepends = ruby-oj: for a faster json parser
-	noextract = fluentd-1.16.2.gem
 	options = !emptydirs
 	backup = etc/fluent/fluentd.conf
-	source = https://rubygems.org/downloads/fluentd-1.16.2.gem
+	source = git+https://github.com/fluent/fluentd.git#commit=d3cf2e0f95a0ad88b9897197db6c5152310f114f
 	source = systemd.service
 	source = tmpfiles.conf
 	source = sysusers.conf
-	sha512sums = ea54c4c0ddb10709a09e8fb3c94441e47401d21cd24d8d221dd6e4a80353360c2cd05438dd4672566a4a0bbabd54d8960269a25c8737156b0d2c4a62c04f488f
-	sha512sums = 01de8becfbd191063e162edcdb623281d6edf140bac6bb4c01aab976f887cb30184484e8196a9942a8623a418e1f49e2d059ac25a943ee9182eeab0e243630f6
-	sha512sums = 084f2716b1d65a49d2126a6fdb8016c7e92eb58a2c7c934236dbfdff65c5643d69f0e6bc71f0cdcb6c2edf8bc071c2f0f31da3c70f6c12220eaf69cb70221e6b
-	sha512sums = af264f901a23ae4b611c57779222c004a348cb7efbe7a2922ce01cef8bc047e42c394309e4746d3b669105d04fbacd057e68487e214c6929328e9cc2a9439980
-	b2sums = 3056c4acba16f456b533bbe08c093226972d23abb198a80fe58f1bf4c56ee0b9d44c3ae5c416dcf9f7bdba2d4d26f7f8e39aa68dc67b0c8a1209d3c351bf925a
-	b2sums = 593511fb52e2d934e89bbdae7ac7687b29165a6d20a48bab223b91b2010c82811da0a79f9c51ee857b48f2fca06677ba0f9db43bb8990df723620fa3471045a9
-	b2sums = 8957872f805a274a56ae9e63896033a5fe175bd4d71704e62aff18524b95bf2a611bb3a4bff3c93b6d977f209e415a7d38d806341e144919022226ab1f53247d
-	b2sums = 78cf6da081b7f370bfe6b362e5f545cefcb770cc42eafd713de5befd8489c543a99e60112b09dc47b7867fdac8be91291cab68fc102f97834f248ce879782d6c
+	source = unbundlify-tests.patch
+	sha256sums = SKIP
+	sha256sums = b02013a8e3895369df58557b813d260a11edf245c59afc1747971205f1b9e825
+	sha256sums = ea811ec16a78cbe1248266bca6589ebaab54f75048288959641b8ef3a8ea7e1b
+	sha256sums = 8eca8af4df0ea2c0b954d8bf72029e7d2034b7e77f9be36d3d261630068f5674
+	sha256sums = 0b9b3cfb302fd849fd414e79bafe99a4009bb4dc8dcbd3a1a4b6ae7c87b653ce
 
 pkgname = fluentd
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..2f1aca742ebf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+*
+!.gitignore
+!.nvchecker.toml
+!.SRCINFO
+!PKGBUILD
+!fluentd.install
+!systemd.service
+!sysusers.conf
+!tmpfiles.conf
+!unbundlify-tests.patch
diff --git a/.nvchecker.toml b/.nvchecker.toml
new file mode 100644
index 000000000000..4d7f106448e0
--- /dev/null
+++ b/.nvchecker.toml
@@ -0,0 +1,3 @@
+[fluentd]
+source = "gems"
+gems = "fluentd"
diff --git a/PKGBUILD b/PKGBUILD
index 9b330308e2e7..4781c907613a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,86 +1,140 @@
-# Maintainer: George Rawlinson <george@rawlinson.net.nz>
+# Maintainer: Carl Smedstad <carl.smedstad at protonmail dot com>
+# Contributor: George Rawlinson <george@rawlinson.net.nz>
 # Contributor: Daniel Nagy <danielnagy at gmx de>
 # Contributor: kusakata <shohei atmark kusakata period com>
 
 pkgname=fluentd
-pkgver=1.16.2
+pkgver=1.16.3
+_commit=d3cf2e0f95a0ad88b9897197db6c5152310f114f
 pkgrel=1
-pkgdesc='Data collector designed to scale and simplify log management'
-arch=('any')
-url='https://www.fluentd.org'
-license=('Apache')
+pkgdesc="Data collector designed to scale and simplify log management"
+arch=(any)
+url="https://github.com/fluent/fluentd"
+license=(Apache-2.0)
 depends=(
-  'ruby'
-  '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'
+  ruby
+  ruby-console
+  ruby-cool.io
+  ruby-http_parser.rb
+  ruby-msgpack
+  ruby-serverengine
+  ruby-sigdump
+  ruby-strptime
+  ruby-tzinfo
+  ruby-tzinfo-data
+  ruby-webrick
+  ruby-yajl-ruby
+)
+makedepends=(
+  git
+  rubygems
+)
+checkdepends=(
+  inetutils
+  procps-ng
+  ruby-async
+  ruby-async-http
+  ruby-flexmock
+  ruby-oj
+  ruby-rake
+  ruby-rr
+  ruby-test-unit-rr
+  ruby-timecop
 )
 optdepends=(
   'jemalloc: for a more efficient malloc implementation'
   'ruby-oj: for a faster json parser'
 )
-options=('!emptydirs')
+backup=(etc/fluent/fluentd.conf)
+options=(!emptydirs)
+install="$pkgname.install"
 source=(
-  "https://rubygems.org/downloads/$pkgname-$pkgver.gem"
-  'systemd.service'
-  'tmpfiles.conf'
-  'sysusers.conf'
+  "git+$url.git#commit=$_commit"
+  "systemd.service"
+  "tmpfiles.conf"
+  "sysusers.conf"
+  "unbundlify-tests.patch"
+)
+sha256sums=(
+  'SKIP'
+  'b02013a8e3895369df58557b813d260a11edf245c59afc1747971205f1b9e825'
+  'ea811ec16a78cbe1248266bca6589ebaab54f75048288959641b8ef3a8ea7e1b'
+  '8eca8af4df0ea2c0b954d8bf72029e7d2034b7e77f9be36d3d261630068f5674'
+  '0b9b3cfb302fd849fd414e79bafe99a4009bb4dc8dcbd3a1a4b6ae7c87b653ce'
 )
-install="$pkgname.install"
-noextract=("$pkgname-$pkgver.gem")
-backup=('etc/fluent/fluentd.conf')
-sha512sums=('ea54c4c0ddb10709a09e8fb3c94441e47401d21cd24d8d221dd6e4a80353360c2cd05438dd4672566a4a0bbabd54d8960269a25c8737156b0d2c4a62c04f488f'
-            '01de8becfbd191063e162edcdb623281d6edf140bac6bb4c01aab976f887cb30184484e8196a9942a8623a418e1f49e2d059ac25a943ee9182eeab0e243630f6'
-            '084f2716b1d65a49d2126a6fdb8016c7e92eb58a2c7c934236dbfdff65c5643d69f0e6bc71f0cdcb6c2edf8bc071c2f0f31da3c70f6c12220eaf69cb70221e6b'
-            'af264f901a23ae4b611c57779222c004a348cb7efbe7a2922ce01cef8bc047e42c394309e4746d3b669105d04fbacd057e68487e214c6929328e9cc2a9439980')
-b2sums=('3056c4acba16f456b533bbe08c093226972d23abb198a80fe58f1bf4c56ee0b9d44c3ae5c416dcf9f7bdba2d4d26f7f8e39aa68dc67b0c8a1209d3c351bf925a'
-        '593511fb52e2d934e89bbdae7ac7687b29165a6d20a48bab223b91b2010c82811da0a79f9c51ee857b48f2fca06677ba0f9db43bb8990df723620fa3471045a9'
-        '8957872f805a274a56ae9e63896033a5fe175bd4d71704e62aff18524b95bf2a611bb3a4bff3c93b6d977f209e415a7d38d806341e144919022226ab1f53247d'
-        '78cf6da081b7f370bfe6b362e5f545cefcb770cc42eafd713de5befd8489c543a99e60112b09dc47b7867fdac8be91291cab68fc102f97834f248ce879782d6c')
 
-package() {
-  # systemd integration
-  install -vDm644 systemd.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-  install -vDm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-  install -vDm644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+_archive="$pkgname"
+
+prepare() {
+  cd "$_archive"
+
+  # Update gemspec/Gemfile to allow newer version of the dependencies
+  sed --in-place --regexp-extended 's|~>|>=|g' "$pkgname.gemspec"
+
+  patch --forward --strip=1 --input="$srcdir/unbundlify-tests.patch"
+}
+
+build() {
+  cd "$_archive"
+
+  local gemdir="$(gem env gemdir)"
 
-  local _gemdir="$(ruby -e'puts Gem.default_dir')"
+  gem build "$pkgname.gemspec"
 
   gem install \
     --local \
     --verbose \
     --ignore-dependencies \
     --no-user-install \
-    --install-dir "$pkgdir/$_gemdir" \
-    --bindir "$pkgdir/usr/bin" \
+    --install-dir "tmp_install/$gemdir" \
+    --bindir "tmp_install/usr/bin" \
     "$pkgname-$pkgver.gem"
 
-  # delete unnecessary files/folders
-  rm -vrf "$pkgdir/$_gemdir/cache"
-  cd "$pkgdir/$_gemdir/gems/$pkgname-$pkgver"
-  rm -vrf test \
-    .deepsource.toml \
-    .drone.yml \
-    .travis.yml \
-    .gitlab-ci.yml \
-    .gitignore \
-    .github \
-    appveyor.yml
-
-  # move documentation
-  cd "$pkgdir/$_gemdir/gems/$pkgname-$pkgver"
-  install -vdm755 "$pkgdir/usr/share/doc/$pkgname"
-  mv -vt "$pkgdir/usr/share/doc/$pkgname" \
-    docs/SECURITY_AUDIT.pdf *.md example
-
-  # configuration
-  install -vDm644 fluent.conf "$pkgdir/etc/fluent/fluentd.conf"
+  # Remove unrepreducible files
+  rm --force --recursive --verbose \
+    "tmp_install/$gemdir/cache/" \
+    "tmp_install/$gemdir/gems/$pkgname-$pkgver/vendor/" \
+    "tmp_install/$gemdir/doc/$pkgname-$pkgver/ri/ext/"
+
+  find "tmp_install/$gemdir/gems/" \
+    -type f \
+    \( \
+    -iname "*.o" -o \
+    -iname "*.c" -o \
+    -iname "*.so" -o \
+    -iname "*.time" -o \
+    -iname "gem.build_complete" -o \
+    -iname "Makefile" \
+    \) \
+    -delete
+
+  find "tmp_install/$gemdir/extensions/" \
+    -type f \
+    \( \
+    -iname "mkmf.log" -o \
+    -iname "gem_make.out" \
+    \) \
+    -delete
+}
+
+check() {
+  cd "$_archive"
+
+  export TZ=UTC
+  GEM_HOME="tmp_install/$(gem env gemdir)" rake test -v
+}
+
+package() {
+  cd "$_archive"
+
+  cp --archive tmp_install/* "$pkgdir"
+
+  install -Dm644 fluent.conf "$pkgdir/etc/fluent/fluentd.conf"
+
+  install -Dm644 "$srcdir/systemd.service" "$pkgdir/usr/lib/systemd/system/$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"
+
+  install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" ./*.md
+  cp -a -t "$pkgdir/usr/share/doc/$pkgname" example docs
 }
diff --git a/unbundlify-tests.patch b/unbundlify-tests.patch
new file mode 100644
index 000000000000..a52c59f585b8
--- /dev/null
+++ b/unbundlify-tests.patch
@@ -0,0 +1,42 @@
+diff --unified --recursive --text --new-file fluentd-1.16.3.orig/test/command/test_fluentd.rb fluentd-1.16.3/test/command/test_fluentd.rb
+--- fluentd-1.16.3.orig/test/command/test_fluentd.rb	2024-02-11 22:25:37.976373458 +0100
++++ fluentd-1.16.3/test/command/test_fluentd.rb	2024-02-11 22:25:12.746266231 +0100
+@@ -64,10 +64,10 @@
+   def create_cmdline(conf_path, *fluentd_options)
+     if Fluent.windows?
+       cmd_path = File.expand_path(File.dirname(__FILE__) + "../../../bin/fluentd")
+-      ["bundle", "exec", ServerEngine.ruby_bin_path, cmd_path, "-c", conf_path, *fluentd_options]
++      [ServerEngine.ruby_bin_path, cmd_path, "-c", conf_path, *fluentd_options]
+     else
+       cmd_path = File.expand_path(File.dirname(__FILE__) + "../../../bin/fluentd")
+-      ["bundle", "exec", cmd_path, "-c", conf_path, *fluentd_options]
++      [cmd_path, "-c", conf_path, *fluentd_options]
+     end
+   end
+ 
+@@ -89,7 +89,6 @@
+     null_stream = Fluent::FileWrapper.open(File::NULL, 'w')
+     gemfile_path = File.expand_path(File.dirname(__FILE__) + "../../../Gemfile")
+ 
+-    env = { "BUNDLE_GEMFILE" => gemfile_path }.merge(env)
+     cmdname = cmdline.shift
+     arg0 = "testing-fluentd"
+     # p(here: "executing process", env: env, cmdname: cmdname, arg0: arg0, args: cmdline)
+@@ -931,7 +930,7 @@
+         create_cmdline(conf_path),
+         '#0 fluentd worker is now running worker=0',
+         patterns_not_match: ['(LoadError)'],
+-        env: { 'RUBYOPT' => '-rtest-unit -rbundler/setup' },
++        env: { 'RUBYOPT' => '-rtest-unit' },
+       )
+     end
+ 
+@@ -1024,7 +1023,7 @@
+       ENV["TEST_RUBY_PATH"] = tmp_ruby_path
+       cmd_path = File.expand_path(File.dirname(__FILE__) + "../../../bin/fluentd")
+       conf_path = create_conf_file('space_mixed_ruby_path_test.conf', conf)
+-      args = ["bundle", "exec", tmp_ruby_path, cmd_path, "-c", conf_path]
++      args = [tmp_ruby_path, cmd_path, "-c", conf_path]
+       assert_log_matches(
+         args,
+         'spawn command to main:',