Update to 1.14.4

This commit is contained in:
jxy_git 2023-08-01 15:43:54 +08:00
parent 13a7a7474a
commit 95cf448be9
4 changed files with 10 additions and 7 deletions

Binary file not shown.

BIN
nokogiri-1.14.4.gem Normal file

Binary file not shown.

View File

@ -1,4 +1,4 @@
%global mainver 1.13.7 %global mainver 1.14.4
%global mainrel 1 %global mainrel 1
%global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g')
%global gem_name nokogiri %global gem_name nokogiri
@ -7,13 +7,13 @@
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: 2 Release: 1
License: MIT and Apache-2.0 License: MIT and Apache-2.0
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
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) BuildRequires: rubygem(did_you_mean)
Obsoletes: ruby-%{gem_name} <= 1.5.2-2 Obsoletes: ruby-%{gem_name} <= 1.5.2-2
BuildRequires: gcc libxml2-devel libxslt-devel ruby-devel glibc-all-langpacks rubygem(racc) BuildRequires: gcc libxml2-devel libxslt-devel ruby-devel glibc-all-langpacks rubygem(racc)
@ -70,7 +70,7 @@ sed -i \
-e 's|^\(CFLAGS.*=.*\)$|\1 -fPIC|' -e 's|^\(CFLAGS.*=.*\)$|\1 -fPIC|'
env LANG=C.UTF-8 gem build %{gem_name}-%{version}.gemspec env LANG=C.UTF-8 gem build %{gem_name}-%{version}.gemspec
#CVE-2022-40303 https://gitlab.gnome.org/GNOME/libxml2/-/commit/c846986 #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 %build
export NOKOGIRI_USE_SYSTEM_LIBRARIES=yes export NOKOGIRI_USE_SYSTEM_LIBRARIES=yes
@ -127,11 +127,11 @@ LANG=C.UTF-8
cp -a %{gem_name}-%{version}/test/ ./%{gem_instdir} cp -a %{gem_name}-%{version}/test/ ./%{gem_instdir}
pushd ./%{gem_instdir} pushd ./%{gem_instdir}
sed -i test/helper.rb \ 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 '/require..minitest.reporters./ s/^/#/' test/helper.rb
sed -i '/Minitest::Reporters/ s/^/#/' test/helper.rb sed -i '/Minitest::Reporters/ s/^/#/' test/helper.rb
env \ env \
RUBYLIB=".:lib:test:ext" \ RUBYLIB=".:lib:test:%{buildroot}%{gem_extdir_mri}" \
ruby \ ruby \
-e \ -e \
"require 'test/helper' ; Dir.glob('test/**/test_*.rb'){|f| require f}" || \ "require 'test/helper' ; Dir.glob('test/**/test_*.rb'){|f| require f}" || \
@ -163,6 +163,9 @@ popd
%{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/
%changelog %changelog
* Tue Aug 01 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 1.14.4-1
- Update to 1.14.4
* Fri Nov 11 2022 Ge Wang <wangge20@h-partners.com> - 1.13.7-2 * Fri Nov 11 2022 Ge Wang <wangge20@h-partners.com> - 1.13.7-2
- fix build failure due to libxml fixed CVE - fix build failure due to libxml fixed CVE