Update to 2.0.0-p647

This commit is contained in:
jeremy 2015-08-22 15:13:05 +00:00
parent e3f28d35d5
commit e42ca93cb8
3 changed files with 4 additions and 26 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2015/06/29 18:55:03 jeremy Exp $
# $OpenBSD: Makefile,v 1.23 2015/08/22 15:13:05 jeremy Exp $
COMMENT-main = object oriented script language with threads
COMMENT-gdbm = gdbm interface for ruby
@ -6,7 +6,7 @@ COMMENT-tk = tk interface for ruby
COMMENT-ri_docs = ri documentation files for ruby
VERSION = 2.0.0
PATCHLEVEL = 645
PATCHLEVEL = 647
RUBYLIBREV = 2.0
DISTNAME = ruby-${VERSION}-p${PATCHLEVEL}
@ -16,7 +16,6 @@ PKGNAME-gdbm = ruby20-gdbm-${VERSION}.${PATCHLEVEL}
PKGNAME-tk = ruby20-tk-${VERSION}.${PATCHLEVEL}
PKGNAME-ri_docs = ruby20-ri_docs-${VERSION}.${PATCHLEVEL}
REVISION-main = 0
PKG_ARCH-ri_docs = *
WANTLIB-ri_docs = # empty

View File

@ -1,2 +1,2 @@
SHA256 (ruby-2.0.0-p645.tar.gz) = Xp+O///pfLpe8AFf7sbh5fO6z2rOeM0c33JwjNcc9Ks=
SIZE (ruby-2.0.0-p645.tar.gz) = 13620967
SHA256 (ruby-2.0.0-p647.tar.gz) = yIqvW07HLiy30pD/hU8E0TWTn2E09RcAKp1l1fxeW+w=
SIZE (ruby-2.0.0-p647.tar.gz) = 13621258

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 Thu Oct 24 07:31:17 2013
+++ lib/rubygems/remote_fetcher.rb Mon Jun 29 08:08:16 2015
@@ -103,7 +103,13 @@ class Gem::RemoteFetcher
rescue Resolv::ResolvError
uri
else
- URI.parse "#{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