CVS commit: pkgsrc/textproc/ruby-nokogiri

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

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sun Mar  6 17:14:35 UTC 2022

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

Log Message:
ruby-nokogiri: update to 1.13.3.

Upstream changes:
 https://github.com/sparklemotion/nokogiri/releases/tag/v1.13.3
 https://github.com/sparklemotion/nokogiri/releases/tag/v1.13.2

1.13.3 / 2022-02-21

Fixed

  * [CRuby] Revert a HTML4 parser bug in libxml 2.9.13 (introduced in Nokogiri
    v1.13.2). The bug causes libxml2's HTML4 parser to fail to recover when
    encountering a bare < character in some contexts. This version of Nokogiri
    restores the earlier behavior, which is to recover from the parse error and
    treat the < as normal character data (which will be serialized as &lt; in a
    text node). The bug (and the fix) is only relevant when the RECOVER parse
    option is set, as it is by default. [#2461]

1.13.2 / 2022-02-21

Security

  * [CRuby] Vendored libxml2 is updated from 2.9.12 to 2.9.13. This update
    addresses CVE-2022-23308.
  * [CRuby] Vendored libxslt is updated from 1.1.34 to 1.1.35. This update
    addresses CVE-2021-30560.

Please see GHSA-fq42-c5rg-92c2 for more information about these CVEs.

Dependencies

  * [CRuby] Vendored libxml2 is updated from 2.9.12 to 2.9.13. Full changelog
    is available at https://download.gnome.org/sources/libxml2/2.9/
    libxml2-2.9.13.news
  * [CRuby] Vendored libxslt is updated from 1.1.34 to 1.1.35. Full changelog
    is available at https://download.gnome.org/sources/libxslt/1.1/
    libxslt-1.1.35.news


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/textproc/ruby-nokogiri/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/textproc/ruby-nokogiri/PLIST
cvs rdiff -u -r1.48 -r1.49 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.68 pkgsrc/textproc/ruby-nokogiri/Makefile:1.69
--- pkgsrc/textproc/ruby-nokogiri/Makefile:1.68 Sun Jan 16 10:12:07 2022
+++ pkgsrc/textproc/ruby-nokogiri/Makefile      Sun Mar  6 17:14:34 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2022/01/16 10:12:07 tsutsui Exp $
+# $NetBSD: Makefile,v 1.69 2022/03/06 17:14:34 tsutsui Exp $
 
-DISTNAME=      nokogiri-1.13.1
+DISTNAME=      nokogiri-1.13.3
 CATEGORIES=    textproc
 
 MAINTAINER=    tsutsui%NetBSD.org@localhost
@@ -8,14 +8,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.7.0:../../misc/ruby-mini_portile2
+DEPENDS+=      ${RUBY_PKGPREFIX}-mini_portile2>=2.8.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+=     :files ports/archives/libxml2-2.9.12.tar.gz= \
-                       ports/archives/libxslt-1.1.34.tar.gz=
+OVERRIDE_GEMSPEC+=     :files ports/archives/libxml2-2.9.13.tar.gz= \
+                       ports/archives/libxslt-1.1.35.tar.gz=
 
 # XXX: work around bug in bootstrap-mk-files, remove when fixed
 MAKE_ENV.SunOS+=       ARFLAGS=rcv

Index: pkgsrc/textproc/ruby-nokogiri/PLIST
diff -u pkgsrc/textproc/ruby-nokogiri/PLIST:1.35 pkgsrc/textproc/ruby-nokogiri/PLIST:1.36
--- pkgsrc/textproc/ruby-nokogiri/PLIST:1.35    Sun Jan  9 19:19:23 2022
+++ pkgsrc/textproc/ruby-nokogiri/PLIST Sun Mar  6 17:14:34 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2022/01/09 19:19:23 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.36 2022/03/06 17:14:34 tsutsui Exp $
 bin/nokogiri${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_EXTSDIR}/gem.build_complete
@@ -173,9 +173,8 @@ ${GEM_LIBDIR}/patches/libxml2/0003-libxm
 ${GEM_LIBDIR}/patches/libxml2/0004-use-glibc-strlen.patch
 ${GEM_LIBDIR}/patches/libxml2/0005-avoid-isnan-isinf.patch
 ${GEM_LIBDIR}/patches/libxml2/0006-update-automake-files-for-arm64.patch
-${GEM_LIBDIR}/patches/libxml2/0007-Fix-XPath-recursion-limit.patch
 ${GEM_LIBDIR}/patches/libxml2/0008-htmlParseComment-handle-abruptly-closed-comments.patch
 ${GEM_LIBDIR}/patches/libxml2/0009-allow-wildcard-namespaces.patch
+${GEM_LIBDIR}/patches/libxml2/0010-Revert-Different-approach-to-fix-quadratic-behavior.patch
 ${GEM_LIBDIR}/patches/libxslt/0001-update-automake-files-for-arm64.patch
-${GEM_LIBDIR}/patches/libxslt/0002-Fix-xml2-config-check-in-configure-script.patch
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec

Index: pkgsrc/textproc/ruby-nokogiri/distinfo
diff -u pkgsrc/textproc/ruby-nokogiri/distinfo:1.48 pkgsrc/textproc/ruby-nokogiri/distinfo:1.49
--- pkgsrc/textproc/ruby-nokogiri/distinfo:1.48 Sun Jan 16 10:12:07 2022
+++ pkgsrc/textproc/ruby-nokogiri/distinfo      Sun Mar  6 17:14:34 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.48 2022/01/16 10:12:07 tsutsui Exp $
+$NetBSD: distinfo,v 1.49 2022/03/06 17:14:34 tsutsui Exp $
 
-BLAKE2s (nokogiri-1.13.1.gem) = 245df3a8eee17ffff29768a4e507c2f9e40dbaf4f49e969cb7b3a6dd3f0918a2
-SHA512 (nokogiri-1.13.1.gem) = 0ed89f53cdb6097c435856ddfa55eeef972a1e33d4e6db2fb8fc66f48827e2f863155b9468fc7cd1c17a7d1a5e2ce8adb91299e4425123034e823b74190cff26
-Size (nokogiri-1.13.1.gem) = 9598976 bytes
+BLAKE2s (nokogiri-1.13.3.gem) = f25a3d80dca7df29d756472b28ad8b456ea0a3a35b8fe0adb72250fce59e5f97
+SHA512 (nokogiri-1.13.3.gem) = d704ed5ea6af3e066e3ddefd74cb15d0feed359b90c3b75b83a8f1ff85d8d4ca5b22a47c6848a2043a84f217e9d6b5ca861125d60ed0f88cb53690eb3726b3e7
+Size (nokogiri-1.13.3.gem) = 5492736 bytes