diff options
| author |   Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2010-08-18 12:26:20 +0200 |
|---|---|---|
| committer | Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2010-08-18 12:26:20 +0200 |
| commit | 24b5b5f3ff1082fc67b980137cc2b40391e00edf (patch) | |
| tree | 291ecd86628c14553ee63b13950e0307b30d2fc5 | |
| parent | Add patch for CVE-2010-0541. (diff) | |
| download | ruby-scripts-patches-1.9.2_rc2-r1.tar.gz ruby-scripts-patches-1.9.2_rc2-r1.tar.bz2 ruby-scripts-patches-1.9.2_rc2-r1.zip | |
Add another patch to make sure that gems are not installed with Ruby 1.9.patches-1.9.2_rc2-r1
| -rw-r--r-- | patchsets/patches-1.9.2_rc2/009_no-gems.patch | 44 | ||||
| -rw-r--r-- | patchsets/patches-1.9.2_rc2/series | 1 |
2 files changed, 45 insertions, 0 deletions
diff --git a/patchsets/patches-1.9.2_rc2/009_no-gems.patch b/patchsets/patches-1.9.2_rc2/009_no-gems.patch new file mode 100644 index 0000000..b9f0f1b --- /dev/null +++ b/patchsets/patches-1.9.2_rc2/009_no-gems.patch @@ -0,0 +1,44 @@ +Index: ruby-1.9.2-rc2/tool/rbinstall.rb +=================================================================== +--- ruby-1.9.2-rc2.orig/tool/rbinstall.rb ++++ ruby-1.9.2-rc2/tool/rbinstall.rb +@@ -491,39 +491,6 @@ install?(:local, :comm, :man) do + end + end + +-install?(:ext, :comm, :gem) do +- directories = [] +- IO.foreach(File.join(srcdir, "lib/rubygems.rb")) do |line| +- if /^\s*DIRECTORIES\s*=\s*%w\[(.*?)\]/ =~ line +- directories = $1.split +- break +- end +- end +- gpath = CONFIG["sitelibdir"].sub(%r'/site_ruby/(?=[^/]+)', '/gems/') +- prepare "default gems", gpath, directories +- +- destdir = File.join(gpath, directories.grep(/^spec/)[0]) +- default_gems = [ +- ['rdoc', 'rdoc.rb'], +- ['minitest', 'minitest/unit.rb'], +- ] +- default_gems.each do |name, src| +- src = File.join(srcdir, "lib", src) +- version = open(src) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next +- version = version.split(%r"=\s*", 2)[1].strip[/\A([\'\"])(.*?)\1/, 2] +- puts "#{" "*30}#{name} #{version}" +- open_for_install(File.join(destdir, "#{name}.gemspec"), $data_mode) do +- <<-GEMSPEC +-Gem::Specification.new do |s| +- s.name = #{name.dump} +- s.version = #{version.dump} +- s.summary = "This #{name} is bundled with Ruby" +-end +- GEMSPEC +- end +- end +-end +- + parse_args() + + include FileUtils diff --git a/patchsets/patches-1.9.2_rc2/series b/patchsets/patches-1.9.2_rc2/series index 46d21ab..7cb11b8 100644 --- a/patchsets/patches-1.9.2_rc2/series +++ b/patchsets/patches-1.9.2_rc2/series @@ -3,3 +3,4 @@ 006_no-rake.patch 007_berkdb-5.0.patch 008_CVE-2010-0541.patch +009_no-gems.patch |