Skip to content

Commit 5708573

Browse files
committed
Update a patch for v7 test
Signed-off-by: Shizuo Fujita <[email protected]>
1 parent 84afb34 commit 5708573

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed
Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1f249c067ff43a5a181856a9646719d333cc1083 Mon Sep 17 00:00:00 2001
1+
From 5eaeb61c45f17b38f537b4207648f6b254987e30 Mon Sep 17 00:00:00 2001
22
From: Shizuo Fujita <[email protected]>
33
Date: Fri, 25 Jul 2025 11:09:35 +0900
44
Subject: [PATCH] Bump version to v7.0.0
@@ -8,16 +8,16 @@ Signed-off-by: Shizuo Fujita <[email protected]>
88
fluent-package/config.rb | 10 +++++-----
99
fluent-package/debian/changelog | 6 ++++++
1010
fluent-package/msi/Dockerfile | 2 +-
11-
fluent-package/yum/fluent-package.spec.in | 5 ++++-
12-
4 files changed, 16 insertions(+), 7 deletions(-)
11+
fluent-package/yum/fluent-package.spec.in | 3 +++
12+
4 files changed, 15 insertions(+), 6 deletions(-)
1313

1414
diff --git a/fluent-package/config.rb b/fluent-package/config.rb
15-
index 5aa9799..fd6e938 100644
15+
index c681f3b4..efcdc09e 100644
1616
--- a/fluent-package/config.rb
1717
+++ b/fluent-package/config.rb
1818
@@ -1,5 +1,5 @@
1919
PACKAGE_NAME = "fluent-package"
20-
-PACKAGE_VERSION = "6.0.0"
20+
-PACKAGE_VERSION = "6.0.1"
2121
+PACKAGE_VERSION = "7.0.0"
2222

2323
# Keep internal path (/opt/td-agent) for package name migration
@@ -26,8 +26,8 @@ index 5aa9799..fd6e938 100644
2626
BUNDLER_VERSION= "2.3.27"
2727

2828
# https://www.ruby-lang.org/en/downloads/ (tar.gz)
29-
-BUNDLED_RUBY_VERSION = "3.4.5"
30-
-BUNDLED_RUBY_SOURCE_SHA256SUM = "1d88d8a27b442fdde4aa06dc99e86b0bbf0b288963d8433112dd5fac798fd5ee"
29+
-BUNDLED_RUBY_VERSION = "3.4.7"
30+
-BUNDLED_RUBY_SOURCE_SHA256SUM = "23815a6d095696f7919090fdc3e2f9459b2c83d57224b2e446ce1f5f7333ef36"
3131
+BUNDLED_RUBY_VERSION = "3.3.8"
3232
+BUNDLED_RUBY_SOURCE_SHA256SUM = "5ae28a87a59a3e4ad66bc2931d232dbab953d0aa8f6baf3bc4f8f80977c89cab"
3333

@@ -37,15 +37,15 @@ index 5aa9799..fd6e938 100644
3737
]
3838

3939
# https://rubyinstaller.org/downloads/ (7-ZIP ARCHIVES)
40-
-BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.5-1"
41-
-BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "61634b204f808deec191a6819e4c25c7b3005d84537b24c4fbe7c604aeece89f"
40+
-BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.7-1"
41+
-BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "955678a8373c23e53032ac10f730a06120c7d3b956074020e57ca8b99b8930d4"
4242
+BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.3.8-1"
4343
+BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "2aa7d8fa7bc527b7373b91c75fae9549f5926fa918ba808b8744c1f0d8ad9f52"
4444

4545
# Files under rubyinstaller/ are patches for RubyInstaller's binary package.
4646
# Other patches for Ruby's source tree which can be shared with BUNDLED_RUBY_PATCHES.
4747
diff --git a/fluent-package/debian/changelog b/fluent-package/debian/changelog
48-
index 2614fac..95eb903 100644
48+
index f2828f27..6ede1213 100644
4949
--- a/fluent-package/debian/changelog
5050
+++ b/fluent-package/debian/changelog
5151
@@ -1,3 +1,9 @@
@@ -55,11 +55,11 @@ index 2614fac..95eb903 100644
5555
+
5656
+ -- Shizuo Fujita <[email protected]> Sun, 29 Aug 2027 13:55:06 -0000
5757
+
58-
fluent-package (6.0.0-1) unstable; urgency=low
58+
fluent-package (6.0.1-1) unstable; urgency=low
5959

6060
* New upstream release.
6161
diff --git a/fluent-package/msi/Dockerfile b/fluent-package/msi/Dockerfile
62-
index a064784..99c36c6 100644
62+
index a064784f..99c36c67 100644
6363
--- a/fluent-package/msi/Dockerfile
6464
+++ b/fluent-package/msi/Dockerfile
6565
@@ -32,7 +32,7 @@ RUN \
@@ -72,21 +72,19 @@ index a064784..99c36c6 100644
7272
ridk install 3 && \
7373
gem install --no-document --force bundler builder
7474
diff --git a/fluent-package/yum/fluent-package.spec.in b/fluent-package/yum/fluent-package.spec.in
75-
index 34f0060..eb970f0 100644
75+
index 47d5404c..d4f56f43 100644
7676
--- a/fluent-package/yum/fluent-package.spec.in
7777
+++ b/fluent-package/yum/fluent-package.spec.in
78-
@@ -437,7 +437,10 @@ fi
78+
@@ -448,6 +448,9 @@ fi
7979
# NOTE: %{_tmpfilesdir} is available since CentOS 7
8080
%attr(0755,fluentd,fluentd) %dir /tmp/@PACKAGE_DIR@
8181
%changelog
82-
-* Fri Aug 29 2025 Kentaro Hayashi <[email protected]> - 6.0.0-1
83-
+* Sun Aug 29 2027 Shizuo Fujita <[email protected]> - 6.0.0-1
82+
+* Sun Aug 29 2027 Shizuo Fujita <[email protected]> - 7.0.0-1
8483
+- New upstream release.
8584
+
86-
+* Tue Aug 29 2025 Kentaro Hayashi <hayashi@clear-code.com> - 6.0.0-1
85+
* Tue Nov 11 2025 Shizuo Fujita <fujita@clear-code.com> - 6.0.1-1
8786
- New upstream release.
8887

89-
* Sat Dec 14 2024 Kentaro Hayashi <[email protected]> - 5.2.0-1
9088
--
91-
2.50.1
89+
2.51.0
9290

0 commit comments

Comments
 (0)