summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2013-09-10 16:33:29 +0000
committertaca <taca@pkgsrc.org>2013-09-10 16:33:29 +0000
commitdc0242838f20808b38c83826ffe4e822fcb1afd9 (patch)
treebe4410d018527f7a57dbd5c3d32cc75656e572bd /misc
parent22e2913350532b86b0f46298baebcb7f09712fe3 (diff)
downloadpkgsrc-dc0242838f20808b38c83826ffe4e822fcb1afd9.tar.gz
Update rubygems to 2.0.8.
This includes a fix for CVE-2013-4287 in rubygems. === 2.0.8 / 2013-09-09 Security fixes: * RubyGems 2.0.7 and earlier are vulnerable to excessive CPU usage due to a backtracking in Gem::Version validation. See CVE-2013-4287 for full details including vulnerable APIs. Fixed versions include 2.0.8, 1.8.26 and 1.8.23.1 (for Ruby 1.9.3). Issue #626 by Damir Sharipov. Bug fixes: * Fixed Gem.clear_paths when Security is defined at top-level. Pull request #625 by elarkin === 2.0.7 / 2013-08-15 * Extensions may now be built in parallel (therefore gems may be installed in parallel). Bug #607 by Hemant Kumar. * Changed broken link to RubyGems Bookshelf to point to RubyGems guides. Ruby pull request #369 by 謝致邦. * Fixed various test failures due to platform differences or poor tests. Patches by Yui Naruse and Koichi Sasada. * Fixed documentation for Kernel#require. === 2.0.6 / 2013-07-24 Bug fixes: * Fixed the `--no-install` and `-I` options to `gem list` and friends. Bug #593 by Blargel. * Fixed crash when installing gems with extensions under the `-V` flag. Bug #601 by Nick Hoffman. * Fixed race condition retrieving HTTP connections in Gem::Request on JRuby. Bug #597 by Hemant Kumar. * Fixed building extensions on ruby 1.9.3 under mingw. Bug #594 by jonforums, Bug #599 by Chris Riesbeck * Restored default of remote search to `gem search`. === 2.0.5 / 2013-07-11 Bug fixes: * Fixed building of extensions that run ruby in their makefiles. Bug #589 by Zachary Salzbank. === 2.0.4 / 2013-07-09 Bug fixes: * Fixed error caused by gem install not finding the right platform for your platform. Bug #576 by John Anderson * Fixed pushing gems with the default host. Bug #495 by Utkarsh Kukreti * Improved unhelpful error message from `gem owner --remove`. Bug #488 by Steve Klabnik * Fixed typo in `gem spec` help. Pull request #563 by oooooooo * Fixed creation of build_info with --install-dir. Bug #457 by Vít Ondruch. * RubyGems converts non-string dependency names to strings now. Bug #505 by Terence Lee * Outdated prerelease versions are now listed in `gem outdated`. * RubyGems now only calls fsync() on the specification when installing, not every file from the gem. This improves the performance of gem installation on some systems. Pull Request #556 by Grzesiek Kolodziejczyk * Removed surprise search term anchoring in `gem search` to restore 1.8-like search behavior while still defaulting to --remote. Pull request #562 by Ben Bleything * Fixed handling of DESTDIR when building extensions. Pull request #573 by Akinori MUSHA * Fixed documentation of `gem pristine` defaults (--all is not a default). Pull request #577 by Shannon Skipper * Fixed a windows extension-building test failure. Pull request #575 by Hiroshi Shirosaki * Fixed issue with `gem update` where it would attempt to use a Version instead of a Requirement to find the latest gem. Fixes #570 by Nick Cox. * RubyGems now ignores an empty but set RUBYGEMS_HOST environment variable. Based on pull request #558 by Robin Dupret. * Removed duplicate creation of gem subdirectories in Gem::DependencyInstaller. Pull Request #456 by Vít Ondruch * RubyGems now works with Ruby built with `--with-ruby-version=''`. Pull Request #455 by Vít Ondruch * Fixed race condition when two threads require the same gem. Ruby bug report #8374 by Joel VanderWerf * Cleaned up siteconf between extension build and extension install. Pull request #587 by Dominic Cleal * Fix deprecation warnings when converting gemspecs to yaml. Ruby commit r41148 by Yui Naruse
Diffstat (limited to 'misc')
-rw-r--r--misc/rubygems/Makefile5
-rw-r--r--misc/rubygems/distinfo19
-rw-r--r--misc/rubygems/patches/patch-aa10
-rw-r--r--misc/rubygems/patches/patch-ab11
-rw-r--r--misc/rubygems/patches/patch-ad21
-rw-r--r--misc/rubygems/patches/patch-ah10
-rw-r--r--misc/rubygems/patches/patch-am21
-rw-r--r--misc/rubygems/patches/patch-lib_rubygems_ext_ext__conf__builder.rb14
8 files changed, 35 insertions, 76 deletions
diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile
index 90e12c771a4..d6192f3e651 100644
--- a/misc/rubygems/Makefile
+++ b/misc/rubygems/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2013/07/07 15:02:56 taca Exp $
+# $NetBSD: Makefile,v 1.54 2013/09/10 16:33:29 taca Exp $
-DISTNAME= rubygems-2.0.3
-PKGREVISION= 2
+DISTNAME= rubygems-2.0.8
CATEGORIES= misc ruby
MASTER_SITES= http://production.cf.rubygems.org/rubygems/
EXTRACT_SUFX= .tgz
diff --git a/misc/rubygems/distinfo b/misc/rubygems/distinfo
index ad93e75b5f4..6ce5a094f8c 100644
--- a/misc/rubygems/distinfo
+++ b/misc/rubygems/distinfo
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.42 2013/07/07 15:02:56 taca Exp $
+$NetBSD: distinfo,v 1.43 2013/09/10 16:33:29 taca Exp $
-SHA1 (rubygems-2.0.3.tgz) = 51b2d002874a30ae729bcc48a3a0c5983ffb508b
-RMD160 (rubygems-2.0.3.tgz) = e2abad996a2380ba5f764a55304c3e416b715080
-Size (rubygems-2.0.3.tgz) = 334203 bytes
-SHA1 (patch-aa) = 02958c28dc9da54bf6d9f854335aa8d8e071497b
-SHA1 (patch-ab) = 9339a71c9c45b8990d72075a68a8992a40b8c0d0
+SHA1 (rubygems-2.0.8.tgz) = 429f40e6f119197da281e98c1c9c5052df20f7f4
+RMD160 (rubygems-2.0.8.tgz) = 04046acc310ee3a143a3b01a7ea4b10be31e6de8
+Size (rubygems-2.0.8.tgz) = 337735 bytes
+SHA1 (patch-aa) = ec1af229bb7cf9b36b0b5669b8c6f3d97f7ea15e
+SHA1 (patch-ab) = d9fd51322581d0d176479fb6a8f0507ad7cd2b13
SHA1 (patch-ac) = 1a59a5d2fc090dfcf6d3bd3b9c133f0ce4a1feee
-SHA1 (patch-ad) = 17e1c7fe9cb7de2c08e8d11a94dcbea082c3b4d1
+SHA1 (patch-ad) = e44afa7a32095652ef0eea7b146827b60829aee6
SHA1 (patch-af) = d96d5dafd830b0c94bf6c191a3274701ebc6d564
SHA1 (patch-ag) = 5b94252ea03eba04849770bc141dfc58de932389
-SHA1 (patch-ah) = dd50c10662c0a295a8790446f9cd7159d0b498dd
+SHA1 (patch-ah) = de58555d7c7e942aa7925ecd1db94769dc5254a1
SHA1 (patch-aj) = 3b77a675470ea3702b9870843d2bb39bb6a83f3e
-SHA1 (patch-am) = 24b664a1c360e90c0874cdad9d107477f86e4fd5
+SHA1 (patch-am) = 9146ece86c0bae61553c916adafb2c108f3f07a9
SHA1 (patch-ao) = 4a8be3bdab5e465814b626d17a5f2811fbfc808c
-SHA1 (patch-lib_rubygems_ext_ext__conf__builder.rb) = c532aee8aa9dbf92c48a643d8da65bebb50a0348
SHA1 (patch-test_rubygems_test__gem.rb) = 883675c1af0314c66c3d02fb9c012fac768ebb9b
diff --git a/misc/rubygems/patches/patch-aa b/misc/rubygems/patches/patch-aa
index 941875cf284..27df8635b29 100644
--- a/misc/rubygems/patches/patch-aa
+++ b/misc/rubygems/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.13 2013/06/11 14:55:54 taca Exp $
+$NetBSD: patch-aa,v 1.14 2013/09/10 16:33:29 taca Exp $
* Relax to allow some attribute could be nil.
* Complete "http://" to homepage attribute if it isn't begin with it.
* Accpet date with Time, but ignore time part.
---- lib/rubygems/specification.rb.orig 2013-02-12 20:04:55.000000000 +0000
+--- lib/rubygems/specification.rb.orig 2013-09-09 23:41:27.000000000 +0000
+++ lib/rubygems/specification.rb
-@@ -164,6 +164,12 @@ class Gem::Specification
+@@ -162,6 +162,12 @@ class Gem::Specification
@@default_value[k].nil?
}
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.13 2013/06/11 14:55:54 taca Exp $
######################################################################
# :section: Required gemspec attributes
-@@ -2317,7 +2323,24 @@ class Gem::Specification
+@@ -2337,7 +2343,24 @@ class Gem::Specification
normalize
nil_attributes = self.class.non_nil_attributes.find_all do |name|
@@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.13 2013/06/11 14:55:54 taca Exp $
end
unless nil_attributes.empty? then
-@@ -2455,10 +2478,15 @@ class Gem::Specification
+@@ -2475,10 +2498,15 @@ class Gem::Specification
raise Gem::InvalidSpecificationException, "#{lazy} is not a summary"
end
diff --git a/misc/rubygems/patches/patch-ab b/misc/rubygems/patches/patch-ab
index 049da707715..821a4b123f3 100644
--- a/misc/rubygems/patches/patch-ab
+++ b/misc/rubygems/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.16 2013/06/15 02:12:48 taca Exp $
+$NetBSD: patch-ab,v 1.17 2013/09/10 16:33:29 taca Exp $
Add install_root option for pkgsrc's rubygems support.
---- lib/rubygems/dependency_installer.rb.orig 2013-03-05 21:25:39.000000000 +0000
+--- lib/rubygems/dependency_installer.rb.orig 2013-09-09 23:41:27.000000000 +0000
+++ lib/rubygems/dependency_installer.rb
@@ -50,6 +50,7 @@ class Gem::DependencyInstaller
# :format_executable:: See Gem::Installer#initialize.
@@ -12,7 +12,7 @@ Add install_root option for pkgsrc's rubygems support.
# :prerelease:: Allow prerelease versions. See #install.
# :security_policy:: See Gem::Installer::new and Gem::Security.
# :user_install:: See Gem::Installer.new
-@@ -57,13 +58,14 @@ class Gem::DependencyInstaller
+@@ -57,12 +58,13 @@ class Gem::DependencyInstaller
# :build_args:: See Gem::Installer::new
def initialize(options = {})
@@ -23,13 +23,12 @@ Add install_root option for pkgsrc's rubygems support.
# HACK shouldn't change the global settings, needed for -i behavior
# maybe move to the install command? See also github #442
Gem::Specification.dirs = @install_dir
- Gem.ensure_gem_subdirectories @install_dir
+ else
+ @install_dir = Gem.dir
end
options = DEFAULT_OPTIONS.merge options
-@@ -92,7 +94,12 @@ class Gem::DependencyInstaller
+@@ -91,7 +93,12 @@ class Gem::DependencyInstaller
@installed_gems = []
@toplevel_specs = nil
@@ -43,7 +42,7 @@ Add install_root option for pkgsrc's rubygems support.
# Set with any errors that SpecFetcher finds while search through
# gemspecs for a dep
-@@ -364,6 +371,7 @@ class Gem::DependencyInstaller
+@@ -363,6 +370,7 @@ class Gem::DependencyInstaller
:format_executable => @format_executable,
:ignore_dependencies => @ignore_dependencies,
:install_dir => @install_dir,
diff --git a/misc/rubygems/patches/patch-ad b/misc/rubygems/patches/patch-ad
index adfbdaed4b3..ed69cfdb93b 100644
--- a/misc/rubygems/patches/patch-ad
+++ b/misc/rubygems/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.12 2013/07/07 15:02:56 taca Exp $
+$NetBSD: patch-ad,v 1.13 2013/09/10 16:33:29 taca Exp $
* Add install_root option for pkgsrc's rubygems support.
---- lib/rubygems/installer.rb.orig 2013-03-05 21:25:39.000000000 +0000
+--- lib/rubygems/installer.rb.orig 2013-09-09 23:41:27.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.
@@ -14,7 +14,7 @@ $NetBSD: patch-ad,v 1.12 2013/07/07 15:02:56 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.
-@@ -538,7 +541,8 @@ class Gem::Installer
+@@ -548,7 +551,8 @@ class Gem::Installer
:env_shebang => false,
:force => false,
:install_dir => Gem.dir,
@@ -24,7 +24,7 @@ $NetBSD: patch-ad,v 1.12 2013/07/07 15:02:56 taca Exp $
}.merge options
@env_shebang = options[:env_shebang]
-@@ -553,8 +557,13 @@ class Gem::Installer
+@@ -563,8 +567,13 @@ class Gem::Installer
# If the user has asked for the gem to be installed in a directory that is
# the system gem directory, then use the system bin directory, else create
# (or use) a new bin dir under the gem_home.
@@ -39,14 +39,3 @@ $NetBSD: patch-ad,v 1.12 2013/07/07 15:02:56 taca Exp $
@build_args = options[:build_args] || Gem::Command.build_args
end
-@@ -773,7 +782,9 @@ EOF
- def write_build_info_file
- return if @build_args.empty?
-
-- open spec.build_info_file, 'w' do |io|
-+ build_info_file = (@options[:install_root].nil?) ? spec.build_info_file :
-+ File.join(@options[:install_root], spec.build_info_file)
-+ open build_info_file, 'w' do |io|
- @build_args.each do |arg|
- io.puts arg
- end
diff --git a/misc/rubygems/patches/patch-ah b/misc/rubygems/patches/patch-ah
index 5a932027e6e..72680a323ad 100644
--- a/misc/rubygems/patches/patch-ah
+++ b/misc/rubygems/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.12 2013/06/15 02:12:48 taca Exp $
+$NetBSD: patch-ah,v 1.13 2013/09/10 16:33:29 taca Exp $
Add install_root option for pkgsrc's rubygems support.
---- lib/rubygems.rb.orig 2013-03-12 04:25:22.000000000 +0000
+--- lib/rubygems.rb.orig 2013-09-09 23:41:27.000000000 +0000
+++ lib/rubygems.rb
-@@ -286,11 +286,17 @@ module Gem
+@@ -291,11 +291,17 @@ module Gem
##
# The path where gem executables are to be installed.
@@ -26,7 +26,7 @@ Add install_root option for pkgsrc's rubygems support.
end
##
-@@ -546,12 +552,12 @@ module Gem
+@@ -551,12 +557,12 @@ module Gem
##
# The index to insert activated gem paths into the $LOAD_PATH.
#
@@ -41,7 +41,7 @@ Add install_root option for pkgsrc's rubygems support.
index
end
-@@ -724,6 +730,7 @@ module Gem
+@@ -729,6 +735,7 @@ module Gem
prefix = File.dirname RUBYGEMS_DIR
if prefix != File.expand_path(ConfigMap[:sitelibdir]) and
diff --git a/misc/rubygems/patches/patch-am b/misc/rubygems/patches/patch-am
index 99906692246..7219cbee0d8 100644
--- a/misc/rubygems/patches/patch-am
+++ b/misc/rubygems/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.5 2013/06/15 02:12:48 taca Exp $
+$NetBSD: patch-am,v 1.6 2013/09/10 16:33:29 taca Exp $
Make sure to setup under DESTDIR.
---- lib/rubygems/commands/setup_command.rb.orig 2013-03-11 20:40:09.000000000 +0000
+--- lib/rubygems/commands/setup_command.rb.orig 2013-09-09 23:41:27.000000000 +0000
+++ lib/rubygems/commands/setup_command.rb
@@ -145,7 +145,7 @@ By default, this RubyGems will install g
@@ -13,20 +13,7 @@ Make sure to setup under DESTDIR.
say
if @verbose then
-@@ -162,7 +162,11 @@ By default, this RubyGems will install g
- release_notes = File.join Dir.pwd, 'History.txt'
-
- release_notes = if File.exist? release_notes then
-- history = File.read release_notes
-+ if RUBY_VERSION != "1.8.7"
-+ history = File.read release_notes, :encoding => 'utf-8'
-+ else
-+ history = File.read release_notes
-+ end
- history = history.sub(/^# coding:.*?^=/m, '')
-
- text = history.split(HISTORY_HEADER)
-@@ -306,11 +310,15 @@ TEXT
+@@ -284,11 +284,15 @@ TEXT
end
end
@@ -43,7 +30,7 @@ Make sure to setup under DESTDIR.
begin
Gem.ensure_gem_subdirectories Gem.dir
rescue SystemCallError
-@@ -321,7 +329,7 @@ TEXT
+@@ -299,7 +303,7 @@ TEXT
(not File.exist? rubygems_doc_dir or
File.writable? rubygems_doc_dir) then
say "Removing old RubyGems RDoc and ri" if @verbose
diff --git a/misc/rubygems/patches/patch-lib_rubygems_ext_ext__conf__builder.rb b/misc/rubygems/patches/patch-lib_rubygems_ext_ext__conf__builder.rb
deleted file mode 100644
index d6cf037df62..00000000000
--- a/misc/rubygems/patches/patch-lib_rubygems_ext_ext__conf__builder.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-lib_rubygems_ext_ext__conf__builder.rb,v 1.1 2013/06/15 02:12:48 taca Exp $
-
-* Expicitly remove a temporary file.
-
---- lib/rubygems/ext/ext_conf_builder.rb.orig 2013-03-11 21:05:39.000000000 +0000
-+++ lib/rubygems/ext/ext_conf_builder.rb
-@@ -49,6 +49,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ex
-
- results
- ensure
-+ siteconf.close true
- ENV["RUBYOPT"] = rubyopt
- ENV["DESTDIR"] = destdir
- end