summaryrefslogtreecommitdiff
path: root/lang/ruby200-base/patches/patch-lib_rubygems_installer.rb
diff options
context:
space:
mode:
authortron <tron>2013-12-01 11:47:59 +0000
committertron <tron>2013-12-01 11:47:59 +0000
commit96bdaccacc92eb80265b8f5b3f0c1c03ce829cbb (patch)
tree4cd5817b3fb282cd2181d2776fe68c52a0ee7493 /lang/ruby200-base/patches/patch-lib_rubygems_installer.rb
parent628364784fc2f8200cf138c4aa9d9990d4f88093 (diff)
downloadpkgsrc-96bdaccacc92eb80265b8f5b3f0c1c03ce829cbb.tar.gz
Pullup ticket #4261 - requested by taca
lang/ruby200-base: security update Revisions pulled up: - lang/ruby/rubyversion.mk 1.106 - lang/ruby200-base/Makefile 1.5 - lang/ruby200-base/PLIST 1.2 - lang/ruby200-base/distinfo 1.7 - lang/ruby200-base/patches/patch-configure 1.4 - lang/ruby200-base/patches/patch-ext_tk_extconf.rb deleted - lang/ruby200-base/patches/patch-lib_rubygems.rb 1.2 - lang/ruby200-base/patches/patch-lib_rubygems_commands_setup__command.rb 1.2 - lang/ruby200-base/patches/patch-lib_rubygems_config__file.rb 1.2 - lang/ruby200-base/patches/patch-lib_rubygems_dependency__installer.rb 1.2 - lang/ruby200-base/patches/patch-lib_rubygems_ext_ext__conf__builder.rb deleted - lang/ruby200-base/patches/patch-lib_rubygems_installer.rb 1.2 - lang/ruby200-base/patches/patch-lib_rubygems_specification.rb 1.2 - lang/ruby200-base/patches/patch-lib_rubygems_version.rb deleted - lang/ruby200-base/patches/patch-man_ri.1 1.2 - lang/ruby200-base/patches/patch-tool_rbinstall.rb 1.2 --- Module Name: pkgsrc Committed By: taca Date: Sun Nov 24 14:22:03 UTC 2013 Modified Files: pkgsrc/lang/ruby: rubyversion.mk pkgsrc/lang/ruby200-base: Makefile PLIST distinfo pkgsrc/lang/ruby200-base/patches: patch-configure patch-lib_rubygems.rb patch-lib_rubygems_commands_setup__command.rb patch-lib_rubygems_config__file.rb patch-lib_rubygems_dependency__installer.rb patch-lib_rubygems_installer.rb patch-lib_rubygems_specification.rb patch-man_ri.1 patch-tool_rbinstall.rb Removed Files: pkgsrc/lang/ruby200-base/patches: patch-ext_tk_extconf.rb patch-lib_rubygems_ext_ext__conf__builder.rb patch-lib_rubygems_version.rb Log Message: Update ruby200-base, ruby200 and ruby-mode package to 2.00-p353. Ruby 2.0.0-p353 is released Now Ruby 2.0.0-p353 is released. This release includes a security fix about floating point parsing. Heap Overflow in Floating Point Parsing (CVE-2013-4164) And some bugfixes are also included. See tickets and ChangeLog for details.
Diffstat (limited to 'lang/ruby200-base/patches/patch-lib_rubygems_installer.rb')
-rw-r--r--lang/ruby200-base/patches/patch-lib_rubygems_installer.rb23
1 files changed, 10 insertions, 13 deletions
diff --git a/lang/ruby200-base/patches/patch-lib_rubygems_installer.rb b/lang/ruby200-base/patches/patch-lib_rubygems_installer.rb
index 3754a75ebee..1510ff320a8 100644
--- a/lang/ruby200-base/patches/patch-lib_rubygems_installer.rb
+++ b/lang/ruby200-base/patches/patch-lib_rubygems_installer.rb
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_rubygems_installer.rb,v 1.1 2013/07/21 02:32:58 taca Exp $
+$NetBSD: patch-lib_rubygems_installer.rb,v 1.1.2.1 2013/12/01 11:47:59 tron Exp $
* Add install_root option for pkgsrc's rubygems support.
* Tweak build_info directory with destdir to store build_args.
---- lib/rubygems/installer.rb.orig 2013-03-17 14:51:53.000000000 +0000
+--- lib/rubygems/installer.rb.orig 2013-08-16 15:35:06.000000000 +0000
+++ lib/rubygems/installer.rb
-@@ -89,6 +89,9 @@ class Gem::Installer
+@@ -98,6 +98,9 @@ class Gem::Installer
# foo_exec18.
# :ignore_dependencies:: Don't raise if a dependency is missing.
# :install_dir:: The directory to install the gem into.
@@ -15,7 +15,7 @@ $NetBSD: patch-lib_rubygems_installer.rb,v 1.1 2013/07/21 02:32:58 taca Exp $
# :security_policy:: Use the specified security policy. See Gem::Security
# :user_install:: Indicate that the gem should be unpacked into the users
# personal gem directory.
-@@ -548,12 +551,20 @@ class Gem::Installer
+@@ -558,12 +561,20 @@ class Gem::Installer
@format_executable = options[:format_executable]
@security_policy = options[:security_policy]
@wrappers = options[:wrappers]
@@ -37,16 +37,13 @@ $NetBSD: patch-lib_rubygems_installer.rb,v 1.1 2013/07/21 02:32:58 taca Exp $
@development = options[:development]
@build_args = options[:build_args] || Gem::Command.build_args
-@@ -773,7 +784,11 @@ EOF
- def write_build_info_file
+@@ -786,6 +797,9 @@ EOF
return if @build_args.empty?
-- open spec.build_info_file, 'w' do |io|
-+ build_info_file = spec.build_info_file
+ build_info_dir = File.join gem_home, 'build_info'
+ unless @install_root.nil?
-+ build_info_file = File.join @gem_home, "build_info", "#{spec.full_name}.info"
++ build_info_dir = File.join @gem_home, "build_info"
+ end
-+ open build_info_file, 'w' do |io|
- @build_args.each do |arg|
- io.puts arg
- end
+
+ FileUtils.mkdir_p build_info_dir
+