summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2021-01-27 12:46:53 +0000
committerMatthias Fechner <mfechner@FreeBSD.org>2021-01-27 12:46:53 +0000
commitc139fa9be9924ec6cc4353e9b8bb9eb7fa3c37f4 (patch)
treeda99e9b000ddadae1bf7afdf9009fb6ead0a18d0
parentUpdate to 2.13.2 which is required for gitlab-ce 13.8. (diff)
Security related update to 1.11.1.
Security: 13c54e6d-5c45-11eb-b4e2-001b217b3468
Notes
Notes: svn path=/head/; revision=563063
-rw-r--r--textproc/rubygem-nokogiri/Makefile5
-rw-r--r--textproc/rubygem-nokogiri/distinfo6
-rw-r--r--textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb8
-rw-r--r--textproc/rubygem-nokogiri/files/patch-gemspec14
4 files changed, 17 insertions, 16 deletions
diff --git a/textproc/rubygem-nokogiri/Makefile b/textproc/rubygem-nokogiri/Makefile
index c104d98ee377..ff293811441b 100644
--- a/textproc/rubygem-nokogiri/Makefile
+++ b/textproc/rubygem-nokogiri/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= nokogiri
-PORTVERSION= 1.10.10
+PORTVERSION= 1.11.1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -16,7 +16,8 @@ LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
libgpg-error.so:security/libgpg-error
# Do not add mini_portile2 to RUN_DEPENDS. Read ext/nokogiri/extconf.rb
# and https://lists.freebsd.org/pipermail/svn-ports-all/2019-March/209423.html
-RUN_DEPENDS= rubygem-pkg-config>=1.1.7:devel/rubygem-pkg-config
+RUN_DEPENDS= rubygem-pkg-config>=1.1.7:devel/rubygem-pkg-config \
+ rubygem-racc>=1.4<2:devel/rubygem-racc
USES= gem gnome pkgconfig gettext-runtime
USE_GNOME= libxml2 libxslt
diff --git a/textproc/rubygem-nokogiri/distinfo b/textproc/rubygem-nokogiri/distinfo
index 92e7cf5f94ed..682c8e31f831 100644
--- a/textproc/rubygem-nokogiri/distinfo
+++ b/textproc/rubygem-nokogiri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600949728
-SHA256 (rubygem/nokogiri-1.10.10.gem) = 22ea03a328972467d7da06f4a7d5ac4f1f6410185efb55a4dae9cd222d30ae76
-SIZE (rubygem/nokogiri-1.10.10.gem) = 9251328
+TIMESTAMP = 1611261222
+SHA256 (rubygem/nokogiri-1.11.1.gem) = 42c2a54dd3ef03ef2543177bee3b5308313214e99f0d1aa85f984324329e5caa
+SIZE (rubygem/nokogiri-1.11.1.gem) = 9266176
diff --git a/textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb b/textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb
index c5fa64d2780a..c0070a9b7bf0 100644
--- a/textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb
+++ b/textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb
@@ -1,8 +1,8 @@
---- ext/nokogiri/extconf.rb.orig 2017-09-20 14:58:44 UTC
+--- ext/nokogiri/extconf.rb.orig 2021-01-21 20:37:43 UTC
+++ ext/nokogiri/extconf.rb
-@@ -658,6 +658,43 @@ have_func('xmlRelaxNGSetValidStructuredE
- have_func('xmlSchemaSetValidStructuredErrors')
- have_func('xmlSchemaSetParserStructuredErrors')
+@@ -819,6 +819,43 @@ unless using_system_libraries?
+ end
+ end
+$INSTALLFILES = [
+ ['html_document.h', '$(archdir)'],
diff --git a/textproc/rubygem-nokogiri/files/patch-gemspec b/textproc/rubygem-nokogiri/files/patch-gemspec
index 74be70e357f6..43f56f9a0877 100644
--- a/textproc/rubygem-nokogiri/files/patch-gemspec
+++ b/textproc/rubygem-nokogiri/files/patch-gemspec
@@ -1,10 +1,10 @@
---- nokogiri.gemspec.orig 2019-08-12 17:41:47 UTC
+--- nokogiri.gemspec.orig 2021-01-21 20:37:44 UTC
+++ nokogiri.gemspec
-@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
- s.specification_version = 4
+@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-- s.add_runtime_dependency(%q<mini_portile2>.freeze, ["~> 2.4.0"])
- s.add_development_dependency(%q<concourse>.freeze, ["~> 0.24"])
- s.add_development_dependency(%q<hoe-bundler>.freeze, ["~> 1.2"])
- s.add_development_dependency(%q<hoe-debugging>.freeze, ["~> 2.0"])
+ s.add_runtime_dependency(%q<racc>.freeze, ["~> 1.4"])
+- s.add_runtime_dependency(%q<mini_portile2>.freeze, ["~> 2.5.0"])
+ s.add_development_dependency(%q<bundler>.freeze, ["~> 2.2"])
+ s.add_development_dependency(%q<concourse>.freeze, ["~> 0.41"])
+ s.add_development_dependency(%q<hoe-markdown>.freeze, ["~> 1.1"])