summaryrefslogtreecommitdiff
path: root/textproc/ruby-nokogiri/Makefile
diff options
context:
space:
mode:
authorbsiegert <bsiegert@pkgsrc.org>2015-11-24 20:10:28 +0000
committerbsiegert <bsiegert@pkgsrc.org>2015-11-24 20:10:28 +0000
commit7b7b82b7fd6fa43e575ac5a24d17445f0f5ae692 (patch)
tree3d0bf2e6b5d0753e9422cf1edb8ea7a439a3b486 /textproc/ruby-nokogiri/Makefile
parent8ed96665fec9028fbdaf135173bb0fd350169f3b (diff)
downloadpkgsrc-7b7b82b7fd6fa43e575ac5a24d17445f0f5ae692.tar.gz
Pullup ticket #4863 - requested by taca
textproc/ruby-nokogiri: security fix Revisions pulled up: - textproc/ruby-nokogiri/ALTERNATIVES 1.1 - textproc/ruby-nokogiri/Makefile 1.27-1.28 - textproc/ruby-nokogiri/PLIST 1.15-1.16 - textproc/ruby-nokogiri/distinfo 1.17-1.18 --- Module Name: pkgsrc Committed By: taca Date: Wed Nov 18 16:04:50 UTC 2015 Modified Files: pkgsrc/textproc/ruby-nokogiri: Makefile PLIST distinfo Added Files: pkgsrc/textproc/ruby-nokogiri: ALTERNATIVES Log Message: Update ruby-nokogiri to 1.6.6.3. pkgsrc change: Add pkg_alternatives support. === 1.6.6.3 / 2015-11-16 This version pulls in several upstream patches to the vendored libxml2 and libxslt to address: * CVE-2015-1819 * CVE-2015-7941_1 * CVE-2015-7941_2 * CVE-2015-7942 * CVE-2015-7942-2 * CVE-2015-8035 * CVE-2015-7995 See #1374 for details. --- Module Name: pkgsrc Committed By: taca Date: Mon Nov 23 07:28:01 UTC 2015 Modified Files: pkgsrc/textproc/ruby-nokogiri: Makefile PLIST distinfo Log Message: Update ruby-nokogiri to 1.6.8.4. === 1.6.6.4 / 2015-11-19 This version pulls in an upstream patche to the vendored libxml2 to address: * unclosed comment uninitialized access issue (#1376) This issue does not have a CVE assigned to it as this time.
Diffstat (limited to 'textproc/ruby-nokogiri/Makefile')
-rw-r--r--textproc/ruby-nokogiri/Makefile11
1 files changed, 5 insertions, 6 deletions
diff --git a/textproc/ruby-nokogiri/Makefile b/textproc/ruby-nokogiri/Makefile
index 3420aad7c61..869abe7eff1 100644
--- a/textproc/ruby-nokogiri/Makefile
+++ b/textproc/ruby-nokogiri/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2015/06/07 16:07:42 taca Exp $
+# $NetBSD: Makefile,v 1.26.4.1 2015/11/24 20:10:28 bsiegert Exp $
-DISTNAME= nokogiri-1.6.6.2
+DISTNAME= nokogiri-1.6.6.4
CATEGORIES= textproc
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -8,15 +8,14 @@ HOMEPAGE= http://nokogiri.org/
COMMENT= HTML, XML, SAX, and Reader parser with XPath and CSS selector support
LICENSE= mit
-CONFLICTS+= ruby[1-9][0-9][0-9]-nokogiri-[0-9]*
-
DEPENDS+= ${RUBY_PKGPREFIX}-mini_portile>=0.6.0<0.7:../../misc/ruby-mini_portile
USE_GCC_RUNTIME= yes
USE_TOOLS+= pkg-config
MAKE_ENV+= NOKOGIRI_USE_SYSTEM_LIBRARIES=yes
-OVERRIDE_GEMSPEC= :files ports/archives/libxml2-2.8.0.tar.gz= \
- ports/archives/libxslt-1.1.26.tar.gz=
+RUBYGEM_OPTIONS+= --format-executable
+OVERRIDE_GEMSPEC= :files ports/archives/libxml2-2.9.2.tar.gz= \
+ ports/archives/libxslt-1.1.28.tar.gz=
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"