diff --git a/CHANGELOG.md b/CHANGELOG.md index f78b5738..196cc4e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,74 @@ About the past changelog entries, see [CHANGELOG v4](CHANGELOG-v4.md) [CHANGELOG v5](CHANGELOG-v5.md) instead. +## Release v6.0.4 - 2026/06/26 + +### News + +* Update bundled Fluentd to v1.19.3 +* Update bundled gems + * It contains fixes for `nokogiri` vulnerabilities (fixed in 1.19.3) + * Update bundled `rdkafka` to fix segmentation fault + * It contains fix for `addressable` vulnerability (CVE-2026-35611) which was fixed in 2.9.0. It might be affected if you use `webhdfs`. + * It contains fix for `faraday` vulnerability (CVE-2026-33637) which was fixed in 2.14.2. It might be affected if you use `opensearch`/`elasticsearch`. +* msi: fixed a bug that bundled ruby version was out-of-date. + +### Core component + +* ruby v3.4.9 +* jemalloc v3.6.0 +* OpenSSL 3.6.1 Windows +* OpenSSL 3.0.8 macOS +* gems + * fluentd v1.19.3 (update) + * msgpack 1.8.1 (update) + * oj 3.16.11 + * webrick 1.9.2 + * openssl 3.3.0 + +### Bundled plugins and gems + +* aws-partitions v1.1150.0 +* aws-sdk-core v3.234.0 +* aws-sdk-kms v1.110.0 +* aws-sdk-s3 v1.208.0 +* aws-sdk-sqs v1.101.0 +* aws-sigv4 v1.12.1 +* elasticsearch v8.19.2 +* fluent-diagtool v1.0.5 +* fluent-plugin-elasticsearch v6.0.0 +* fluent-plugin-flowcounter-simple 0.1.0 +* fluent-plugin-kafka v0.19.7 (update) +* fluent-plugin-metrics-cmetrics v0.1.2 +* fluent-plugin-fluent-package-update-notifier 0.2.3 +* fluent-plugin-obsolete-plugins v0.2.2 +* fluent-plugin-opensearch v1.1.6 (update) +* fluent-plugin-opentelemetry 0.5.2 +* fluent-plugin-prometheus v2.2.2 (update) +* fluent-plugin-prometheus_pushgateway v0.2.1 +* fluent-plugin-record-modifier v2.2.1 +* fluent-plugin-rewrite-tag-filter v2.4.0 +* fluent-plugin-s3 v1.8.4 +* fluent-plugin-sd-dns 0.1.0 +* fluent-plugin-systemd v1.1.1 +* fluent-plugin-td v1.2.0 +* fluent-plugin-utmpx v0.5.0 +* fluent-plugin-webhdfs v1.6.0 +* mini_portile2 v2.8.9 +* prometheus-client v4.2.5 +* rdkafka v0.27.0 (update) +* ruby-kafka v1.5.0 +* systemd-journal v2.1.1 +* td-client v3.0.0 +* webhdfs v0.11.0 + +On Windows + +* fluent-plugin-parser-winevt_xml v0.2.8 +* fluent-plugin-windows-exporter v1.0.0 +* winevt_c v0.11.3 (update) +* nokogiri v1.19.3 (update) + ## Release v6.0.3 - 2026/03/27 ### News diff --git a/fluent-package/Gemfile b/fluent-package/Gemfile index cdea238a..837f81da 100644 --- a/fluent-package/Gemfile +++ b/fluent-package/Gemfile @@ -20,10 +20,10 @@ gem "sigdump", "0.2.5" gem "http_parser.rb", "0.8.1" gem "yajl-ruby", "1.4.3" gem "serverengine", "2.4.0" -gem "msgpack", "1.8.0" +gem "msgpack", "1.8.1" gem "oj", "3.16.11" gem "tzinfo", "2.0.6" -gem "tzinfo-data", "1.2026.1" +gem "tzinfo-data", "1.2026.2" # Fluentd v1.19.0 requires io-event 1.10.x or before. # The dependency condition cannot be met with async >= 2.25 @@ -44,12 +44,19 @@ if ENV["INSTALL_GEM_FROM_LOCAL_REPO"] # https://github.com/fluent/fluent-package-builder/issues/618 # NOTE: platforms: does not work in source ... do block gem "win32-service" if RUBY_PLATFORM =~ /mswin|mingw/ + # Bundle forked version of ffi-win32-extensions until + # ffi 1.17.1 or later is supported. + # This workaround should be applied to fluent-package not to block using + # newer rdkafka to fix SEGV issue. + # https://github.com/fluent/fluent-package-builder/issues/1051 + gem "ffi-win32-extensions" if RUBY_PLATFORM =~ /mswin|mingw/ end else # Lock to specific revision git_source(:github) {|repo_name| "https://github.com/#{repo_name}" } gem "fluentd", github: "fluent/fluentd", ref: FLUENTD_REVISION gem "win32-service", github: "fluent-plugins-nursery/win32-service", branch: "fluent-package", platforms: [:mingw, :x64_mingw] + gem "ffi-win32-extensions", github: "fluent-plugins-nursery/ffi-win32-extensions", branch: "fluent-package", platforms: [:mingw, :x64_mingw] end # plugin gems @@ -58,9 +65,9 @@ gem "elasticsearch", "8.19.2" gem "fluent-plugin-elasticsearch", "6.0.0" gem "ruby-kafka", "1.5.0" gem "digest-murmurhash", "1.1.1" -gem "fluent-plugin-kafka", "0.19.6" +gem "fluent-plugin-kafka", "0.19.7" gem "prometheus-client", "4.2.5" -gem "fluent-plugin-prometheus", "2.2.1" +gem "fluent-plugin-prometheus", "2.2.2" gem "fluent-plugin-prometheus_pushgateway", "0.2.1" gem "jmespath", "1.6.2" gem "aws-partitions", "1.1150.0" @@ -85,26 +92,27 @@ gem "mini_portile2", "2.8.9" gem "cmetrics", "0.3.3" gem "fluent-plugin-metrics-cmetrics", "0.1.2" gem "opensearch-ruby", "3.4.0" -gem "fluent-plugin-opensearch", "1.1.5" +gem "fluent-plugin-opensearch", "1.1.6" gem "fluent-plugin-fluent-package-update-notifier", "0.2.3" gem "fluent-plugin-obsolete-plugins", "0.2.2" gem "fluent-plugin-opentelemetry", "0.5.2" -# fix CVE-2026-25765 for elasticseach and opensearch -gem "faraday", "2.14.1" +# fix CVE-2026-25765,CVE-2026-33637 for elasticseach and opensearch +gem "faraday", "2.14.2" windows_platforms = [:mingw, :x64_mingw] # :mswin # ffi-win32-extensions doesn't support ffi 1.17.1 or later -gem "ffi", "1.17.0", platforms: windows_platforms -gem "ffi-win32-extensions", "1.1.0", platforms: windows_platforms +gem "ffi", "1.17.4", platforms: windows_platforms +# Use officially released version when PR was merged and released. +#gem "ffi-win32-extensions", "1.1.0", platforms: windows_platforms # fiddle gem that isn't default gems as of Ruby 3.5 gem "fiddle", "1.1.8", platforms: windows_platforms -gem "nokogiri", "1.19.2", platforms: windows_platforms +gem "nokogiri", "1.19.3", platforms: windows_platforms gem "win32-event", "0.6.3", platforms: windows_platforms gem "win32-ipc", "0.7.0", platforms: windows_platforms # Use officially released version when PR was merged and released. #gem "win32-service", "2.3.2", platforms: windows_platforms -gem "winevt_c", "0.11.2", platforms: windows_platforms +gem "winevt_c", "0.11.3", platforms: windows_platforms gem "win32-eventlog", "0.6.7", platforms: windows_platforms gem "fluent-plugin-parser-winevt_xml", "0.2.8", platforms: windows_platforms gem "fluent-plugin-windows-eventlog", "0.9.2", platforms: windows_platforms @@ -116,7 +124,7 @@ gem "capng_c", "0.2.4", platforms: not_windows_platforms # (librdkafka 2.8.0 supports "OpenSSL without the ENGINE component") # librdkafka 2.8.0 can't be built on CentOS 7. unless platform_centos7? - gem "rdkafka", "0.21.0", platforms: not_windows_platforms + gem "rdkafka", "0.27.0", platforms: not_windows_platforms end gem "fluent-plugin-systemd", "1.1.1", platforms: not_windows_platforms gem "fluent-plugin-utmpx", "0.5.0", platforms: not_windows_platforms diff --git a/fluent-package/Gemfile.lock b/fluent-package/Gemfile.lock index 0abeefd2..594575f4 100644 --- a/fluent-package/Gemfile.lock +++ b/fluent-package/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/fluent-plugins-nursery/ffi-win32-extensions + revision: a549365f60c06635bd9b14dd961db118721a2aec + branch: fluent-package + specs: + ffi-win32-extensions (1.1.1) + ffi (~> 1.15) + GIT remote: https://github.com/fluent-plugins-nursery/win32-service revision: cfcc2007b3843127329d6a7307a62a927a714327 @@ -9,8 +17,8 @@ GIT GIT remote: https://github.com/fluent/fluentd - revision: 76841666b4e4aade23f0c100a7e048995f7d52c8 - ref: 76841666b4e4aade23f0c100a7e048995f7d52c8 + revision: c16dd7ed11b9c158d30c189481b80099bcf9c5f8 + ref: c16dd7ed11b9c158d30c189481b80099bcf9c5f8 specs: fluentd (1.19.2) async-http (~> 0.86) @@ -35,6 +43,7 @@ GIT webrick (~> 1.4) win32-event (~> 0.6.3) win32-ipc (~> 0.7.0) + win32-registry (~> 0.1) win32-service (~> 2.3.0) yajl-ruby (~> 1.0) zstd-ruby (~> 1.5) @@ -42,7 +51,7 @@ GIT GEM remote: https://rubygems.org/ specs: - addressable (2.8.8) + addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) async (2.24.0) console (~> 1.29) @@ -60,7 +69,7 @@ GEM protocol-http1 (~> 0.30) protocol-http2 (~> 0.22) traces (~> 0.10) - async-pool (0.11.1) + async-pool (0.11.2) async (>= 2.0) aws-eventstream (1.4.0) aws-partitions (1.1150.0) @@ -112,21 +121,19 @@ GEM multi_json excon (1.3.2) logger - faraday (2.14.1) + faraday (2.14.2) faraday-net_http (>= 2.0, < 3.5) json logger faraday-excon (2.3.0) excon (>= 1.0.0) faraday (>= 2.11.0, < 3) - faraday-net_http (3.4.2) + faraday-net_http (3.4.3) net-http (~> 0.5) faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) faraday (>= 2.0, < 3) - ffi (1.17.0) - ffi-win32-extensions (1.1.0) - ffi (>= 1.15.5, <= 1.17.0) + ffi (1.17.4) fiber-annotation (0.2.0) fiber-local (1.1.0) fiber-storage @@ -151,7 +158,7 @@ GEM fluent-plugin-fluent-package-update-notifier (0.2.3) fluentd (>= 0.14.10, < 2) specinfra (~> 2.94.1) - fluent-plugin-kafka (0.19.6) + fluent-plugin-kafka (0.19.7) bigdecimal (~> 3.1) fluentd (>= 0.10.58, < 2) ltsv @@ -161,7 +168,7 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-obsolete-plugins (0.2.2) fluentd (>= 0.14.10, < 2) - fluent-plugin-opensearch (1.1.5) + fluent-plugin-opensearch (1.1.6) aws-sdk-core (~> 3) excon faraday (>= 2.0.0) @@ -181,7 +188,7 @@ GEM csv (~> 3.2) fluentd (>= 0.14.12, < 2) nokogiri (>= 1.12.5) - fluent-plugin-prometheus (2.2.1) + fluent-plugin-prometheus (2.2.2) fluentd (>= 1.9.1, < 2) prometheus-client (>= 2.1.0) fluent-plugin-prometheus_pushgateway (0.2.1) @@ -243,16 +250,16 @@ GEM ltsv (0.1.2) metrics (0.14.1) mini_portile2 (2.8.9) - msgpack (1.8.0) + msgpack (1.8.1) multi_json (1.17.0) mutex_m (0.3.0) net-http (0.8.0) uri (>= 0.11.1) net-scp (4.1.0) net-ssh (>= 2.6.5, < 8.0.0) - net-ssh (7.3.0) + net-ssh (7.3.2) net-telnet (0.2.0) - nokogiri (1.19.2) + nokogiri (1.19.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.16.11) @@ -275,8 +282,10 @@ GEM public_suffix (6.0.2) racc (1.8.1) rake (13.3.1) - rdkafka (0.21.0) - ffi (~> 1.15) + rdkafka (0.27.0) + ffi (~> 1.17.1) + json (> 2.0) + logger mini_portile2 (~> 2.6) rake (> 12) rexml (3.4.4) @@ -290,7 +299,7 @@ GEM sigdump (~> 0.2.2) sfl (2.3) sigdump (0.2.5) - specinfra (2.94.1) + specinfra (2.94.2) base64 net-scp net-ssh (>= 2.7) @@ -325,7 +334,7 @@ GEM traces (0.18.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2026.1) + tzinfo-data (1.2026.2) tzinfo (>= 1.0.0) uri (1.0.4) webhdfs (0.11.0) @@ -337,7 +346,9 @@ GEM ffi win32-ipc (0.7.0) ffi - winevt_c (0.11.2) + win32-registry (0.1.2) + fiddle (~> 1.0) + winevt_c (0.11.3) yajl-ruby (1.4.3) zip-zip (0.3) rubyzip (>= 1.0.0) @@ -363,21 +374,21 @@ DEPENDENCIES cool.io (= 1.9.4) digest-murmurhash (= 1.1.1) elasticsearch (= 8.19.2) - faraday (= 2.14.1) - ffi (= 1.17.0) - ffi-win32-extensions (= 1.1.0) + faraday (= 2.14.2) + ffi (= 1.17.4) + ffi-win32-extensions! fiddle (= 1.1.8) fluent-diagtool (= 1.0.5) fluent-plugin-elasticsearch (= 6.0.0) fluent-plugin-flowcounter-simple (= 0.1.0) fluent-plugin-fluent-package-update-notifier (= 0.2.3) - fluent-plugin-kafka (= 0.19.6) + fluent-plugin-kafka (= 0.19.7) fluent-plugin-metrics-cmetrics (= 0.1.2) fluent-plugin-obsolete-plugins (= 0.2.2) - fluent-plugin-opensearch (= 1.1.5) + fluent-plugin-opensearch (= 1.1.6) fluent-plugin-opentelemetry (= 0.5.2) fluent-plugin-parser-winevt_xml (= 0.2.8) - fluent-plugin-prometheus (= 2.2.1) + fluent-plugin-prometheus (= 2.2.2) fluent-plugin-prometheus_pushgateway (= 0.2.1) fluent-plugin-record-modifier (= 2.2.1) fluent-plugin-rewrite-tag-filter (= 2.4.0) @@ -394,27 +405,27 @@ DEPENDENCIES httpclient (= 2.9.0) jmespath (= 1.6.2) mini_portile2 (= 2.8.9) - msgpack (= 1.8.0) - nokogiri (= 1.19.2) + msgpack (= 1.8.1) + nokogiri (= 1.19.3) oj (= 3.16.11) opensearch-ruby (= 3.4.0) prometheus-client (= 4.2.5) rake - rdkafka (= 0.21.0) + rdkafka (= 0.27.0) ruby-kafka (= 1.5.0) serverengine (= 2.4.0) sigdump (= 0.2.5) td (= 0.19.1) td-client (= 3.0.0) tzinfo (= 2.0.6) - tzinfo-data (= 1.2026.1) + tzinfo-data (= 1.2026.2) webhdfs (= 0.11.0) webrick (= 1.9.2) win32-event (= 0.6.3) win32-eventlog (= 0.6.7) win32-ipc (= 0.7.0) win32-service! - winevt_c (= 0.11.2) + winevt_c (= 0.11.3) yajl-ruby (= 1.4.3) BUNDLED WITH diff --git a/fluent-package/Rakefile b/fluent-package/Rakefile index bfb4bcd2..1cd67995 100755 --- a/fluent-package/Rakefile +++ b/fluent-package/Rakefile @@ -178,6 +178,7 @@ class DownloadTask attr_reader :file_ruby_source, :file_ruby_installer_x64 attr_reader :file_fluentd_archive attr_reader :file_win32_service_archive + attr_reader :file_ffi_win32_extensions_archive attr_reader :files_ruby_gems attr_reader :file_openssl_source @@ -201,6 +202,7 @@ class DownloadTask define_ruby_files define_fluentd_archive define_win32_service_archive if windows? + define_ffi_win32_extensions_archive if windows? define_gem_files define_openssl_file @@ -217,6 +219,9 @@ class DownloadTask desc "Clone win32-service repository and create a tarball" task :win32_service => [@file_win32_service_archive] + desc "Clone ffi-win32-extensions repository and create a tarball" + task :ffi_win32_extensions => [@file_ffi_win32_extensions_archive] + desc "Download ruby gems" task :ruby_gems => @files_ruby_gems @@ -340,6 +345,21 @@ class DownloadTask end end + def define_ffi_win32_extensions_archive + @file_ffi_win32_extensions_archive = File.join(DOWNLOADS_DIR, "ffi-win32-extensions.tar.gz") + file @file_ffi_win32_extensions_archive do + ensure_directory(DOWNLOADS_DIR) do + dirname = "ffi-win32-extensions" + rm_rf(dirname) if File.exist?(dirname) + sh("git", "clone", "https://github.com/fluent-plugins-nursery/ffi-win32-extensions.git") + cd("ffi-win32-extensions") do + sh("git", "checkout", "fluent-package") + end + sh(*tar_command, "cvfz", "#{dirname}.tar.gz", dirname) + end + end + end + def define_gem_files paths = [] Dir.glob("#{DOWNLOADS_DIR}/*.gem") do |path| @@ -445,7 +465,7 @@ class BuildTask end desc "Install ruby gems" - task :ruby_gems => windows? ? [:"download:ruby_gems", :fluentd, :win32_service] : [:"download:ruby_gems", :fluentd] do + task :ruby_gems => windows? ? [:"download:ruby_gems", :fluentd, :win32_service, :ffi_win32_extensions] : [:"download:ruby_gems", :fluentd] do puts "::group::Install ruby gems" if ENV["CI"] gem_install("bundler", BUNDLER_VERSION) @@ -496,6 +516,23 @@ class BuildTask end end + desc "Install ffi-win32-extensions" + task :ffi_win32_extensions => [:"download:ffi_win32_extensions"] do + cd(DOWNLOADS_DIR) do + tar_options = ["--no-same-owner", "--force-local"] + archive_path = @download_task.file_ffi_win32_extensions_archive + sh(*tar_command, "xvf", archive_path, *tar_options) unless File.exist?("ffi-win32-extensions") + cd("ffi-win32-extensions") do + sh("bundle", "install") + sh("rake", "gem:create") + sh("rake", "gem:create") + mkdir_p("pkg") + mv(Dir.glob("*.gem"), "pkg/") + setup_local_gem_repo + end + end + end + desc "Install all gems" task :gems => [:ruby_gems] diff --git a/fluent-package/bump-version-v7.patch b/fluent-package/bump-version-v7.patch index fa8aceb4..6dc7312f 100644 --- a/fluent-package/bump-version-v7.patch +++ b/fluent-package/bump-version-v7.patch @@ -1,22 +1,22 @@ -From 9e1837728f192a7829df30a1f92423a1f3708760 Mon Sep 17 00:00:00 2001 +From 3ee9427ad7739451ccecd80eca0675c5c4213eb2 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi -Date: Mon, 23 Mar 2026 16:07:31 +0900 +Date: Fri, 29 May 2026 13:50:35 +0900 Subject: [PATCH] Bump version to v7 Signed-off-by: Kentaro Hayashi --- - fluent-package/config.rb | 6 +++--- - fluent-package/debian/changelog | 6 ++++++ - fluent-package/yum/fluent-package.spec.in | 3 +++ - 3 files changed, 12 insertions(+), 3 deletions(-) + fluent-package/config.rb | 10 +++++----- + fluent-package/debian/changelog | 6 ++++++ + fluent-package/yum/fluent-package.spec.in | 3 +++ + 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/fluent-package/config.rb b/fluent-package/config.rb -index 03a3fbd..322bf6d 100644 +index 655371d..4046705 100644 --- a/fluent-package/config.rb +++ b/fluent-package/config.rb @@ -1,5 +1,5 @@ PACKAGE_NAME = "fluent-package" --PACKAGE_VERSION = "6.0.3" +-PACKAGE_VERSION = "6.0.4" +PACKAGE_VERSION = "7.0.0" # Keep internal path (/opt/td-agent) for package name migration @@ -27,13 +27,24 @@ index 03a3fbd..322bf6d 100644 # https://www.ruby-lang.org/en/downloads/ (tar.gz) -BUNDLED_RUBY_VERSION = "3.4.9" -BUNDLED_RUBY_SOURCE_SHA256SUM = "7bb4d4f5e807cc27251d14d9d6086d182c5b25875191e44ab15b709cd7a7dd9c" -+BUNDLED_RUBY_VERSION = "4.0.2" -+BUNDLED_RUBY_SOURCE_SHA256SUM = "51502b26b50b68df4963336ca41e368cde92c928faf91654de4c4c1791f82aac" ++BUNDLED_RUBY_VERSION = "4.0.5" ++BUNDLED_RUBY_SOURCE_SHA256SUM = "7d6149079a63f8ae1d326c9fa65c6019ba2dc3155eae7b39159817911c88958e" BUNDLED_RUBY_PATCHES = [ # An example entry: +@@ -32,8 +32,8 @@ BUNDLED_RUBY_PATCHES = [ + ] + + # https://rubyinstaller.org/downloads/ (7-ZIP ARCHIVES) +-BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.9-1" +-BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "4375268618b61dadf53bf8e54beaca74ea30580c90d3c47ea9f2a134bd3e494e" ++BUNDLED_RUBY_INSTALLER_X64_VERSION = "4.0.5-1" ++BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "74e31613fc71e6e23431dfc4d8b6ec2818a4dc1fd16e0983b074144c16719c8b" + + # Files under rubyinstaller/ are patches for RubyInstaller's binary package. + # Other patches for Ruby's source tree which can be shared with BUNDLED_RUBY_PATCHES. diff --git a/fluent-package/debian/changelog b/fluent-package/debian/changelog -index 07b315b..2bf9599 100644 +index 3ee9005..bc4aa0c 100644 --- a/fluent-package/debian/changelog +++ b/fluent-package/debian/changelog @@ -1,3 +1,9 @@ @@ -43,21 +54,21 @@ index 07b315b..2bf9599 100644 + + -- Kentaro Hayashi Sun, 29 Aug 2027 06:31:51 -0000 + - fluent-package (6.0.3-1) unstable; urgency=low + fluent-package (6.0.4-1) unstable; urgency=low * New upstream release. diff --git a/fluent-package/yum/fluent-package.spec.in b/fluent-package/yum/fluent-package.spec.in -index a786cc3..30aa7cb 100644 +index 0825876..d05a0ec 100644 --- a/fluent-package/yum/fluent-package.spec.in +++ b/fluent-package/yum/fluent-package.spec.in -@@ -472,6 +472,9 @@ fi +@@ -474,6 +474,9 @@ fi # NOTE: %{_tmpfilesdir} is available since CentOS 7 %attr(0755,fluentd,fluentd) %dir /tmp/@PACKAGE_DIR@ %changelog +* Sun Aug 29 2027 Kentaro Hayashi - 7.0.0-1 +- New upstream release. + - * Wed Mar 25 2026 Kentaro Hayashi - 6.0.3-1 + * Fri Jun 26 2026 Kentaro Hayashi - 6.0.4-1 - New upstream release. -- diff --git a/fluent-package/config.rb b/fluent-package/config.rb index 03a3fbd8..f7efb502 100644 --- a/fluent-package/config.rb +++ b/fluent-package/config.rb @@ -1,5 +1,5 @@ PACKAGE_NAME = "fluent-package" -PACKAGE_VERSION = "6.0.3" +PACKAGE_VERSION = "6.0.4" # Keep internal path (/opt/td-agent) for package name migration SERVICE_NAME = "fluentd" @@ -7,7 +7,7 @@ PACKAGE_DIR = "fluent" COMPAT_PACKAGE_DIR = COMPAT_SERVICE_NAME -FLUENTD_REVISION = '76841666b4e4aade23f0c100a7e048995f7d52c8' # v1.19.2 +FLUENTD_REVISION = '12a7b7d4a404d8bf3fa0d3ffe8a15aab91a25c41' # v1.19.3 (RC Jun 3) FLUENTD_LOCAL_GEM_REPO = "file://" + File.expand_path(File.join(__dir__, "local_gem_repo")) # https://github.com/jemalloc/jemalloc/releases @@ -32,8 +32,8 @@ ] # https://rubyinstaller.org/downloads/ (7-ZIP ARCHIVES) -BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.8-1" -BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "d1c3ba83ae748c08e35e0b1d9939d45dbca7925e0a8bf84a42860bf19847e0d6" +BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.9-1" +BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "4375268618b61dadf53bf8e54beaca74ea30580c90d3c47ea9f2a134bd3e494e" # Files under rubyinstaller/ are patches for RubyInstaller's binary package. # Other patches for Ruby's source tree which can be shared with BUNDLED_RUBY_PATCHES. diff --git a/fluent-package/debian/changelog b/fluent-package/debian/changelog index 07b315b0..3ee90052 100644 --- a/fluent-package/debian/changelog +++ b/fluent-package/debian/changelog @@ -1,3 +1,9 @@ +fluent-package (6.0.4-1) unstable; urgency=low + + * New upstream release. + + -- Kentaro Hayashi Fri, 26 Jun 2026 01:20:19 -0000 + fluent-package (6.0.3-1) unstable; urgency=low * New upstream release. diff --git a/fluent-package/yum/fluent-package.spec.in b/fluent-package/yum/fluent-package.spec.in index a786cc34..08258766 100644 --- a/fluent-package/yum/fluent-package.spec.in +++ b/fluent-package/yum/fluent-package.spec.in @@ -153,6 +153,8 @@ The stable distribution of Fluentd, formerly known as td-agent. rake build:rpm_config FLUENT_PACKAGE_STAGING_PATH=%{buildroot} NO_VAR_RUN=1 rake build:all FLUENT_PACKAGE_STAGING_PATH=%{buildroot} PATH="$HOME/.cargo/bin:$PATH" +# Do not use prebuilt rdkafka gem because of missing @GLIBC_ symbol error +rake build:all FLUENT_PACKAGE_STAGING_PATH=%{buildroot} REBUILD_GEMS="rdkafka" PATH="$HOME/.cargo/bin:$PATH" mkdir -p %{buildroot}%{_mandir}/man1 cp @PACKAGE@/debian/*.1 %{buildroot}%{_mandir}/man1/ for man in `find %{buildroot} -type f -wholename '*/man/man[1-9]/*.[1-9]'`; do @@ -472,6 +474,9 @@ fi # NOTE: %{_tmpfilesdir} is available since CentOS 7 %attr(0755,fluentd,fluentd) %dir /tmp/@PACKAGE_DIR@ %changelog +* Fri Jun 26 2026 Kentaro Hayashi - 6.0.4-1 +- New upstream release. + * Wed Mar 25 2026 Kentaro Hayashi - 6.0.3-1 - New upstream release.