diff --git a/nokogiri-1.10.5.gem b/nokogiri-1.11.1.gem similarity index 71% rename from nokogiri-1.10.5.gem rename to nokogiri-1.11.1.gem index fbbbb94a4f937d30fbf03889058df76e26b4a821..0233e904c46d6dcd3a21ab31aac716bda107a404 100644 Binary files a/nokogiri-1.10.5.gem and b/nokogiri-1.11.1.gem differ diff --git a/rubygem-nokogiri-1.6.6.4-shutdown-libxml2-warning.patch b/rubygem-nokogiri-1.6.6.4-shutdown-libxml2-warning.patch deleted file mode 100644 index add8fe8bf5cf030579681fa804cf421a6bfb6b53..0000000000000000000000000000000000000000 --- a/rubygem-nokogiri-1.6.6.4-shutdown-libxml2-warning.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nokogiri-1.6.6.4/./lib/nokogiri/version.rb.nowarn 2015-11-20 05:50:37.000000000 +0900 -+++ nokogiri-1.6.6.4/./lib/nokogiri/version.rb 2015-12-11 14:32:04.151973080 +0900 -@@ -34,6 +34,7 @@ - end - - def warnings -+ return [] - return [] unless libxml2? - - if compiled_parser_version != loaded_parser_version diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index ae717aed959e2903ec7729b7e5ffcf2a6f063253..ee6178f1e69b7ec8ac729e83e77c1398a321d638 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.10.5 +%global mainver 1.11.1 %global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -12,9 +12,7 @@ License: MIT URL: https://nokogiri.org Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem Source1: https://github.com/sparklemotion/%{gem_name}/archive/v%{mainver}.tar.gz -# Shut down libxml2 version unmatching warning -Patch0: %{name}-1.6.6.4-shutdown-libxml2-warning.patch -BuildRequires: ruby(release) ruby(rubygems) rubygem(minitest) rubygems-devel +BuildRequires: ruby(release) ruby(rubygems) rubygem(minitest) rubygem(minitest-reporters) rubygems-devel Obsoletes: ruby-%{gem_name} <= 1.5.2-2 BuildRequires: gcc rubygem(pkg-config) libxml2-devel libxslt-devel ruby-devel %description @@ -52,7 +50,6 @@ mkdir tmpunpackdir pushd tmpunpackdir gem unpack %{SOURCE0} cd %{gem_name}-%{version} -%patch0 -p1 gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec sed -i \ -e 's|, "ports/archives/[^"][^"]*"||g' \ @@ -69,6 +66,7 @@ mkdir -p ./%{gem_dir} export NOKOGIRI_USE_SYSTEM_LIBRARIES=yes %gem_install chmod 0644 .%{gem_dir}/cache/%{gem_name}-%{mainver}%{?prever}.gem +ln -sf ../../../../../../lib64/gems/ruby/%{gem_name}-%{version}/%{gem_name}/%{gem_name}.so ./%{gem_instdir}/lib/%{gem_name}/%{gem_name}.so rm -f .%{gem_instdir}/lib/*.jar rm -rf .%{gem_instdir}/ext/java @@ -90,6 +88,9 @@ do chmod 0644 $f done cp -p %{gem_name}-%{version}/[A-Z]* %{buildroot}%{gem_instdir}/ +pushd %{buildroot} +ln -sf ../../../../../../lib64/gems/ruby/%{gem_name}-%{version}/%{gem_name}/%{gem_name}.so %{buildroot}%{gem_instdir}/lib/%{gem_name}/%{gem_name}.so +popd rm -rf %{buildroot}%{gem_instdir}/ext/%{gem_name}/ rm -rf %{buildroot}%{gem_instdir}/tmp/ rm -f %{buildroot}%{gem_instdir}/{.autotest,.require_paths,.gemtest,.travis.yml} @@ -145,5 +146,10 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Feb 03 2021 shinwell_hu - 1.11.1-1 +- Upgrade to 1.11.1 to fix following CVE + CVE-2020-26247 +- Remove unnecessary patch to enable check libxml2 + * Wed Aug 19 2020 luoshengwei - 1.10.5-1 - package init diff --git a/v1.10.5.tar.gz b/v1.11.1.tar.gz similarity index 44% rename from v1.10.5.tar.gz rename to v1.11.1.tar.gz index efd89f66d7b0e57e999be9207c4dae356bd28b07..68c3f9e045ae5f5b03cdeda50089951823ad7c27 100644 Binary files a/v1.10.5.tar.gz and b/v1.11.1.tar.gz differ