Skip to content

Commit dda4a25

Browse files
sorahsorah
committed
New upstream version 2.4.10
1 parent bb5d43c commit dda4a25

File tree

12 files changed

+67
-83
lines changed

12 files changed

+67
-83
lines changed

‎ChangeLog‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
------------------------------------------------------------------------
2-
r67824 | usa | 2019-10-02 14:02:17 +0900 (Wed, 02 Oct 2019) | 1 line
2+
r67879 | usa | 2020-03-31 20:42:18 +0900 (Tue, 31 Mar 2020) | 1 line
33

4-
add tag v2_4_9
4+
add tag v2_4_10
5+
------------------------------------------------------------------------
6+
r67874 | usa | 2020-03-31 19:54:03 +0900 (Tue, 31 Mar 2020) | 1 line
7+
8+
Bump version to 2.4.10
9+
------------------------------------------------------------------------
10+
r67873 | usa | 2020-03-31 19:51:26 +0900 (Tue, 31 Mar 2020) | 6 lines
11+
12+
merge revision(s) 36e9ed7fef6eb2d14becf6c52452e4ab16e4bf01: [Backport #16698]
13+
14+
backport 80b5a0ff2a7709367178f29d4ebe1c54122b1c27 partially as a
15+
securify fix for CVE-2020-10663. The patch was provided by Jeremy Evans.
16+
17+
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
518
------------------------------------------------------------------------
619
r67823 | usa | 2019-10-02 14:01:50 +0900 (Wed, 02 Oct 2019) | 2 lines
720

‎ext/json/parser/parser.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1802,7 +1802,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
18021802
} else {
18031803
json->max_nesting = 100;
18041804
json->allow_nan = 0;
1805-
json->create_additions = 1;
1805+
json->create_additions = 0;
18061806
json->create_id = rb_funcall(mJSON, i_create_id, 0);
18071807
json->object_class = Qnil;
18081808
json->array_class = Qnil;

‎ext/json/parser/parser.rl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
697697
} else {
698698
json->max_nesting = 100;
699699
json->allow_nan = 0;
700-
json->create_additions = 1;
700+
json->create_additions = 0;
701701
json->create_id = rb_funcall(mJSON, i_create_id, 0);
702702
json->object_class = Qnil;
703703
json->array_class = Qnil;

‎gems/did_you_mean-1.1.0/did_you_mean.gemspec‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,18 @@ Gem::Specification.new do |s|
1515
s.homepage = "https://github.com/yuki24/did_you_mean".freeze
1616
s.licenses = ["MIT".freeze]
1717
s.required_ruby_version = Gem::Requirement.new(">= 2.4.0dev".freeze)
18-
s.rubygems_version = "2.7.6".freeze
18+
s.rubygems_version = "3.1.2".freeze
1919
s.summary = "\"Did you mean?\" experience in Ruby".freeze
2020
s.test_files = ["test/core_ext/name_error_extension_test.rb".freeze, "test/edit_distance/jaro_winkler_test.rb".freeze, "test/experimental/initializer_name_correction_test.rb".freeze, "test/experimental/key_error_test.rb".freeze, "test/experimental/method_name_checker_test.rb".freeze, "test/spell_checker_test.rb".freeze, "test/spell_checking/class_name_test.rb".freeze, "test/spell_checking/method_name_test.rb".freeze, "test/spell_checking/uncorrectable_name_test.rb".freeze, "test/spell_checking/variable_name_test.rb".freeze, "test/test_helper.rb".freeze, "test/verbose_formatter_test.rb".freeze]
2121

2222
if s.respond_to? :specification_version then
2323
s.specification_version = 4
24+
end
2425

25-
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
26-
s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
27-
s.add_development_dependency(%q<rake>.freeze, [">= 0"])
28-
s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
29-
else
30-
s.add_dependency(%q<bundler>.freeze, [">= 0"])
31-
s.add_dependency(%q<rake>.freeze, [">= 0"])
32-
s.add_dependency(%q<minitest>.freeze, [">= 0"])
33-
end
26+
if s.respond_to? :add_runtime_dependency then
27+
s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
28+
s.add_development_dependency(%q<rake>.freeze, [">= 0"])
29+
s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
3430
else
3531
s.add_dependency(%q<bundler>.freeze, [">= 0"])
3632
s.add_dependency(%q<rake>.freeze, [">= 0"])

‎gems/minitest-5.10.1/minitest.gemspec‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,16 @@ Gem::Specification.new do |s|
1717
s.homepage = "https://github.com/seattlerb/minitest".freeze
1818
s.licenses = ["MIT".freeze]
1919
s.rdoc_options = ["--main".freeze, "README.rdoc".freeze]
20-
s.rubygems_version = "2.7.6".freeze
20+
s.rubygems_version = "3.1.2".freeze
2121
s.summary = "minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking".freeze
2222

2323
if s.respond_to? :specification_version then
2424
s.specification_version = 4
25+
end
2526

26-
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
27-
s.add_development_dependency(%q<rdoc>.freeze, ["~> 4.0"])
28-
s.add_development_dependency(%q<hoe>.freeze, ["~> 3.15"])
29-
else
30-
s.add_dependency(%q<rdoc>.freeze, ["~> 4.0"])
31-
s.add_dependency(%q<hoe>.freeze, ["~> 3.15"])
32-
end
27+
if s.respond_to? :add_runtime_dependency then
28+
s.add_development_dependency(%q<rdoc>.freeze, ["~> 4.0"])
29+
s.add_development_dependency(%q<hoe>.freeze, ["~> 3.15"])
3330
else
3431
s.add_dependency(%q<rdoc>.freeze, ["~> 4.0"])
3532
s.add_dependency(%q<hoe>.freeze, ["~> 3.15"])

‎gems/net-telnet-0.1.1/net-telnet.gemspec‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,16 @@ Gem::Specification.new do |s|
1414
s.email = ["[email protected]".freeze]
1515
s.files = [".gitignore".freeze, ".travis.yml".freeze, "Gemfile".freeze, "LICENSE.txt".freeze, "README.md".freeze, "Rakefile".freeze, "bin/console".freeze, "bin/setup".freeze, "lib/net-telnet.rb".freeze, "lib/net/telnet.rb".freeze, "lib/net/telnet/version.rb".freeze, "net-telnet.gemspec".freeze]
1616
s.homepage = "https://github.com/ruby/net-telnet".freeze
17-
s.rubygems_version = "2.7.6".freeze
17+
s.rubygems_version = "3.1.2".freeze
1818
s.summary = "Provides telnet client functionality.".freeze
1919

2020
if s.respond_to? :specification_version then
2121
s.specification_version = 4
22+
end
2223

23-
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
24-
s.add_development_dependency(%q<bundler>.freeze, ["~> 1.9"])
25-
s.add_development_dependency(%q<rake>.freeze, ["~> 10.0"])
26-
else
27-
s.add_dependency(%q<bundler>.freeze, ["~> 1.9"])
28-
s.add_dependency(%q<rake>.freeze, ["~> 10.0"])
29-
end
24+
if s.respond_to? :add_runtime_dependency then
25+
s.add_development_dependency(%q<bundler>.freeze, ["~> 1.9"])
26+
s.add_development_dependency(%q<rake>.freeze, ["~> 10.0"])
3027
else
3128
s.add_dependency(%q<bundler>.freeze, ["~> 1.9"])
3229
s.add_dependency(%q<rake>.freeze, ["~> 10.0"])

‎gems/power_assert-0.4.1/power_assert.gemspec‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,17 @@ Gem::Specification.new do |s|
1616
s.homepage = "https://github.com/k-tsj/power_assert".freeze
1717
s.licenses = ["2-clause BSDL".freeze, "Ruby's".freeze]
1818
s.rdoc_options = ["--main".freeze, "README.rdoc".freeze]
19-
s.rubygems_version = "2.7.6".freeze
19+
s.rubygems_version = "3.1.2".freeze
2020
s.summary = "Power Assert for Ruby".freeze
2121

2222
if s.respond_to? :specification_version then
2323
s.specification_version = 4
24+
end
2425

25-
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
26-
s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
27-
s.add_development_dependency(%q<rake>.freeze, [">= 0"])
28-
s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
29-
else
30-
s.add_dependency(%q<test-unit>.freeze, [">= 0"])
31-
s.add_dependency(%q<rake>.freeze, [">= 0"])
32-
s.add_dependency(%q<simplecov>.freeze, [">= 0"])
33-
end
26+
if s.respond_to? :add_runtime_dependency then
27+
s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
28+
s.add_development_dependency(%q<rake>.freeze, [">= 0"])
29+
s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
3430
else
3531
s.add_dependency(%q<test-unit>.freeze, [">= 0"])
3632
s.add_dependency(%q<rake>.freeze, [">= 0"])

‎gems/rake-12.0.0/rake.gemspec‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,17 @@ Gem::Specification.new do |s|
1818
s.licenses = ["MIT".freeze]
1919
s.rdoc_options = ["--main".freeze, "README.rdoc".freeze]
2020
s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
21-
s.rubygems_version = "2.7.6".freeze
21+
s.rubygems_version = "3.1.2".freeze
2222
s.summary = "Rake is a Make-like program implemented in Ruby".freeze
2323

2424
if s.respond_to? :specification_version then
2525
s.specification_version = 4
26+
end
2627

27-
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
28-
s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
29-
s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
30-
s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
31-
else
32-
s.add_dependency(%q<bundler>.freeze, [">= 0"])
33-
s.add_dependency(%q<minitest>.freeze, [">= 0"])
34-
s.add_dependency(%q<rdoc>.freeze, [">= 0"])
35-
end
28+
if s.respond_to? :add_runtime_dependency then
29+
s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
30+
s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
31+
s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
3632
else
3733
s.add_dependency(%q<bundler>.freeze, [">= 0"])
3834
s.add_dependency(%q<minitest>.freeze, [">= 0"])

‎gems/test-unit-3.2.3/test-unit.gemspec‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,21 @@ Gem::Specification.new do |s|
1414
s.files = ["COPYING".freeze, "GPL".freeze, "LGPL".freeze, "PSFL".freeze, "README.md".freeze, "Rakefile".freeze, "doc/text/how-to.md".freeze, "doc/text/news.md".freeze, "lib/test-unit.rb".freeze, "lib/test/unit.rb".freeze, "lib/test/unit/assertion-failed-error.rb".freeze, "lib/test/unit/assertions.rb".freeze, "lib/test/unit/attribute-matcher.rb".freeze, "lib/test/unit/attribute.rb".freeze, "lib/test/unit/auto-runner-loader.rb".freeze, "lib/test/unit/autorunner.rb".freeze, "lib/test/unit/code-snippet-fetcher.rb".freeze, "lib/test/unit/collector.rb".freeze, "lib/test/unit/collector/descendant.rb".freeze, "lib/test/unit/collector/dir.rb".freeze, "lib/test/unit/collector/load.rb".freeze, "lib/test/unit/collector/objectspace.rb".freeze, "lib/test/unit/collector/xml.rb".freeze, "lib/test/unit/color-scheme.rb".freeze, "lib/test/unit/color.rb".freeze, "lib/test/unit/data.rb".freeze, "lib/test/unit/diff.rb".freeze, "lib/test/unit/error.rb".freeze, "lib/test/unit/exception-handler.rb".freeze, "lib/test/unit/failure.rb".freeze, "lib/test/unit/fault-location-detector.rb".freeze, "lib/test/unit/fixture.rb".freeze, "lib/test/unit/notification.rb".freeze, "lib/test/unit/omission.rb".freeze, "lib/test/unit/pending.rb".freeze, "lib/test/unit/priority.rb".freeze, "lib/test/unit/runner/console.rb".freeze, "lib/test/unit/runner/emacs.rb".freeze, "lib/test/unit/runner/xml.rb".freeze, "lib/test/unit/test-suite-creator.rb".freeze, "lib/test/unit/testcase.rb".freeze, "lib/test/unit/testresult.rb".freeze, "lib/test/unit/testsuite.rb".freeze, "lib/test/unit/ui/console/outputlevel.rb".freeze, "lib/test/unit/ui/console/testrunner.rb".freeze, "lib/test/unit/ui/emacs/testrunner.rb".freeze, "lib/test/unit/ui/testrunner.rb".freeze, "lib/test/unit/ui/testrunnermediator.rb".freeze, "lib/test/unit/ui/testrunnerutilities.rb".freeze, "lib/test/unit/ui/xml/testrunner.rb".freeze, "lib/test/unit/util/backtracefilter.rb".freeze, "lib/test/unit/util/method-owner-finder.rb".freeze, "lib/test/unit/util/observable.rb".freeze, "lib/test/unit/util/output.rb".freeze, "lib/test/unit/util/procwrapper.rb".freeze, "lib/test/unit/version.rb".freeze, "sample/adder.rb".freeze, "sample/subtracter.rb".freeze, "sample/test_adder.rb".freeze, "sample/test_subtracter.rb".freeze, "sample/test_user.rb".freeze, "test/collector/test-descendant.rb".freeze, "test/collector/test-load.rb".freeze, "test/collector/test_dir.rb".freeze, "test/collector/test_objectspace.rb".freeze, "test/fixtures/header-label.csv".freeze, "test/fixtures/header-label.tsv".freeze, "test/fixtures/header.csv".freeze, "test/fixtures/header.tsv".freeze, "test/fixtures/no-header.csv".freeze, "test/fixtures/no-header.tsv".freeze, "test/fixtures/plus.csv".freeze, "test/run-test.rb".freeze, "test/test-assertions.rb".freeze, "test/test-attribute-matcher.rb".freeze, "test/test-attribute.rb".freeze, "test/test-code-snippet.rb".freeze, "test/test-color-scheme.rb".freeze, "test/test-color.rb".freeze, "test/test-data.rb".freeze, "test/test-diff.rb".freeze, "test/test-emacs-runner.rb".freeze, "test/test-error.rb".freeze, "test/test-failure.rb".freeze, "test/test-fault-location-detector.rb".freeze, "test/test-fixture.rb".freeze, "test/test-notification.rb".freeze, "test/test-omission.rb".freeze, "test/test-pending.rb".freeze, "test/test-priority.rb".freeze, "test/test-test-case.rb".freeze, "test/test-test-result.rb".freeze, "test/test-test-suite-creator.rb".freeze, "test/test-test-suite.rb".freeze, "test/testunit-test-util.rb".freeze, "test/ui/test_testrunmediator.rb".freeze, "test/util/test-method-owner-finder.rb".freeze, "test/util/test-output.rb".freeze, "test/util/test_backtracefilter.rb".freeze, "test/util/test_observable.rb".freeze, "test/util/test_procwrapper.rb".freeze]
1515
s.homepage = "http://test-unit.github.io/".freeze
1616
s.licenses = ["Ruby".freeze, "PSFL".freeze]
17-
s.rubygems_version = "2.7.6".freeze
17+
s.rubygems_version = "3.1.2".freeze
1818
s.summary = "An xUnit family unit testing framework for Ruby.".freeze
1919
s.test_files = ["test/test-code-snippet.rb".freeze, "test/test-fault-location-detector.rb".freeze, "test/test-attribute.rb".freeze, "test/test-priority.rb".freeze, "test/test-color-scheme.rb".freeze, "test/test-failure.rb".freeze, "test/test-color.rb".freeze, "test/ui/test_testrunmediator.rb".freeze, "test/test-attribute-matcher.rb".freeze, "test/test-test-suite.rb".freeze, "test/test-test-suite-creator.rb".freeze, "test/test-diff.rb".freeze, "test/test-emacs-runner.rb".freeze, "test/test-data.rb".freeze, "test/fixtures/header.csv".freeze, "test/fixtures/header.tsv".freeze, "test/fixtures/no-header.tsv".freeze, "test/fixtures/plus.csv".freeze, "test/fixtures/no-header.csv".freeze, "test/fixtures/header-label.tsv".freeze, "test/fixtures/header-label.csv".freeze, "test/test-assertions.rb".freeze, "test/test-test-result.rb".freeze, "test/testunit-test-util.rb".freeze, "test/collector/test-load.rb".freeze, "test/collector/test_dir.rb".freeze, "test/collector/test_objectspace.rb".freeze, "test/collector/test-descendant.rb".freeze, "test/test-error.rb".freeze, "test/run-test.rb".freeze, "test/test-pending.rb".freeze, "test/test-fixture.rb".freeze, "test/util/test-output.rb".freeze, "test/util/test-method-owner-finder.rb".freeze, "test/util/test_observable.rb".freeze, "test/util/test_procwrapper.rb".freeze, "test/util/test_backtracefilter.rb".freeze, "test/test-notification.rb".freeze, "test/test-omission.rb".freeze, "test/test-test-case.rb".freeze]
2020

2121
if s.respond_to? :specification_version then
2222
s.specification_version = 4
23+
end
2324

24-
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
25-
s.add_runtime_dependency(%q<power_assert>.freeze, [">= 0"])
26-
s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
27-
s.add_development_dependency(%q<rake>.freeze, [">= 0"])
28-
s.add_development_dependency(%q<yard>.freeze, [">= 0"])
29-
s.add_development_dependency(%q<kramdown>.freeze, [">= 0"])
30-
s.add_development_dependency(%q<packnga>.freeze, [">= 0"])
31-
else
32-
s.add_dependency(%q<power_assert>.freeze, [">= 0"])
33-
s.add_dependency(%q<bundler>.freeze, [">= 0"])
34-
s.add_dependency(%q<rake>.freeze, [">= 0"])
35-
s.add_dependency(%q<yard>.freeze, [">= 0"])
36-
s.add_dependency(%q<kramdown>.freeze, [">= 0"])
37-
s.add_dependency(%q<packnga>.freeze, [">= 0"])
38-
end
25+
if s.respond_to? :add_runtime_dependency then
26+
s.add_runtime_dependency(%q<power_assert>.freeze, [">= 0"])
27+
s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
28+
s.add_development_dependency(%q<rake>.freeze, [">= 0"])
29+
s.add_development_dependency(%q<yard>.freeze, [">= 0"])
30+
s.add_development_dependency(%q<kramdown>.freeze, [">= 0"])
31+
s.add_development_dependency(%q<packnga>.freeze, [">= 0"])
3932
else
4033
s.add_dependency(%q<power_assert>.freeze, [">= 0"])
4134
s.add_dependency(%q<bundler>.freeze, [">= 0"])

‎gems/xmlrpc-0.2.1/xmlrpc.gemspec‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,17 @@ Gem::Specification.new do |s|
1616
s.homepage = "https://github.com/ruby/xmlrpc".freeze
1717
s.licenses = ["Ruby".freeze]
1818
s.required_ruby_version = Gem::Requirement.new(">= 2.4.0dev".freeze)
19-
s.rubygems_version = "2.7.6".freeze
19+
s.rubygems_version = "3.1.2".freeze
2020
s.summary = "XMLRPC is a lightweight protocol that enables remote procedure calls over HTTP.".freeze
2121

2222
if s.respond_to? :specification_version then
2323
s.specification_version = 4
24+
end
2425

25-
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
26-
s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
27-
s.add_development_dependency(%q<rake>.freeze, [">= 0"])
28-
s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
29-
else
30-
s.add_dependency(%q<bundler>.freeze, [">= 0"])
31-
s.add_dependency(%q<rake>.freeze, [">= 0"])
32-
s.add_dependency(%q<test-unit>.freeze, [">= 0"])
33-
end
26+
if s.respond_to? :add_runtime_dependency then
27+
s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
28+
s.add_development_dependency(%q<rake>.freeze, [">= 0"])
29+
s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
3430
else
3531
s.add_dependency(%q<bundler>.freeze, [">= 0"])
3632
s.add_dependency(%q<rake>.freeze, [">= 0"])

0 commit comments

Comments
 (0)