diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-12 13:33:19 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-12 13:33:19 +0000 |
commit | 50454616565ed8c1565a90d1d0fa11c42adb3fdf (patch) | |
tree | 90212bc3ff02eb43276891dbf2055962bfaa489c | |
parent | 67351ac6f503dfafb1aba0b6e4e3928f12c36b96 (diff) |
merge revision(s) 56399:
* tool/downloader.rb: Removed verification of gem certification.
Because signed gem is not working on rubygems ecosystem.
* tool/gem-unpack.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | tool/downloader.rb | 14 | ||||
-rwxr-xr-x | tool/gem-unpack.rb | 3 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 9 insertions, 20 deletions
@@ -1,3 +1,9 @@ +Wed Oct 12 22:31:09 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> + + * tool/downloader.rb: Removed verification of gem certification. + Because signed gem is not working on rubygems ecosystem. + * tool/gem-unpack.rb: ditto. + Fri Oct 7 02:48:06 2016 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> * lib/rubygems/ssl_certs/GlobalSignRootCA.pem: add for RugyGems.org. diff --git a/tool/downloader.rb b/tool/downloader.rb index 40a207f14e..0047dea848 100644 --- a/tool/downloader.rb +++ b/tool/downloader.rb @@ -51,24 +51,10 @@ class Downloader class RubyGems < self def self.download(name, dir = nil, ims = true, options = {}) require 'rubygems' - require 'rubygems/package' options[:ssl_ca_cert] = Dir.glob(File.expand_path("../lib/rubygems/ssl_certs/*.pem", File.dirname(__FILE__))) file = under(dir, name) super("#{https}://rubygems.org/downloads/#{name}", file, nil, ims, options) or return false - policy = Gem::Security::LowSecurity - (policy = policy.dup).ui = Gem::SilentUI.new if policy.respond_to?(:'ui=') - pkg = Gem::Package.new(file) - pkg.security_policy = policy - begin - pkg.verify - rescue Gem::Security::Exception => e - $stderr.puts e.message - File.unlink(file) - false - else - true - end end def self.verify(pkg) diff --git a/tool/gem-unpack.rb b/tool/gem-unpack.rb index 7f84126677..3a53dd50c8 100755 --- a/tool/gem-unpack.rb +++ b/tool/gem-unpack.rb @@ -2,10 +2,7 @@ require 'rubygems' require 'rubygems/package' def Gem.unpack(file, dir = nil) - policy = Gem::Security::LowSecurity - (policy = policy.dup).ui = Gem::SilentUI.new pkg = Gem::Package.new(file) - pkg.security_policy = policy spec = pkg.spec target = spec.full_name target = File.join(dir, target) if dir @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.3.2" -#define RUBY_RELEASE_DATE "2016-10-07" -#define RUBY_PATCHLEVEL 194 +#define RUBY_RELEASE_DATE "2016-10-12" +#define RUBY_PATCHLEVEL 195 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 7 +#define RUBY_RELEASE_DAY 12 #include "ruby/version.h" |