Pullup ticket #5644 - requested by taca

textproc/ruby-nokogiri: bugfix

Revisions pulled up:
- textproc/ruby-nokogiri/Makefile                               1.37
- textproc/ruby-nokogiri/PLIST                                  1.24
- textproc/ruby-nokogiri/distinfo                               1.26

---
   Module Name:	pkgsrc
   Committed By:	tsutsui
   Date:		Fri Oct 20 15:56:58 UTC 2017

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

   Log Message:
   nokogiri: update to 1.8.1.

   This version is necessary for ruby-mini_portile2 2.3.0 in pkgsrc-2017Q3.

   pkgsrc changes:
   - strict dependency against ruby-mini_portile2 as defined in the Gemfile
   - take maintainership

   Upstream changes (from CHANGELOG.md):

   # 1.8.1 / 2017-09-19

   ## Dependencies

   * [MRI] libxml2 is updated from 2.9.4 to 2.9.5.
   * [MRI] libxslt is updated from 1.1.29 to 1.1.30.
   * [MRI] optional dependency on the pkg-config gem has had its constraint loosened to `~> 1.1` (from `~> 1.1.7`). [#1660]
   * [MRI] Upgrade mini_portile2 dependency from `~> 2.2.0` to `~> 2.3.0`, which will validate checksums on the vendored libxml2 and libxslt tarballs before using them.

   ## Bugs

   * NodeSet#first with an integer argument longer than the length of the NodeSet now correctly clamps the length of the returned NodeSet to the original length. [#1650] (Thanks, @Derenge!)
   * [MRI] Ensure CData.new raises TypeError if the `content` argument is not implicitly convertible into a string. [#1669]

3 files changed, 10 insertions, 14 deletions

diff --git a/textproc/ruby-nokogiri/Makefile b/textproc/ruby-nokogiri/Makefile
index 617bc521889..59f54e46a5f 100644
--- a/textproc/ruby-nokogiri/Makefile
+++ b/textproc/ruby-nokogiri/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2017/06/05 15:22:56 taca Exp $
+# $NetBSD: Makefile,v 1.36.6.1 2017/11/20 19:35:32 bsiegert Exp $
 
-DISTNAME=	nokogiri-1.8.0
+DISTNAME=	nokogiri-1.8.1
 CATEGORIES=	textproc
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,7 +8,7 @@ HOMEPAGE=	http://nokogiri.org/
 COMMENT=	HTML, XML, SAX, and Reader parser with XPath and CSS selector support
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-mini_portile2>=2.2.0:../../misc/ruby-mini_portile2
+DEPENDS+=	${RUBY_PKGPREFIX}-mini_portile2>=2.3.0<2.4.0:../../misc/ruby-mini_portile2
 
 USE_GCC_RUNTIME=	yes
 USE_TOOLS+=		pkg-config
diff --git a/textproc/ruby-nokogiri/PLIST b/textproc/ruby-nokogiri/PLIST
index 7368b5b5b71..bcd722f817c 100644
--- a/textproc/ruby-nokogiri/PLIST
+++ b/textproc/ruby-nokogiri/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2017/06/05 15:22:56 taca Exp $
+@comment $NetBSD: PLIST,v 1.23.6.1 2017/11/20 19:35:32 bsiegert Exp $
 bin/nokogiri${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_EXTSDIR}/gem.build_complete
@@ -158,13 +158,9 @@ ${GEM_LIBDIR}/lib/nokogiri/xml/xpath_context.rb
 ${GEM_LIBDIR}/lib/nokogiri/xslt.rb
 ${GEM_LIBDIR}/lib/nokogiri/xslt/stylesheet.rb
 ${GEM_LIBDIR}/lib/xsd/xmlparser/nokogiri.rb
-${GEM_LIBDIR}/patches/libxml2/0001-Fix-comparison-with-root-node-in-xmlXPathCmpNodes.patch
-${GEM_LIBDIR}/patches/libxml2/0002-Fix-XPointer-paths-beginning-with-range-to.patch
-${GEM_LIBDIR}/patches/libxml2/0003-Disallow-namespace-nodes-in-XPointer-ranges.patch
-${GEM_LIBDIR}/patches/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch
-${GEM_LIBDIR}/patches/libxslt/0002-Check-for-integer-overflow-in-xsltAddTextString.patch
 ${GEM_LIBDIR}/patches/sort-patches-by-date
 ${GEM_LIBDIR}/suppressions/README.txt
+${GEM_LIBDIR}/suppressions/nokogiri_ruby-2.supp
 ${GEM_LIBDIR}/tasks/test.rb
 ${GEM_LIBDIR}/test/css/test_nthiness.rb
 ${GEM_LIBDIR}/test/css/test_parser.rb
diff --git a/textproc/ruby-nokogiri/distinfo b/textproc/ruby-nokogiri/distinfo
index 9e142859274..9306f243be2 100644
--- a/textproc/ruby-nokogiri/distinfo
+++ b/textproc/ruby-nokogiri/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.25 2017/06/05 15:22:56 taca Exp $
+$NetBSD: distinfo,v 1.25.6.1 2017/11/20 19:35:32 bsiegert Exp $
 
-SHA1 (nokogiri-1.8.0.gem) = 8312ece43d8dd00eccb29c302eff98df20a65f19
-RMD160 (nokogiri-1.8.0.gem) = a85e99f3b6281bebeb402801a62ce903a5cda577
-SHA512 (nokogiri-1.8.0.gem) = 958b402325e8428d7a6299356dd31cfa191fd6e8ced78e4333395d6a18718c838b810c2dc9c0864553e5e247ed92d6629b985f4076241ad45affd04cae11a75f
-Size (nokogiri-1.8.0.gem) = 9171456 bytes
+SHA1 (nokogiri-1.8.1.gem) = 07ae5eeb780e90cdad7bd4ad110f28003a9e91b3
+RMD160 (nokogiri-1.8.1.gem) = 7f2c0d6b540b813ae1b62f881842970f5c02333a
+SHA512 (nokogiri-1.8.1.gem) = b74e423e295265bd34960ffcfabfad5cc6048ca9c524e9dbf3aff652dab1b5b41470d1161f009bccd61b3acd16cad82b466c2e36e2ed65801f87b88b7c047b93
+Size (nokogiri-1.8.1.gem) = 9274368 bytes