nokogiri 1.6.7.rc3-x86-mingw32 → 1.6.7.rc4-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78939392649f5b906b88edbe0b5bfdb505646ffa
-  data.tar.gz: 64edbd21264ed1cf15ec141fb071fe039e0202cb
+  metadata.gz: 397b90666e901d199364ab97f5e27153e292c0db
+  data.tar.gz: 3cceb8d58f82f3f0093b08086b11757b6559d8e8
 SHA512:
-  metadata.gz: 831ac3adcc7d679c33885581e567cd365208afd328ea26af1efe5212de859bfddacd791652d93d9eb0af065fa1a04b9b91cc8c018751294dd7df0ea4b5b430f7
-  data.tar.gz: a1b75ec418f92fbf30d59bf7a0423b99387f6d86e20b45afde753d02928d447973becd40c337f82297cdb3bdec00e56d74bf6e565a2560707e5ca5abdafb86b5
+  metadata.gz: 70bbb7a3482a347e768cba035b5934693a3d6d346c71fc498511cfa153f7fc367317f160649246acaab66811b3775fbe4ba320dcf0e79c55ae13a16267d1cefd
+  data.tar.gz: 4c8515458a626b9bb0465d0f741389c794f2c584576df5c4d60b58dd2253004a6fd25195e96af0340e72979dc738186dbb55eba59bf647f359d9e34ec4a94878

data/CHANGELOG.ja.rdoc

@@ -1,4 +1,32 @@
-=== 1.6.7.rc2 / 2015年08月31日
+=== 1.6.7.rc4 / 2015年11月22日
+
+==== Security patches
+
+This version pulls in several upstream patches to the vendored libxml2 and libxslt to address:
+
+* CVE-2015-1819
+* CVE-2015-7941_1
+* CVE-2015-7941_2
+* CVE-2015-7942
+* CVE-2015-7942-2
+* CVE-2015-8035
+* CVE-2015-7995
+* unclosed comment uninitialized access issue (does not have a CVE assigned)
+
+See #1374 and #1376 for details.
+
+==== Features
+
+* [MRI] libxml2 and libxslt `config.guess` files brought up to date. (#1326) (Thanks, @hernan-erasmo!)
+* [JRuby] fix error in validating files with jruby (#1355, #1361) (Thanks, @twalpole!)
+* [MRI, OSX] Patch to handle nonstandard location of `iconv.h`. (#1206, #1210, #1218, #1345) (Thanks, @neonichu!)
+
+==== Bug Fixes
+
+* [JRuby] reset the namespace cache when replacing the document's innerHtml (#1265) (Thanks, @mkristian!)
+
+
+=== 1.6.7.rc3 / 2015年09月04日 and 1.6.7.rc2 / 2015年08月31日
 
 Note that rc1 was not released.
 

data/CHANGELOG.rdoc

@@ -1,3 +1,31 @@
+=== 1.6.7.rc4 / 2015-11-22
+
+==== Security patches
+
+This version pulls in several upstream patches to the vendored libxml2 and libxslt to address:
+
+* CVE-2015-1819
+* CVE-2015-7941_1
+* CVE-2015-7941_2
+* CVE-2015-7942
+* CVE-2015-7942-2
+* CVE-2015-8035
+* CVE-2015-7995
+* unclosed comment uninitialized access issue (does not have a CVE assigned)
+
+See #1374 and #1376 for details.
+
+==== Features
+
+* [MRI] libxml2 and libxslt `config.guess` files brought up to date. (#1326) (Thanks, @hernan-erasmo!)
+* [JRuby] fix error in validating files with jruby (#1355, #1361) (Thanks, @twalpole!)
+* [MRI, OSX] Patch to handle nonstandard location of `iconv.h`. (#1206, #1210, #1218, #1345) (Thanks, @neonichu!)
+
+==== Bug Fixes
+
+* [JRuby] reset the namespace cache when replacing the document's innerHtml (#1265) (Thanks, @mkristian!)
+
+
 === 1.6.7.rc3 / 2015-09-04 and 1.6.7.rc2 / 2015-08-31
 
 Note that rc1 was not released.

data/Gemfile

@@ -4,7 +4,7 @@
 
 source "https://rubygems.org/"
 
-gem "mini_portile", "~>0.7.0.rc4"
+gem "mini_portile2", "~>2.0.0.rc2"
 
 gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", ">=1.1", :group => [:development, :test]
@@ -17,6 +17,6 @@ gem "rake-compiler", "~>0.9.2", :group => [:development, :test]
 gem "rake-compiler-dock", "~>0.4.2", :group => [:development, :test]
 gem "racc", ">=1.4.6", :group => [:development, :test], :platform => :ruby
 gem "rexical", ">=1.0.5", :group => [:development, :test], :platform => :ruby
-gem "hoe", "~>3.13", :group => [:development, :test]
+gem "hoe", "~>3.14", :group => [:development, :test]
 
 # vim: syntax=ruby

data/Rakefile

@@ -128,7 +128,8 @@ HOE = Hoe.spec 'nokogiri' do
 
   unless java?
     self.extra_deps += [
-      ["mini_portile",    "~> 0.7.0.rc4"],
+      # Keep this version in sync with the one in extconf.rb !
+      ["mini_portile2",    "~> 2.0.0.rc2"],
     ]
   end
 

data/ext/nokogiri/extconf.rb

@@ -391,7 +391,12 @@ when using_system_libraries?
 else
   message "Building nokogiri using packaged libraries.\n"
 
-  require 'mini_portile'
+  # The gem version constraint in the Rakefile is not respected at install time.
+  # Keep this version in sync with the one in the Rakefile !
+  gem "mini_portile2", "~> 2.0.0.rc2"
+  require 'mini_portile2'
+  message "Using mini_portile version #{MiniPortile::VERSION}\n"
+
   require 'yaml'
 
   static_p = enable_config('static', true) or
@@ -448,10 +453,10 @@ else
       ]
     end
   else
-    if darwin_p && !File.exist?('/usr/include/iconv.h')
+    if darwin_p && !have_header('iconv.h')
       abort <<'EOM'.chomp
 -----
-The file "/usr/include/iconv.h" is missing in your build environment,
+The file "iconv.h" is missing in your build environment,
 which means you haven't installed Xcode Command Line Tools properly.
 
 To install Command Line Tools, try running `xcode-select --install` on

data/ext/nokogiri/xml_sax_parser_context.c

@@ -206,7 +206,7 @@ static VALUE column(VALUE self)
  *  recovery=(boolean)
  *
  * Should this parser recover from structural errors? It will not stop processing
- * file on structural errors if if set to true
+ * file on structural errors if set to true
  */
 static VALUE set_recovery(VALUE self, VALUE value)
 {
@@ -226,7 +226,7 @@ static VALUE set_recovery(VALUE self, VALUE value)
  *  recovery
  *
  * Should this parser recover from structural errors? It will not stop processing
- * file on structural errors if if set to true
+ * file on structural errors if set to true
  */
 static VALUE get_recovery(VALUE self)
 {

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.6.7.rc3'
+  VERSION = '1.6.7.rc4'
 
   class VersionInfo # :nodoc:
     def jruby?

data/test/html/test_document.rb

@@ -14,6 +14,11 @@ module Nokogiri
         assert @html.xpath(nil)
       end
 
+      def test_does_not_fail_with_illformatted_html
+        doc = Nokogiri::HTML('"</html>";'.force_encoding(Encoding::BINARY))
+        assert_not_nil doc
+      end
+
       def test_exceptions_remove_newlines
         errors = @html.errors
         assert errors.length > 0, 'has errors'

data/test/xml/test_schema.rb

@@ -94,9 +94,22 @@ EOF
       end
 
       def test_validate_invalid_document
-        read_doc = File.read(PO_XML_FILE).gsub(/<city>[^<]*<\/city>/, '')
+        doc = Nokogiri::XML File.read(PO_XML_FILE)
+        doc.css("city").unlink
 
-        assert errors = @xsd.validate(Nokogiri::XML(read_doc))
+        assert errors = @xsd.validate(doc)
+        assert_equal 2, errors.length
+      end
+
+      def test_validate_invalid_file
+        tempfile = Tempfile.new("xml")
+
+        doc = Nokogiri::XML File.read(PO_XML_FILE)
+        doc.css("city").unlink
+        tempfile.write doc.to_xml
+        tempfile.close
+
+        assert errors = @xsd.validate(tempfile.path)
         assert_equal 2, errors.length
       end
 

data/test/xml/test_xpath.rb

@@ -425,6 +425,21 @@ END
         assert_equal 1, xml_doc.xpath('//mods:titleInfo',ns_hash).length
         assert_equal 'finnish', xml_doc.xpath('//mods:titleInfo[1]/@lang',ns_hash).first.value
       end
+
+      def test_xpath_after_reset_doc_via_innerhtml
+        xml = <<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<document xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0">
+  <text:section name="Section1">[TEXT_INSIDE_SECTION]</text:section>
+</document>
+XML
+
+        doc = Nokogiri::XML(xml)
+        doc.inner_html = doc.inner_html
+        sections = doc.xpath(".//text:section[@name='Section1']")
+        assert_equal 1, sections.size
+        assert_equal "[TEXT_INSIDE_SECTION]", sections.first.text
+      end
     end
   end
 end

data/test_all

@@ -14,11 +14,11 @@
 RUBIES="\
   ruby-2.2 \
   ruby-2.1 \
-  ruby-2.0.0-p598 \
+  ruby-2.0.0-p647 \
   ruby-1.9.3-p551 \
   ruby-1.9.2-p330 \
-  jruby-9.0.0.0.pre1 \
-  jruby-1.7.18
+  jruby-9.0.4.0 \
+  jruby-1.7.19
   "
 
 TEST_LOG=test.log

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.7.rc3
+  version: 1.6.7.rc4
 platform: x86-mingw32
 authors:
 - Aaron Patterson
@@ -12,22 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mini_portile
+  name: mini_portile2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0.rc4
+        version: 2.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0.rc4
+        version: 2.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -188,14 +188,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
 description: |-
   Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among
   Nokogiri's many features is the ability to search documents via XPath