From 1fbb7b552072bc41c1bba778f4c683d1f850091a Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 13 Feb 2026 13:50:55 +0900 Subject: [PATCH 01/12] Bump version to 6.0.2 Signed-off-by: Kentaro Hayashi --- fluent-package/config.rb | 2 +- fluent-package/debian/changelog | 6 ++++++ fluent-package/yum/fluent-package.spec.in | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/fluent-package/config.rb b/fluent-package/config.rb index c681f3b40..811a8ba42 100644 --- a/fluent-package/config.rb +++ b/fluent-package/config.rb @@ -1,5 +1,5 @@ PACKAGE_NAME = "fluent-package" -PACKAGE_VERSION = "6.0.1" +PACKAGE_VERSION = "6.0.2" # Keep internal path (/opt/td-agent) for package name migration SERVICE_NAME = "fluentd" diff --git a/fluent-package/debian/changelog b/fluent-package/debian/changelog index f2828f275..56073b541 100644 --- a/fluent-package/debian/changelog +++ b/fluent-package/debian/changelog @@ -1,3 +1,9 @@ +fluent-package (6.0.2-1) unstable; urgency=low + + * New upstream release. + + -- Kentaro Hayashi Fri, 27 Feb 2026 04:51:09 -0000 + fluent-package (6.0.1-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 9ddf15f98..cc395a860 100644 --- a/fluent-package/yum/fluent-package.spec.in +++ b/fluent-package/yum/fluent-package.spec.in @@ -472,6 +472,9 @@ fi # NOTE: %{_tmpfilesdir} is available since CentOS 7 %attr(0755,fluentd,fluentd) %dir /tmp/@PACKAGE_DIR@ %changelog +* Fri Feb 27 2026 Kentaro Hayashi - 6.0.2-1 +- New upstream release. + * Tue Nov 11 2025 Shizuo Fujita - 6.0.1-1 - New upstream release. From 90f2290760f8963c698f73035d16fb9dcd3f5b03 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 13 Feb 2026 13:55:54 +0900 Subject: [PATCH 02/12] Update bundled versions Signed-off-by: Kentaro Hayashi --- fluent-package/config.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fluent-package/config.rb b/fluent-package/config.rb index 811a8ba42..bbecffb45 100644 --- a/fluent-package/config.rb +++ b/fluent-package/config.rb @@ -7,7 +7,7 @@ PACKAGE_DIR = "fluent" COMPAT_PACKAGE_DIR = COMPAT_SERVICE_NAME -FLUENTD_REVISION = 'efdc4dca81c23480c9b55e13e55de6aa925b1cf5' # v1.19.1 +FLUENTD_REVISION = '76841666b4e4aade23f0c100a7e048995f7d52c8' # v1.19.2 FLUENTD_LOCAL_GEM_REPO = "file://" + File.expand_path(File.join(__dir__, "local_gem_repo")) # https://github.com/jemalloc/jemalloc/releases @@ -23,8 +23,8 @@ BUNDLER_VERSION= "2.3.27" # https://www.ruby-lang.org/en/downloads/ (tar.gz) -BUNDLED_RUBY_VERSION = "3.4.7" -BUNDLED_RUBY_SOURCE_SHA256SUM = "23815a6d095696f7919090fdc3e2f9459b2c83d57224b2e446ce1f5f7333ef36" +BUNDLED_RUBY_VERSION = "3.4.8" +BUNDLED_RUBY_SOURCE_SHA256SUM = "53c4ddad41fbb6189f1f5ee0db57a51d54bd1f87f8755b3d68604156a35b045b" BUNDLED_RUBY_PATCHES = [ # An example entry: @@ -32,8 +32,8 @@ ] # https://rubyinstaller.org/downloads/ (7-ZIP ARCHIVES) -BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.7-1" -BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "955678a8373c23e53032ac10f730a06120c7d3b956074020e57ca8b99b8930d4" +BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.8-1" +BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "d1c3ba83ae748c08e35e0b1d9939d45dbca7925e0a8bf84a42860bf19847e0d6" # 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. From 6bb59bec9f3d23a8ac7bafea2f98e5859681dae5 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 13 Feb 2026 14:01:08 +0900 Subject: [PATCH 03/12] Update bundled gems Signed-off-by: Kentaro Hayashi --- fluent-package/Gemfile | 14 ++++---- fluent-package/Gemfile.lock | 65 +++++++++++++++++++++---------------- 2 files changed, 44 insertions(+), 35 deletions(-) diff --git a/fluent-package/Gemfile b/fluent-package/Gemfile index f047dcd3c..97627dafe 100644 --- a/fluent-package/Gemfile +++ b/fluent-package/Gemfile @@ -15,21 +15,21 @@ source "https://rubygems.org" no_fat_gem = [:ruby] gem "rake" gem "bundler", BUNDLER_VERSION -gem "cool.io", "1.9.0", platforms: no_fat_gem +gem "cool.io", "1.9.3", platforms: no_fat_gem gem "sigdump", "0.2.5" -gem "http_parser.rb", "0.8.0" +gem "http_parser.rb", "0.8.1" gem "yajl-ruby", "1.4.3" gem "serverengine", "2.4.0" gem "msgpack", "1.8.0" gem "oj", "3.16.11" gem "tzinfo", "2.0.6" -gem "tzinfo-data", "1.2025.2" +gem "tzinfo-data", "1.2025.3" # Fluentd v1.19.0 requires io-event 1.10.x or before. # The dependency condition cannot be met with async >= 2.25 gem "async", "2.24.0" gem "async-http", "0.89.0" -gem "webrick", "1.9.1" +gem "webrick", "1.9.2" if ENV["INSTALL_GEM_FROM_LOCAL_REPO"] # During build process, pre-built fluentd gem will be installed @@ -88,7 +88,7 @@ gem "opensearch-ruby", "3.4.0" gem "fluent-plugin-opensearch", "1.1.5" gem "fluent-plugin-fluent-package-update-notifier", "0.2.3" gem "fluent-plugin-obsolete-plugins", "0.2.2" -gem "fluent-plugin-opentelemetry", "0.4.0" +gem "fluent-plugin-opentelemetry", "0.5.1" windows_platforms = [:mingw, :x64_mingw] # :mswin # ffi-win32-extensions doesn't support ffi 1.17.1 or later @@ -104,11 +104,11 @@ gem "win32-ipc", "0.7.0", platforms: windows_platforms gem "winevt_c", "0.11.2", 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.1", platforms: windows_platforms +gem "fluent-plugin-windows-eventlog", "0.9.2", platforms: windows_platforms gem "fluent-plugin-windows-exporter", "1.0.0", platforms: windows_platforms not_windows_platforms = [:ruby] -gem "capng_c", "0.2.3", platforms: not_windows_platforms +gem "capng_c", "0.2.4", platforms: not_windows_platforms # Use newer bundled rdkafka with librdkafka 2.8.0 to support AlmaLinux 10 # (librdkafka 2.8.0 supports "OpenSSL without the ENGINE component") # librdkafka 2.8.0 can't be built on CentOS 7. diff --git a/fluent-package/Gemfile.lock b/fluent-package/Gemfile.lock index f660ec7a8..357c40bce 100644 --- a/fluent-package/Gemfile.lock +++ b/fluent-package/Gemfile.lock @@ -9,10 +9,10 @@ GIT GIT remote: https://github.com/fluent/fluentd - revision: efdc4dca81c23480c9b55e13e55de6aa925b1cf5 - ref: efdc4dca81c23480c9b55e13e55de6aa925b1cf5 + revision: 76841666b4e4aade23f0c100a7e048995f7d52c8 + ref: 76841666b4e4aade23f0c100a7e048995f7d52c8 specs: - fluentd (1.19.1) + fluentd (1.19.2) async-http (~> 0.86) base64 (~> 0.2) bundler @@ -24,12 +24,14 @@ GIT http_parser.rb (>= 0.5.1, < 0.9.0) logger (~> 1.6) msgpack (>= 1.3.1, < 2.0.0) + net-http (~> 0.8) + ostruct (~> 0.6) serverengine (>= 2.3.2, < 3.0.0) sigdump (~> 0.2.5) strptime (>= 0.2.4, < 1.0.0) tzinfo (>= 1.0, < 3.0) tzinfo-data (~> 1.0) - uri (~> 1.0, < 1.1.0) + uri (~> 1.0) webrick (~> 1.4) win32-event (~> 0.6.3) win32-ipc (~> 0.7.0) @@ -40,8 +42,8 @@ GIT GEM remote: https://rubygems.org/ specs: - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + addressable (2.8.8) + public_suffix (>= 2.0.2, < 8.0) async (2.24.0) console (~> 1.29) fiber-annotation @@ -58,7 +60,7 @@ GEM protocol-http1 (~> 0.30) protocol-http2 (~> 0.22) traces (~> 0.10) - async-pool (0.11.0) + async-pool (0.11.1) async (>= 2.0) aws-eventstream (1.4.0) aws-partitions (1.1150.0) @@ -85,16 +87,16 @@ GEM base64 (0.3.0) bigdecimal (3.2.3) bindata (2.4.15) - capng_c (0.2.3) + capng_c (0.2.4) certstore_c (0.1.7) cmetrics (0.3.3) mini_portile2 (~> 2.7) - concurrent-ruby (1.3.5) + concurrent-ruby (1.3.6) console (1.33.0) fiber-annotation fiber-local (~> 1.1) json - cool.io (1.9.0) + cool.io (1.9.3) csv (3.3.5) digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) @@ -108,7 +110,7 @@ GEM elasticsearch-api (= 8.19.2) elasticsearch-api (8.19.2) multi_json - excon (1.3.1) + excon (1.3.2) logger faraday (2.13.4) faraday-net_http (>= 2.0, < 3.5) @@ -117,8 +119,8 @@ GEM faraday-excon (2.3.0) excon (>= 1.0.0) faraday (>= 2.11.0, < 3) - faraday-net_http (3.4.1) - net-http (>= 0.5.0) + faraday-net_http (3.4.2) + net-http (~> 0.5) faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) faraday (>= 2.0, < 3) @@ -167,11 +169,13 @@ GEM faraday_middleware-aws-sigv4 (~> 1.0.1) fluentd (>= 0.14.22) opensearch-ruby (>= 3.0.1) - fluent-plugin-opentelemetry (0.4.0) + fluent-plugin-opentelemetry (0.5.1) async-http (~> 0.88) excon (~> 1.2) fluentd (~> 1.18) + get_process_mem (~> 1.0) google-protobuf (~> 4.30) + sys-proctable (~> 1.3) fluent-plugin-parser-winevt_xml (0.2.8) base64 (~> 0.2) csv (~> 3.2) @@ -205,13 +209,16 @@ GEM fluent-plugin-webhdfs (1.6.0) fluentd (>= 0.14.22) webhdfs (>= 0.11.0) - fluent-plugin-windows-eventlog (0.9.1) + fluent-plugin-windows-eventlog (0.9.2) fluentd (>= 0.14.12, < 2) win32-eventlog winevt_c (>= 0.11.0) fluent-plugin-windows-exporter (1.0.0) bindata (~> 2.4) fluentd (>= 0.14.10, < 2) + get_process_mem (1.0.0) + bigdecimal (>= 2.0) + ffi (~> 1.0) google-protobuf (4.32.1-aarch64-linux-gnu) bigdecimal rake (>= 13) @@ -222,7 +229,7 @@ GEM bigdecimal rake (>= 13) hirb (0.7.3) - http_parser.rb (0.8.0) + http_parser.rb (0.8.1) httpclient (2.9.0) mutex_m io-endpoint (0.15.2) @@ -239,8 +246,8 @@ GEM msgpack (1.8.0) multi_json (1.17.0) mutex_m (0.3.0) - net-http (0.6.0) - uri + 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) @@ -290,7 +297,9 @@ GEM net-telnet sfl strptime (0.2.5) - systemd-journal (2.1.1) + sys-proctable (1.3.0) + ffi (~> 1.1) + systemd-journal (2.1.2) ffi (~> 1.9) td (0.19.1) csv @@ -316,12 +325,12 @@ GEM traces (0.18.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2025.2) + tzinfo-data (1.2025.3) tzinfo (>= 1.0.0) uri (1.0.4) webhdfs (0.11.0) addressable - webrick (1.9.1) + webrick (1.9.2) win32-event (0.6.3) win32-ipc (>= 0.6.0) win32-eventlog (0.6.7) @@ -349,9 +358,9 @@ DEPENDENCIES aws-sdk-sqs (= 1.101.0) aws-sigv4 (= 1.12.1) bundler (= 2.3.27) - capng_c (= 0.2.3) + capng_c (= 0.2.4) cmetrics (= 0.3.3) - cool.io (= 1.9.0) + cool.io (= 1.9.3) digest-murmurhash (= 1.1.1) elasticsearch (= 8.19.2) ffi (= 1.17.0) @@ -365,7 +374,7 @@ DEPENDENCIES fluent-plugin-metrics-cmetrics (= 0.1.2) fluent-plugin-obsolete-plugins (= 0.2.2) fluent-plugin-opensearch (= 1.1.5) - fluent-plugin-opentelemetry (= 0.4.0) + fluent-plugin-opentelemetry (= 0.5.1) fluent-plugin-parser-winevt_xml (= 0.2.8) fluent-plugin-prometheus (= 2.2.1) fluent-plugin-prometheus_pushgateway (= 0.2.1) @@ -377,10 +386,10 @@ DEPENDENCIES fluent-plugin-td (= 1.2.0) fluent-plugin-utmpx (= 0.5.0) fluent-plugin-webhdfs (= 1.6.0) - fluent-plugin-windows-eventlog (= 0.9.1) + fluent-plugin-windows-eventlog (= 0.9.2) fluent-plugin-windows-exporter (= 1.0.0) fluentd! - http_parser.rb (= 0.8.0) + http_parser.rb (= 0.8.1) httpclient (= 2.9.0) jmespath (= 1.6.2) mini_portile2 (= 2.8.9) @@ -397,9 +406,9 @@ DEPENDENCIES td (= 0.19.1) td-client (= 3.0.0) tzinfo (= 2.0.6) - tzinfo-data (= 1.2025.2) + tzinfo-data (= 1.2025.3) webhdfs (= 0.11.0) - webrick (= 1.9.1) + webrick (= 1.9.2) win32-event (= 0.6.3) win32-eventlog (= 0.6.7) win32-ipc (= 0.7.0) From 0be9f9521f497b77d5fbd5cab6109764fd59ea1e Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 13 Feb 2026 14:54:14 +0900 Subject: [PATCH 04/12] msi: update builder ruby version Signed-off-by: Kentaro Hayashi --- fluent-package/msi/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fluent-package/msi/Dockerfile b/fluent-package/msi/Dockerfile index a064784f3..9a7ce7aca 100644 --- a/fluent-package/msi/Dockerfile +++ b/fluent-package/msi/Dockerfile @@ -32,7 +32,7 @@ RUN \ # Required CMake 3.x to build cmetrics gem choco install -y cmake --version=3.31.6 --installargs 'ADD_CMAKE_TO_PATH=System' && \ choco install -y msys2 --params /NoUpdate --version=20250221.0.0 && \ - choco install ruby -y --version=3.4.4.2 && \ + choco install ruby -y --version=3.4.8.1 && \ refreshenv && \ ridk install 3 && \ gem install --no-document --force bundler builder From 3fa42f06bf6850e2693c7b24939da383f1f82738 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 13 Feb 2026 15:22:57 +0900 Subject: [PATCH 05/12] Update test patch for v7.0.0 Signed-off-by: Kentaro Hayashi --- fluent-package/bump-version-v7.patch | 56 +++++++++++----------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/fluent-package/bump-version-v7.patch b/fluent-package/bump-version-v7.patch index 981487b8d..bca17e56a 100644 --- a/fluent-package/bump-version-v7.patch +++ b/fluent-package/bump-version-v7.patch @@ -1,51 +1,50 @@ -From 5eaeb61c45f17b38f537b4207648f6b254987e30 Mon Sep 17 00:00:00 2001 -From: Shizuo Fujita -Date: Fri, 25 Jul 2025 11:09:35 +0900 +From c8d4773262556bcd0ba7b47f67efcd3d30b6946d Mon Sep 17 00:00:00 2001 +From: Kentaro Hayashi +Date: Fri, 13 Feb 2026 15:21:38 +0900 Subject: [PATCH] Bump version to v7.0.0 -Signed-off-by: Shizuo Fujita +Signed-off-by: Kentaro Hayashi --- fluent-package/config.rb | 10 +++++----- fluent-package/debian/changelog | 6 ++++++ - fluent-package/msi/Dockerfile | 2 +- fluent-package/yum/fluent-package.spec.in | 3 +++ - 4 files changed, 15 insertions(+), 6 deletions(-) + 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/fluent-package/config.rb b/fluent-package/config.rb -index c681f3b4..efcdc09e 100644 +index bbecffb..ddc0dec 100644 --- a/fluent-package/config.rb +++ b/fluent-package/config.rb @@ -1,5 +1,5 @@ PACKAGE_NAME = "fluent-package" --PACKAGE_VERSION = "6.0.1" +-PACKAGE_VERSION = "6.0.2" +PACKAGE_VERSION = "7.0.0" # Keep internal path (/opt/td-agent) for package name migration SERVICE_NAME = "fluentd" -@@ -23,8 +23,8 @@ +@@ -23,8 +23,8 @@ OPENSSL_FOR_MACOS_SHA256SUM = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d BUNDLER_VERSION= "2.3.27" # https://www.ruby-lang.org/en/downloads/ (tar.gz) --BUNDLED_RUBY_VERSION = "3.4.7" --BUNDLED_RUBY_SOURCE_SHA256SUM = "23815a6d095696f7919090fdc3e2f9459b2c83d57224b2e446ce1f5f7333ef36" -+BUNDLED_RUBY_VERSION = "3.3.8" -+BUNDLED_RUBY_SOURCE_SHA256SUM = "5ae28a87a59a3e4ad66bc2931d232dbab953d0aa8f6baf3bc4f8f80977c89cab" +-BUNDLED_RUBY_VERSION = "3.4.8" +-BUNDLED_RUBY_SOURCE_SHA256SUM = "53c4ddad41fbb6189f1f5ee0db57a51d54bd1f87f8755b3d68604156a35b045b" ++BUNDLED_RUBY_VERSION = "4.0.1" ++BUNDLED_RUBY_SOURCE_SHA256SUM = "3924be2d05db30f4e35f859bf028be85f4b7dd01714142fd823e4af5de2faf9d" BUNDLED_RUBY_PATCHES = [ # An example entry: -@@ -32,8 +32,8 @@ +@@ -32,8 +32,8 @@ BUNDLED_RUBY_PATCHES = [ ] # https://rubyinstaller.org/downloads/ (7-ZIP ARCHIVES) --BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.7-1" --BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "955678a8373c23e53032ac10f730a06120c7d3b956074020e57ca8b99b8930d4" -+BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.3.8-1" -+BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "2aa7d8fa7bc527b7373b91c75fae9549f5926fa918ba808b8744c1f0d8ad9f52" +-BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.8-1" +-BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "d1c3ba83ae748c08e35e0b1d9939d45dbca7925e0a8bf84a42860bf19847e0d6" ++BUNDLED_RUBY_INSTALLER_X64_VERSION = "4.0.1-1" ++BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "45cd5ac6aa0fdd976acbc0b0c768e38e8f5357b1b07d2c803cccafd7de758fb1" # 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 f2828f27..6ede1213 100644 +index 56073b5..3c760ab 100644 --- a/fluent-package/debian/changelog +++ b/fluent-package/debian/changelog @@ -1,3 +1,9 @@ @@ -55,24 +54,11 @@ index f2828f27..6ede1213 100644 + + -- Shizuo Fujita Sun, 29 Aug 2027 13:55:06 -0000 + - fluent-package (6.0.1-1) unstable; urgency=low + fluent-package (6.0.2-1) unstable; urgency=low * New upstream release. -diff --git a/fluent-package/msi/Dockerfile b/fluent-package/msi/Dockerfile -index a064784f..99c36c67 100644 ---- a/fluent-package/msi/Dockerfile -+++ b/fluent-package/msi/Dockerfile -@@ -32,7 +32,7 @@ RUN \ - # Required CMake 3.x to build cmetrics gem - choco install -y cmake --version=3.31.6 --installargs 'ADD_CMAKE_TO_PATH=System' && \ - choco install -y msys2 --params /NoUpdate --version=20250221.0.0 && \ -- choco install ruby -y --version=3.4.4.2 && \ -+ choco install ruby -y --version=3.3.8.1 && \ - refreshenv && \ - ridk install 3 && \ - gem install --no-document --force bundler builder diff --git a/fluent-package/yum/fluent-package.spec.in b/fluent-package/yum/fluent-package.spec.in -index 47d5404c..d4f56f43 100644 +index 9e3e81f..a663057 100644 --- a/fluent-package/yum/fluent-package.spec.in +++ b/fluent-package/yum/fluent-package.spec.in @@ -448,6 +448,9 @@ fi @@ -82,7 +68,7 @@ index 47d5404c..d4f56f43 100644 +* Sun Aug 29 2027 Shizuo Fujita - 7.0.0-1 +- New upstream release. + - * Tue Nov 11 2025 Shizuo Fujita - 6.0.1-1 + * Fri Feb 27 2026 Kentaro Hayashi - 6.0.2-1 - New upstream release. -- From 72fc57ee91e949d833ca4646f13e576efe51d00b Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Sat, 14 Feb 2026 21:51:55 +0900 Subject: [PATCH 06/12] yum: use latest releasever explicitly There is a case that releasever is bound to old one in incus container images. It causes mismatch of runtime API in some libraries (e.g. OpenSSL 3.0 vs OpenSSL 3.2 for AL2023) Signed-off-by: Kentaro Hayashi --- .../yum/systemd-test/update-to-next-major-version.sh | 5 +++++ .../systemd-test/update-to-next-version-service-status.sh | 5 +++++ .../update-to-next-version-with-auto-and-manual.sh | 5 +++++ .../update-to-next-version-with-backward-compat-for-v4.sh | 5 +++++ fluent-package/yum/systemd-test/update-to-next-version.sh | 5 +++++ fluent-package/yum/systemd-test/update-without-data-lost.sh | 5 +++++ 6 files changed, 30 insertions(+) diff --git a/fluent-package/yum/systemd-test/update-to-next-major-version.sh b/fluent-package/yum/systemd-test/update-to-next-major-version.sh index bf2c31a87..13e17c767 100755 --- a/fluent-package/yum/systemd-test/update-to-next-major-version.sh +++ b/fluent-package/yum/systemd-test/update-to-next-major-version.sh @@ -4,6 +4,11 @@ set -exu . $(dirname $0)/common.sh +if [ "$distribution" = "amazon" ]; then + sudo $DNF repolist -v + sudo $DNF --releasever=latest update -y +fi + service_restart=$1 status_before_update=$2 # active / inactive diff --git a/fluent-package/yum/systemd-test/update-to-next-version-service-status.sh b/fluent-package/yum/systemd-test/update-to-next-version-service-status.sh index 4bda239a6..f511e2a87 100755 --- a/fluent-package/yum/systemd-test/update-to-next-version-service-status.sh +++ b/fluent-package/yum/systemd-test/update-to-next-version-service-status.sh @@ -4,6 +4,11 @@ set -exu . $(dirname $0)/common.sh +if [ "$distribution" = "amazon" ]; then + sudo $DNF repolist -v + sudo $DNF --releasever=latest update -y +fi + enabled_before_update=$1 # enabled / disabled status_before_update=$2 # active / inactive diff --git a/fluent-package/yum/systemd-test/update-to-next-version-with-auto-and-manual.sh b/fluent-package/yum/systemd-test/update-to-next-version-with-auto-and-manual.sh index c4c5a02dd..020db2b6a 100755 --- a/fluent-package/yum/systemd-test/update-to-next-version-with-auto-and-manual.sh +++ b/fluent-package/yum/systemd-test/update-to-next-version-with-auto-and-manual.sh @@ -4,6 +4,11 @@ set -exu . $(dirname $0)/common.sh +if [ "$distribution" = "amazon" ]; then + sudo $DNF repolist -v + sudo $DNF --releasever=latest update -y +fi + package="/host/${distribution}/${DISTRIBUTION_VERSION}/x86_64/Packages/fluent-package-[0-9]*.rpm" # Make a dummy pacakge for the next version diff --git a/fluent-package/yum/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh b/fluent-package/yum/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh index 8f76de349..db1e92c5b 100755 --- a/fluent-package/yum/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh +++ b/fluent-package/yum/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh @@ -4,6 +4,11 @@ set -exu . $(dirname $0)/common.sh +if [ "$distribution" = "amazon" ]; then + sudo $DNF repolist -v + sudo $DNF --releasever=latest update -y +fi + install_v4 sudo systemctl enable --now td-agent systemctl status --no-pager td-agent diff --git a/fluent-package/yum/systemd-test/update-to-next-version.sh b/fluent-package/yum/systemd-test/update-to-next-version.sh index 4cc930d8b..f917f85b4 100755 --- a/fluent-package/yum/systemd-test/update-to-next-version.sh +++ b/fluent-package/yum/systemd-test/update-to-next-version.sh @@ -4,6 +4,11 @@ set -exu . $(dirname $0)/common.sh +if [ "$distribution" = "amazon" ]; then + sudo $DNF repolist -v + sudo $DNF --releasever=latest update -y +fi + # Install the current package="/host/${distribution}/${DISTRIBUTION_VERSION}/x86_64/Packages/fluent-package-[0-9]*.rpm" sudo $DNF install -y $package diff --git a/fluent-package/yum/systemd-test/update-without-data-lost.sh b/fluent-package/yum/systemd-test/update-without-data-lost.sh index afc29d2d6..dda3d4b66 100755 --- a/fluent-package/yum/systemd-test/update-without-data-lost.sh +++ b/fluent-package/yum/systemd-test/update-without-data-lost.sh @@ -4,6 +4,11 @@ set -exu . $(dirname $0)/common.sh +if [ "$distribution" = "amazon" ]; then + sudo $DNF repolist -v + sudo $DNF --releasever=latest update -y +fi + v6_package="/host/${distribution}/${DISTRIBUTION_VERSION}/x86_64/Packages/fluent-package-*.rpm" v7_package="/host/v7-test/${distribution}/${DISTRIBUTION_VERSION}/x86_64/Packages/fluent-package-*.rpm" From 5c036d73e8b79bed514945a62f63e372cdf97f13 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Tue, 17 Feb 2026 11:36:52 +0900 Subject: [PATCH 07/12] Update s3 related gems It will fix CVE-2025-14762 Name: aws-sdk-s3 Version: 1.197.0 CVE: CVE-2025-14762 GHSA: GHSA-2xgq-q749-89fq Criticality: Medium URL: https://github.com/aws/aws-sdk-ruby/security/advisories/GHSA-2xgq-q749-89fq Title: AWS SDK for Ruby's S3 Encryption Client has a Key Commitment Issue Solution: update to '>= 1.208.0' Signed-off-by: Kentaro Hayashi --- fluent-package/Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fluent-package/Gemfile b/fluent-package/Gemfile index 97627dafe..f160a702b 100644 --- a/fluent-package/Gemfile +++ b/fluent-package/Gemfile @@ -64,11 +64,11 @@ gem "fluent-plugin-prometheus", "2.2.1" gem "fluent-plugin-prometheus_pushgateway", "0.2.1" gem "jmespath", "1.6.2" gem "aws-partitions", "1.1150.0" -gem "aws-sdk-core", "3.230.0" +gem "aws-sdk-core", "3.234.0" gem "aws-sdk-kms", "1.110.0" gem "aws-sdk-sqs", "1.101.0" gem "aws-sigv4", "1.12.1" -gem "aws-sdk-s3", "1.197.0" +gem "aws-sdk-s3", "1.208.0" gem "fluent-plugin-s3", "1.8.3" gem "httpclient", "2.9.0" gem "fluent-diagtool", "1.0.5" From d7b881044b9e3b72b3e29a65a96785fa7db5a6fd Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Tue, 17 Feb 2026 12:05:26 +0900 Subject: [PATCH 08/12] Update lockfile for aws gems Signed-off-by: Kentaro Hayashi --- fluent-package/Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fluent-package/Gemfile.lock b/fluent-package/Gemfile.lock index 357c40bce..18135d9bd 100644 --- a/fluent-package/Gemfile.lock +++ b/fluent-package/Gemfile.lock @@ -64,7 +64,7 @@ GEM async (>= 2.0) aws-eventstream (1.4.0) aws-partitions (1.1150.0) - aws-sdk-core (3.230.0) + aws-sdk-core (3.234.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -75,8 +75,8 @@ GEM aws-sdk-kms (1.110.0) aws-sdk-core (~> 3, >= 3.228.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.197.0) - aws-sdk-core (~> 3, >= 3.228.0) + aws-sdk-s3 (1.208.0) + aws-sdk-core (~> 3, >= 3.234.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) aws-sdk-sqs (1.101.0) @@ -352,9 +352,9 @@ DEPENDENCIES async (= 2.24.0) async-http (= 0.89.0) aws-partitions (= 1.1150.0) - aws-sdk-core (= 3.230.0) + aws-sdk-core (= 3.234.0) aws-sdk-kms (= 1.110.0) - aws-sdk-s3 (= 1.197.0) + aws-sdk-s3 (= 1.208.0) aws-sdk-sqs (= 1.101.0) aws-sigv4 (= 1.12.1) bundler (= 2.3.27) From ce0cc834a7a618de774c98f83fa91143083264b6 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Tue, 17 Feb 2026 14:13:40 +0900 Subject: [PATCH 09/12] Update indirect dependency to faraday CVE: CVE-2026-25765 GHSA: GHSA-33mh-2634-fwr2 Criticality: Medium URL: https://github.com/lostisland/faraday/security/advisories/GHSA-33mh-2634-fwr2 Title: Faraday affected by SSRF via protocol-relative URL host override in build_exclusive_url Solution: update to '~> 1.10.5', '>= 2.14.1' Signed-off-by: Kentaro Hayashi --- fluent-package/Gemfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fluent-package/Gemfile b/fluent-package/Gemfile index f160a702b..e8fce8f68 100644 --- a/fluent-package/Gemfile +++ b/fluent-package/Gemfile @@ -90,6 +90,9 @@ gem "fluent-plugin-fluent-package-update-notifier", "0.2.3" gem "fluent-plugin-obsolete-plugins", "0.2.2" gem "fluent-plugin-opentelemetry", "0.5.1" +# fix CVE-2026-25765 for elasticseach and opensearch +gem "faraday", "2.14.1" + 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 From ca17d811eeedc9b6dc6774077eab9e9d2e594ab0 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Tue, 17 Feb 2026 15:33:55 +0900 Subject: [PATCH 10/12] Update lockfile for faraday Signed-off-by: Kentaro Hayashi --- fluent-package/Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fluent-package/Gemfile.lock b/fluent-package/Gemfile.lock index 18135d9bd..7b22a5171 100644 --- a/fluent-package/Gemfile.lock +++ b/fluent-package/Gemfile.lock @@ -112,7 +112,7 @@ GEM multi_json excon (1.3.2) logger - faraday (2.13.4) + faraday (2.14.1) faraday-net_http (>= 2.0, < 3.5) json logger @@ -363,6 +363,7 @@ DEPENDENCIES cool.io (= 1.9.3) digest-murmurhash (= 1.1.1) elasticsearch (= 8.19.2) + faraday (= 2.14.1) ffi (= 1.17.0) ffi-win32-extensions (= 1.1.0) fiddle (= 1.1.8) From bb57c662c4991fbd70cf59eafc21265d5d2d500e Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 25 Feb 2026 10:49:15 +0900 Subject: [PATCH 11/12] ci: use latest releasever explicitly GitHub#977 introduce test case for update error if working directory is missing, but it lack to update latest releasever. There is a case that releasever is bound to old one in incus container images. It causes mismatch of runtime API in some libraries (e.g. OpenSSL 3.0 vs OpenSSL 3.2 for AL2023) Signed-off-by: Kentaro Hayashi --- .../yum/systemd-test/downgrade-to-v6-lts-tmpfiles.sh | 5 +++++ fluent-package/yum/systemd-test/tmpfiles.sh | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/fluent-package/yum/systemd-test/downgrade-to-v6-lts-tmpfiles.sh b/fluent-package/yum/systemd-test/downgrade-to-v6-lts-tmpfiles.sh index f1224d39a..c00bd8c94 100755 --- a/fluent-package/yum/systemd-test/downgrade-to-v6-lts-tmpfiles.sh +++ b/fluent-package/yum/systemd-test/downgrade-to-v6-lts-tmpfiles.sh @@ -4,6 +4,11 @@ set -exu . $(dirname $0)/common.sh +if [ "$distribution" = "amazon" ]; then + sudo $DNF repolist -v + sudo $DNF --releasever=latest update -y +fi + # Display unit info for debug sudo systemctl cat systemd-tmpfiles-clean.service sudo systemctl cat systemd-tmpfiles-clean.timer diff --git a/fluent-package/yum/systemd-test/tmpfiles.sh b/fluent-package/yum/systemd-test/tmpfiles.sh index bdebdbb3b..24e90ff2f 100755 --- a/fluent-package/yum/systemd-test/tmpfiles.sh +++ b/fluent-package/yum/systemd-test/tmpfiles.sh @@ -4,6 +4,11 @@ set -exu . $(dirname $0)/common.sh +if [ "$distribution" = "amazon" ]; then + sudo $DNF repolist -v + sudo $DNF --releasever=latest update -y +fi + # Display unit info for debug sudo systemctl cat systemd-tmpfiles-clean.service sudo systemctl cat systemd-tmpfiles-clean.timer From 113a7fb2e202fa987f3d206c2d1edb5f199ceb07 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 13 Feb 2026 14:58:18 +0900 Subject: [PATCH 12/12] Add v6.0.2 changelog Signed-off-by: Kentaro Hayashi --- CHANGELOG.md | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e953dd229..5e3eec9e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,73 @@ About the past changelog entries, see [CHANGELOG v4](CHANGELOG-v4.md) [CHANGELOG v5](CHANGELOG-v5.md) instead. +## Release v6.0.2 - 2026/02/27 + +### News + +* Update Ruby to 3.4.8 +* Update fluentd to 1.19.2 +* Update bundled gems +* rpm: fixed update error if working directory was removed (#955) +* Update aws-sdk-s3 to fix CVE-2025-14762 explicitly +* Update faraday to fix CVE-2026-25765 explicitly + +### Core component + +* ruby v3.4.8 (update) +* jemalloc v3.6.0 +* OpenSSL 3.6.0 Windows +* OpenSSL 3.0.8 macOS +* gems + * fluentd v1.19.2 (update) + * msgpack 1.8.0 + * 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 (update) +* aws-sdk-kms v1.110.0 +* aws-sdk-s3 v1.208.0 (update) +* 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.5 +* 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.5 +* fluent-plugin-opentelemetry 0.5.1 (update) +* fluent-plugin-prometheus v2.2.1 +* 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.3 +* 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.21.0 +* 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.2 +* nokogiri v1.18.10 + ## Release v6.0.1 - 2025/11/11 ### News