diff --git a/nokogiri-1.13.7.gem b/nokogiri-1.14.4.gem similarity index 37% rename from nokogiri-1.13.7.gem rename to nokogiri-1.14.4.gem index 812022628a95df50acfbea39cf3228de7e6e81d8..628f3366a5b0f6e5463c9de97e252ad885262087 100644 Binary files a/nokogiri-1.13.7.gem and b/nokogiri-1.14.4.gem differ diff --git a/rubygem-nokogiri-1.13.7-full.tar.gz b/rubygem-nokogiri-1.14.4-full.tar.gz similarity index 72% rename from rubygem-nokogiri-1.13.7-full.tar.gz rename to rubygem-nokogiri-1.14.4-full.tar.gz index 01ed169dfa090bac33662a58b5f625d2495973a2..abac1e4e6d09ea525edfaa3f9a6a3fb85ab00433 100644 Binary files a/rubygem-nokogiri-1.13.7-full.tar.gz and b/rubygem-nokogiri-1.14.4-full.tar.gz differ diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 84216d0fb1b7b54dc24889dce2f874c1af1ca1ef..4ed570641364547e7831ac942d2b7df5945b5f87 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.13.7 +%global mainver 1.14.4 %global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -7,13 +7,13 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: 2 +Release: 1 License: MIT and Apache-2.0 URL: https://nokogiri.org Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem -Source1: rubygem-%{gem_name}-%{version}%{?prever}-full.tar.gz +Source1: rubygem-%{gem_name}-%{version}%{?prever}-full.tar.gz -BuildRequires: ruby(release) ruby(rubygems) rubygem(minitest) rubygems-devel +BuildRequires: ruby(release) ruby(rubygems) rubygem(minitest) rubygems-devel rubygem(rubyzip) BuildRequires: rubygem(did_you_mean) Obsoletes: ruby-%{gem_name} <= 1.5.2-2 BuildRequires: gcc libxml2-devel libxslt-devel ruby-devel glibc-all-langpacks rubygem(racc) @@ -70,7 +70,7 @@ sed -i \ -e 's|^\(CFLAGS.*=.*\)$|\1 -fPIC|' env LANG=C.UTF-8 gem build %{gem_name}-%{version}.gemspec #CVE-2022-40303 https://gitlab.gnome.org/GNOME/libxml2/-/commit/c846986 -sed -i 's/assert_predicate(handler.errors, :empty?)/assert_match(\/CData section too big\/, handler.errors.first)/g' nokogiri-1.13.7/test/xml/sax/test_parser.rb +sed -i 's/assert_predicate(handler.errors, :empty?)/assert_match(\/CData section too big\/, handler.errors.first)/g' nokogiri-1.14.4/test/xml/sax/test_parser.rb %build export NOKOGIRI_USE_SYSTEM_LIBRARIES=yes @@ -127,11 +127,11 @@ LANG=C.UTF-8 cp -a %{gem_name}-%{version}/test/ ./%{gem_instdir} pushd ./%{gem_instdir} sed -i test/helper.rb \ - -e '\@require.*simplecov@,\@^end$@d' + -e '\@require.*simplecov@,\@^end$@s|^|#|' sed -i '/require..minitest.reporters./ s/^/#/' test/helper.rb sed -i '/Minitest::Reporters/ s/^/#/' test/helper.rb env \ - RUBYLIB=".:lib:test:ext" \ + RUBYLIB=".:lib:test:%{buildroot}%{gem_extdir_mri}" \ ruby \ -e \ "require 'test/helper' ; Dir.glob('test/**/test_*.rb'){|f| require f}" || \ @@ -163,6 +163,9 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Tue Aug 01 2023 jiangxinyu - 1.14.4-1 +- Update to 1.14.4 + * Fri Nov 11 2022 Ge Wang - 1.13.7-2 - fix build failure due to libxml fixed CVE