nokogiri 1.5.4.rc2-java → 1.5.4.rc3-java

data/CHANGELOG.ja.rdoc

@@ -5,15 +5,24 @@
   * The "nokogiri" script now has more verbose output when passed the `--rng` option. #675 (Thanks, Dan Radez!)
   * Build support on hardened Debian systems that use `-Werror=format-security`. #680.
   * Better build support for systems with pkg-config. #584
+  * Better build support for systems with multiple iconv installations.
 
 * Bugfixes
 
   * Segmentation fault when creating a comment node for a DocumentFragment. #677, #678.
   * Treat '.' as xpath in at() and search(). #690
-  * [MRI] [Security] Default parse options for XML documents were
+
+  * [MRI, Security] Default parse options for XML documents were
     changed to not make network connections during document parsing,
     to avoid XXE vulnerability. #693
 
+    To re-enable this behavior, the configuration method `nononet` may
+    be called, like this:
+
+    Nokogiri::XML::Document.parse(xml) { |config| config.nononet }
+    
+    Insert your own joke about double-negatives here.
+
 
 == 1.5.3 / 2012-06-01
 

data/CHANGELOG.rdoc

@@ -5,15 +5,25 @@
   * The "nokogiri" script now has more verbose output when passed the `--rng` option. #675 (Thanks, Dan Radez!)
   * Build support on hardened Debian systems that use `-Werror=format-security`. #680.
   * Better build support for systems with pkg-config. #584
+  * Better build support for systems with multiple iconv installations.
 
 * Bugfixes
 
   * Segmentation fault when creating a comment node for a DocumentFragment. #677, #678.
   * Treat '.' as xpath in at() and search(). #690
-  * [MRI] [Security] Default parse options for XML documents were
+
+  * [MRI, Security] Default parse options for XML documents were
     changed to not make network connections during document parsing,
     to avoid XXE vulnerability. #693
 
+    To re-enable this behavior, the configuration method `nononet` may
+    be called, like this:
+
+    Nokogiri::XML::Document.parse(xml) { |config| config.nononet }
+    
+    Insert your own joke about double-negatives here.
+
+
 == 1.5.3 / 2012-06-01
 
 * Features

data/ext/nokogiri/extconf.rb

@@ -7,8 +7,8 @@ require 'mkmf'
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
 ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-LIBDIR = Config::CONFIG['libdir']
-INCLUDEDIR = Config::CONFIG['includedir']
+LIBDIR = RbConfig::CONFIG['libdir']
+INCLUDEDIR = RbConfig::CONFIG['includedir']
 
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'
   $LIBRUBYARG_STATIC.gsub!(/-static/, '')
@@ -103,10 +103,18 @@ pkg_config('libxslt')
 pkg_config('libxml-2.0')
 pkg_config('libiconv')
 
+def have_iconv?
+  %w{ iconv_open libiconv_open }.any? do |method|
+    have_func(method, 'iconv.h') or
+      have_library('iconv', method, 'iconv.h') or
+      find_library('iconv', method, 'iconv.h')
+  end
+end
+
 asplode "libxml2"  unless find_header('libxml/parser.h')
 asplode "libxslt"  unless find_header('libxslt/xslt.h')
 asplode "libexslt" unless find_header('libexslt/exslt.h')
-asplode "libiconv" unless have_func('iconv_open', 'iconv.h') or have_library('iconv', 'iconv_open', 'iconv.h') or find_library('iconv', 'iconv_open', 'iconv.h')
+asplode "libiconv" unless have_iconv?
 asplode "libxml2"  unless find_library("#{lib_prefix}xml2", 'xmlParseDoc')
 asplode "libxslt"  unless find_library("#{lib_prefix}xslt", 'xsltParseStylesheetDoc')
 asplode "libexslt" unless find_library("#{lib_prefix}exslt", 'exsltFuncRegister')

data/lib/nokogiri/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: nokogiri
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.5.4.rc2
+  version: 1.5.4.rc3
 platform: java
 authors: 
   - Aaron Patterson