This updates nokogiri to the current version. The largest change between the in-tree version and this new version is an HTML5 parser based on gumbo. The full changelog is available at https://nokogiri.org/CHANGELOG.html
Unfortunately, it's no longer possible to avoid the mini_portile2 dependency for building. It was previously only needed for builds that didn't use --use-system-libraries, but now it is needed for all builds to build the embedded gumbo. I've attached a .tar.gz for the mini_portile2 port. This new version requires fuzzing the nokogiri dependency in cms_scanner. sebastia@, can you check that cms_scanner still works with this? All other dependencies still build with this patch. OKs for import of devel/ruby-mini_portile2 (and/or the nokogiri update)? Thanks, Jeremy Index: textproc/ruby-nokogiri/Makefile =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/Makefile,v retrieving revision 1.40 diff -u -p -r1.40 Makefile --- textproc/ruby-nokogiri/Makefile 6 Oct 2021 21:11:58 -0000 1.40 +++ textproc/ruby-nokogiri/Makefile 13 Feb 2022 22:45:10 -0000 @@ -2,7 +2,7 @@ COMMENT= HTML, XML, SAX and Reader parser -DISTNAME= nokogiri-1.11.7 +DISTNAME= nokogiri-1.13.1 CATEGORIES= textproc HOMEPAGE= http://nokogiri.org/ @@ -14,10 +14,9 @@ PERMIT_PACKAGE= Yes WANTLIB= exslt xml2 xslt gcrypt gpg-error LIB_DEPENDS= textproc/libxslt +BUILD_DEPENDS= devel/ruby-mini_portile2,${MODRUBY_FLAVOR}>=2.7.0,<3.0 MODULES= lang/ruby - -FLAVOR ?= CONFIGURE_STYLE= ruby gem ext Index: textproc/ruby-nokogiri/distinfo =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/distinfo,v retrieving revision 1.18 diff -u -p -r1.18 distinfo --- textproc/ruby-nokogiri/distinfo 18 Jun 2021 08:57:51 -0000 1.18 +++ textproc/ruby-nokogiri/distinfo 13 Feb 2022 21:30:33 -0000 @@ -1,2 +1,2 @@ -SHA256 (nokogiri-1.11.7.gem) = SXapyeeWUn1R3GwxG5vZOgIz9qeWKg9WmqXHgkYYNu8= -SIZE (nokogiri-1.11.7.gem) = 9353728 +SHA256 (nokogiri-1.13.1.gem) = ITi7jhvV8RwtxXpqftk93ONYJdrn0lJiZY2JoiJXH/8= +SIZE (nokogiri-1.13.1.gem) = 9598976 Index: textproc/ruby-nokogiri/patches/patch-_metadata =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/patches/patch-_metadata,v retrieving revision 1.5 diff -u -p -r1.5 patch-_metadata --- textproc/ruby-nokogiri/patches/patch-_metadata 3 Feb 2021 18:50:36 -0000 1.5 +++ textproc/ruby-nokogiri/patches/patch-_metadata 13 Feb 2022 21:32:03 -0000 @@ -6,10 +6,10 @@ the extension. Index: .metadata --- .metadata.orig +++ .metadata -@@ -40,7 +40,7 @@ dependencies: +@@ -29,7 +29,7 @@ dependencies: - - "~>" - !ruby/object:Gem::Version - version: 2.5.0 + version: 2.7.0 - type: :runtime + type: :development prerelease: false Index: textproc/ruby-nokogiri/pkg/PLIST =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/pkg/PLIST,v retrieving revision 1.19 diff -u -p -r1.19 PLIST --- textproc/ruby-nokogiri/pkg/PLIST 18 Jun 2021 08:57:51 -0000 1.19 +++ textproc/ruby-nokogiri/pkg/PLIST 13 Feb 2022 22:10:54 -0000 @@ -13,6 +13,7 @@ ${GEM_LIB}/gems/${DISTNAME}/dependencies ${GEM_LIB}/gems/${DISTNAME}/lib/ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/class_resolver.rb ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/css/ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/css.rb ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/css/node.rb @@ -26,18 +27,25 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/decorators/ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/decorators/slop.rb ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/extension.rb -${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/ +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/gumbo.rb ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html.rb -${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/builder.rb -${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/document.rb -${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/document_fragment.rb -${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/element_description.rb -${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/element_description_defaults.rb -${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/entity_lookup.rb -${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/sax/ -${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/sax/parser.rb -${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/sax/parser_context.rb -${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/sax/push_parser.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html4/ +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html4.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html4/builder.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html4/document.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html4/document_fragment.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html4/element_description.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html4/element_description_defaults.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html4/entity_lookup.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html4/sax/ +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html4/sax/parser.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html4/sax/parser_context.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html4/sax/push_parser.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html5/ +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html5.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html5/document.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html5/document_fragment.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html5/node.rb ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/jruby/ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/jruby/dependencies.rb @so ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/nokogiri.so @@ -94,17 +102,4 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri ${GEM_LIB}/gems/${DISTNAME}/lib/xsd/ ${GEM_LIB}/gems/${DISTNAME}/lib/xsd/xmlparser/ ${GEM_LIB}/gems/${DISTNAME}/lib/xsd/xmlparser/nokogiri.rb -${GEM_LIB}/gems/${DISTNAME}/patches/ -${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/ -${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/0001-Remove-script-macro-support.patch -${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/0002-Update-entities-to-remove-handling-of-ssi.patch -${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/0003-libxml2.la-is-in-top_builddir.patch -${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/0004-use-glibc-strlen.patch -${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/0005-avoid-isnan-isinf.patch -${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/0006-update-automake-files-for-arm64.patch -${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/0007-Fix-XPath-recursion-limit.patch -${GEM_LIB}/gems/${DISTNAME}/patches/libxslt/ -${GEM_LIB}/gems/${DISTNAME}/patches/libxslt/0001-update-automake-files-for-arm64.patch -${GEM_LIB}/gems/${DISTNAME}/patches/libxslt/0002-Fix-xml2-config-check-in-configure-script.patch -${GEM_LIB}/gems/${DISTNAME}/ports/ ${GEM_LIB}/specifications/${DISTNAME}.gemspec Index: security/ruby-cms_scanner/Makefile =================================================================== RCS file: /cvs/ports/security/ruby-cms_scanner/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- security/ruby-cms_scanner/Makefile 4 Jan 2022 06:38:19 -0000 1.18 +++ security/ruby-cms_scanner/Makefile 13 Feb 2022 22:29:34 -0000 @@ -21,7 +21,7 @@ RUN_DEPENDS += devel/ruby-get_process_m devel/ruby-opt_parse_validator,${MODRUBY_FLAVOR}>=1.9.5,<1.10 \ devel/ruby-yajl,${MODRUBY_FLAVOR},>=1.4.1,<1.5 \ net/ruby-public_suffix,${MODRUBY_FLAVOR},>=4.0.3,<4.1 \ - textproc/ruby-nokogiri,${MODRUBY_FLAVOR},>=1.11.4,<1.13 \ + textproc/ruby-nokogiri,${MODRUBY_FLAVOR},>=1.11.4,<1.14 \ www/ruby-ethon,${MODRUBY_FLAVOR},>=0.14,<0.15 \ www/ruby-typhoeus,${MODRUBY_FLAVOR},>=1.3,<1.5 \ www/ruby-xmlrpc,${MODRUBY_FLAVOR},>=0.3.2,<0.4 Index: security/ruby-cms_scanner/patches/patch-_metadata =================================================================== RCS file: /cvs/ports/security/ruby-cms_scanner/patches/patch-_metadata,v retrieving revision 1.2 diff -u -p -r1.2 patch-_metadata --- security/ruby-cms_scanner/patches/patch-_metadata 4 Jan 2022 06:38:19 -0000 1.2 +++ security/ruby-cms_scanner/patches/patch-_metadata 13 Feb 2022 22:32:53 -0000 @@ -2,9 +2,20 @@ $OpenBSD: patch-_metadata,v 1.2 2022/01/ Remove sys-proctable dependency, only needed on Windows. +Bump version of nokogiri to work with in-tree version. + Index: .metadata --- .metadata.orig +++ .metadata +@@ -47,7 +47,7 @@ dependencies: + version: 1.11.4 + - - "<" + - !ruby/object:Gem::Version +- version: 1.13.0 ++ version: 1.14.0 + type: :runtime + prerelease: false + version_requirements: !ruby/object:Gem::Requirement @@ -161,7 +161,7 @@ dependencies: - - "~>" - !ruby/object:Gem::Version
ruby-mini_portile2.tar.gz
Description: application/tar-gz
