nokogiri 1.6.6.4 → 1.6.7.rc2

data/README.ja.rdoc

@@ -1,112 +0,0 @@
-= Nokogiri (鋸) {<img src="https://secure.travis-ci.org/sparklemotion/nokogiri.png?rvm=1.9.3" />}[http://travis-ci.org/sparklemotion/nokogiri] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/sparklemotion/nokogiri]
-
-* http://nokogiri.org
-* https://github.com/sparklemotion/nokogiri
-* https://groups.google.com/group/nokogiri-talk
-* https://github.com/sparklemotion/nokogiri/issues
-
-== DESCRIPTION:
-
-Nokogiri はHTMLとXMLとSAXとXSLTとReaderのパーサーです。とりわけ重要な特徴は、
-ドキュメントをXPathやCSS3セレクター経由で探索する機能を持つことです。
-
-XMLは暴力に似ている - XMLが君の問題を解決しないとしたら、君はXMLを十分に
-使いこなしていない事になる。
-
-== FEATURES:
-
-* XPath 1.0による探索
-* CSS3 のセレクターによる探索
-* XML/HTMLのビルダー
-
-XML/HTMLの高速な解析と探索検索、ならびにCSS3セレクタとXPath 1.0をサポートしています。
-
-== SUPPORT:
-
-日本語でNokogiriの
-{メーリングリスト}[https://groups.google.com/group/nokogiri-list]
-
-  * https://groups.google.com/group/nokogiri-list
-
-{バグ報告}[https://github.com/sparklemotion/nokogiri/issues]
-
-  * https://github.com/sparklemotion/nokogiri/issues
-
-IRCのチャンネルはfreenodeの #nokogiri です。
-
-== SYNOPSIS:
-
-  require 'nokogiri'
-  require 'open-uri'
-
-  # Fetch and parse HTML document
-  doc = Nokogiri::HTML(open('http://www.nokogiri.org/tutorials/installing_nokogiri.html'))
-
-  ####
-  # Search for nodes by css
-  doc.css('nav ul.menu li a').each do |link|
-    puts link.content
-  end
-
-  ####
-  # Search for nodes by xpath
-  doc.xpath('//h2 | //h3').each do |link|
-    puts link.content
-  end
-
-  ####
-  # Or mix and match.
-  doc.search('code.sh', '//h2').each do |link|
-    puts link.content
-  end
-
-
-== REQUIREMENTS:
-
-* ruby 1.9.3以上
-
-* Nokogiri 1.6.0以降ではlibxml2とlibxsltは同梱されているが、
-  もしインストール済みのものを使いたい場合:
-
-  * libxml2 2.6.21以上, iconvサポート付きのもの
-    (libxml2-dev/-develパッケージも必要)
-
-  * libxslt 上記のlibxml2でビルドされ、サポートされているもの
-    (libxslt-dev/-develパッケージも必要)
-
-== INSTALL:
-
-* sudo gem install nokogiri
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2008 - 2015:
-
-* {Aaron Patterson}[http://tenderlovemaking.com]
-* {Mike Dalessio}[http://mike.daless.io]
-* {Charles Nutter}[http://blog.headius.com]
-* {Sergio Arbeo}[http://www.serabe.com]
-* {Patrick Mahoney}[http://polycrystal.org]
-* {Yoko Harada}[http://yokolet.blogspot.com]
-* {Akinori MUSHA}[https://akinori.org]
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,177 +0,0 @@
-= Nokogiri {<img src="https://secure.travis-ci.org/sparklemotion/nokogiri.png?rvm=1.9.3" />}[http://travis-ci.org/sparklemotion/nokogiri] {<img src="https://codeclimate.com/github/sparklemotion/nokogiri.png" />}[https://codeclimate.com/github/sparklemotion/nokogiri] {<img src="https://www.versioneye.com/ruby/nokogiri/badge.png" alt="Dependency Status" />}[https://www.versioneye.com/ruby/nokogiri]
-
-* http://nokogiri.org
-* https://github.com/sparklemotion/nokogiri
-* https://groups.google.com/group/nokogiri-talk
-* https://github.com/sparklemotion/nokogiri/issues
-
-== DESCRIPTION:
-
-Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri's
-many features is the ability to search documents via XPath or CSS3 selectors.
-
-XML is like violence - if it doesn’t solve your problems, you are not using
-enough of it.
-
-== FEATURES:
-
-* XPath 1.0 support for document searching
-* CSS3 selector support for document searching
-* XML/HTML builder
-
-Nokogiri parses and searches XML/HTML very quickly, and also has
-correctly implemented CSS3 selector support as well as XPath 1.0 support.
-
-== SUPPORT:
-
-Before filing a bug report, please read our {submission guidelines}[http://nokogiri.org/tutorials/getting_help.html] at:
-
-  * http://nokogiri.org/tutorials/getting_help.html
-
-The Nokogiri {mailing list}[https://groups.google.com/group/nokogiri-talk]
-is available here:
-
-  * https://groups.google.com/group/nokogiri-talk
-
-The {bug tracker}[https://github.com/sparklemotion/nokogiri/issues]
-is available here:
-
-  * https://github.com/sparklemotion/nokogiri/issues
-
-The IRC channel is #nokogiri on freenode.
-
-== SYNOPSIS:
-
-  require 'nokogiri'
-  require 'open-uri'
-
-  # Fetch and parse HTML document
-  doc = Nokogiri::HTML(open('http://www.nokogiri.org/tutorials/installing_nokogiri.html'))
-
-  ####
-  # Search for nodes by css
-  doc.css('nav ul.menu li a').each do |link|
-    puts link.content
-  end
-
-  ####
-  # Search for nodes by xpath
-  doc.xpath('//h2 | //h3').each do |link|
-    puts link.content
-  end
-
-  ####
-  # Or mix and match.
-  doc.search('code.sh', '//h2').each do |link|
-    puts link.content
-  end
-
-
-== REQUIREMENTS:
-
-* ruby 1.9.3 or higher
-
-* in Nokogiri 1.6.0 and later libxml2 and libxslt are bundled with the
-  gem, but if you want to use them installed on the system:
-
-  * libxml2 >=2.6.21 with iconv support
-    (libxml2-dev/-devel is required too)
-
-  * libxslt, built with and supported by the given libxml2
-    (libxslt-dev/-devel is required too)
-
-== ENCODING:
-
-Strings are always stored as UTF-8 internally.  Methods that return
-text values will always return UTF-8 encoded strings.  Methods that
-return XML (like to_xml, to_html and inner_html) will return a string
-encoded like the source document.
-
-*WARNING*
-
-Some documents declare one particular encoding, but use a different
-one. So, which encoding should the parser choose?
-
-Remember that data is just a stream of bytes. Only we humans add
-meaning to that stream. Any particular set of bytes could be valid
-characters in multiple encodings, so detecting encoding with 100%
-accuracy is not possible. libxml2 does its best, but it can't be right
-100% of the time.
-
-If you want Nokogiri to handle the document encoding properly, your
-best bet is to explicitly set the encoding.  Here is an example of
-explicitly setting the encoding to EUC-JP on the parser:
-
-    doc = Nokogiri.XML('<foo><bar /><foo>', nil, 'EUC-JP')
-
-== INSTALL:
-
-* sudo gem install nokogiri
-
-=== Binary packages
-
-Binary packages are available for:
-
-* SuSE[https://download.opensuse.org/repositories/devel:/languages:/ruby:/extensions/]
-* Fedora[http://s390.koji.fedoraproject.org/koji/packageinfo?packageID=6756]
-
-== DEVELOPMENT:
-
-=== Developing on C Ruby (MRI)
-
-Developing Nokogiri requires racc and rexical to generate the parser and
-tokenizer.  To start development, make sure you have `libxml2` and `libxslt`
-installed.
-
-Then install core gems and bootstrap:
-
-    $ gem install hoe rake-compiler mini_portile
-    $ rake newb
-
-=== Developing on JRuby
-
-Currently, development with JRuby depends on CRuby being installed.  With
-CRuby, install racc and rexical:
-
-    $ gem install racc rexical
-
-Make sure hoe and rake compiler are installed with JRuby:
-
-    $ jgem install hoe rake-compiler
-
-Then run rake:
-
-    $ jruby -S rake
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2008 - 2015:
-
-* {Aaron Patterson}[http://tenderlovemaking.com]
-* {Mike Dalessio}[http://mike.daless.io]
-* {Charles Nutter}[http://blog.headius.com]
-* {Sergio Arbeo}[http://www.serabe.com]
-* {Patrick Mahoney}[http://polycrystal.org]
-* {Yoko Harada}[http://yokolet.blogspot.com]
-* {Akinori MUSHA}[https://akinori.org]
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/ports/patches/libxml2/0003-Stop-parsing-on-entities-boundaries-errors.patch

@@ -1,32 +0,0 @@
-From 99d99063ae5c4b6bd2b58324273401f3ce42a550 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Mon, 23 Feb 2015 11:17:35 +0800
-Subject: [PATCH 3/8] Stop parsing on entities boundaries errors
-
-For https://bugzilla.gnome.org/show_bug.cgi?id=744980
-
-There are times, like on unterminated entities that it's preferable to
-stop parsing, even if that means less error reporting. Entities are
-feeding the parser on further processing, and if they are ill defined
-then it's possible to get the parser to bug. Also do the same on
-Conditional Sections if the input is broken, as the structure of
-the document can't be guessed.
----
- parser.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/parser.c b/parser.c
-index 1d93967..7b0380c 100644
---- a/parser.c
-+++ b/parser.c
-@@ -5658,6 +5658,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) {
- 	if (RAW != '>') {
- 	    xmlFatalErrMsgStr(ctxt, XML_ERR_ENTITY_NOT_FINISHED,
- 	            "xmlParseEntityDecl: entity %s not terminated\n", name);
-+	    xmlStopParser(ctxt);
- 	} else {
- 	    if (input != ctxt->input) {
- 		xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY,
--- 
-2.5.0
-

data/ports/patches/libxml2/0004-Cleanup-conditional-section-error-handling.patch

@@ -1,49 +0,0 @@
-From c8d3950c5532c2e3d954bacdb8c479bb9fdacf89 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Mon, 23 Feb 2015 11:29:20 +0800
-Subject: [PATCH 4/8] Cleanup conditional section error handling
-
-For https://bugzilla.gnome.org/show_bug.cgi?id=744980
-
-The error handling of Conditional Section also need to be
-straightened as the structure of the document can't be
-guessed on a failure there and it's better to stop parsing
-as further errors are likely to be irrelevant.
----
- parser.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/parser.c b/parser.c
-index 7b0380c..1e714e7 100644
---- a/parser.c
-+++ b/parser.c
-@@ -6770,6 +6770,8 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
- 	SKIP_BLANKS;
- 	if (RAW != '[') {
- 	    xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL);
-+	    xmlStopParser(ctxt);
-+	    return;
- 	} else {
- 	    if (ctxt->input->id != id) {
- 		xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY,
-@@ -6830,6 +6832,8 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
- 	SKIP_BLANKS;
- 	if (RAW != '[') {
- 	    xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL);
-+	    xmlStopParser(ctxt);
-+	    return;
- 	} else {
- 	    if (ctxt->input->id != id) {
- 		xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY,
-@@ -6885,6 +6889,8 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
- 
-     } else {
- 	xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID_KEYWORD, NULL);
-+	xmlStopParser(ctxt);
-+	return;
-     }
- 
-     if (RAW == 0)
--- 
-2.5.0
-

data/ports/patches/libxml2/0005-CVE-2015-1819-Enforce-the-reader-to-run-in-constant-.patch

@@ -1,177 +0,0 @@
-From 12f31177b0d9be57ed8fb3467b501606fb145286 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Tue, 14 Apr 2015 17:41:48 +0800
-Subject: [PATCH 5/8] CVE-2015-1819 Enforce the reader to run in constant
- memory
-
-One of the operation on the reader could resolve entities
-leading to the classic expansion issue. Make sure the
-buffer used for xmlreader operation is bounded.
-Introduce a new allocation type for the buffers for this effect.
----
- buf.c                 | 43 ++++++++++++++++++++++++++++++++++++++++++-
- include/libxml/tree.h |  3 ++-
- xmlreader.c           | 20 +++++++++++++++++++-
- 3 files changed, 63 insertions(+), 3 deletions(-)
-
-diff --git a/buf.c b/buf.c
-index 6efc7b6..07922ff 100644
---- a/buf.c
-+++ b/buf.c
-@@ -27,6 +27,7 @@
- #include <libxml/tree.h>
- #include <libxml/globals.h>
- #include <libxml/tree.h>
-+#include <libxml/parserInternals.h> /* for XML_MAX_TEXT_LENGTH */
- #include "buf.h"
- 
- #define WITH_BUFFER_COMPAT
-@@ -299,7 +300,8 @@ xmlBufSetAllocationScheme(xmlBufPtr buf,
-     if ((scheme == XML_BUFFER_ALLOC_DOUBLEIT) ||
-         (scheme == XML_BUFFER_ALLOC_EXACT) ||
-         (scheme == XML_BUFFER_ALLOC_HYBRID) ||
--        (scheme == XML_BUFFER_ALLOC_IMMUTABLE)) {
-+        (scheme == XML_BUFFER_ALLOC_IMMUTABLE) ||
-+	(scheme == XML_BUFFER_ALLOC_BOUNDED)) {
- 	buf->alloc = scheme;
-         if (buf->buffer)
-             buf->buffer->alloc = scheme;
-@@ -458,6 +460,18 @@ xmlBufGrowInternal(xmlBufPtr buf, size_t len) {
-     size = buf->use + len + 100;
- #endif
- 
-+    if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) {
-+        /*
-+	 * Used to provide parsing limits
-+	 */
-+        if ((buf->use + len >= XML_MAX_TEXT_LENGTH) ||
-+	    (buf->size >= XML_MAX_TEXT_LENGTH)) {
-+	    xmlBufMemoryError(buf, "buffer error: text too long\n");
-+	    return(0);
-+	}
-+	if (size >= XML_MAX_TEXT_LENGTH)
-+	    size = XML_MAX_TEXT_LENGTH;
-+    }
-     if ((buf->alloc == XML_BUFFER_ALLOC_IO) && (buf->contentIO != NULL)) {
-         size_t start_buf = buf->content - buf->contentIO;
- 
-@@ -739,6 +753,15 @@ xmlBufResize(xmlBufPtr buf, size_t size)
-     CHECK_COMPAT(buf)
- 
-     if (buf->alloc == XML_BUFFER_ALLOC_IMMUTABLE) return(0);
-+    if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) {
-+        /*
-+	 * Used to provide parsing limits
-+	 */
-+        if (size >= XML_MAX_TEXT_LENGTH) {
-+	    xmlBufMemoryError(buf, "buffer error: text too long\n");
-+	    return(0);
-+	}
-+    }
- 
-     /* Don't resize if we don't have to */
-     if (size < buf->size)
-@@ -867,6 +890,15 @@ xmlBufAdd(xmlBufPtr buf, const xmlChar *str, int len) {
- 
-     needSize = buf->use + len + 2;
-     if (needSize > buf->size){
-+	if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) {
-+	    /*
-+	     * Used to provide parsing limits
-+	     */
-+	    if (needSize >= XML_MAX_TEXT_LENGTH) {
-+		xmlBufMemoryError(buf, "buffer error: text too long\n");
-+		return(-1);
-+	    }
-+	}
-         if (!xmlBufResize(buf, needSize)){
- 	    xmlBufMemoryError(buf, "growing buffer");
-             return XML_ERR_NO_MEMORY;
-@@ -938,6 +970,15 @@ xmlBufAddHead(xmlBufPtr buf, const xmlChar *str, int len) {
-     }
-     needSize = buf->use + len + 2;
-     if (needSize > buf->size){
-+	if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) {
-+	    /*
-+	     * Used to provide parsing limits
-+	     */
-+	    if (needSize >= XML_MAX_TEXT_LENGTH) {
-+		xmlBufMemoryError(buf, "buffer error: text too long\n");
-+		return(-1);
-+	    }
-+	}
-         if (!xmlBufResize(buf, needSize)){
- 	    xmlBufMemoryError(buf, "growing buffer");
-             return XML_ERR_NO_MEMORY;
-diff --git a/include/libxml/tree.h b/include/libxml/tree.h
-index 2f90717..4a9b3bc 100644
---- a/include/libxml/tree.h
-+++ b/include/libxml/tree.h
-@@ -76,7 +76,8 @@ typedef enum {
-     XML_BUFFER_ALLOC_EXACT,	/* grow only to the minimal size */
-     XML_BUFFER_ALLOC_IMMUTABLE, /* immutable buffer */
-     XML_BUFFER_ALLOC_IO,	/* special allocation scheme used for I/O */
--    XML_BUFFER_ALLOC_HYBRID	/* exact up to a threshold, and doubleit thereafter */
-+    XML_BUFFER_ALLOC_HYBRID,	/* exact up to a threshold, and doubleit thereafter */
-+    XML_BUFFER_ALLOC_BOUNDED	/* limit the upper size of the buffer */
- } xmlBufferAllocationScheme;
- 
- /**
-diff --git a/xmlreader.c b/xmlreader.c
-index f19e123..471e7e2 100644
---- a/xmlreader.c
-+++ b/xmlreader.c
-@@ -2091,6 +2091,9 @@ xmlNewTextReader(xmlParserInputBufferPtr input, const char *URI) {
- 		"xmlNewTextReader : malloc failed\n");
- 	return(NULL);
-     }
-+    /* no operation on a reader should require a huge buffer */
-+    xmlBufSetAllocationScheme(ret->buffer,
-+			      XML_BUFFER_ALLOC_BOUNDED);
-     ret->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler));
-     if (ret->sax == NULL) {
- 	xmlBufFree(ret->buffer);
-@@ -3616,6 +3619,7 @@ xmlTextReaderConstValue(xmlTextReaderPtr reader) {
- 	    return(((xmlNsPtr) node)->href);
-         case XML_ATTRIBUTE_NODE:{
- 	    xmlAttrPtr attr = (xmlAttrPtr) node;
-+	    const xmlChar *ret;
- 
- 	    if ((attr->children != NULL) &&
- 	        (attr->children->type == XML_TEXT_NODE) &&
-@@ -3629,10 +3633,21 @@ xmlTextReaderConstValue(xmlTextReaderPtr reader) {
-                                         "xmlTextReaderSetup : malloc failed\n");
-                         return (NULL);
-                     }
-+		    xmlBufSetAllocationScheme(reader->buffer,
-+		                              XML_BUFFER_ALLOC_BOUNDED);
-                 } else
-                     xmlBufEmpty(reader->buffer);
- 	        xmlBufGetNodeContent(reader->buffer, node);
--		return(xmlBufContent(reader->buffer));
-+		ret = xmlBufContent(reader->buffer);
-+		if (ret == NULL) {
-+		    /* error on the buffer best to reallocate */
-+		    xmlBufFree(reader->buffer);
-+		    reader->buffer = xmlBufCreateSize(100);
-+		    xmlBufSetAllocationScheme(reader->buffer,
-+		                              XML_BUFFER_ALLOC_BOUNDED);
-+		    ret = BAD_CAST "";
-+		}
-+		return(ret);
- 	    }
- 	    break;
- 	}
-@@ -5131,6 +5146,9 @@ xmlTextReaderSetup(xmlTextReaderPtr reader,
-                         "xmlTextReaderSetup : malloc failed\n");
-         return (-1);
-     }
-+    /* no operation on a reader should require a huge buffer */
-+    xmlBufSetAllocationScheme(reader->buffer,
-+			      XML_BUFFER_ALLOC_BOUNDED);
-     if (reader->sax == NULL)
- 	reader->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler));
-     if (reader->sax == NULL) {
--- 
-2.5.0
-