CVS commit: pkgsrc/textproc/ruby-nokogiri

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Fri Jan  8 17:09:42 UTC 2021

Modified Files:
        pkgsrc/textproc/ruby-nokogiri: Makefile PLIST distinfo

Log Message:
ruby-nokogiri: update to 1.11.1.

Upstream changelog (from CHANGELOG.md):

v1.11.1 / 2021-01-06

 Fixed

  * [CRuby] If libxml-ruby is loaded before nokogiri, the SAX and Push parsers
    no longer call libxml-ruby's handlers. Instead, they defensively override
    the libxml2 global handler before parsing. [#2168]

v1.11.0 / 2021-01-03

 Notes

 Faster, more reliable installation: Native Gems for Linux and OSX/Darwin

"Native gems" contain pre-compiled libraries for a specific machine
architecture. On supported platforms, this removes the need for compiling the C
extension and the packaged libraries. This results in much faster installation
and more reliable installation, which as you probably know are the biggest
headaches for Nokogiri users.

We've been shipping native Windows gems since 2009, but starting in v1.11.0 we
are also shipping native gems for these platforms:

  * Linux: x86-linux and x86_64-linux -- including musl platforms like alpine
  * OSX/Darwin: x86_64-darwin and arm64-darwin

We'd appreciate your thoughts and feedback on this work at #2075.

 Dependencies

 Ruby

This release introduces support for Ruby 2.7 and 3.0 in the precompiled native
gems.

This release ends support for:

  * Ruby 2.3, for which official support ended on 2019-03-31 [#1886] (Thanks
    @ashmaroli!)
  * Ruby 2.4, for which official support ended on 2020-04-05
  * JRuby 9.1, which is the Ruby 2.3-compatible release.

 Gems

  * Explicitly add racc as a runtime dependency. [#1988] (Thanks, @voxik!)
  * [MRI] Upgrade mini_portile2 dependency from ~> 2.4.0 to ~> 2.5.0 [#2005]
    (Thanks, @alejandroperea!)

 Security

See note below about CVE-2020-26247 in the "Changed" subsection entitled
"XML::Schema parsing treats input as untrusted by default".

 Added

  * Add Node methods for manipulating "keyword attributes" (for example, class
    and rel): #kwattr_values, #kwattr_add, #kwattr_append, and #kwattr_remove.
    [#2000]
  * Add support for CSS queries a:has(> b), a:has(~ b), and a:has(+ b). [#688]
    (Thanks, @jonathanhefner!)
  * Add Node#value? to better match expected semantics of a Hash-like object.
    [#1838, #1840] (Thanks, @MatzFan!)
  * [CRuby] Add Nokogiri::XML::Node#line= for use by downstream libs like
    nokogumbo. [#1918] (Thanks, @stevecheckoway!)
  * nokogiri.gemspec is back after a 10-year hiatus. We still prefer you use
    the official releases, but master is pretty stable these days, and YOLO.

 Performance

  * [CRuby] The CSS ~= operator and class selector . are about 2x faster.
    [#2137, #2135]
  * [CRuby] Patch libxml2 to call strlen from xmlStrlen rather than the naive
    implementation, because strlen is generally optimized for the architecture.
    [#2144] (Thanks, @ilyazub!)
  * Improve performance of some namespace operations. [#1916] (Thanks,
    @ashmaroli!)
  * Remove unnecessary array allocations from Node serialization methods
    [#1911] (Thanks, @ashmaroli!)
  * Avoid creation of unnecessary zero-length String objects. [#1970] (Thanks,
    @ashmaroli!)
  * Always compile libxml2 and libxslt with '-O2' [#2022, #2100] (Thanks,
    @ilyazub!)
  * [JRuby] Lots of code cleanup and performance improvements. [#1934] (Thanks,
    @kares!)
  * [CRuby] RelaxNG.from_document no longer leaks memory. [#2114]

 Improved

  * [CRuby] Handle incorrectly-closed HTML comments as WHATWG recommends for
    browsers. [#2058] (Thanks to HackerOne user mayflower for reporting this!)
  * {HTML,XML}::Document#parse now accept Pathname objects. Previously this
    worked only if the referenced file was less than 4096 bytes long; longer
    files resulted in undefined behavior because the read method would be
    repeatedly invoked. [#1821, #2110] (Thanks, @doriantaylor and @phokz!)
  * [CRuby] Nokogumbo builds faster because it can now use header files
    provided by Nokogiri. [#1788] (Thanks, @stevecheckoway!)
  * Add frozen_string_literal: true magic comment to all lib files. [#1745]
    (Thanks, @oniofchaos!)
  * [JRuby] Clean up deprecated calls into JRuby. [#2027] (Thanks, @headius!)

 Fixed

  * HTML Parsing in "strict" mode (i.e., the RECOVER parse option not set) now
    correctly raises a XML::SyntaxError exception. Previously the value of the
    RECOVER bit was being ignored by CRuby and was misinterpreted by JRuby.
    [#2130]
  * The CSS ~= operator now correctly handles non-space whitespace in the class
    attribute. commit e45dedd
  * The switch to turn off the CSS-to-XPath cache is now thread-local, rather
    than being shared mutable state. [#1935]
  * The Node methods add_previous_sibling, previous=, before, add_next_sibling,
    next=, after, replace, and swap now correctly use their parent as the
    context node for parsing markup. These methods now also raise a
    RuntimeError if they are called on a node with no parent. [nokogumbo#160]
  * [JRuby] XML::Schema XSD validation errors are captured in XML::Schema#
    errors. These errors were previously ignored.
  * [JRuby] Standardize reading from IO like objects, including StringIO.
    [#1888, #1897]
  * [JRuby] Fix how custom XPath function namespaces are inferred to be less
    naive. [#1890, #2148]
  * [JRuby] Clarify exception message when custom XPath functions can't be
    resolved.
  * [JRuby] Comparison of Node to Document with Node#<=> now matches
    CRuby/libxml2 behavior.
  * [CRuby] Syntax errors are now correctly captured in Document#errors for
    short HTML documents. Previously the SAX parser used for encoding detection
    was clobbering libxml2's global error handler.
  * [CRuby] Fixed installation on AIX with respect to vasprintf. [#1908]
  * [CRuby] On some platforms, avoid symbol name collision with glibc's
    canonicalize. [#2105]
  * [Windows Visual C++] Fixed compiler warnings and errors. [#2061, #2068]
  * [CRuby] Fixed Nokogumbo integration which broke in the v1.11.0 release
    candidates. [#1788] (Thanks, @stevecheckoway!)
  * [JRuby] Fixed document encoding regression in v1.11.0 release candidates.
    [#2080, #2083] (Thanks, @thbar!)

 Removed

  * The internal method Nokogiri::CSS::Parser.cache_on= has been removed. Use
    .set_cache if you need to muck with the cache internals.
  * The class method Nokogiri::CSS::Parser.parse has been removed. This was
    originally deprecated in 2009 in 13db61b. Use Nokogiri::CSS.parse instead.

 Changed

 XML::Schema input is now "untrusted" by default

Address CVE-2020-26247.

In Nokogiri versions <= 1.11.0.rc3, XML Schemas parsed by Nokogiri::XML::Schema
were trusted by default, allowing external resources to be accessed over the
network, potentially enabling XXE or SSRF attacks.

This behavior is counter to the security policy intended by Nokogiri
maintainers, which is to treat all input as untrusted by default whenever
possible.

Please note that this security fix was pushed into a new minor version, 1.11.x,
rather than a patch release to the 1.10.x branch, because it is a breaking
change for some schemas and the risk was assessed to be "Low Severity".

More information and instructions for enabling "trusted input" behavior in
v1.11.0.rc4 and later is available at the public advisory.

 HTML parser now obeys the strict or norecover parsing option

(Also noted above in the "Fixed" section) HTML Parsing in "strict" mode (i.e.,
the RECOVER parse option not set) now correctly raises a XML::SyntaxError
exception. Previously the value of the RECOVER bit was being ignored by CRuby
and was misinterpreted by JRuby.

If you're using the default parser options, you will be unaffected by this fix.
If you're passing strict or norecover to your HTML parser call, you may be
surprised to see that the parser now fails to recover and raises a
XML::SyntaxError exception. Given the number of HTML documents on the internet
that libxml2 would consider to be ill-formed, this is probably not what you
want, and you can omit setting that parse option to restore the behavior that
you have been relying upon.

Apologies to anyone inconvenienced by this breaking bugfix being present in a
minor release, but I felt it was appropriate to introduce this fix because it's
straightforward to fix any code that has been relying on this buggy behavior.

 VersionInfo, the output of nokogiri -v, and related constants

This release changes the metadata provided in Nokogiri::VersionInfo which also
affects the output of nokogiri -v. Some related constants have also been
changed. If you're using VersionInfo programmatically, or relying on constants
related to underlying library versions, please read the detailed changes for
Nokogiri::VersionInfo at #2139 and accept our apologies for the inconvenience.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/textproc/ruby-nokogiri/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/textproc/ruby-nokogiri/PLIST
cvs rdiff -u -r1.38 -r1.39 pkgsrc/textproc/ruby-nokogiri/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/ruby-nokogiri/Makefile
diff -u pkgsrc/textproc/ruby-nokogiri/Makefile:1.56 pkgsrc/textproc/ruby-nokogiri/Makefile:1.57
--- pkgsrc/textproc/ruby-nokogiri/Makefile:1.56 Thu Nov  5 09:09:15 2020
+++ pkgsrc/textproc/ruby-nokogiri/Makefile      Fri Jan  8 17:09:41 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2020/11/05 09:09:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.57 2021/01/08 17:09:41 tsutsui Exp $
 
-DISTNAME=      nokogiri-1.10.10
-PKGREVISION=   1
+DISTNAME=      nokogiri-1.11.1
+#PKGREVISION=  0
 CATEGORIES=    textproc
 
 MAINTAINER=    tsutsui%NetBSD.org@localhost
@@ -9,14 +9,14 @@ HOMEPAGE=     https://nokogiri.org/
 COMMENT=       HTML, XML, SAX, and Reader parser with XPath and CSS selector support
 LICENSE=       mit
 
-DEPENDS+=      ${RUBY_PKGPREFIX}-mini_portile2>=2.4.0:../../misc/ruby-mini_portile2
+DEPENDS+=      ${RUBY_PKGPREFIX}-racc>=1.4.0:../../devel/ruby-racc
+DEPENDS+=      ${RUBY_PKGPREFIX}-mini_portile2>=2.5.0:../../misc/ruby-mini_portile2
 
 USE_GCC_RUNTIME=       yes
 USE_TOOLS+=            pkg-config
 MAKE_ENV+=             NOKOGIRI_USE_SYSTEM_LIBRARIES=yes
 RUBYGEM_OPTIONS+=      --format-executable
-OVERRIDE_GEMSPEC+=     mini_portile2>=2.4.0 \
-                       :files ports/archives/libxml2-2.9.10.tar.gz= \
+OVERRIDE_GEMSPEC+=     :files ports/archives/libxml2-2.9.10.tar.gz= \
                        ports/archives/libxslt-1.1.34.tar.gz=
 
 .include "../../devel/ruby-pkg-config/tool.mk"

Index: pkgsrc/textproc/ruby-nokogiri/PLIST
diff -u pkgsrc/textproc/ruby-nokogiri/PLIST:1.31 pkgsrc/textproc/ruby-nokogiri/PLIST:1.32
--- pkgsrc/textproc/ruby-nokogiri/PLIST:1.31    Sun Feb 16 04:11:05 2020
+++ pkgsrc/textproc/ruby-nokogiri/PLIST Fri Jan  8 17:09:41 2021
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.31 2020/02/16 04:11:05 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.32 2021/01/08 17:09:41 tsutsui Exp $
 bin/nokogiri${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_EXTSDIR}/gem.build_complete
 ${GEM_EXTSDIR}/nokogiri/nokogiri.${RUBY_DLEXT}
+${GEM_LIBDIR}/Gemfile
 ${GEM_LIBDIR}/LICENSE-DEPENDENCIES.md
 ${GEM_LIBDIR}/LICENSE.md
 ${GEM_LIBDIR}/README.md
@@ -22,6 +23,7 @@ ${GEM_LIBDIR}/ext/nokogiri/html_sax_push
 ${GEM_LIBDIR}/ext/nokogiri/html_sax_push_parser.h
 ${GEM_LIBDIR}/ext/nokogiri/nokogiri.c
 ${GEM_LIBDIR}/ext/nokogiri/nokogiri.h
+${GEM_LIBDIR}/ext/nokogiri/test_global_handlers.c
 ${GEM_LIBDIR}/ext/nokogiri/xml_attr.c
 ${GEM_LIBDIR}/ext/nokogiri/xml_attr.h
 ${GEM_LIBDIR}/ext/nokogiri/xml_attribute_decl.c
@@ -99,9 +101,12 @@ ${GEM_LIBDIR}/lib/nokogiri/html/entity_l
 ${GEM_LIBDIR}/lib/nokogiri/html/sax/parser.rb
 ${GEM_LIBDIR}/lib/nokogiri/html/sax/parser_context.rb
 ${GEM_LIBDIR}/lib/nokogiri/html/sax/push_parser.rb
+${GEM_LIBDIR}/lib/nokogiri/jruby/dependencies.rb
 ${GEM_LIBDIR}/lib/nokogiri/nokogiri.${RUBY_DLEXT}
 ${GEM_LIBDIR}/lib/nokogiri/syntax_error.rb
 ${GEM_LIBDIR}/lib/nokogiri/version.rb
+${GEM_LIBDIR}/lib/nokogiri/version/constant.rb
+${GEM_LIBDIR}/lib/nokogiri/version/info.rb
 ${GEM_LIBDIR}/lib/nokogiri/xml.rb
 ${GEM_LIBDIR}/lib/nokogiri/xml/attr.rb
 ${GEM_LIBDIR}/lib/nokogiri/xml/attribute_decl.rb
@@ -147,4 +152,8 @@ ${GEM_LIBDIR}/patches/libxml2/0002-Remov
 ${GEM_LIBDIR}/patches/libxml2/0003-Update-entities-to-remove-handling-of-ssi.patch
 ${GEM_LIBDIR}/patches/libxml2/0004-libxml2.la-is-in-top_builddir.patch
 ${GEM_LIBDIR}/patches/libxml2/0005-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch
+${GEM_LIBDIR}/patches/libxml2/0006-htmlParseComment-treat-as-if-it-closed-the-comment.patch
+${GEM_LIBDIR}/patches/libxml2/0007-use-new-htmlParseLookupCommentEnd-to-find-comment-en.patch
+${GEM_LIBDIR}/patches/libxml2/0008-use-glibc-strlen.patch
+${GEM_LIBDIR}/patches/libxml2/0009-avoid-isnan-isinf.patch
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec

Index: pkgsrc/textproc/ruby-nokogiri/distinfo
diff -u pkgsrc/textproc/ruby-nokogiri/distinfo:1.38 pkgsrc/textproc/ruby-nokogiri/distinfo:1.39
--- pkgsrc/textproc/ruby-nokogiri/distinfo:1.38 Sat Oct  3 14:27:32 2020
+++ pkgsrc/textproc/ruby-nokogiri/distinfo      Fri Jan  8 17:09:41 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.38 2020/10/03 14:27:32 tsutsui Exp $
+$NetBSD: distinfo,v 1.39 2021/01/08 17:09:41 tsutsui Exp $
 
-SHA1 (nokogiri-1.10.10.gem) = 422f16a50ff9375fb74e45169e04070835766e4a
-RMD160 (nokogiri-1.10.10.gem) = 716563fa080f9f3d5d410f83e88792ad15bfe4d7
-SHA512 (nokogiri-1.10.10.gem) = b4628df47dbd8b9123a6f0625829e745a19d26539d54b2748c985d6fdda978072bdcd136df2f47535984186eae7fb318b67d59f1ea413777f1a146bc78e0dae2
-Size (nokogiri-1.10.10.gem) = 9251328 bytes
+SHA1 (nokogiri-1.11.1.gem) = 838f26941f2a97866c29d824531eebdc8a63302a
+RMD160 (nokogiri-1.11.1.gem) = 2eaf4bdad13c344d7cfe6f67366bbdcd42cd8a11
+SHA512 (nokogiri-1.11.1.gem) = 6d73cde64190afd0850eca9bedb41ceccd34919f04bd83726ba41cf1bda1bab3ecd56a5c4d391f1eb9f7e407a80ec65c922a2ebf8c7854ffc8a08bbd284f6827
+Size (nokogiri-1.11.1.gem) = 9266176 bytes