From 7088a71e71256efe5cd0ac6d56923bcb4bcd8974 Mon Sep 17 00:00:00 2001 From: Takuro Ashie Date: Fri, 24 Jun 2022 14:29:10 +0900 Subject: [PATCH] td-agent v4.3.2 Signed-off-by: Takuro Ashie --- CHANGELOG.md | 17 +++++++++++++++++ td-agent/Gemfile | 2 +- td-agent/Gemfile.lock | 22 +++++++++++----------- td-agent/config.rb | 8 ++++---- td-agent/debian/changelog | 6 ++++++ td-agent/yum/td-agent.spec.in | 3 +++ 6 files changed, 42 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5b6a3aef..1e5765839 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Treasure Agent 4 changelog +## Release v4.3.2 - 2022/06/28 + +### News + +This release is mainly for supporting new distributions released in 2022Q2. +We choose Ruby 3.1 to bundle for such new distributions to adopt to recent +environment such as OpenSSL 3.0. For other distributions, we still use +Ruby 2.7. We'll migrate to Ruby 3 completely after Ruby 3.2 is released. + +* Support new distributions + * Red Hat Enterprise Linux 9 + * Ubuntu 22.04 LTS (Jammy Jellyfish) +* Remove nokogiri from Linux and macOS packages + * It's not used in actual by default on such environments. +* Update yajl-ruby to v1.4.3 to address vulnerability +* Update OpenSSL to 1.1.1p (for macOS and Windows) + ## Release v4.3.1.1 - 2022/05/24 ### News diff --git a/td-agent/Gemfile b/td-agent/Gemfile index 61d179b13..c9ab706b5 100644 --- a/td-agent/Gemfile +++ b/td-agent/Gemfile @@ -12,7 +12,7 @@ gem "bundler", BUNDLER_VERSION gem "cool.io", "1.7.1", platforms: no_fat_gem gem "sigdump", "0.2.4" gem "http_parser.rb", "0.8.0" -gem "yajl-ruby", "1.4.2" +gem "yajl-ruby", "1.4.3" gem "serverengine", '2.2.5' gem "msgpack", "1.5.1" gem "oj", "3.13.11" diff --git a/td-agent/Gemfile.lock b/td-agent/Gemfile.lock index 62b770056..4979b5fdb 100644 --- a/td-agent/Gemfile.lock +++ b/td-agent/Gemfile.lock @@ -40,7 +40,7 @@ GEM protocol-http2 (~> 0.14.0) async-io (1.33.0) async - async-pool (0.3.9) + async-pool (0.3.10) async (>= 1.25) aws-eventstream (1.2.0) aws-partitions (1.577.0) @@ -81,7 +81,7 @@ GEM elasticsearch-api (= 8.1.2) elasticsearch-api (8.1.2) multi_json - excon (0.92.2) + excon (0.92.3) faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -98,8 +98,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -185,14 +185,14 @@ GEM http_parser.rb (0.8.0) httpclient (2.8.3) jmespath (1.6.1) - json (2.6.1) + json (2.6.2) linux-utmpx (0.3.0) bindata (~> 2.4.8) ltsv (0.1.2) mini_portile2 (2.8.0) msgpack (1.5.1) multi_json (1.15.0) - multipart-post (2.1.1) + multipart-post (2.2.3) nio4r (2.5.8) nokogiri (1.13.6-x64-mingw32) racc (~> 1.4) @@ -208,8 +208,8 @@ GEM parallel (1.22.1) prometheus-client (2.1.0) protocol-hpack (1.4.2) - protocol-http (0.22.5) - protocol-http1 (0.14.2) + protocol-http (0.22.6) + protocol-http1 (0.14.4) protocol-http (~> 0.22) protocol-http2 (0.14.2) protocol-hpack (~> 1.4) @@ -248,7 +248,7 @@ GEM td-client (1.0.8) httpclient (>= 2.7) msgpack (>= 0.5.6, < 2) - td-logger (0.3.27) + td-logger (0.3.28) fluent-logger (>= 0.5.0, < 2.0) msgpack (>= 0.5.6, < 2.0) td-client (>= 0.8.66, < 2.0) @@ -277,7 +277,7 @@ GEM win32-api (>= 1.4.5) windows-api (>= 0.4.0) winevt_c (0.9.3) - yajl-ruby (1.4.2) + yajl-ruby (1.4.3) zip-zip (0.3) rubyzip (>= 1.0.0) @@ -353,7 +353,7 @@ DEPENDENCIES windows-api (= 0.4.4) windows-pr (= 1.2.6) winevt_c (= 0.9.3) - yajl-ruby (= 1.4.2) + yajl-ruby (= 1.4.3) BUNDLED WITH 2.3.11 diff --git a/td-agent/config.rb b/td-agent/config.rb index c0096b080..bc283e041 100644 --- a/td-agent/config.rb +++ b/td-agent/config.rb @@ -1,5 +1,5 @@ PACKAGE_NAME = "td-agent" -PACKAGE_VERSION = "4.3.1.1" +PACKAGE_VERSION = "4.3.2" FLUENTD_REVISION = 'c0f48a0080550eff6aa6fa19d269e480684e7a45' # v1.14.6 FLUENTD_LOCAL_GEM_REPO = "file://" + File.expand_path(File.join(__dir__, "local_gem_repo")) @@ -11,11 +11,11 @@ #JEMALLOC_VERSION = "5.2.1" # https://www.openssl.org/source/ -OPENSSL_VERSION = "1.1.1n" +OPENSSL_VERSION = "1.1.1p" # To fix memory leak issue: https://github.com/fluent/fluent-package-builder/issues/374 -MINGW_OPENSSL_VERSION = "1.1.1.o-2" -MINGW_OPENSSL_SHA256SUM = "e1e642d441de3d6b9d4e499b42bb5464458e3a2d2431012b28e6f1ad94099167" +MINGW_OPENSSL_VERSION = "1.1.1.p-1" +MINGW_OPENSSL_SHA256SUM = "1b665a0acc0d84d20e2d5acb454956b10d17078596e360e604cb78bd54f7c915" BUNDLER_VERSION= "2.3.11" diff --git a/td-agent/debian/changelog b/td-agent/debian/changelog index f1db9c720..63bda8715 100644 --- a/td-agent/debian/changelog +++ b/td-agent/debian/changelog @@ -1,3 +1,9 @@ +td-agent (4.3.2-1) unstable; urgency=low + + * New upstream release. + + -- Takuro Ashie Fri, 24 Jun 2022 05:31:56 -0000 + td-agent (4.3.1.1-1) unstable; urgency=low * New upstream release. diff --git a/td-agent/yum/td-agent.spec.in b/td-agent/yum/td-agent.spec.in index 7f3280bdc..ac1d672a6 100644 --- a/td-agent/yum/td-agent.spec.in +++ b/td-agent/yum/td-agent.spec.in @@ -253,6 +253,9 @@ fi # NOTE: %{_tmpfilesdir} is available since CentOS 7 %attr(0755,td-agent,td-agent) %dir /tmp/@PACKAGE@ %changelog +* Fri Jun 24 2022 Takuro Ashie - 4.3.2-1 +- New upstream release. + * Tue May 24 2022 Takuro Ashie - 4.3.1.1-1 - New upstream release.