3cd2ea3699
* Upgrade to Ruby 3.0.7. Resolves: RHEL-35740 The released Ruby 3.0.5 includes the following fix. * Fix HTTP response splitting in CGI. Resolves: RHEL-35741 The released Ruby 3.0.6 includes the following fixes. * Fix ReDoS vulnerability in URI. Resolves: RHEL-35742 * Fix ReDoS vulnerability in Time. Resolves: RHEL-35743 The released Ruby 3.0.7 includes the following fixes. * Fix buffer overread vulnerability in StringIO. Resolves: RHEL-35744 * Fix RCE vulnerability with .rdoc_options in RDoc. Resolves: RHEL-35746 * Fix arbitrary memory address read vulnerability with Regex search. Resolves: RHEL-35747 Replaced the patch ruby-3.0.3-ext-openssl-extconf.rb-require-OpenSSL-version-1.0.1.patch with the tiny patch ruby-ext-openssl-extconf.rb-ignore-OpenSSL-version-check.patch not using the reverse logic. Because it was hard to maintain the patch file, when the included file was updated on the upstream. Added the following patches. * Fix net-http test errors due to expired certificate. The patch ruby-3.4.0-ruby-net-http-Renew-test-certificates.patch was copied from the part on the Fedora rawhide <05a6c9c8f3>. * Fix `TestNetHTTPS#test_session_reuse_but_expire` test failure cause. The patch ruby-3.3.1-Fix-test-session-reuse-but-expire.patch was copied from the part on Fedora rawhide <a34f33bc50>. As a reference, the part comes from Fedora ruby-3.3 branch <99d21ecc4c>.
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From 7e9ec8a20b0f7469b415283d2ec0c22087f8eb2b Mon Sep 17 00:00:00 2001
|
|
From: Jun Aruga <jaruga@redhat.com>
|
|
Date: Wed, 24 Aug 2022 12:02:56 +0200
|
|
Subject: [PATCH] Fix tests with Europe/Amsterdam pre-1970 time on tzdata
|
|
version 2022b.
|
|
|
|
The Time Zone Database (tzdata) changed the pre-1970 timestamps in some zones
|
|
including Europe/Amsterdam on tzdata version 2022b or later.
|
|
See <https://github.com/eggert/tz/commit/35fa37fbbb152f5dbed4fd5edfdc968e3584fe12>.
|
|
|
|
The tzdata RPM package maintainer on Fedora project suggested changing the Ruby
|
|
test, because the change is intentional.
|
|
See <https://bugzilla.redhat.com/show_bug.cgi?id=2118259#c1>.
|
|
|
|
We use post-1970 time test data to simplify the test.
|
|
---
|
|
spec/ruby/core/time/shared/local.rb | 8 +++-----
|
|
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/spec/ruby/core/time/shared/local.rb b/spec/ruby/core/time/shared/local.rb
|
|
index 997b7186f1..c4aa7a7ea9 100644
|
|
--- a/spec/ruby/core/time/shared/local.rb
|
|
+++ b/spec/ruby/core/time/shared/local.rb
|
|
@@ -6,18 +6,16 @@
|
|
end
|
|
end
|
|
|
|
-=begin
|
|
platform_is_not :windows do
|
|
describe "timezone changes" do
|
|
- it "correctly adjusts the timezone change to 'CEST' on 'Europe/Amsterdam'" do
|
|
+ it "correctly adjusts the timezone change to 'CET' on 'Europe/Amsterdam'" do
|
|
with_timezone("Europe/Amsterdam") do
|
|
- Time.send(@method, 1940, 5, 16).to_a.should ==
|
|
- [0, 40, 1, 16, 5, 1940, 4, 137, true, "CEST"]
|
|
+ Time.send(@method, 1970, 5, 16).to_a.should ==
|
|
+ [0, 0, 0, 16, 5, 1970, 6, 136, false, "CET"]
|
|
end
|
|
end
|
|
end
|
|
end
|
|
-=end
|
|
end
|
|
|
|
describe :time_local_10_arg, shared: true do
|
|
--
|
|
2.36.1
|
|
|