diff options
author | taca <taca> | 2015-04-19 16:19:00 +0000 |
---|---|---|
committer | taca <taca> | 2015-04-19 16:19:00 +0000 |
commit | f44a8ea1e65f0147ee2825327edffa32e1d92b77 (patch) | |
tree | ddb52a6ca8b95869fb743d165bd868b71852e551 /lang | |
parent | 4b134e3c3b0acfbb580b8d013ad430b8990b2905 (diff) | |
download | pkgsrc-f44a8ea1e65f0147ee2825327edffa32e1d92b77.tar.gz |
Update ruby21-base and ruby21 packages to 2.1.6.
From release announce:
Ruby 2.1.6 has been released.
This release includes a security fix for OpenSSL extension. Please view the
topic below for more details.
CVE-2015-1855: Ruby OpenSSL Hostname Verification
And, many bug fixes are also included. See tickets and ChangeLog for details.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/ruby/rubyversion.mk | 6 | ||||
-rw-r--r-- | lang/ruby21-base/PLIST | 9 | ||||
-rw-r--r-- | lang/ruby21-base/distinfo | 9 | ||||
-rw-r--r-- | lang/ruby21-base/patches/patch-lib_rdoc_text.rb | 20 |
4 files changed, 12 insertions, 32 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index feb23b79832..49bdcbbcf52 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.139 2015/04/19 16:12:23 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.140 2015/04/19 16:19:00 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -229,14 +229,14 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/} RUBY18_VERSION= 1.8.7 RUBY193_VERSION= 1.9.3 RUBY200_VERSION= 2.0.0 -RUBY21_VERSION= 2.1.5 +RUBY21_VERSION= 2.1.6 RUBY22_VERSION= 2.2.1 # patch RUBY18_PATCHLEVEL= pl374 RUBY193_PATCHLEVEL= p551 RUBY200_PATCHLEVEL= p645 -#RUBY21_PATCHLEVEL= p273 +#RUBY21_PATCHLEVEL= p336 #RUBY22_PATCHLEVEL= p85 # current API compatible version; used for version of shared library diff --git a/lang/ruby21-base/PLIST b/lang/ruby21-base/PLIST index 785404c1b8d..d672029cbd4 100644 --- a/lang/ruby21-base/PLIST +++ b/lang/ruby21-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2015/01/02 07:32:58 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.6 2015/04/19 16:19:00 taca Exp $ bin/erb${RUBY_SUFFIX} bin/gem${RUBY_SUFFIX} bin/irb${RUBY_SUFFIX} @@ -712,6 +712,7 @@ ${RUBY_LIB}/rubygems/source_specific_file.rb ${RUBY_LIB}/rubygems/spec_fetcher.rb ${RUBY_LIB}/rubygems/specification.rb ${RUBY_LIB}/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem +${RUBY_LIB}/rubygems/ssl_certs/AddTrustExternalCARoot.pem ${RUBY_LIB}/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem ${RUBY_LIB}/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem ${RUBY_LIB}/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem @@ -922,15 +923,15 @@ ${RUBY_ARCHLIB}/zlib.${RUBY_DLEXT} ${GEM_HOME}/gems/rake-10.1.0/bin/rake ${GEM_HOME}/gems/rdoc-4.1.0/bin/rdoc ${GEM_HOME}/gems/rdoc-4.1.0/bin/ri -${GEM_HOME}/gems/test-unit-2.1.5.0/bin/testrb +${GEM_HOME}/gems/test-unit-2.1.6.0/bin/testrb ${GEM_HOME}/specifications/default/bigdecimal-1.2.4.gemspec -${GEM_HOME}/specifications/default/io-console-0.4.2.gemspec +${GEM_HOME}/specifications/default/io-console-0.4.3.gemspec ${GEM_HOME}/specifications/default/json-1.8.1.gemspec ${GEM_HOME}/specifications/default/minitest-4.7.5.gemspec ${GEM_HOME}/specifications/default/psych-2.0.5.gemspec ${GEM_HOME}/specifications/default/rake-10.1.0.gemspec ${GEM_HOME}/specifications/default/rdoc-4.1.0.gemspec -${GEM_HOME}/specifications/default/test-unit-2.1.5.0.gemspec +${GEM_HOME}/specifications/default/test-unit-2.1.6.0.gemspec man/man1/erb${RUBY_SUFFIX}.1 man/man1/irb${RUBY_SUFFIX}.1 man/man1/rake${RUBY_SUFFIX}.1 diff --git a/lang/ruby21-base/distinfo b/lang/ruby21-base/distinfo index 7615f36917d..f41317d8750 100644 --- a/lang/ruby21-base/distinfo +++ b/lang/ruby21-base/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.14 2015/04/03 09:02:24 jperkin Exp $ +$NetBSD: distinfo,v 1.15 2015/04/19 16:19:00 taca Exp $ -SHA1 (ruby-2.1.5.tar.bz2) = d822e022bb8875724852f049f499f101d24a7fe5 -RMD160 (ruby-2.1.5.tar.bz2) = 32019c949a8c9bb716f6683a20f19231da452fda -Size (ruby-2.1.5.tar.bz2) = 11994454 bytes +SHA1 (ruby-2.1.6.tar.bz2) = 380c3a5fa508fdaa2b227dbc00c56f703fd271d4 +RMD160 (ruby-2.1.6.tar.bz2) = fa473e794ee0df4cd30aebfa70af16840a618c43 +Size (ruby-2.1.6.tar.bz2) = 12011651 bytes SHA1 (patch-configure) = 3c9f007caddd7155c3f3495f81eabe55b86651a5 SHA1 (patch-ext_dbm_extconf.rb) = 08520edd956e17cb6cc80b6ee2c77af77a834bd2 SHA1 (patch-ext_tk_extconf.rb) = fc80ef5a2859736ae85303cfb2fc78ce8bc70fbc @@ -16,7 +16,6 @@ SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = b0786f50ebab4b5a0ccf916054bc13f SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 92a4bc7b995554b9933b1e9f9ce4df87e365bcfb SHA1 (patch-ext_tk_tcltklib.c) = 475affcb88a06ac6daf622814a9da5027ca3d34e SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051 -SHA1 (patch-lib_rdoc_text.rb) = 71be8fa7620483e43ddf00001f44bc6c5ccb75ee SHA1 (patch-lib_rubygems.rb) = adfbb16b9d90fe38e253bcbd34d0efa712077f21 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 13b7f3bceb2876228027447640d51fde2700a970 diff --git a/lang/ruby21-base/patches/patch-lib_rdoc_text.rb b/lang/ruby21-base/patches/patch-lib_rdoc_text.rb deleted file mode 100644 index 47afb1d960e..00000000000 --- a/lang/ruby21-base/patches/patch-lib_rdoc_text.rb +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-lib_rdoc_text.rb,v 1.1 2015/03/08 15:08:33 taca Exp $ - -* Get rid of infitite loop with '\r' only in text (from changest r49223). - ---- lib/rdoc/text.rb.orig 2013-09-18 23:33:36.000000000 +0000 -+++ lib/rdoc/text.rb -@@ -68,11 +68,11 @@ module RDoc::Text - expanded = [] - - text.each_line do |line| -- line.gsub!(/^((?:.{8})*?)([^\t\r\n]{0,7})\t/) do -+ nil while line.gsub!(/(?:\G|\r)((?:.{8})*?)([^\t\r\n]{0,7})\t/) do - r = "#{$1}#{$2}#{' ' * (8 - $2.size)}" - r.force_encoding text.encoding if Object.const_defined? :Encoding - r -- end until line !~ /\t/ -+ end - - expanded << line - end |