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

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of nokogiri might be problematic. Click here for more details.

@@ -5,15 +5,24 @@
5
5
  * The "nokogiri" script now has more verbose output when passed the `--rng` option. #675 (Thanks, Dan Radez!)
6
6
  * Build support on hardened Debian systems that use `-Werror=format-security`. #680.
7
7
  * Better build support for systems with pkg-config. #584
8
+ * Better build support for systems with multiple iconv installations.
8
9
 
9
10
  * Bugfixes
10
11
 
11
12
  * Segmentation fault when creating a comment node for a DocumentFragment. #677, #678.
12
13
  * Treat '.' as xpath in at() and search(). #690
13
- * [MRI] [Security] Default parse options for XML documents were
14
+
15
+ * [MRI, Security] Default parse options for XML documents were
14
16
  changed to not make network connections during document parsing,
15
17
  to avoid XXE vulnerability. #693
16
18
 
19
+ To re-enable this behavior, the configuration method `nononet` may
20
+ be called, like this:
21
+
22
+ Nokogiri::XML::Document.parse(xml) { |config| config.nononet }
23
+
24
+ Insert your own joke about double-negatives here.
25
+
17
26
 
18
27
  == 1.5.3 / 2012-06-01
19
28
 
@@ -5,15 +5,25 @@
5
5
  * The "nokogiri" script now has more verbose output when passed the `--rng` option. #675 (Thanks, Dan Radez!)
6
6
  * Build support on hardened Debian systems that use `-Werror=format-security`. #680.
7
7
  * Better build support for systems with pkg-config. #584
8
+ * Better build support for systems with multiple iconv installations.
8
9
 
9
10
  * Bugfixes
10
11
 
11
12
  * Segmentation fault when creating a comment node for a DocumentFragment. #677, #678.
12
13
  * Treat '.' as xpath in at() and search(). #690
13
- * [MRI] [Security] Default parse options for XML documents were
14
+
15
+ * [MRI, Security] Default parse options for XML documents were
14
16
  changed to not make network connections during document parsing,
15
17
  to avoid XXE vulnerability. #693
16
18
 
19
+ To re-enable this behavior, the configuration method `nononet` may
20
+ be called, like this:
21
+
22
+ Nokogiri::XML::Document.parse(xml) { |config| config.nononet }
23
+
24
+ Insert your own joke about double-negatives here.
25
+
26
+
17
27
  == 1.5.3 / 2012-06-01
18
28
 
19
29
  * Features
@@ -7,8 +7,8 @@ require 'mkmf'
7
7
  RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
8
8
 
9
9
  ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
10
- LIBDIR = Config::CONFIG['libdir']
11
- INCLUDEDIR = Config::CONFIG['includedir']
10
+ LIBDIR = RbConfig::CONFIG['libdir']
11
+ INCLUDEDIR = RbConfig::CONFIG['includedir']
12
12
 
13
13
  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'
14
14
  $LIBRUBYARG_STATIC.gsub!(/-static/, '')
@@ -103,10 +103,18 @@ pkg_config('libxslt')
103
103
  pkg_config('libxml-2.0')
104
104
  pkg_config('libiconv')
105
105
 
106
+ def have_iconv?
107
+ %w{ iconv_open libiconv_open }.any? do |method|
108
+ have_func(method, 'iconv.h') or
109
+ have_library('iconv', method, 'iconv.h') or
110
+ find_library('iconv', method, 'iconv.h')
111
+ end
112
+ end
113
+
106
114
  asplode "libxml2" unless find_header('libxml/parser.h')
107
115
  asplode "libxslt" unless find_header('libxslt/xslt.h')
108
116
  asplode "libexslt" unless find_header('libexslt/exslt.h')
109
- 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')
117
+ asplode "libiconv" unless have_iconv?
110
118
  asplode "libxml2" unless find_library("#{lib_prefix}xml2", 'xmlParseDoc')
111
119
  asplode "libxslt" unless find_library("#{lib_prefix}xslt", 'xsltParseStylesheetDoc')
112
120
  asplode "libexslt" unless find_library("#{lib_prefix}exslt", 'exsltFuncRegister')
Binary file
@@ -1,6 +1,6 @@
1
1
  module Nokogiri
2
2
  # The version of Nokogiri you are using
3
- VERSION = '1.5.4.rc2'
3
+ VERSION = '1.5.4.rc3'
4
4
 
5
5
  class VersionInfo # :nodoc:
6
6
  def jruby?
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: nokogiri
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease: 6
5
- version: 1.5.4.rc2
5
+ version: 1.5.4.rc3
6
6
  platform: java
7
7
  authors:
8
8
  - Aaron Patterson