From 6d42d8bef4a7b704242855cb7d6c73155ed4ca47 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 22 Apr 2012 08:17:16 +0000 Subject: 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 --- lang/ruby/rubyversion.mk | 4 ++-- lang/ruby193-base/Makefile | 3 +-- lang/ruby193-base/PLIST | 12 ++++++++++-- lang/ruby193-base/distinfo | 13 ++++++------- lang/ruby193-base/patches/patch-ext_dbm_extconf.rb | 16 ---------------- .../patches/patch-lib_rubygems_config__file.rb | 8 ++++---- .../patches/patch-lib_rubygems_specification.rb | 19 ++++++++++++------- 7 files changed, 35 insertions(+), 40 deletions(-) delete mode 100644 lang/ruby193-base/patches/patch-ext_dbm_extconf.rb diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index a2af0e9c4e7..2ba3fd6e1cc 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.77 2012/03/21 15:48:41 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.78 2012/04/22 08:17:16 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -205,7 +205,7 @@ RUBY193_VERSION= 1.9.3 # patch RUBY18_PATCHLEVEL= pl358 RUBY19_PATCHLEVEL= pl318 -RUBY193_PATCHLEVEL= p125 +RUBY193_PATCHLEVEL= p194 # current API compatible version; used for version of shared library RUBY18_API_VERSION= 1.8.7 diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile index 5106da25de6..8e80088613d 100644 --- a/lang/ruby193-base/Makefile +++ b/lang/ruby193-base/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2012/03/21 15:40:13 taca Exp $ +# $NetBSD: Makefile,v 1.11 2012/04/22 08:17:16 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} -PKGREVISION= 1 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} DIST_SUBDIR= ruby193-base-201202170 diff --git a/lang/ruby193-base/PLIST b/lang/ruby193-base/PLIST index 4813b3c1480..7c95512befa 100644 --- a/lang/ruby193-base/PLIST +++ b/lang/ruby193-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2011/12/04 02:31:54 taca Exp $ +@comment $NetBSD: PLIST,v 1.3 2012/04/22 08:17:16 taca Exp $ bin/erb${RUBY_VER} bin/gem${RUBY_VER} bin/irb${RUBY_VER} @@ -198,7 +198,7 @@ ${RUBY_LIB}/psych/coder.rb ${RUBY_LIB}/psych/core_ext.rb ${RUBY_LIB}/psych/deprecated.rb ${RUBY_LIB}/psych/handler.rb -${RUBY_LIB}/psych/json.rb +${RUBY_LIB}/psych/handlers/document_stream.rb ${RUBY_LIB}/psych/json/ruby_events.rb ${RUBY_LIB}/psych/json/stream.rb ${RUBY_LIB}/psych/json/tree_builder.rb @@ -217,6 +217,7 @@ ${RUBY_LIB}/psych/scalar_scanner.rb ${RUBY_LIB}/psych/set.rb ${RUBY_LIB}/psych/stream.rb ${RUBY_LIB}/psych/streaming.rb +${RUBY_LIB}/psych/syntax_error.rb ${RUBY_LIB}/psych/tree_builder.rb ${RUBY_LIB}/psych/visitors.rb ${RUBY_LIB}/psych/visitors/depth_first.rb @@ -553,6 +554,8 @@ ${RUBY_LIB}/rubygems/package/tar_writer.rb ${RUBY_LIB}/rubygems/package_task.rb ${RUBY_LIB}/rubygems/path_support.rb ${RUBY_LIB}/rubygems/platform.rb +${RUBY_LIB}/rubygems/psych_additions.rb +${RUBY_LIB}/rubygems/psych_tree.rb ${RUBY_LIB}/rubygems/remote_fetcher.rb ${RUBY_LIB}/rubygems/require_paths_builder.rb ${RUBY_LIB}/rubygems/requirement.rb @@ -561,6 +564,11 @@ ${RUBY_LIB}/rubygems/server.rb ${RUBY_LIB}/rubygems/source_index.rb ${RUBY_LIB}/rubygems/spec_fetcher.rb ${RUBY_LIB}/rubygems/specification.rb +${RUBY_LIB}/rubygems/ssl_certs/AddTrustExternalCARoot.pem +${RUBY_LIB}/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem +${RUBY_LIB}/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem +${RUBY_LIB}/rubygems/ssl_certs/ca-bundle.pem +${RUBY_LIB}/rubygems/syck_hack.rb ${RUBY_LIB}/rubygems/test_case.rb ${RUBY_LIB}/rubygems/test_utilities.rb ${RUBY_LIB}/rubygems/text.rb diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo index 9e56b8e45ae..8afb50b12e1 100644 --- a/lang/ruby193-base/distinfo +++ b/lang/ruby193-base/distinfo @@ -1,25 +1,24 @@ -$NetBSD: distinfo,v 1.5 2012/02/18 05:03:34 taca Exp $ +$NetBSD: distinfo,v 1.6 2012/04/22 08:17:16 taca Exp $ -SHA1 (ruby193-base-201202170/ruby-1.9.3-p125.tar.bz2) = bcdd597cfea7f79fb949314f265fc36af7de16a5 -RMD160 (ruby193-base-201202170/ruby-1.9.3-p125.tar.bz2) = 37517b3b0ab27ec09e3c5a5c48102d39f9657e28 -Size (ruby193-base-201202170/ruby-1.9.3-p125.tar.bz2) = 9733962 bytes +SHA1 (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = afb497dc10ea3d83ecbe3ccd9ed45fba1457721c +RMD160 (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = bca45d750cfd8523e838903c8693749652960d60 +Size (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = 9841223 bytes SHA1 (patch-configure) = 3045588df7baca5e100363eaef64567d6a59d527 SHA1 (patch-configure.in) = c6671d30e11dfb2d5e4b253b6f3e53cf32af0152 SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5 -SHA1 (patch-ext_dbm_extconf.rb) = 9fcf42c12e8220e85b4b58aa32e4fbd9cdad6889 SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8 SHA1 (patch-lib_rubygems.rb) = cc02e3a296d88605ef8444d64ca805ddebb524c6 SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 85b666544fc0787e67bb54071d8660cbfe3015d6 SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 7d8dd07d332f0e89822d06f2d71e7552358107cc SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = b8e18f1feedb7966e2a5280d6020c6134a7d83a3 -SHA1 (patch-lib_rubygems_config__file.rb) = 7c07ac3069c5186d7e2eaef6128291ee1d49f0e9 +SHA1 (patch-lib_rubygems_config__file.rb) = ed4ff25ea89a2d13ee601c7edfda0902f08fe29c SHA1 (patch-lib_rubygems_defaults.rb) = 101a6e653ef3811cdda3ed333b50448c0d3f0d26 SHA1 (patch-lib_rubygems_dependency__installer.rb) = 572775dd430619f93168732ad312d06819b6f1d7 SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc742d3 SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180 SHA1 (patch-lib_rubygems_installer.rb) = cec82bd0c5255a2a23799273c7a2835e2bef7e33 -SHA1 (patch-lib_rubygems_specification.rb) = 187e290d3b1d05dee348960391240b1a8d6b21cc +SHA1 (patch-lib_rubygems_specification.rb) = 1c39cabe198607661052511162c32b0293ffc30a SHA1 (patch-lib_rubygems_uninstaller.rb) = bde19710968f80e56760288d09870a08f3a4ec52 SHA1 (patch-man_erb.1) = 210aa77328689868162566bf01e3ba261dec0c2b SHA1 (patch-man_irb.1) = 899fdd973bb2491cf7f606ee68ffa6cdbe42f725 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 -- cgit v1.2.3