nokogiri 1.11.1 → 1.11.6

data/patches/libxslt/0002-Fix-xml2-config-check-in-configure-script.patch

@@ -0,0 +1,19 @@
+From: Nick Wellnhofer <wellnhofer@aevum.de>
+Date: Fri, 15 Nov 2019 11:53:11 +0100
+Subject: [PATCH] Fix xml2-config check in configure script
+
+A 'print' option has never been supported. After a recent change to
+libxml2, invalid options cause xml2-config to fail.
+diff --git a/configure b/configure
+index c63adc5..6061227 100755
+--- a/configure
++++ b/configure
+@@ -14860,7 +14860,7 @@ PKG_CONFIG=$_save_PKG_CONFIG
+ fi
+ 
+ 
+-if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1
++if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1
+ then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml libraries >= $LIBXML_REQUIRED_VERSION" >&5
+ $as_echo_n "checking for libxml libraries >= $LIBXML_REQUIRED_VERSION... " >&6; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.6
 platform: ruby
 authors:
 - Mike Dalessio
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -81,14 +81,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -228,17 +228,16 @@ extra_rdoc_files:
 - ext/nokogiri/xml_dtd.c
 - ext/nokogiri/xml_xpath_context.c
 - ext/nokogiri/xml_attr.c
+- ext/nokogiri/libxml2_backwards_compat.c
 - ext/nokogiri/xml_comment.c
 - ext/nokogiri/nokogiri.c
 - ext/nokogiri/xml_sax_parser_context.c
 - ext/nokogiri/xml_node_set.c
 - ext/nokogiri/xml_reader.c
-- ext/nokogiri/xml_libxml2_hacks.c
 - ext/nokogiri/xml_cdata.c
 - ext/nokogiri/xml_element_content.c
 - ext/nokogiri/html_entity_lookup.c
 - ext/nokogiri/xml_namespace.c
-- ext/nokogiri/xml_io.c
 - ext/nokogiri/xml_document.c
 - ext/nokogiri/xml_element_decl.c
 - ext/nokogiri/xml_schema.c
@@ -271,74 +270,40 @@ files:
 - ext/nokogiri/depend
 - ext/nokogiri/extconf.rb
 - ext/nokogiri/html_document.c
-- ext/nokogiri/html_document.h
 - ext/nokogiri/html_element_description.c
-- ext/nokogiri/html_element_description.h
 - ext/nokogiri/html_entity_lookup.c
-- ext/nokogiri/html_entity_lookup.h
 - ext/nokogiri/html_sax_parser_context.c
-- ext/nokogiri/html_sax_parser_context.h
 - ext/nokogiri/html_sax_push_parser.c
-- ext/nokogiri/html_sax_push_parser.h
+- ext/nokogiri/libxml2_backwards_compat.c
 - ext/nokogiri/nokogiri.c
 - ext/nokogiri/nokogiri.h
 - ext/nokogiri/test_global_handlers.c
 - ext/nokogiri/xml_attr.c
-- ext/nokogiri/xml_attr.h
 - ext/nokogiri/xml_attribute_decl.c
-- ext/nokogiri/xml_attribute_decl.h
 - ext/nokogiri/xml_cdata.c
-- ext/nokogiri/xml_cdata.h
 - ext/nokogiri/xml_comment.c
-- ext/nokogiri/xml_comment.h
 - ext/nokogiri/xml_document.c
-- ext/nokogiri/xml_document.h
 - ext/nokogiri/xml_document_fragment.c
-- ext/nokogiri/xml_document_fragment.h
 - ext/nokogiri/xml_dtd.c
-- ext/nokogiri/xml_dtd.h
 - ext/nokogiri/xml_element_content.c
-- ext/nokogiri/xml_element_content.h
 - ext/nokogiri/xml_element_decl.c
-- ext/nokogiri/xml_element_decl.h
 - ext/nokogiri/xml_encoding_handler.c
-- ext/nokogiri/xml_encoding_handler.h
 - ext/nokogiri/xml_entity_decl.c
-- ext/nokogiri/xml_entity_decl.h
 - ext/nokogiri/xml_entity_reference.c
-- ext/nokogiri/xml_entity_reference.h
-- ext/nokogiri/xml_io.c
-- ext/nokogiri/xml_io.h
-- ext/nokogiri/xml_libxml2_hacks.c
-- ext/nokogiri/xml_libxml2_hacks.h
 - ext/nokogiri/xml_namespace.c
-- ext/nokogiri/xml_namespace.h
 - ext/nokogiri/xml_node.c
-- ext/nokogiri/xml_node.h
 - ext/nokogiri/xml_node_set.c
-- ext/nokogiri/xml_node_set.h
 - ext/nokogiri/xml_processing_instruction.c
-- ext/nokogiri/xml_processing_instruction.h
 - ext/nokogiri/xml_reader.c
-- ext/nokogiri/xml_reader.h
 - ext/nokogiri/xml_relax_ng.c
-- ext/nokogiri/xml_relax_ng.h
 - ext/nokogiri/xml_sax_parser.c
-- ext/nokogiri/xml_sax_parser.h
 - ext/nokogiri/xml_sax_parser_context.c
-- ext/nokogiri/xml_sax_parser_context.h
 - ext/nokogiri/xml_sax_push_parser.c
-- ext/nokogiri/xml_sax_push_parser.h
 - ext/nokogiri/xml_schema.c
-- ext/nokogiri/xml_schema.h
 - ext/nokogiri/xml_syntax_error.c
-- ext/nokogiri/xml_syntax_error.h
 - ext/nokogiri/xml_text.c
-- ext/nokogiri/xml_text.h
 - ext/nokogiri/xml_xpath_context.c
-- ext/nokogiri/xml_xpath_context.h
 - ext/nokogiri/xslt_stylesheet.c
-- ext/nokogiri/xslt_stylesheet.h
 - lib/nokogiri.rb
 - lib/nokogiri/css.rb
 - lib/nokogiri/css/node.rb
@@ -350,6 +315,7 @@ files:
 - lib/nokogiri/css/tokenizer.rex
 - lib/nokogiri/css/xpath_visitor.rb
 - lib/nokogiri/decorators/slop.rb
+- lib/nokogiri/extension.rb
 - lib/nokogiri/html.rb
 - lib/nokogiri/html/builder.rb
 - lib/nokogiri/html/document.rb
@@ -405,16 +371,15 @@ files:
 - lib/nokogiri/xslt.rb
 - lib/nokogiri/xslt/stylesheet.rb
 - lib/xsd/xmlparser/nokogiri.rb
-- patches/libxml2/0001-Revert-Do-not-URI-escape-in-server-side-includes.patch
-- patches/libxml2/0002-Remove-script-macro-support.patch
-- patches/libxml2/0003-Update-entities-to-remove-handling-of-ssi.patch
-- patches/libxml2/0004-libxml2.la-is-in-top_builddir.patch
-- patches/libxml2/0005-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch
-- patches/libxml2/0006-htmlParseComment-treat-as-if-it-closed-the-comment.patch
-- patches/libxml2/0007-use-new-htmlParseLookupCommentEnd-to-find-comment-en.patch
-- patches/libxml2/0008-use-glibc-strlen.patch
-- patches/libxml2/0009-avoid-isnan-isinf.patch
-- ports/archives/libxml2-2.9.10.tar.gz
+- patches/libxml2/0001-Remove-script-macro-support.patch
+- patches/libxml2/0002-Update-entities-to-remove-handling-of-ssi.patch
+- patches/libxml2/0003-libxml2.la-is-in-top_builddir.patch
+- patches/libxml2/0004-use-glibc-strlen.patch
+- patches/libxml2/0005-avoid-isnan-isinf.patch
+- patches/libxml2/0006-update-automake-files-for-arm64.patch
+- patches/libxslt/0001-update-automake-files-for-arm64.patch
+- patches/libxslt/0002-Fix-xml2-config-check-in-configure-script.patch
+- ports/archives/libxml2-2.9.12.tar.gz
 - ports/archives/libxslt-1.1.34.tar.gz
 homepage: https://nokogiri.org
 licenses:

data/ext/nokogiri/html_document.h

@@ -1,10 +0,0 @@
-#ifndef NOKOGIRI_HTML_DOCUMENT
-#define NOKOGIRI_HTML_DOCUMENT
-
-#include <nokogiri.h>
-
-void init_html_document();
-
-extern VALUE cNokogiriHtmlDocument ;
-
-#endif

data/ext/nokogiri/html_element_description.h

@@ -1,10 +0,0 @@
-#ifndef NOKOGIRI_HTML_ELEMENT_DESCRIPTION
-#define NOKOGIRI_HTML_ELEMENT_DESCRIPTION
-
-#include <nokogiri.h>
-
-void init_html_element_description();
-
-extern VALUE cNokogiriHtmlElementDescription ;
-
-#endif

data/ext/nokogiri/html_entity_lookup.h

@@ -1,8 +0,0 @@
-#ifndef NOKOGIRI_HTML_ENTITY_LOOKUP
-#define NOKOGIRI_HTML_ENTITY_LOOKUP
-
-#include <nokogiri.h>
-
-void init_html_entity_lookup();
-
-#endif

data/ext/nokogiri/html_sax_parser_context.h

@@ -1,11 +0,0 @@
-#ifndef NOKOGIRI_HTML_SAX_PARSER_CONTEXT
-#define NOKOGIRI_HTML_SAX_PARSER_CONTEXT
-
-#include <nokogiri.h>
-
-extern VALUE cNokogiriHtmlSaxParserContext;
-
-void init_html_sax_parser_context();
-
-#endif
-

data/ext/nokogiri/html_sax_push_parser.h

@@ -1,9 +0,0 @@
-#ifndef NOKOGIRI_HTML_SAX_PUSH_PARSER
-#define NOKOGIRI_HTML_SAX_PUSH_PARSER
-
-#include <nokogiri.h>
-
-void init_html_sax_push_parser();
-
-extern VALUE cNokogiriHtmlSaxPushParser ;
-#endif

data/ext/nokogiri/xml_attr.h

@@ -1,9 +0,0 @@
-#ifndef NOKOGIRI_XML_ATTR
-#define NOKOGIRI_XML_ATTR
-
-#include <nokogiri.h>
-
-void init_xml_attr();
-
-extern VALUE cNokogiriXmlAttr;
-#endif

data/ext/nokogiri/xml_attribute_decl.h

@@ -1,9 +0,0 @@
-#ifndef NOKOGIRI_XML_ATTRIBUTE_DECL
-#define NOKOGIRI_XML_ATTRIBUTE_DECL
-
-#include <nokogiri.h>
-
-void init_xml_attribute_decl();
-
-extern VALUE cNokogiriXmlAttributeDecl;
-#endif

data/ext/nokogiri/xml_cdata.h

@@ -1,9 +0,0 @@
-#ifndef NOKOGIRI_XML_CDATA
-#define NOKOGIRI_XML_CDATA
-
-#include <nokogiri.h>
-
-void init_xml_cdata();
-
-extern VALUE cNokogiriXmlCData;
-#endif

data/ext/nokogiri/xml_comment.h

@@ -1,9 +0,0 @@
-#ifndef NOKOGIRI_XML_COMMENT
-#define NOKOGIRI_XML_COMMENT
-
-#include <nokogiri.h>
-
-void init_xml_comment();
-
-extern VALUE cNokogiriXmlComment;
-#endif

data/ext/nokogiri/xml_document.h

@@ -1,23 +0,0 @@
-#ifndef NOKOGIRI_XML_DOCUMENT
-#define NOKOGIRI_XML_DOCUMENT
-
-#include <nokogiri.h>
-
-struct _nokogiriTuple {
-  VALUE         doc;
-  st_table     *unlinkedNodes;
-  VALUE         node_cache;
-};
-typedef struct _nokogiriTuple nokogiriTuple;
-typedef nokogiriTuple * nokogiriTuplePtr;
-
-void init_xml_document();
-VALUE Nokogiri_wrap_xml_document(VALUE klass, xmlDocPtr doc);
-
-#define DOC_RUBY_OBJECT_TEST(x) ((nokogiriTuplePtr)(x->_private))
-#define DOC_RUBY_OBJECT(x) (((nokogiriTuplePtr)(x->_private))->doc)
-#define DOC_UNLINKED_NODE_HASH(x) (((nokogiriTuplePtr)(x->_private))->unlinkedNodes)
-#define DOC_NODE_CACHE(x) (((nokogiriTuplePtr)(x->_private))->node_cache)
-
-extern VALUE cNokogiriXmlDocument ;
-#endif

data/ext/nokogiri/xml_document_fragment.h

@@ -1,10 +0,0 @@
-#ifndef NOKOGIRI_XML_DOCUMENT_FRAGMENT
-#define NOKOGIRI_XML_DOCUMENT_FRAGMENT
-
-#include <nokogiri.h>
-
-void init_xml_document_fragment();
-
-extern VALUE cNokogiriXmlDocumentFragment;
-#endif
-

data/ext/nokogiri/xml_dtd.h

@@ -1,10 +0,0 @@
-#ifndef NOKOGIRI_XML_DTD
-#define NOKOGIRI_XML_DTD
-
-#include <nokogiri.h>
-
-extern VALUE cNokogiriXmlDtd;
-
-void init_xml_dtd();
-
-#endif

data/ext/nokogiri/xml_element_content.h

@@ -1,10 +0,0 @@
-#ifndef NOKOGIRI_XML_ELEMENT_CONTENT
-#define NOKOGIRI_XML_ELEMENT_CONTENT
-
-#include <nokogiri.h>
-
-
-VALUE Nokogiri_wrap_element_content(VALUE doc, xmlElementContentPtr element);
-void init_xml_element_content();
-
-#endif

data/ext/nokogiri/xml_element_decl.h

@@ -1,9 +0,0 @@
-#ifndef NOKOGIRI_XML_ELEMENT_DECL
-#define NOKOGIRI_XML_ELEMENT_DECL
-
-#include <nokogiri.h>
-
-void init_xml_element_decl();
-
-extern VALUE cNokogiriXmlElementDecl;
-#endif

data/ext/nokogiri/xml_encoding_handler.h

@@ -1,8 +0,0 @@
-#ifndef NOKOGIRI_XML_ENCODING_HANDLER
-#define NOKOGIRI_XML_ENCODING_HANDLER
-
-#include <nokogiri.h>
-
-void init_xml_encoding_handler();
-
-#endif

data/ext/nokogiri/xml_entity_decl.h

@@ -1,10 +0,0 @@
-#ifndef NOKOGIRI_XML_ENTITY_DECL
-#define NOKOGIRI_XML_ENTITY_DECL
-
-#include <nokogiri.h>
-
-void init_xml_entity_decl();
-
-extern VALUE cNokogiriXmlEntityDecl;
-#endif
-

data/ext/nokogiri/xml_entity_reference.h

@@ -1,9 +0,0 @@
-#ifndef NOKOGIRI_XML_ENTITY_REFERENCE
-#define NOKOGIRI_XML_ENTITY_REFERENCE
-
-#include <nokogiri.h>
-
-void init_xml_entity_reference();
-
-extern VALUE cNokogiriXmlEntityReference;
-#endif

data/ext/nokogiri/xml_io.c

@@ -1,63 +0,0 @@
-#include <xml_io.h>
-
-static ID id_read, id_write;
-
-VALUE read_check(VALUE val) {
-  VALUE *args = (VALUE *)val;
-  return rb_funcall(args[0], id_read, 1, args[1]);
-}
-
-VALUE read_failed(VALUE arg, VALUE exc) {
-  return Qundef;
-}
-
-int io_read_callback(void * ctx, char * buffer, int len) {
-  VALUE string, args[2];
-  size_t str_len, safe_len;
-
-  args[0] = (VALUE)ctx;
-  args[1] = INT2NUM(len);
-
-  string = rb_rescue(read_check, (VALUE)args, read_failed, 0);
-
-  if (NIL_P(string)) return 0;
-  if (string == Qundef) return -1;
-  if (TYPE(string) != T_STRING) return -1;
-
-  str_len = (size_t)RSTRING_LEN(string);
-  safe_len = str_len > (size_t)len ? (size_t)len : str_len;
-  memcpy(buffer, StringValuePtr(string), safe_len);
-
-  return (int)safe_len;
-}
-
-VALUE write_check(VALUE val) {
-  VALUE *args = (VALUE *)val;
-  return rb_funcall(args[0], id_write, 1, args[1]);
-}
-
-VALUE write_failed(VALUE arg, VALUE exc) {
-  return Qundef;
-}
-
-int io_write_callback(void * ctx, char * buffer, int len) {
-  VALUE args[2], size;
-
-  args[0] = (VALUE)ctx;
-  args[1] = rb_str_new(buffer, (long)len);
-
-  size = rb_rescue(write_check, (VALUE)args, write_failed, 0);
-
-  if (size == Qundef) return -1;
-
-  return NUM2INT(size);
-}
-
-int io_close_callback(void * ctx) {
-  return 0;
-}
-
-void init_nokogiri_io() {
-  id_read = rb_intern("read");
-  id_write = rb_intern("write");
-}