Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rubygem-nokogiri for
openSUSE:Factory checked in at 2022-04-14 17:23:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-nokogiri (Old)
and /work/SRC/openSUSE:Factory/.rubygem-nokogiri.new.1941 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-nokogiri"
Thu Apr 14 17:23:45 2022 rev:61 rq:969380 version:1.13.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-nokogiri/rubygem-nokogiri.changes
2022-03-13 20:25:12.383658116 +0100
+++
/work/SRC/openSUSE:Factory/.rubygem-nokogiri.new.1941/rubygem-nokogiri.changes
2022-04-14 17:23:49.251148056 +0200
@@ -1,0 +2,27 @@
+Tue Apr 12 09:18:33 UTC 2022 - Marcus Rueckert <[email protected]>
+
+- updated to version 1.13.4
+ - Security
+ - Address CVE-2022-24836, a regular expression
+ denial-of-service vulnerability. See GHSA-crjr-9rc5-ghw8 for
+ more information.
+ - [CRuby] Vendored zlib is updated to address CVE-2018-25032.
+ See GHSA-v6gp-9mmm-c6p5 for more information.
+ - [JRuby] Vendored Xerces-J (xerces:xercesImpl) is updated to
+ address CVE-2022-23437. See GHSA-xxx9-3xcr-gjj3 for more
+ information.
+ - [JRuby] Vendored nekohtml (org.cyberneko.html) is updated to
+ address CVE-2022-24839. See GHSA-gx8x-g87m-h5q6 for more
+ information.
+ - Dependencies
+ - [CRuby] Vendored zlib is updated from 1.2.11 to 1.2.12. (See
+ LICENSE-DEPENDENCIES.md for details on which packages
+ redistribute this library.)
+ - [JRuby] Vendored Xerces-J (xerces:xercesImpl) is updated from
+ 2.12.0 to 2.12.2.
+ - [JRuby] Vendored nekohtml (org.cyberneko.html) is updated
+ from a fork of 1.9.21 to 1.9.22.noko2. This fork is now
+ publicly developed at
+ https://github.com/sparklemotion/nekohtml
+
+-------------------------------------------------------------------
@@ -31,0 +59,5 @@
+
+-------------------------------------------------------------------
+Thu Jan 27 17:40:19 UTC 2022 - Marcus Rueckert <[email protected]>
+
+- fix ruby versions for the leap build
Old:
----
nokogiri-1.13.3.gem
New:
----
nokogiri-1.13.4.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-nokogiri.spec ++++++
--- /var/tmp/diff_new_pack.CsojLc/_old 2022-04-14 17:23:50.427149430 +0200
+++ /var/tmp/diff_new_pack.CsojLc/_new 2022-04-14 17:23:50.431149434 +0200
@@ -24,14 +24,14 @@
#
Name: rubygem-nokogiri
-Version: 1.13.3
+Version: 1.13.4
Release: 0
%define mod_name nokogiri
%define mod_full_name %{mod_name}-%{version}
# MANUAL
-%if 0%{?suse_version} && 0%{?suse_version} < 1550
-%define rb_build_versions ruby27 ruby30
-%define rb_build_ruby_abis ruby:2.7.0 ruby:3.0.0
+%if 0%{?suse_version} == 1500
+%define rb_build_versions ruby27
+%define rb_build_ruby_abis ruby:2.7.0
%endif
BuildRequires: %{rubygem mini_portile2 >= 2.8}
BuildRequires: %{rubygem pkg-config}
++++++ gem2rpm.yml ++++++
--- /var/tmp/diff_new_pack.CsojLc/_old 2022-04-14 17:23:50.467149476 +0200
+++ /var/tmp/diff_new_pack.CsojLc/_new 2022-04-14 17:23:50.471149481 +0200
@@ -16,9 +16,9 @@
# :disable_automatic_rdoc_dep: true
# ## used by gem2rpm
:preamble: |-
- %if 0%{?suse_version} && 0%{?suse_version} < 1550
- %define rb_build_versions ruby27 ruby30
- %define rb_build_ruby_abis ruby:2.7.0 ruby:3.0.0
+ %if 0%{?suse_version} == 1500
+ %define rb_build_versions ruby27
+ %define rb_build_ruby_abis ruby:2.7.0
%endif
BuildRequires: %{rubygem mini_portile2 >= 2.8}
BuildRequires: %{rubygem pkg-config}
++++++ nokogiri-1.13.3.gem -> nokogiri-1.13.4.gem ++++++
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dependencies.yml new/dependencies.yml
--- old/dependencies.yml 2022-02-22 05:28:33.000000000 +0100
+++ new/dependencies.yml 2022-04-11 22:18:49.000000000 +0200
@@ -9,8 +9,8 @@
# sha-256 hash provided in
https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.sha256sum
zlib:
- version: "1.2.11"
- sha256: "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"
+ version: "1.2.12"
+ sha256: "91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9"
# SHA-256 hash provided on http://zlib.net/
libiconv:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ext/nokogiri/extconf.rb new/ext/nokogiri/extconf.rb
--- old/ext/nokogiri/extconf.rb 2022-02-22 05:28:33.000000000 +0100
+++ new/ext/nokogiri/extconf.rb 2022-04-11 22:18:49.000000000 +0200
@@ -382,6 +382,7 @@
["iconv", "opt"].each do |target|
config = preserving_globals { dir_config(target) }
next unless config.any? && try_link_iconv("--with-#{target}-* flags") {
dir_config(target) }
+
idirs, ldirs = config.map do |dirs|
Array(dirs).flat_map do |dir|
dir.split(File::PATH_SEPARATOR)
@@ -715,14 +716,6 @@
execute("configure",
["env", "CHOST=#{host}", "CFLAGS=#{cflags}", "./configure",
"--static", configure_prefix])
end
-
- def compile
- if /darwin/.match?(host)
- execute("compile", "make AR=#{host}-libtool")
- else
- super
- end
- end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/css/parser_extras.rb
new/lib/nokogiri/css/parser_extras.rb
--- old/lib/nokogiri/css/parser_extras.rb 2022-02-22 05:28:33.000000000
+0100
+++ new/lib/nokogiri/css/parser_extras.rb 2022-04-11 22:18:49.000000000
+0200
@@ -24,12 +24,14 @@
# Get the css selector in +string+ from the cache
def [](string)
return nil unless cache_on?
+
@mutex.synchronize { @cache[string] }
end
# Set the css selector in +string+ in the cache to +value+
def []=(string, value)
return value unless cache_on?
+
@mutex.synchronize { @cache[string] = value }
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/html4/document.rb
new/lib/nokogiri/html4/document.rb
--- old/lib/nokogiri/html4/document.rb 2022-02-22 05:28:33.000000000 +0100
+++ new/lib/nokogiri/html4/document.rb 2022-04-11 22:18:49.000000000 +0200
@@ -125,8 +125,9 @@
private :set_metadata_element
####
- # Serialize Node using +options+. Save options can also be set using a
- # block. See SaveOptions.
+ # Serialize Node using +options+. Save options can also be set using a
block.
+ #
+ # See also Nokogiri::XML::Node::SaveOptions and
Node@Serialization+and+Generating+Output.
#
# These two statements are equivalent:
#
@@ -241,6 +242,7 @@
def start_element(name, attrs = [])
return unless name == "meta"
+
attr = Hash[attrs]
(charset = attr["charset"]) &&
(@encoding = charset)
@@ -266,7 +268,7 @@
end
def self.detect_encoding(chunk)
- (m = chunk.match(/\A(<\?xml[ \t\r\n]+[^>]*>)/)) &&
+ (m = chunk.match(/\A(<\?xml[ \t\r\n][^>]*>)/)) &&
(return Nokogiri.XML(m[1]).encoding)
if Nokogiri.jruby?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/html4/sax/parser.rb
new/lib/nokogiri/html4/sax/parser.rb
--- old/lib/nokogiri/html4/sax/parser.rb 2022-02-22 05:28:33.000000000
+0100
+++ new/lib/nokogiri/html4/sax/parser.rb 2022-04-11 22:18:49.000000000
+0200
@@ -30,6 +30,7 @@
def parse_memory(data, encoding = "UTF-8")
raise ArgumentError unless data
return if data.empty?
+
ctx = ParserContext.memory(data, encoding)
yield ctx if block_given?
ctx.parse_with(self)
@@ -51,6 +52,7 @@
raise ArgumentError unless filename
raise Errno::ENOENT unless File.exist?(filename)
raise Errno::EISDIR if File.directory?(filename)
+
ctx = ParserContext.file(filename, encoding)
yield ctx if block_given?
ctx.parse_with(self)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/html5/document.rb
new/lib/nokogiri/html5/document.rb
--- old/lib/nokogiri/html5/document.rb 2022-02-22 05:28:33.000000000 +0100
+++ new/lib/nokogiri/html5/document.rb 2022-04-11 22:18:49.000000000 +0200
@@ -39,16 +39,19 @@
unless string_or_io.respond_to?(:read) ||
string_or_io.respond_to?(:to_str)
raise ArgumentError, "not a string or IO object"
end
+
do_parse(string_or_io, url, encoding, options)
end
def self.read_io(io, url = nil, encoding = nil, **options)
raise ArgumentError, "io object doesn't respond to :read" unless
io.respond_to?(:read)
+
do_parse(io, url, encoding, options)
end
def self.read_memory(string, url = nil, encoding = nil, **options)
raise ArgumentError, "string object doesn't respond to :to_str" unless
string.respond_to?(:to_str)
+
do_parse(string, url, encoding, options)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/html5/node.rb
new/lib/nokogiri/html5/node.rb
--- old/lib/nokogiri/html5/node.rb 2022-02-22 05:28:33.000000000 +0100
+++ new/lib/nokogiri/html5/node.rb 2022-04-11 22:18:49.000000000 +0200
@@ -27,6 +27,7 @@
module Node
def inner_html(options = {})
return super(options) unless document.is_a?(HTML5::Document)
+
result = options[:preserve_newline] && HTML5.prepend_newline?(self) ?
+"\n" : +""
result << children.map { |child| child.to_html(options) }.join
result
@@ -34,6 +35,7 @@
def write_to(io, *options)
return super(io, *options) unless document.is_a?(HTML5::Document)
+
options = options.first.is_a?(Hash) ? options.shift : {}
encoding = options[:encoding] || options[0]
if Nokogiri.jruby?
@@ -64,6 +66,7 @@
def fragment(tags)
return super(tags) unless document.is_a?(HTML5::Document)
+
DocumentFragment.new(document, tags, self)
end
@@ -76,6 +79,7 @@
# actually create the xml namespace if it doesn't exist already.
def add_child_node_and_reparent_attrs(node)
return super(node) unless document.is_a?(HTML5::Document)
+
# I'm not sure what this method is supposed to do. Reparenting
# namespaces is handled by libxml2, including child namespaces which
# this method wouldn't handle.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/html5.rb new/lib/nokogiri/html5.rb
--- old/lib/nokogiri/html5.rb 2022-02-22 05:28:33.000000000 +0100
+++ new/lib/nokogiri/html5.rb 2022-04-11 22:18:49.000000000 +0200
@@ -468,6 +468,7 @@
def self.prepend_newline?(node)
return false unless ["pre", "textarea", "listing"].include?(node.name)
&& !node.children.empty?
+
first_child = node.children[0]
first_child.text? && first_child.content.start_with?("\n")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/version/constant.rb
new/lib/nokogiri/version/constant.rb
--- old/lib/nokogiri/version/constant.rb 2022-02-22 05:28:33.000000000
+0100
+++ new/lib/nokogiri/version/constant.rb 2022-04-11 22:18:49.000000000
+0200
@@ -2,5 +2,5 @@
module Nokogiri
# The version of Nokogiri you are using
- VERSION = "1.13.3"
+ VERSION = "1.13.4"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/version/info.rb
new/lib/nokogiri/version/info.rb
--- old/lib/nokogiri/version/info.rb 2022-02-22 05:28:33.000000000 +0100
+++ new/lib/nokogiri/version/info.rb 2022-04-11 22:18:49.000000000 +0200
@@ -191,6 +191,7 @@
def self.uses_libxml?(requirement = nil)
return false unless VersionInfo.instance.libxml2?
return true unless requirement
+
Gem::Requirement.new(requirement).satisfied_by?(VersionInfo.instance.loaded_libxml_version)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/xml/builder.rb
new/lib/nokogiri/xml/builder.rb
--- old/lib/nokogiri/xml/builder.rb 2022-02-22 05:28:33.000000000 +0100
+++ new/lib/nokogiri/xml/builder.rb 2022-04-11 22:18:49.000000000 +0200
@@ -363,6 +363,7 @@
@parent.ancestors.each do |a|
next if a == doc
+
@ns = a.namespace_definitions.find { |x| x.prefix == ns.to_s }
return self if @ns
end
@@ -407,6 +408,7 @@
if node.namespace.nil?
raise ArgumentError, "Namespace #{@ns[:pending]} has not been
defined"
end
+
@ns = nil
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/xml/document.rb
new/lib/nokogiri/xml/document.rb
--- old/lib/nokogiri/xml/document.rb 2022-02-22 05:28:33.000000000 +0100
+++ new/lib/nokogiri/xml/document.rb 2022-04-11 22:18:49.000000000 +0200
@@ -321,6 +321,7 @@
# the document or +nil+ when there is no DTD.
def validate
return nil unless internal_subset
+
internal_subset.validate(self)
end
@@ -353,8 +354,10 @@
# Apply any decorators to +node+
def decorate(node)
return unless @decorators
+
@decorators.each do |klass, list|
next unless node.is_a?(klass)
+
list.each { |moodule| node.extend(moodule) }
end
end
@@ -380,9 +383,11 @@
def add_child(node_or_tags)
raise "A document may not have multiple root nodes." if (root &&
root.name != "nokogiri_text_wrapper") && !(node_or_tags.comment? ||
node_or_tags.processing_instruction?)
+
node_or_tags = coerce(node_or_tags)
if node_or_tags.is_a?(XML::NodeSet)
raise "A document may not have multiple root nodes." if
node_or_tags.size > 1
+
super(node_or_tags.first)
else
super
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/xml/node/save_options.rb
new/lib/nokogiri/xml/node/save_options.rb
--- old/lib/nokogiri/xml/node/save_options.rb 2022-02-22 05:28:33.000000000
+0100
+++ new/lib/nokogiri/xml/node/save_options.rb 2022-04-11 22:18:49.000000000
+0200
@@ -4,7 +4,8 @@
module XML
class Node
###
- # Save options for serializing nodes
+ # Save options for serializing nodes.
+ # See the method group entitled Node@Serialization+and+Generating+Output
for usage.
class SaveOptions
# Format serialized xml
FORMAT = 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/xml/node.rb new/lib/nokogiri/xml/node.rb
--- old/lib/nokogiri/xml/node.rb 2022-02-22 05:28:33.000000000 +0100
+++ new/lib/nokogiri/xml/node.rb 2022-04-11 22:18:49.000000000 +0200
@@ -123,7 +123,7 @@
# [Yields] Nokogiri::XML::Node
# [Returns] Nokogiri::XML::Node
#
- def initialize(name, document)
+ def initialize(name, document) # rubocop:disable
Style/RedundantInitialize
# This is intentionally empty.
end
@@ -163,6 +163,7 @@
if (first = children.first)
# Mimic the error add_child would raise.
raise "Document already has a root node" if document? &&
!(node_or_tags.comment? || node_or_tags.processing_instruction?)
+
first.__send__(:add_sibling, :previous, node_or_tags)
else
add_child(node_or_tags)
@@ -1072,6 +1073,7 @@
# nil on XML documents and on unknown tags.
def description
return nil if document.xml?
+
Nokogiri::HTML4::ElementDescription[name]
end
@@ -1119,6 +1121,7 @@
while parents.last.respond_to?(:parent)
break unless (ctx_parent = parents.last.parent)
+
parents << ctx_parent
end
@@ -1150,6 +1153,7 @@
def ==(other)
return false unless other
return false unless other.respond_to?(:pointer_id)
+
pointer_id == other.pointer_id
end
@@ -1159,14 +1163,16 @@
def <=>(other)
return nil unless other.is_a?(Nokogiri::XML::Node)
return nil unless document == other.document
+
compare(other)
end
# :section: Serialization and Generating Output
###
- # Serialize Node using +options+. Save options can also be set using a
- # block. See SaveOptions.
+ # Serialize Node using +options+. Save options can also be set using a
block.
+ #
+ # See also Nokogiri::XML::Node::SaveOptions and
Node@Serialization+and+Generating+Output.
#
# These two statements are equivalent:
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/xml/node_set.rb
new/lib/nokogiri/xml/node_set.rb
--- old/lib/nokogiri/xml/node_set.rb 2022-02-22 05:28:33.000000000 +0100
+++ new/lib/nokogiri/xml/node_set.rb 2022-04-11 22:18:49.000000000 +0200
@@ -27,6 +27,7 @@
# Get the first element of the NodeSet.
def first(n = nil)
return self[0] unless n
+
list = []
[n, length].min.times { |i| list << self[i] }
list
@@ -304,6 +305,7 @@
# the set is empty
def pop
return nil if length == 0
+
delete(last)
end
@@ -312,6 +314,7 @@
# +nil+ if the set is empty.
def shift
return nil if length == 0
+
delete(first)
end
@@ -322,6 +325,7 @@
def ==(other)
return false unless other.is_a?(Nokogiri::XML::NodeSet)
return false unless length == other.length
+
each_with_index do |node, i|
return false unless node == other[i]
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/xml/parse_options.rb
new/lib/nokogiri/xml/parse_options.rb
--- old/lib/nokogiri/xml/parse_options.rb 2022-02-22 05:28:33.000000000
+0100
+++ new/lib/nokogiri/xml/parse_options.rb 2022-04-11 22:18:49.000000000
+0200
@@ -89,6 +89,7 @@
constants.each do |constant|
next if constant.to_sym == :STRICT
+
class_eval %{
def #{constant.downcase}
@options |= #{constant}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/xml/processing_instruction.rb
new/lib/nokogiri/xml/processing_instruction.rb
--- old/lib/nokogiri/xml/processing_instruction.rb 2022-02-22
05:28:33.000000000 +0100
+++ new/lib/nokogiri/xml/processing_instruction.rb 2022-04-11
22:18:49.000000000 +0200
@@ -3,7 +3,7 @@
module Nokogiri
module XML
class ProcessingInstruction < Node
- def initialize(document, name, content)
+ def initialize(document, name, content) # rubocop:disable
Style/RedundantInitialize
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/xml/sax/parser.rb
new/lib/nokogiri/xml/sax/parser.rb
--- old/lib/nokogiri/xml/sax/parser.rb 2022-02-22 05:28:33.000000000 +0100
+++ new/lib/nokogiri/xml/sax/parser.rb 2022-04-11 22:18:49.000000000 +0200
@@ -101,6 +101,7 @@
raise ArgumentError unless filename
raise Errno::ENOENT unless File.exist?(filename)
raise Errno::EISDIR if File.directory?(filename)
+
ctx = ParserContext.file(filename)
yield ctx if block_given?
ctx.parse_with(self)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/xml/syntax_error.rb
new/lib/nokogiri/xml/syntax_error.rb
--- old/lib/nokogiri/xml/syntax_error.rb 2022-02-22 05:28:33.000000000
+0100
+++ new/lib/nokogiri/xml/syntax_error.rb 2022-04-11 22:18:49.000000000
+0200
@@ -64,6 +64,7 @@
def location_to_s
return nil if nil_or_zero?(line) && nil_or_zero?(column)
+
"#{line}:#{column}"
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/nokogiri/xml.rb new/lib/nokogiri/xml.rb
--- old/lib/nokogiri/xml.rb 2022-02-22 05:28:33.000000000 +0100
+++ new/lib/nokogiri/xml.rb 2022-04-11 22:18:49.000000000 +0200
@@ -27,6 +27,7 @@
if string_or_io.respond_to?(:read)
return Reader.from_io(string_or_io, url, encoding, options.to_i)
end
+
Reader.from_memory(string_or_io, url, encoding, options.to_i)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2022-02-22 05:28:33.000000000 +0100
+++ new/metadata 2022-04-11 22:18:49.000000000 +0200
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: nokogiri
version: !ruby/object:Gem::Version
- version: 1.13.3
+ version: 1.13.4
platform: ruby
authors:
- Mike Dalessio
@@ -20,7 +20,7 @@
autorequire:
bindir: bin
cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-04-11 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: mini_portile2
