Date: Tue, 14 Apr 2015 00:36:00 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383966 - in head: Mk lang/ruby20 lang/ruby21 lang/ruby22 lang/ruby22/files Message-ID: <201504140036.t3E0a0EE022559@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue Apr 14 00:35:59 2015 New Revision: 383966 URL: https://svnweb.freebsd.org/changeset/ports/383966 Log: Update Ruby to latest versions to address CVE-2015-1855. Security: https://www.ruby-lang.org/en/news/2015/04/13/ruby-openssl-hostname-matching-vulnerability/ (vuxml forthcoming) Modified: head/Mk/bsd.ruby.mk head/lang/ruby20/distinfo head/lang/ruby21/distinfo head/lang/ruby21/pkg-plist head/lang/ruby22/distinfo head/lang/ruby22/files/patch-tool_rbinstall.rb Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Mon Apr 13 22:47:33 2015 (r383965) +++ head/Mk/bsd.ruby.mk Tue Apr 14 00:35:59 2015 (r383966) @@ -172,17 +172,17 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} # Ruby 2.0 # RUBY_RELVERSION= 2.0.0 -RUBY_PORTREVISION= 1 +RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 -RUBY_PATCHLEVEL= 643 +RUBY_PATCHLEVEL= 645 RUBY20= "" # PLIST_SUB helpers . elif ${RUBY_VER} == 2.1 # # Ruby 2.1 # -RUBY_RELVERSION= 2.1.5 -RUBY_PORTREVISION= 4 +RUBY_RELVERSION= 2.1.6 +RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY21= "" # PLIST_SUB helpers @@ -191,8 +191,8 @@ RUBY21= "" # PLIST_SUB helpers # # Ruby 2.2 # -RUBY_RELVERSION= 2.2.1 -RUBY_PORTREVISION= 1 +RUBY_RELVERSION= 2.2.2 +RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY22= "" # PLIST_SUB helpers Modified: head/lang/ruby20/distinfo ============================================================================== --- head/lang/ruby20/distinfo Mon Apr 13 22:47:33 2015 (r383965) +++ head/lang/ruby20/distinfo Tue Apr 14 00:35:59 2015 (r383966) @@ -1,2 +1,2 @@ -SHA256 (ruby/ruby-2.0.0-p643.tar.bz2) = 1f626f20647693a215a8db3ea0d6ab5ab9cee7c1945cc441b9f8f7b9612b91a0 -SIZE (ruby/ruby-2.0.0-p643.tar.bz2) = 10772113 +SHA256 (ruby/ruby-2.0.0-p645.tar.bz2) = 2dcdcf9900cb923a16d3662d067bc8c801997ac3e4a774775e387e883b3683e9 +SIZE (ruby/ruby-2.0.0-p645.tar.bz2) = 10786492 Modified: head/lang/ruby21/distinfo ============================================================================== --- head/lang/ruby21/distinfo Mon Apr 13 22:47:33 2015 (r383965) +++ head/lang/ruby21/distinfo Tue Apr 14 00:35:59 2015 (r383966) @@ -1,2 +1,2 @@ -SHA256 (ruby/ruby-2.1.5.tar.xz) = 22ba1eb8d475c9ed7e0541418d86044c1ea4c093ab79c300c38fc0f721afe9a3 -SIZE (ruby/ruby-2.1.5.tar.xz) = 9371780 +SHA256 (ruby/ruby-2.1.6.tar.xz) = 137b27bffefd795fd97c288fff539d135f42320f8a1afddde99a34e1fbe7314e +SIZE (ruby/ruby-2.1.6.tar.xz) = 9381724 Modified: head/lang/ruby21/pkg-plist ============================================================================== --- head/lang/ruby21/pkg-plist Mon Apr 13 22:47:33 2015 (r383965) +++ head/lang/ruby21/pkg-plist Tue Apr 14 00:35:59 2015 (r383966) @@ -759,6 +759,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER% %%RUBY_LIBDIR%%/rubygems/source_specific_file.rb %%RUBY_LIBDIR%%/rubygems/spec_fetcher.rb %%RUBY_LIBDIR%%/rubygems/specification.rb +%%RUBY_LIBDIR%%/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem +%%RUBY_LIBDIR%%/rubygems/ssl_certs/AddTrustExternalCARoot.pem %%RUBY_LIBDIR%%/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem %%RUBY_LIBDIR%%/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem %%RUBY_LIBDIR%%/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem Modified: head/lang/ruby22/distinfo ============================================================================== --- head/lang/ruby22/distinfo Mon Apr 13 22:47:33 2015 (r383965) +++ head/lang/ruby22/distinfo Tue Apr 14 00:35:59 2015 (r383966) @@ -1,2 +1,2 @@ -SHA256 (ruby/ruby-2.2.1.tar.xz) = 3b2852c07fdc12d0ba2b5698c7587ae2b46141539a526d143da5860b55a626c0 -SIZE (ruby/ruby-2.2.1.tar.xz) = 10320352 +SHA256 (ruby/ruby-2.2.2.tar.xz) = f033b5d08ab57083e48c1d81bcd7399967578c370b664da90e12a32891424462 +SIZE (ruby/ruby-2.2.2.tar.xz) = 10463044 Modified: head/lang/ruby22/files/patch-tool_rbinstall.rb ============================================================================== --- head/lang/ruby22/files/patch-tool_rbinstall.rb Mon Apr 13 22:47:33 2015 (r383965) +++ head/lang/ruby22/files/patch-tool_rbinstall.rb Tue Apr 14 00:35:59 2015 (r383966) @@ -1,5 +1,5 @@ ---- tool/rbinstall.rb.orig 2014-12-26 15:44:52.000000000 +0900 -+++ tool/rbinstall.rb 2015-03-06 07:28:12.508424655 +0900 +--- tool/rbinstall.rb.orig 2015-03-25 03:33:14.000000000 +0000 ++++ tool/rbinstall.rb 2015-04-13 18:16:00.160952000 +0000 @@ -311,6 +311,7 @@ libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true] rubyhdrdir = CONFIG["rubyhdrdir", true] @@ -79,7 +79,7 @@ -install?(:ext, :comm, :gem) do - begin - require "zlib" -- rescue LoadErroe +- rescue LoadError - end - if defined?(Zlib) - require 'pathname'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504140036.t3E0a0EE022559>