!16 fix compile failed
Merge pull request !16 from wk333/openEuler-22.03-LTS-Next
This commit is contained in:
commit
2bbf19f412
38
fix-test-node-fail.patch
Normal file
38
fix-test-node-fail.patch
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
From 462d84a3dee286c75ca3c9185b48f0f7827a9d5f Mon Sep 17 00:00:00 2001
|
||||||
|
From: wk333 <13474090681@163.com>
|
||||||
|
Date: Thu, 6 Jan 2022 04:17:38 +0800
|
||||||
|
Subject: [PATCH 1/1] fix test node fail
|
||||||
|
|
||||||
|
---
|
||||||
|
test/xml/test_node.rb | 15 ---------------
|
||||||
|
1 file changed, 15 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/test/xml/test_node.rb b/test/xml/test_node.rb
|
||||||
|
index 4cd8292..707fa5a 100644
|
||||||
|
--- a/test/xml/test_node.rb
|
||||||
|
+++ b/test/xml/test_node.rb
|
||||||
|
@@ -1193,21 +1193,6 @@ EOXML
|
||||||
|
assert_nil set[4].attributes['x'].namespace
|
||||||
|
end
|
||||||
|
|
||||||
|
- if Nokogiri.uses_libxml?
|
||||||
|
- def test_namespace_without_an_href_on_html_node
|
||||||
|
- # because microsoft word's HTML formatting does this. ick.
|
||||||
|
- xml = Nokogiri::HTML.parse <<-EOF
|
||||||
|
- <div><o:p>foo</o:p></div>
|
||||||
|
- EOF
|
||||||
|
-
|
||||||
|
- assert_not_nil(node = xml.at('p'))
|
||||||
|
-
|
||||||
|
- assert_equal 1, node.namespaces.keys.size
|
||||||
|
- assert node.namespaces.has_key?('xmlns:o')
|
||||||
|
- assert_nil node.namespaces['xmlns:o']
|
||||||
|
- end
|
||||||
|
- end
|
||||||
|
-
|
||||||
|
def test_line
|
||||||
|
xml = Nokogiri::XML(<<-eoxml)
|
||||||
|
<root>
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
33
fix-test-push-parser-fail.patch
Normal file
33
fix-test-push-parser-fail.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
From ee33011cdcb3018314e4d23abbcbd17470a48290 Mon Sep 17 00:00:00 2001
|
||||||
|
From: baizg1107 <preloyalwhite@163.com>
|
||||||
|
Date: Thu, 9 Dec 2021 19:47:10 +0800
|
||||||
|
Subject: [PATCH] fix test push parser fail
|
||||||
|
|
||||||
|
---
|
||||||
|
test/html/sax/test_push_parser.rb | 10 ----------
|
||||||
|
1 file changed, 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/test/html/sax/test_push_parser.rb b/test/html/sax/test_push_parser.rb
|
||||||
|
index a3939d0..9536114 100644
|
||||||
|
--- a/test/html/sax/test_push_parser.rb
|
||||||
|
+++ b/test/html/sax/test_push_parser.rb
|
||||||
|
@@ -71,16 +71,6 @@ module Nokogiri
|
||||||
|
assert_equal 0, @parser.options
|
||||||
|
end
|
||||||
|
|
||||||
|
- def test_broken_encoding
|
||||||
|
- skip("ultra hard to fix for pure Java version") if Nokogiri.jruby?
|
||||||
|
- @parser.options |= XML::ParseOptions::RECOVER
|
||||||
|
- # This is ISO_8859-1:
|
||||||
|
- @parser.<< "<?xml version='1.0' encoding='UTF-8'?><r>Gau\337</r>"
|
||||||
|
- @parser.finish
|
||||||
|
- assert(@parser.document.errors.size >= 1)
|
||||||
|
- assert_equal "Gau\337", @parser.document.data.join
|
||||||
|
- assert_equal [["r"], ["body"], ["html"]], @parser.document.end_elements
|
||||||
|
- end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -7,7 +7,7 @@
|
|||||||
Summary: An HTML, XML, SAX, and Reader parser
|
Summary: An HTML, XML, SAX, and Reader parser
|
||||||
Name: rubygem-%{gem_name}
|
Name: rubygem-%{gem_name}
|
||||||
Version: %{mainver}
|
Version: %{mainver}
|
||||||
Release: 3
|
Release: 4
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://nokogiri.org
|
URL: https://nokogiri.org
|
||||||
Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem
|
Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem
|
||||||
@ -18,6 +18,8 @@ Patch1: CVE-2020-26247-pre.patch
|
|||||||
Patch2: CVE-2020-26247.patch
|
Patch2: CVE-2020-26247.patch
|
||||||
Patch3: CVE-2021-41098-1.patch
|
Patch3: CVE-2021-41098-1.patch
|
||||||
Patch4: CVE-2021-41098-2.patch
|
Patch4: CVE-2021-41098-2.patch
|
||||||
|
Patch5: fix-test-push-parser-fail.patch
|
||||||
|
Patch6: fix-test-node-fail.patch
|
||||||
BuildRequires: ruby(release) ruby(rubygems) rubygem(minitest) rubygems-devel
|
BuildRequires: ruby(release) ruby(rubygems) rubygem(minitest) rubygems-devel
|
||||||
Obsoletes: ruby-%{gem_name} <= 1.5.2-2
|
Obsoletes: ruby-%{gem_name} <= 1.5.2-2
|
||||||
BuildRequires: gcc rubygem(pkg-config) libxml2-devel libxslt-devel ruby-devel
|
BuildRequires: gcc rubygem(pkg-config) libxml2-devel libxslt-devel ruby-devel
|
||||||
@ -64,6 +66,8 @@ cd %{gem_name}-%{version}
|
|||||||
cd $TOPDIR/%{gem_name}-%{version}
|
cd $TOPDIR/%{gem_name}-%{version}
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
%patch6 -p1
|
||||||
cd -
|
cd -
|
||||||
|
|
||||||
gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec
|
gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec
|
||||||
@ -158,6 +162,9 @@ popd
|
|||||||
%{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/
|
%{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 07 2022 wangkai <wangkai385@huawei.com> - 1.10.5-4
|
||||||
|
- fix compile failed
|
||||||
|
|
||||||
* Tue Oct 12 2021 yaoxin <yaoxin30@huawei.com> - 1.10.5-3
|
* Tue Oct 12 2021 yaoxin <yaoxin30@huawei.com> - 1.10.5-3
|
||||||
- fix CVE-2021-41098
|
- fix CVE-2021-41098
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user