From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 14 13:01:11 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4D5AE35; Tue, 14 Apr 2015 13:01:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 857F0D1F; Tue, 14 Apr 2015 13:01:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3ED1B6E070171; Tue, 14 Apr 2015 13:01:11 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3ED19lO070159; Tue, 14 Apr 2015 13:01:09 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201504141301.t3ED19lO070159@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 14 Apr 2015 13:01:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r383997 - in branches/2015Q2: Mk lang/ruby20 lang/ruby21 lang/ruby22 lang/ruby22/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2015 13:01:11 -0000 Author: swills Date: Tue Apr 14 13:01:08 2015 New Revision: 383997 URL: https://svnweb.freebsd.org/changeset/ports/383997 Log: MFH: r383966 Update Ruby to latest versions to address CVE-2015-1855. Security: d4379f59-3e9b-49eb-933b-61de4d0b0fdb Modified: branches/2015Q2/Mk/bsd.ruby.mk branches/2015Q2/lang/ruby20/distinfo branches/2015Q2/lang/ruby21/distinfo branches/2015Q2/lang/ruby21/pkg-plist branches/2015Q2/lang/ruby22/distinfo branches/2015Q2/lang/ruby22/files/patch-tool_rbinstall.rb Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/Mk/bsd.ruby.mk ============================================================================== --- branches/2015Q2/Mk/bsd.ruby.mk Tue Apr 14 12:44:40 2015 (r383996) +++ branches/2015Q2/Mk/bsd.ruby.mk Tue Apr 14 13:01:08 2015 (r383997) @@ -174,15 +174,15 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} RUBY_RELVERSION= 2.0.0 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= 3 +RUBY_RELVERSION= 2.1.6 +RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY21= "" # PLIST_SUB helpers @@ -191,7 +191,7 @@ RUBY21= "" # PLIST_SUB helpers # # Ruby 2.2 # -RUBY_RELVERSION= 2.2.1 +RUBY_RELVERSION= 2.2.2 RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 Modified: branches/2015Q2/lang/ruby20/distinfo ============================================================================== --- branches/2015Q2/lang/ruby20/distinfo Tue Apr 14 12:44:40 2015 (r383996) +++ branches/2015Q2/lang/ruby20/distinfo Tue Apr 14 13:01:08 2015 (r383997) @@ -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: branches/2015Q2/lang/ruby21/distinfo ============================================================================== --- branches/2015Q2/lang/ruby21/distinfo Tue Apr 14 12:44:40 2015 (r383996) +++ branches/2015Q2/lang/ruby21/distinfo Tue Apr 14 13:01:08 2015 (r383997) @@ -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: branches/2015Q2/lang/ruby21/pkg-plist ============================================================================== --- branches/2015Q2/lang/ruby21/pkg-plist Tue Apr 14 12:44:40 2015 (r383996) +++ branches/2015Q2/lang/ruby21/pkg-plist Tue Apr 14 13:01:08 2015 (r383997) @@ -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: branches/2015Q2/lang/ruby22/distinfo ============================================================================== --- branches/2015Q2/lang/ruby22/distinfo Tue Apr 14 12:44:40 2015 (r383996) +++ branches/2015Q2/lang/ruby22/distinfo Tue Apr 14 13:01:08 2015 (r383997) @@ -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: branches/2015Q2/lang/ruby22/files/patch-tool_rbinstall.rb ============================================================================== --- branches/2015Q2/lang/ruby22/files/patch-tool_rbinstall.rb Tue Apr 14 12:44:40 2015 (r383996) +++ branches/2015Q2/lang/ruby22/files/patch-tool_rbinstall.rb Tue Apr 14 13:01:08 2015 (r383997) @@ -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'