nokogiri 1.6.8 → 1.6.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29f6393de42025a5ef006dfbb9432e3fcf4082c9
-  data.tar.gz: 1d441cbcc162fcfc0cd8cf13fa39fea66518e230
+  metadata.gz: 7aba1b02c58b5803189789642e2509a8c37f7c17
+  data.tar.gz: 27b7137433f9b0ad54bdc5818ca6bfaf94d41f55
 SHA512:
-  metadata.gz: 339827f075e801032aa1583486a0753567939ce5430e6a58e026c412930cc3f2fe6a8e4e0d76fa84820f9e645f633f28d62081d2cb5eac9ed7aec03effe7a98e
-  data.tar.gz: 5fa461a4c9db3450e4bb8646cd2fcdd18020547cb6bc9f7d29f88fc7d518b6eae89a935c82de207427c513fe1aac01e54e3fb95c1737332c4a8bd03f26963040
+  metadata.gz: c18fc20453e6fbc27da1d006224cc63106bf82db2e777373e8d9c9746cc70bb9ea4f801795f27d9be7d5136e98177751ed02e029fd0f4129494524b872682ae2
+  data.tar.gz: 9991ca8a13901c1ef526781107797a9be90ab18badfb0bcd39e312bd3cdadeaa9489b2b94a7e290a07f8503d44aea94c887fb93e4e45728ad71d8b1969bef7f8

data/CHANGELOG.rdoc

@@ -1,4 +1,17 @@
-=== 1.6.8 / unreleased
+=== 1.6.8.1 / 2016-10-03
+
+==== Dependency License Notes
+
+Removes required dependency on the `pkg-config` gem. This dependency
+was introduced in v1.6.8 and, because it's distributed under LGPL, was
+objectionable to many Nokogiri users (#1488, #1496).
+
+This version makes `pkg-config` an optional dependency. If it's
+installed, it's used; but otherwise Nokogiri will attempt to work
+around its absence.
+
+
+=== 1.6.8 / 2016-06-06
 
 ==== Security Notes
 

data/Gemfile

@@ -5,7 +5,6 @@
 source "https://rubygems.org/"
 
 gem "mini_portile2", "~>2.1.0"
-gem "pkg-config", "~>1.1.7"
 
 gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", "~>1.2.0", :group => [:development, :test]

data/Rakefile

@@ -128,7 +128,6 @@ HOE = Hoe.spec 'nokogiri' do
   unless java?
     self.extra_deps += [
       ["mini_portile2",    "~> 2.1.0"], # keep version in sync with extconf.rb
-      ["pkg-config",       "~> 1.1.7"], # keep version in sync with extconf.rb
     ]
   end
 

data/build_all

@@ -16,7 +16,7 @@ else
 fi
 
 set -o errexit
-set -x
+#set -x
 
 rm -rf tmp pkg
 bundle exec rake clean clobber

data/ext/nokogiri/extconf.rb

@@ -106,27 +106,28 @@ def do_clean
   exit! 0
 end
 
-# The gem version constraint in the Rakefile is not respected at install time.
-# Keep this version in sync with the one in the Rakefile !
-require 'rubygems'
-gem 'pkg-config', '~> 1.1.7'
-require 'pkg-config'
-message "Using pkg-config version #{PKGConfig::VERSION}\n"
-
 def package_config pkg, options={}
   package = pkg_config(pkg)
   return package if package
 
-  return nil unless PKGConfig.have_package(pkg)
+  begin
+    require 'rubygems'
+    gem 'pkg-config', (gem_ver='~> 1.1.7')
+    require 'pkg-config' and message("Using pkg-config gem version #{PKGConfig::VERSION}\n")
+  rescue LoadError
+    message "pkg-config could not be used to find #{pkg}\nPlease install either `pkg-config` or the pkg-config gem per\n\n    gem install pkg-config -v #{gem_ver.inspect}\n\n"
+  else
+    return nil unless PKGConfig.have_package(pkg)
 
-  cflags  = PKGConfig.cflags(pkg)
-  ldflags = PKGConfig.libs_only_L(pkg)
-  libs    = PKGConfig.libs_only_l(pkg)
+    cflags  = PKGConfig.cflags(pkg)
+    ldflags = PKGConfig.libs_only_L(pkg)
+    libs    = PKGConfig.libs_only_l(pkg)
 
-  Logging::message "PKGConfig package configuration for %s\n", pkg
-  Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n", cflags, ldflags, libs
+    Logging::message "PKGConfig package configuration for %s\n", pkg
+    Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n", cflags, ldflags, libs
 
-  [cflags, ldflags, libs]
+    [cflags, ldflags, libs]
+  end
 end
 
 def nokogiri_try_compile

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.6.8'
+  VERSION = '1.6.8.1'
 
   class VersionInfo # :nodoc:
     def jruby?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.8.1
 platform: ruby
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -28,20 +28,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: pkg-config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement