diff options
| author | taca <taca@pkgsrc.org> | 2012-04-22 08:17:16 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2012-04-22 08:17:16 +0000 |
| commit | 6d42d8bef4a7b704242855cb7d6c73155ed4ca47 (patch) | |
| tree | 7bd5708e29df676297241ee9f5c68c1235375663 /lang/ruby193-base/patches | |
| parent | c1593c8a8d2561577fe746bdfee125beef45d407 (diff) | |
| download | pkgsrc-6d42d8bef4a7b704242855cb7d6c73155ed4ca47.tar.gz | |
Update ruby193 packages to 1.9.3p194.
Security fix with updating bundled RubyGems to 1.8.23 and several bug fixes.
Please refer ChangeLog in detail:
http://svn.ruby-lang.org/repos/ruby/tags/v1_9_3_194/ChangeLog
Diffstat (limited to 'lang/ruby193-base/patches')
3 files changed, 16 insertions, 27 deletions
diff --git a/lang/ruby193-base/patches/patch-ext_dbm_extconf.rb b/lang/ruby193-base/patches/patch-ext_dbm_extconf.rb deleted file mode 100644 index 8306dca8ad4..00000000000 --- a/lang/ruby193-base/patches/patch-ext_dbm_extconf.rb +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ext_dbm_extconf.rb,v 1.1 2012/02/18 05:03:34 taca Exp $ - -Fix build problem on NetBSD (and might be other *BSD). - ---- ext/dbm/extconf.rb.orig 2012-02-16 08:56:21.000000000 +0000 -+++ ext/dbm/extconf.rb -@@ -5,8 +5,7 @@ dir_config("dbm") - if dblib = with_config("dbm-type", nil) - dblib = dblib.split(/[ ,]+/) - else -- #dblib = %w(libc db db2 db1 db5 db4 db3 dbm gdbm gdbm_compat qdbm) -- dblib = %w(gdbm gdbm_compat qdbm) -+ dblib = %w(libc db db2 db1 db5 db4 db3 dbm gdbm gdbm_compat qdbm) - end - - headers = { diff --git a/lang/ruby193-base/patches/patch-lib_rubygems_config__file.rb b/lang/ruby193-base/patches/patch-lib_rubygems_config__file.rb index 54969f3fe41..fc2e942b1f4 100644 --- a/lang/ruby193-base/patches/patch-lib_rubygems_config__file.rb +++ b/lang/ruby193-base/patches/patch-lib_rubygems_config__file.rb @@ -1,10 +1,10 @@ -$NetBSD: patch-lib_rubygems_config__file.rb,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $ +$NetBSD: patch-lib_rubygems_config__file.rb,v 1.2 2012/04/22 08:17:16 taca Exp $ Don't hard code config file's path for gem. ---- lib/rubygems/config_file.rb.orig 2011-07-27 02:04:03.000000000 +0000 +--- lib/rubygems/config_file.rb.orig 2012-04-19 23:38:41.000000000 +0000 +++ lib/rubygems/config_file.rb -@@ -45,32 +45,7 @@ class Gem::ConfigFile +@@ -47,32 +47,7 @@ class Gem::ConfigFile PLATFORM_DEFAULTS = {} @@ -31,7 +31,7 @@ Don't hard code config file's path for gem. - - path.strip - rescue LoadError -- "/etc" +- RbConfig::CONFIG["sysconfdir"] || "/etc" - end - end + system_config_path = '@PKG_SYSCONFDIR@' diff --git a/lang/ruby193-base/patches/patch-lib_rubygems_specification.rb b/lang/ruby193-base/patches/patch-lib_rubygems_specification.rb index 79a7d2e815e..d2f3fa5c5f4 100644 --- a/lang/ruby193-base/patches/patch-lib_rubygems_specification.rb +++ b/lang/ruby193-base/patches/patch-lib_rubygems_specification.rb @@ -1,6 +1,11 @@ -$NetBSD: patch-lib_rubygems_specification.rb,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $ +$NetBSD: patch-lib_rubygems_specification.rb,v 1.2 2012/04/22 08:17:16 taca Exp $ ---- lib/rubygems/specification.rb.orig 2011-10-08 10:53:11.000000000 +0000 +Changes for pkgsrc environment: + +* Allow some attributes to nil. +* Relax date/time format. + +--- lib/rubygems/specification.rb.orig 2012-04-19 22:43:16.000000000 +0000 +++ lib/rubygems/specification.rb @@ -118,6 +118,12 @@ class Gem::Specification @@default_value[k].nil? @@ -15,16 +20,16 @@ $NetBSD: patch-lib_rubygems_specification.rb,v 1.1.1.1 2011/11/08 16:10:51 taca ###################################################################### # :section: Required gemspec attributes -@@ -984,7 +990,7 @@ class Gem::Specification +@@ -1000,7 +1006,7 @@ class Gem::Specification # way to do it. @date = case date when String then - if /\A(\d{4})-(\d{2})-(\d{2})\Z/ =~ date then + if /\A(\d{4})-(\d{2})-(\d{2})/ =~ date then Time.utc($1.to_i, $2.to_i, $3.to_i) - else - raise(Gem::InvalidSpecificationException, -@@ -1950,7 +1956,24 @@ class Gem::Specification + + # Workaround for where the date format output from psych isn't +@@ -1987,7 +1993,24 @@ class Gem::Specification normalize nil_attributes = self.class.non_nil_attributes.find_all do |name| @@ -50,7 +55,7 @@ $NetBSD: patch-lib_rubygems_specification.rb,v 1.1.1.1 2011/11/08 16:10:51 taca end unless nil_attributes.empty? then -@@ -2053,10 +2076,15 @@ class Gem::Specification +@@ -2090,10 +2113,15 @@ class Gem::Specification raise Gem::InvalidSpecificationException, "#{lazy} is not a summary" end |