!13 Upgrade to 2.8.6

From: @lyn1001 
Reviewed-by: @shinwell_hu 
Signed-off-by: @shinwell_hu

fix_addressable_tests.patch

@@ -1,71 +0,0 @@
---- spec/addressable/uri_spec_orig.rb
-+++ spec/addressable/uri_spec.rb
-@@ -401,9 +401,9 @@
-     expect(@uri.normalized_host).to eq("example.com")
-   end
- 
--  it "returns 'com' for #tld" do
--    expect(@uri.tld).to eq("com")
--  end
-+  # it "returns 'com' for #tld" do
-+  #   expect(@uri.tld).to eq("com")
-+  # end
- 
-   it "returns 'user:password@example.com:8080' for #authority" do
-     expect(@uri.authority).to eq("user:password@example.com:8080")
-@@ -2393,9 +2393,9 @@
-     expect(@uri.origin).to eq('http://example.com')
-   end
- 
--  it "should have a tld of 'com'" do
--    expect(@uri.tld).to eq('com')
--  end
-+  # it "should have a tld of 'com'" do
-+  #   expect(@uri.tld).to eq('com')
-+  # end
- end
- 
- describe Addressable::URI, "when parsed from " +
-@@ -2408,13 +2408,13 @@
-     expect(@uri.origin).to eq('http://www.example.co.uk')
-   end
- 
--  it "should have a tld of 'co.uk'" do
--    expect(@uri.tld).to eq('co.uk')
--  end
--
--  it "should have a domain of 'example.co.uk'" do
--    expect(@uri.domain).to eq('example.co.uk')
--  end
-+  # it "should have a tld of 'co.uk'" do
-+  #   expect(@uri.tld).to eq('co.uk')
-+  # end
-+
-+  # it "should have a domain of 'example.co.uk'" do
-+  #   expect(@uri.domain).to eq('example.co.uk')
-+  # end
- end
- 
- describe Addressable::URI, "when parsed from " +
-@@ -2427,13 +2427,13 @@
-     expect(@uri.origin).to eq('http://sub_domain.blogspot.com')
-   end
- 
--  it "should have a tld of 'com'" do
--    expect(@uri.tld).to eq('com')
--  end
--
--  it "should have a domain of 'blogspot.com'" do
--    expect(@uri.domain).to eq('blogspot.com')
--  end
-+  # it "should have a tld of 'com'" do
-+  #   expect(@uri.tld).to eq('com')
-+  # end
-+
-+  # it "should have a domain of 'blogspot.com'" do
-+  #   expect(@uri.domain).to eq('blogspot.com')
-+  # end
- end
- 
- describe Addressable::URI, "when parsed from " +
-

no-rack-mount.patch

@@ -1,18 +0,0 @@
---- Gemfile
-+++ Gemfile
-@@ -14,13 +14,11 @@
- end
- 
- group :test, :development do
--  gem 'rake', '> 10.0', '< 12'
-+  gem 'rake', '> 10.0', '< 12.1'
-   gem 'simplecov', :require => false
-   gem 'coveralls', :require => false, :platforms => [
-     :ruby_20, :ruby_21, :ruby_22, :ruby_23
-   ]
--  # Used to test compatibility.
--  gem 'rack-mount', git: 'https://github.com/sporkmonger/rack-mount.git', require: 'rack/mount'
- 
-   if RUBY_VERSION.start_with?('2.0', '2.1')
-     gem 'rack', '< 2', :require => false
-

rubygem-addressable.spec

@@ -1,6 +1,6 @@
 %global gem_name addressable
 Name:                rubygem-%{gem_name}
-Version:             2.5.2
+Version:             2.8.6
 Release:             1
 Summary:             URI Implementation
 License:             ASL 2.0
@@ -9,10 +9,7 @@ Source0:             https://rubygems.org/gems/%{gem_name}-%{version}.gem
 BuildRequires:       ruby(release) rubygems-devel rubygem(bigdecimal) rubygem(public_suffix)
 BuildRequires:       rubygem(rspec-its) rubygem(idn)
 BuildArch:           noarch
-# Revert f1d5855162c48d06eb1907871909d5859b9a7d3c (rack-mount)
+
-Patch0:              no-rack-mount.patch
-# Comment out failing tests
-Patch1:              fix_addressable_tests.patch
 %description
 Addressable is a replacement for the URI implementation that is part of
 Ruby's standard library. It more closely conforms to the relevant RFCs and
@@ -26,14 +23,10 @@ BuildArch:           noarch
 Documentation for %{name}.
 
 %prep
-gem unpack %{SOURCE0}
+%setup -q -n %{gem_name}-%{version}
-%setup -q -D -T -n  %{gem_name}-%{version}
-gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
-%patch0
-%patch1
 
 %build
-gem build %{gem_name}.gemspec
+gem build ../%{gem_name}-%{version}.gemspec
 %gem_install
 
 %install
@@ -43,11 +36,10 @@ cp -a .%{gem_dir}/* \
 
 %check
 pushd .%{gem_instdir}
-rm spec/addressable/rack_mount_compat_spec.rb
 sed -i "/require 'bundler\/setup'/ s/^/#/" spec/spec_helper.rb
 sed -i '/^begin$/,/^end$/ s/^/#/' spec/spec_helper.rb
-rm spec/addressable/net_http_compat_spec.rb
+mv spec/addressable/net_http_compat_spec.rb{,.disabled}
-rspec spec/
+LC_ALL=C.UTF-8 rspec spec/
 popd
 
 %files
@@ -66,7 +58,24 @@ popd
 %doc %{gem_instdir}/README.md
 %{gem_instdir}/Rakefile
 %{gem_instdir}/spec
+%{gem_instdir}/%{gem_name}.gemspec
 
 %changelog
+* Wed Feb 21 2024 liyanan <liyanan61@h-partners.com> - 2.8.6-1
+- Upgrade to 2.8.6
+- Memoize regexps for common character classes
+
+* Mon Nov 13 2023 Ge Wang <wang__Ge@126.com> - 2.8.5-1
+- Upgrade to 2.8.5
+
+* Thu Jun 30 2022 wulei <wulei80@h-partners.com> - 2.8.0-1
+- Upgrade to 2.8.0
+
+* Fri Jan 21 2022 chenchen <chen_aka_jan@163.com> - 2.5.2-3
+- remove deprecated warning for fix build error
+
+* Wed Jul 14 2021 liwu <liwu13@huawei.com> - 2.5.2-2
+- fix CVE-2021-32740
+
 * Tue Aug 18 2020 shenleizhao <shenleizhao@huawei.com> - 2.5.2-1
 - package init