Merge branch 'master-2.4' into dist/2.4/xenial

sorah · sorah · commit d2f160b9c2a3 · 2020-04-01T04:03:27.000+09:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,7 +1,20 @@
 ------------------------------------------------------------------------
-r67824 | usa | 2019-10-02 14:02:17 +0900 (Wed, 02 Oct 2019) | 1 line
+r67879 | usa | 2020-03-31 20:42:18 +0900 (Tue, 31 Mar 2020) | 1 line
 
-add tag v2_4_9
+add tag v2_4_10
+------------------------------------------------------------------------
+r67874 | usa | 2020-03-31 19:54:03 +0900 (Tue, 31 Mar 2020) | 1 line
+
+Bump version to 2.4.10
+------------------------------------------------------------------------
+r67873 | usa | 2020-03-31 19:51:26 +0900 (Tue, 31 Mar 2020) | 6 lines
+
+merge revision(s) 36e9ed7fef6eb2d14becf6c52452e4ab16e4bf01: [Backport #16698]
+
+	backport 80b5a0ff2a7709367178f29d4ebe1c54122b1c27 partially as a
+	 securify fix for CVE-2020-10663. The patch was provided by Jeremy Evans.
+
+	git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 ------------------------------------------------------------------------
 r67823 | usa | 2019-10-02 14:01:50 +0900 (Wed, 02 Oct 2019) | 2 lines
 
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+ruby2.4 (2.4.10-0nkmi1~dist) unstable; urgency=medium
+
+  * 2.4.10
+  * explicitly pass runstatedir/localstatedir/sysconfdir
+
+ -- Sorah Fukumori <her@sorah.jp>  Tue, 31 Mar 2020 18:54:20 +0000
+
 ruby2.4 (2.4.9-0nkmi1~dist) unstable; urgency=medium
 
   * 2.4.9
diff --git a/debian/rules b/debian/rules
@@ -29,6 +29,9 @@ configure_options += --disable-rpath
 configure_options += --with-baseruby=$(baseruby)
 configure_options += --with-sitedir='/usr/local/lib/site_ruby'
 configure_options += --with-sitearchdir="/usr/local/lib/$(DEB_HOST_MULTIARCH)/site_ruby"
+configure_options += --runstatedir=/var/run
+configure_options += --localstatedir=/var
+configure_options += --sysconfdir=/etc
 
 # the following are ignored by ./configure, but used by some extconf.rb scripts
 configure_options += --enable-ipv6
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
@@ -1802,7 +1802,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
     } else {
         json->max_nesting = 100;
         json->allow_nan = 0;
-        json->create_additions = 1;
+        json->create_additions = 0;
         json->create_id = rb_funcall(mJSON, i_create_id, 0);
         json->object_class = Qnil;
         json->array_class = Qnil;
diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
@@ -697,7 +697,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
     } else {
         json->max_nesting = 100;
         json->allow_nan = 0;
-        json->create_additions = 1;
+        json->create_additions = 0;
         json->create_id = rb_funcall(mJSON, i_create_id, 0);
         json->object_class = Qnil;
         json->array_class = Qnil;
diff --git a/gems/did_you_mean-1.1.0/did_you_mean.gemspec b/gems/did_you_mean-1.1.0/did_you_mean.gemspec
@@ -15,22 +15,18 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/yuki24/did_you_mean".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.4.0dev".freeze)
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "3.1.2".freeze
   s.summary = "\"Did you mean?\" experience in Ruby".freeze
   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]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<minitest>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
   else
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
     s.add_dependency(%q<rake>.freeze, [">= 0"])
diff --git a/gems/minitest-5.10.1/minitest.gemspec b/gems/minitest-5.10.1/minitest.gemspec
@@ -17,19 +17,16 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/seattlerb/minitest".freeze
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--main".freeze, "README.rdoc".freeze]
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "3.1.2".freeze
   s.summary = "minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rdoc>.freeze, ["~> 4.0"])
-      s.add_development_dependency(%q<hoe>.freeze, ["~> 3.15"])
-    else
-      s.add_dependency(%q<rdoc>.freeze, ["~> 4.0"])
-      s.add_dependency(%q<hoe>.freeze, ["~> 3.15"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<rdoc>.freeze, ["~> 4.0"])
+    s.add_development_dependency(%q<hoe>.freeze, ["~> 3.15"])
   else
     s.add_dependency(%q<rdoc>.freeze, ["~> 4.0"])
     s.add_dependency(%q<hoe>.freeze, ["~> 3.15"])
diff --git a/gems/net-telnet-0.1.1/net-telnet.gemspec b/gems/net-telnet-0.1.1/net-telnet.gemspec
@@ -14,19 +14,16 @@ Gem::Specification.new do |s|
   s.email = ["hsbt@ruby-lang.org".freeze]
   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]
   s.homepage = "https://github.com/ruby/net-telnet".freeze
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "3.1.2".freeze
   s.summary = "Provides telnet client functionality.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.9"])
-      s.add_development_dependency(%q<rake>.freeze, ["~> 10.0"])
-    else
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.9"])
-      s.add_dependency(%q<rake>.freeze, ["~> 10.0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<bundler>.freeze, ["~> 1.9"])
+    s.add_development_dependency(%q<rake>.freeze, ["~> 10.0"])
   else
     s.add_dependency(%q<bundler>.freeze, ["~> 1.9"])
     s.add_dependency(%q<rake>.freeze, ["~> 10.0"])
diff --git a/gems/power_assert-0.4.1/power_assert.gemspec b/gems/power_assert-0.4.1/power_assert.gemspec
@@ -16,21 +16,17 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/k-tsj/power_assert".freeze
   s.licenses = ["2-clause BSDL".freeze, "Ruby's".freeze]
   s.rdoc_options = ["--main".freeze, "README.rdoc".freeze]
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "3.1.2".freeze
   s.summary = "Power Assert for Ruby".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<test-unit>.freeze, [">= 0"])
-      s.add_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
   else
     s.add_dependency(%q<test-unit>.freeze, [">= 0"])
     s.add_dependency(%q<rake>.freeze, [">= 0"])
diff --git a/gems/rake-12.0.0/rake.gemspec b/gems/rake-12.0.0/rake.gemspec
@@ -18,21 +18,17 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--main".freeze, "README.rdoc".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "3.1.2".freeze
   s.summary = "Rake is a Make-like program implemented in Ruby".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_dependency(%q<minitest>.freeze, [">= 0"])
-      s.add_dependency(%q<rdoc>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
   else
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
     s.add_dependency(%q<minitest>.freeze, [">= 0"])
diff --git a/gems/test-unit-3.2.3/test-unit.gemspec b/gems/test-unit-3.2.3/test-unit.gemspec
@@ -14,28 +14,21 @@ Gem::Specification.new do |s|
   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]
   s.homepage = "http://test-unit.github.io/".freeze
   s.licenses = ["Ruby".freeze, "PSFL".freeze]
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "3.1.2".freeze
   s.summary = "An xUnit family unit testing framework for Ruby.".freeze
   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]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<power_assert>.freeze, [">= 0"])
-      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<yard>.freeze, [">= 0"])
-      s.add_development_dependency(%q<kramdown>.freeze, [">= 0"])
-      s.add_development_dependency(%q<packnga>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<power_assert>.freeze, [">= 0"])
-      s.add_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<yard>.freeze, [">= 0"])
-      s.add_dependency(%q<kramdown>.freeze, [">= 0"])
-      s.add_dependency(%q<packnga>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<power_assert>.freeze, [">= 0"])
+    s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_development_dependency(%q<yard>.freeze, [">= 0"])
+    s.add_development_dependency(%q<kramdown>.freeze, [">= 0"])
+    s.add_development_dependency(%q<packnga>.freeze, [">= 0"])
   else
     s.add_dependency(%q<power_assert>.freeze, [">= 0"])
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
diff --git a/gems/xmlrpc-0.2.1/xmlrpc.gemspec b/gems/xmlrpc-0.2.1/xmlrpc.gemspec
@@ -16,21 +16,17 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/ruby/xmlrpc".freeze
   s.licenses = ["Ruby".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.4.0dev".freeze)
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "3.1.2".freeze
   s.summary = "XMLRPC is a lightweight protocol that enables remote procedure calls over HTTP.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<test-unit>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
   else
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
     s.add_dependency(%q<rake>.freeze, [">= 0"])
diff --git a/revision.h b/revision.h
@@ -1 +1 @@
-#define RUBY_REVISION 67824
+#define RUBY_REVISION 67879
diff --git a/version.h b/version.h
@@ -1,10 +1,10 @@
-#define RUBY_VERSION "2.4.9"
-#define RUBY_RELEASE_DATE "2019-10-02"
-#define RUBY_PATCHLEVEL 362
+#define RUBY_VERSION "2.4.10"
+#define RUBY_RELEASE_DATE "2020-03-31"
+#define RUBY_PATCHLEVEL 364
 
-#define RUBY_RELEASE_YEAR 2019
-#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_YEAR 2020
+#define RUBY_RELEASE_MONTH 3
+#define RUBY_RELEASE_DAY 31
 
 #include "ruby/version.h"
 
