Update ruby-nokogiri to 1.5.5. Fixes an XXE security issue.

This commit is contained in:
jeremy 2012-06-29 16:41:53 +00:00
parent e7d0106f4d
commit d931b17c3f
3 changed files with 24 additions and 29 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2012/06/07 15:35:58 jeremy Exp $
# $OpenBSD: Makefile,v 1.15 2012/06/29 16:41:53 jeremy Exp $
COMMENT= HTML, XML, SAX and Reader parser
DISTNAME= nokogiri-1.5.3
DISTNAME= nokogiri-1.5.5
CATEGORIES= textproc
HOMEPAGE= http://nokogiri.rubyforge.org/nokogiri

View File

@ -1,5 +1,5 @@
MD5 (nokogiri-1.5.3.gem) = Nrfv7IgI6hH0PyPeSZPELQ==
RMD160 (nokogiri-1.5.3.gem) = cbtJF8KKu2096+BNsM6gZ8jpvHY=
SHA1 (nokogiri-1.5.3.gem) = KDH5/k2Orda5TxZPWPWh6FjSptQ=
SHA256 (nokogiri-1.5.3.gem) = bfIHh2WhAUsQvizwJSZIqktGJzmhGNx4ZKg8K04rjn8=
SIZE (nokogiri-1.5.3.gem) = 205824
MD5 (nokogiri-1.5.5.gem) = tlsmB78bPmzbBJH6q4FuaA==
RMD160 (nokogiri-1.5.5.gem) = vJ+da3r6ppf8z7L0W3gqLctr+MU=
SHA1 (nokogiri-1.5.5.gem) = xQW0YPzwOdtpwIzP5p2i3Li5Xxo=
SHA256 (nokogiri-1.5.5.gem) = dkACGKnnCZ1NbUrSu28SGNgK6Toetn40tB5obTeI1I8=
SIZE (nokogiri-1.5.5.gem) = 209920

View File

@ -1,33 +1,28 @@
$OpenBSD: patch-Rakefile,v 1.2 2012/06/07 15:35:58 jeremy Exp $
$OpenBSD: patch-Rakefile,v 1.3 2012/06/29 16:41:53 jeremy Exp $
Allow regress tests to work.
--- Rakefile.orig Wed Dec 31 16:00:00 1969
+++ Rakefile Fri Jun 1 14:17:42 2012
@@ -37,18 +37,6 @@ HOE = Hoe.spec 'nokogiri' do
GENERATED_TOKENIZER
]
- self.extra_dev_deps += [
- ["hoe-bundler", ">= 1.1"],
- ["hoe-debugging", ">= 1.0.3"],
- ["hoe-gemspec", ">= 1.0"],
- ["hoe-git", ">= 1.4"],
- ["mini_portile", ">= 0.2.2"],
- ["minitest", "~> 2.2.2"],
- ["racc", ">= 1.4.6"],
- ["rake-compiler", "= 0.8.0"],
- ["rexical", ">= 1.0.5"],
+++ Rakefile Tue Jun 26 15:04:00 2012
@@ -47,12 +47,12 @@ HOE = Hoe.spec 'nokogiri' do
["minitest", "~> 2.2.2"],
["rake", ">= 0.9"],
["rake-compiler", "= 0.8.0"]
- ]
-
+ ].clear
if ! java?
self.extra_dev_deps += [
["racc", ">= 1.4.6"],
["rexical", ">= 1.0.5"]
- ]
+ ].clear
end
if java?
self.spec_extras = { :platform => 'java' }
else
@@ -83,7 +71,7 @@ if java?
else
@@ -90,6 +90,7 @@ else
mingw_available = true
begin
- require 'tasks/cross_compile'
require 'tasks/cross_compile'
+ raise
rescue
mingw_available = false