Update to 2.1.7

This commit is contained in:
jeremy 2015-08-22 15:13:41 +00:00
parent e42ca93cb8
commit 9c54e94f14
4 changed files with 20 additions and 106 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2015/06/29 18:55:03 jeremy Exp $
# $OpenBSD: Makefile,v 1.16 2015/08/22 15:13:41 jeremy Exp $
BROKEN-mips64 = miniruby spins on rbconfig.rb
@ -7,7 +7,7 @@ COMMENT-gdbm = gdbm interface for ruby
COMMENT-tk = tk interface for ruby
COMMENT-ri_docs = ri documentation files for ruby
VERSION = 2.1.6
VERSION = 2.1.7
RUBYLIBREV = 2.1
DISTNAME = ruby-${VERSION}
@ -17,7 +17,6 @@ PKGNAME-gdbm = ruby21-gdbm-${VERSION}
PKGNAME-tk = ruby21-tk-${VERSION}
PKGNAME-ri_docs = ruby21-ri_docs-${VERSION}
REVISION-main = 0
PKG_ARCH-ri_docs = *
WANTLIB-ri_docs = # empty

View File

@ -1,2 +1,2 @@
SHA256 (ruby-2.1.6.tar.gz) = HhNirnQnyR+lPcnAWu5O4gDi19iXCokcW9dr7ijSi+Q=
SIZE (ruby-2.1.6.tar.gz) = 15141710
SHA256 (ruby-2.1.7.tar.gz) = 9ZwVlqw5zH5gEm59NpjBn0gvBAYGdP3+ASThdSum3YE=
SIZE (ruby-2.1.7.tar.gz) = 15151458

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-lib_rubygems_remote_fetcher_rb,v 1.1 2015/06/29 18:55:03 jeremy Exp $
Add fixes for CVE-2015-3900 and CVE-2015-4020.
--- lib/rubygems/remote_fetcher.rb.orig Mon Jun 29 08:16:00 2015
+++ lib/rubygems/remote_fetcher.rb Mon Jun 29 08:16:29 2015
@@ -90,7 +90,13 @@ class Gem::RemoteFetcher
rescue Resolv::ResolvError
uri
else
- URI.parse "#{uri.scheme}://#{res.target}#{uri.path}"
+ target = res.target.to_s.strip
+
+ if /\.#{Regexp.quote(host)}\z/ =~ target
+ return URI.parse "#{uri.scheme}://#{target}#{uri.path}"
+ end
+
+ uri
end
end

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-ri_docs,v 1.5 2015/04/15 21:59:38 jeremy Exp $
@comment $OpenBSD: PLIST-ri_docs,v 1.6 2015/08/22 15:13:41 jeremy Exp $
share/ri/
share/ri/${RUBYLIBREV}/
share/ri/${RUBYLIBREV}/system/
@ -570,84 +570,6 @@ share/ri/${RUBYLIBREV}/system/CGI/parse-c.ri
share/ri/${RUBYLIBREV}/system/CGI/print-i.ri
share/ri/${RUBYLIBREV}/system/CGI/stdinput-i.ri
share/ri/${RUBYLIBREV}/system/CGI/stdoutput-i.ri
share/ri/${RUBYLIBREV}/system/CMath/
share/ri/${RUBYLIBREV}/system/CMath/acos%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/acos%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/acos-c.ri
share/ri/${RUBYLIBREV}/system/CMath/acos-i.ri
share/ri/${RUBYLIBREV}/system/CMath/acosh%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/acosh%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/acosh-c.ri
share/ri/${RUBYLIBREV}/system/CMath/acosh-i.ri
share/ri/${RUBYLIBREV}/system/CMath/asin%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/asin%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/asin-c.ri
share/ri/${RUBYLIBREV}/system/CMath/asin-i.ri
share/ri/${RUBYLIBREV}/system/CMath/asinh%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/asinh%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/asinh-c.ri
share/ri/${RUBYLIBREV}/system/CMath/asinh-i.ri
share/ri/${RUBYLIBREV}/system/CMath/atan%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/atan%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/atan-c.ri
share/ri/${RUBYLIBREV}/system/CMath/atan-i.ri
share/ri/${RUBYLIBREV}/system/CMath/atan2%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/atan2%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/atan2-c.ri
share/ri/${RUBYLIBREV}/system/CMath/atan2-i.ri
share/ri/${RUBYLIBREV}/system/CMath/atanh%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/atanh%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/atanh-c.ri
share/ri/${RUBYLIBREV}/system/CMath/atanh-i.ri
share/ri/${RUBYLIBREV}/system/CMath/cbrt%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/cbrt%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/cbrt-c.ri
share/ri/${RUBYLIBREV}/system/CMath/cbrt-i.ri
share/ri/${RUBYLIBREV}/system/CMath/cdesc-CMath.ri
share/ri/${RUBYLIBREV}/system/CMath/cos%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/cos%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/cos-c.ri
share/ri/${RUBYLIBREV}/system/CMath/cos-i.ri
share/ri/${RUBYLIBREV}/system/CMath/cosh%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/cosh%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/cosh-c.ri
share/ri/${RUBYLIBREV}/system/CMath/cosh-i.ri
share/ri/${RUBYLIBREV}/system/CMath/exp%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/exp%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/exp-c.ri
share/ri/${RUBYLIBREV}/system/CMath/exp-i.ri
share/ri/${RUBYLIBREV}/system/CMath/log%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/log%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/log-c.ri
share/ri/${RUBYLIBREV}/system/CMath/log-i.ri
share/ri/${RUBYLIBREV}/system/CMath/log10%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/log10%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/log10-c.ri
share/ri/${RUBYLIBREV}/system/CMath/log10-i.ri
share/ri/${RUBYLIBREV}/system/CMath/log2%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/log2%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/log2-c.ri
share/ri/${RUBYLIBREV}/system/CMath/log2-i.ri
share/ri/${RUBYLIBREV}/system/CMath/sin%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/sin%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/sin-c.ri
share/ri/${RUBYLIBREV}/system/CMath/sin-i.ri
share/ri/${RUBYLIBREV}/system/CMath/sinh%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/sinh%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/sinh-c.ri
share/ri/${RUBYLIBREV}/system/CMath/sinh-i.ri
share/ri/${RUBYLIBREV}/system/CMath/sqrt%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/sqrt%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/sqrt-c.ri
share/ri/${RUBYLIBREV}/system/CMath/sqrt-i.ri
share/ri/${RUBYLIBREV}/system/CMath/tan%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/tan%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/tan-c.ri
share/ri/${RUBYLIBREV}/system/CMath/tan-i.ri
share/ri/${RUBYLIBREV}/system/CMath/tanh%21-c.ri
share/ri/${RUBYLIBREV}/system/CMath/tanh%21-i.ri
share/ri/${RUBYLIBREV}/system/CMath/tanh-c.ri
share/ri/${RUBYLIBREV}/system/CMath/tanh-i.ri
share/ri/${RUBYLIBREV}/system/CSV/
share/ri/${RUBYLIBREV}/system/CSV/%3c%3c-i.ri
share/ri/${RUBYLIBREV}/system/CSV/MalformedCSVError/
@ -6431,7 +6353,10 @@ share/ri/${RUBYLIBREV}/system/Object/Digest-i.ri
share/ri/${RUBYLIBREV}/system/Object/ParseError/
share/ri/${RUBYLIBREV}/system/Object/ParseError/cdesc-ParseError.ri
share/ri/${RUBYLIBREV}/system/Object/TimeoutError/
share/ri/${RUBYLIBREV}/system/Object/TimeoutError/catch-c.ri
share/ri/${RUBYLIBREV}/system/Object/TimeoutError/cdesc-TimeoutError.ri
share/ri/${RUBYLIBREV}/system/Object/TimeoutError/exception-i.ri
share/ri/${RUBYLIBREV}/system/Object/TimeoutError/thread-i.ri
share/ri/${RUBYLIBREV}/system/Object/cdesc-Object.ri
share/ri/${RUBYLIBREV}/system/Object/class-i.ri
share/ri/${RUBYLIBREV}/system/Object/clone-i.ri
@ -9697,7 +9622,6 @@ share/ri/${RUBYLIBREV}/system/REXML/Attribute/%3d%3d-i.ri
share/ri/${RUBYLIBREV}/system/REXML/Attribute/cdesc-Attribute.ri
share/ri/${RUBYLIBREV}/system/REXML/Attribute/clone-i.ri
share/ri/${RUBYLIBREV}/system/REXML/Attribute/doctype-i.ri
share/ri/${RUBYLIBREV}/system/REXML/Document/document-i.ri
share/ri/${RUBYLIBREV}/system/REXML/Attribute/element%3d-i.ri
share/ri/${RUBYLIBREV}/system/REXML/Attribute/element-i.ri
share/ri/${RUBYLIBREV}/system/REXML/Attribute/hash-i.ri
@ -9796,6 +9720,7 @@ share/ri/${RUBYLIBREV}/system/REXML/Document/build-i.ri
share/ri/${RUBYLIBREV}/system/REXML/Document/cdesc-Document.ri
share/ri/${RUBYLIBREV}/system/REXML/Document/clone-i.ri
share/ri/${RUBYLIBREV}/system/REXML/Document/doctype-i.ri
share/ri/${RUBYLIBREV}/system/REXML/Document/document-i.ri
share/ri/${RUBYLIBREV}/system/REXML/Document/encoding-i.ri
share/ri/${RUBYLIBREV}/system/REXML/Document/entity_expansion_count-i.ri
share/ri/${RUBYLIBREV}/system/REXML/Document/entity_expansion_limit%3d-c.ri
@ -14175,9 +14100,20 @@ share/ri/${RUBYLIBREV}/system/Time/zone_offset-i.ri
share/ri/${RUBYLIBREV}/system/Time/zone_utc%3f-i.ri
share/ri/${RUBYLIBREV}/system/Timeout/
share/ri/${RUBYLIBREV}/system/Timeout/Error/
share/ri/${RUBYLIBREV}/system/Timeout/Error/catch-c.ri
share/ri/${RUBYLIBREV}/system/Timeout/Error/cdesc-Error.ri
share/ri/${RUBYLIBREV}/system/Timeout/Error/exception-i.ri
share/ri/${RUBYLIBREV}/system/Timeout/Error/thread-i.ri
share/ri/${RUBYLIBREV}/system/Timeout/ExitException/
share/ri/${RUBYLIBREV}/system/Timeout/ExitException/catch-c.ri
share/ri/${RUBYLIBREV}/system/Timeout/ExitException/cdesc-ExitException.ri
share/ri/${RUBYLIBREV}/system/Timeout/ExitException/exception-i.ri
share/ri/${RUBYLIBREV}/system/Timeout/ExitException/thread-i.ri
share/ri/${RUBYLIBREV}/system/Timeout/TimeoutError/
share/ri/${RUBYLIBREV}/system/Timeout/TimeoutError/catch-c.ri
share/ri/${RUBYLIBREV}/system/Timeout/TimeoutError/cdesc-TimeoutError.ri
share/ri/${RUBYLIBREV}/system/Timeout/TimeoutError/exception-i.ri
share/ri/${RUBYLIBREV}/system/Timeout/TimeoutError/thread-i.ri
share/ri/${RUBYLIBREV}/system/Timeout/cdesc-Timeout.ri
share/ri/${RUBYLIBREV}/system/Timeout/timeout-c.ri
share/ri/${RUBYLIBREV}/system/Timeout/timeout-i.ri