diff --git a/gemrc b/gemrc
new file mode 100644
index 0000000000000000000000000000000000000000..a7c4c76c63d0748165a0502b0dfe607841bfdb05
--- /dev/null
+++ b/gemrc
@@ -0,0 +1,2 @@
+sources:
+- https://mirrors.aliyun.com/rubygems/
diff --git a/ruby-3.1.3-Fix-for-tzdata-2022g.patch b/ruby-3.1.3-Fix-for-tzdata-2022g.patch
deleted file mode 100644
index a8a16055ff596524b88e81e24e23c51d3dd2e6ac..0000000000000000000000000000000000000000
--- a/ruby-3.1.3-Fix-for-tzdata-2022g.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From a1124dc162810f86cb0bff58cde24064cfc561bc Mon Sep 17 00:00:00 2001
-From: nagachika <nagachika@ruby-lang.org>
-Date: Fri, 9 Dec 2022 21:11:47 +0900
-Subject: [PATCH] merge revision(s) 58cc3c9f387dcf8f820b43e043b540fa06248da3:
- [Backport #19187]
-
-	[Bug #19187] Fix for tzdata-2022g
-
-	---
-	 test/ruby/test_time_tz.rb | 21 +++++++++++++++------
-	 1 file changed, 15 insertions(+), 6 deletions(-)
----
- test/ruby/test_time_tz.rb | 21 +++++++++++++++------
- 1 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb
-index b6785f336028d..939f218ed4d10 100644
---- a/test/ruby/test_time_tz.rb
-+++ b/test/ruby/test_time_tz.rb
-@@ -7,9 +7,9 @@ class TestTimeTZ < Test::Unit::TestCase
-   has_lisbon_tz = true
-   force_tz_test = ENV["RUBY_FORCE_TIME_TZ_TEST"] == "yes"
-   case RUBY_PLATFORM
--  when /linux/
-+  when /darwin|linux/
-     force_tz_test = true
--  when /darwin|freebsd|openbsd/
-+  when /freebsd|openbsd/
-     has_lisbon_tz = false
-     force_tz_test = true
-   end
-@@ -95,6 +95,9 @@ def group_by(e, &block)
-   CORRECT_KIRITIMATI_SKIP_1994 = with_tz("Pacific/Kiritimati") {
-     Time.local(1994, 12, 31, 0, 0, 0).year == 1995
-   }
-+  CORRECT_SINGAPORE_1982 = with_tz("Asia/Singapore") {
-+    "2022g" if Time.local(1981, 12, 31, 23, 59, 59).utc_offset == 8*3600
-+  }
- 
-   def time_to_s(t)
-     t.to_s
-@@ -140,9 +143,12 @@ def test_america_managua
- 
-   def test_asia_singapore
-     with_tz(tz="Asia/Singapore") {
--      assert_time_constructor(tz, "1981-12-31 23:59:59 +0730", :local, [1981,12,31,23,59,59])
--      assert_time_constructor(tz, "1982-01-01 00:30:00 +0800", :local, [1982,1,1,0,0,0])
--      assert_time_constructor(tz, "1982-01-01 00:59:59 +0800", :local, [1982,1,1,0,29,59])
-+      assert_time_constructor(tz, "1981-12-31 23:29:59 +0730", :local, [1981,12,31,23,29,59])
-+      if CORRECT_SINGAPORE_1982
-+        assert_time_constructor(tz, "1982-01-01 00:00:00 +0800", :local, [1981,12,31,23,30,00])
-+        assert_time_constructor(tz, "1982-01-01 00:00:00 +0800", :local, [1982,1,1,0,0,0])
-+        assert_time_constructor(tz, "1982-01-01 00:29:59 +0800", :local, [1982,1,1,0,29,59])
-+      end
-       assert_time_constructor(tz, "1982-01-01 00:30:00 +0800", :local, [1982,1,1,0,30,0])
-     }
-   end
-@@ -450,8 +456,11 @@ def self.gen_zdump_test(data)
- America/Managua  Wed Jan  1 04:59:59 1997 UTC = Tue Dec 31 23:59:59 1996 EST isdst=0 gmtoff=-18000
- America/Managua  Wed Jan  1 05:00:00 1997 UTC = Tue Dec 31 23:00:00 1996 CST isdst=0 gmtoff=-21600
- Asia/Singapore  Sun Aug  8 16:30:00 1965 UTC = Mon Aug  9 00:00:00 1965 SGT isdst=0 gmtoff=27000
--Asia/Singapore  Thu Dec 31 16:29:59 1981 UTC = Thu Dec 31 23:59:59 1981 SGT isdst=0 gmtoff=27000
-+Asia/Singapore  Thu Dec 31 15:59:59 1981 UTC = Thu Dec 31 23:29:59 1981 SGT isdst=0 gmtoff=27000
- Asia/Singapore  Thu Dec 31 16:30:00 1981 UTC = Fri Jan  1 00:30:00 1982 SGT isdst=0 gmtoff=28800
-+End
-+  gen_zdump_test <<'End' if CORRECT_SINGAPORE_1982
-+Asia/Singapore  Thu Dec 31 16:00:00 1981 UTC = Fri Jan  1 00:00:00 1982 SGT isdst=0 gmtoff=28800
- End
-   gen_zdump_test CORRECT_TOKYO_DST_1951 ? <<'End' + (CORRECT_TOKYO_DST_1951 < "2018f" ? <<'2018e' : <<'2018f') : <<'End'
- Asia/Tokyo  Sat May  5 14:59:59 1951 UTC = Sat May  5 23:59:59 1951 JST isdst=0 gmtoff=32400
diff --git a/ruby-3.1.3.tar.xz b/ruby-3.1.4.tar.xz
similarity index 64%
rename from ruby-3.1.3.tar.xz
rename to ruby-3.1.4.tar.xz
index cc45963a623ff2fde2f424796e9cbdf1c15353dd..dfcab374f47928d8a5f445710817c81ff4cad7ae 100644
Binary files a/ruby-3.1.3.tar.xz and b/ruby-3.1.4.tar.xz differ
diff --git a/ruby-3.2.0-ruby-cgi-Fix-test_cgi_cookie_new_with_domain-to-pass.patch b/ruby-3.2.0-ruby-cgi-Fix-test_cgi_cookie_new_with_domain-to-pass.patch
deleted file mode 100644
index 21579c5b77f7ca07d8f91782648dc3efc8676170..0000000000000000000000000000000000000000
--- a/ruby-3.2.0-ruby-cgi-Fix-test_cgi_cookie_new_with_domain-to-pass.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 656f25987cf2885104d5b13c8d3f5b7d32f1b333 Mon Sep 17 00:00:00 2001
-From: Jean Boussier <jean.boussier@gmail.com>
-Date: Wed, 23 Nov 2022 12:10:36 +0100
-Subject: [PATCH] [ruby/cgi] Fix test_cgi_cookie_new_with_domain to pass on
- older rubies
-
-https://github.com/ruby/cgi/commit/05f0c58048
----
- test/cgi/test_cgi_cookie.rb | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/test/cgi/test_cgi_cookie.rb b/test/cgi/test_cgi_cookie.rb
-index e3ec4bea5286..6d31932d321a 100644
---- a/test/cgi/test_cgi_cookie.rb
-+++ b/test/cgi/test_cgi_cookie.rb
-@@ -62,18 +62,18 @@ def test_cgi_cookie_new_complex
- 
-   def test_cgi_cookie_new_with_domain
-     h = {'name'=>'name1', 'value'=>'value1'}
--    cookie = CGI::Cookie.new('domain'=>'a.example.com', **h)
-+    cookie = CGI::Cookie.new(h.merge('domain'=>'a.example.com'))
-     assert_equal('a.example.com', cookie.domain)
- 
--    cookie = CGI::Cookie.new('domain'=>'1.example.com', **h)
-+    cookie = CGI::Cookie.new(h.merge('domain'=>'1.example.com'))
-     assert_equal('1.example.com', cookie.domain, 'enhanced by RFC 1123')
- 
-     assert_raise(ArgumentError) {
--      CGI::Cookie.new('domain'=>'-a.example.com', **h)
-+      CGI::Cookie.new(h.merge('domain'=>'-a.example.com'))
-     }
- 
-     assert_raise(ArgumentError) {
--      CGI::Cookie.new('domain'=>'a-.example.com', **h)
-+      CGI::Cookie.new(h.merge('domain'=>'a-.example.com'))
-     }
-   end
- 
diff --git a/ruby-3.2.0-ruby-cgi-Loosen-the-domain-regex-to-accept.patch b/ruby-3.2.0-ruby-cgi-Loosen-the-domain-regex-to-accept.patch
deleted file mode 100644
index f2172814a78c580390fa55520badd1ecfa7ae923..0000000000000000000000000000000000000000
--- a/ruby-3.2.0-ruby-cgi-Loosen-the-domain-regex-to-accept.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 745dcf5326ea2c8e2047a3bddeb0fbb7e7d07649 Mon Sep 17 00:00:00 2001
-From: Xenor Chang <tubaxenor@gmail.com>
-Date: Mon, 28 Nov 2022 12:34:06 +0800
-Subject: [PATCH] [ruby/cgi] Loosen the domain regex to accept '.'
- (https://github.com/ruby/cgi/pull/29)
-
-* Loosen the domain regex to accept '.'
-
-Co-authored-by: Nobuyoshi Nakada <nobu@ruby-lang.org>
-
-https://github.com/ruby/cgi/commit/5e09d632f3
-Co-authored-by: Hiroshi SHIBATA <hsbt@ruby-lang.org>
----
- lib/cgi/cookie.rb           | 2 +-
- test/cgi/test_cgi_cookie.rb | 3 +++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/cgi/cookie.rb b/lib/cgi/cookie.rb
-index 1a9c1a82c123..9498e2f9faf9 100644
---- a/lib/cgi/cookie.rb
-+++ b/lib/cgi/cookie.rb
-@@ -42,7 +42,7 @@ class Cookie < Array
- 
-     TOKEN_RE = %r"\A[[!-~]&&[^()<>@,;:\\\"/?=\[\]{}]]+\z"
-     PATH_VALUE_RE = %r"\A[[ -~]&&[^;]]*\z"
--    DOMAIN_VALUE_RE = %r"\A(?<label>(?!-)[-A-Za-z0-9]+(?<!-))(?:\.\g<label>)*\z"
-+    DOMAIN_VALUE_RE = %r"\A\.?(?<label>(?!-)[-A-Za-z0-9]+(?<!-))(?:\.\g<label>)*\z"
- 
-     # Create a new CGI::Cookie object.
-     #
-diff --git a/test/cgi/test_cgi_cookie.rb b/test/cgi/test_cgi_cookie.rb
-index 6d31932d321a..eadae4531365 100644
---- a/test/cgi/test_cgi_cookie.rb
-+++ b/test/cgi/test_cgi_cookie.rb
-@@ -65,6 +65,9 @@ def test_cgi_cookie_new_with_domain
-     cookie = CGI::Cookie.new(h.merge('domain'=>'a.example.com'))
-     assert_equal('a.example.com', cookie.domain)
- 
-+    cookie = CGI::Cookie.new(h.merge('domain'=>'.example.com'))
-+    assert_equal('.example.com', cookie.domain)
-+
-     cookie = CGI::Cookie.new(h.merge('domain'=>'1.example.com'))
-     assert_equal('1.example.com', cookie.domain, 'enhanced by RFC 1123')
- 
diff --git a/ruby.spec b/ruby.spec
index a0f974ea6fe6a5a432ca9053598d2432fedfd8ca..766948a0fbff13eca622852081f9a591a880ba54 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,9 +1,9 @@
 # PLEASE ALWAYS bump release even when upgrading version, as this package is
 # producing rubygem packages with different versions other than main package.
-%define anolis_release 5
+%define anolis_release 6
 %global major_version 3
 %global minor_version 1
-%global teeny_version 3
+%global teeny_version 4
 %global major_minor_version %{major_version}.%{minor_version}
 
 %global ruby_version %{major_minor_version}.%{teeny_version}
@@ -31,7 +31,7 @@
 %global bundler_tmpdir_version 0.1.0
 # TODO: Check the version if/when available in library.
 %global bundler_tsort_version 0.1.1
-%global bundler_uri_version 0.10.1
+%global bundler_uri_version 0.10.2
 
 %global bigdecimal_version 3.1.1
 %global did_you_mean_version 1.6.1
@@ -103,9 +103,11 @@ Source11: rubygems.con
 Source13: test_abrt.rb
 # SystemTap tests.
 Source14: test_systemtap.rb
+# Default to aliyun gems mirror
+Source101: gemrc
 
 # The load directive is supported since RPM 4.12, i.e. F21+. The build process
-# fails on older Fedoras.
+# fails on older distros.
 %{load:%{SOURCE4}}
 %{load:%{SOURCE5}}
 
@@ -119,7 +121,7 @@ Patch1: ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
 # http://bugs.ruby-lang.org/issues/8973
 Patch2: ruby-2.1.0-Enable-configuration-of-archlibdir.patch
 # Force multiarch directories for i.86 to be always named i386. This solves
-# some differencies in build between Fedora and RHEL.
+# some differencies in build between distros.
 Patch3: ruby-2.1.0-always-use-i386.patch
 # Allows to install RubyGems into custom directory, outside of Ruby's tree.
 # http://bugs.ruby-lang.org/issues/5617
@@ -129,8 +131,6 @@ Patch4: ruby-2.1.0-custom-rubygems-location.patch
 # https://bugs.ruby-lang.org/issues/15306
 # Unfortunately, due to https://bugs.ruby-lang.org/issues/16254
 # and especially since https://github.com/ruby/ruby/pull/2735
-# this would require boostrapping:
-# https://lists.fedoraproject.org/archives/list/ruby-sig@lists.fedoraproject.org/message/LH6L6YJOYQT4Y5ZNOO4SLIPTUWZ5V45Q/
 # For now, load the ABRT hook via this simple patch:
 Patch6: ruby-2.7.0-Initialize-ABRT-hook.patch
 # Prevent segfaults running with SystemTap due to `RubyVM::FrozenCore` being
@@ -167,17 +167,6 @@ Patch27: ruby-irb-1.4.1-drop-rdoc-hard-dep.patch
 # Set soft dependency on RDoc in input-method.rb in IRB.
 # https://github.com/ruby/irb/pull/395
 Patch28: ruby-irb-1.4.1-set-rdoc-soft-dep.patch
-# CGI is now too restrictive about leading '.' in domain, leading to failures
-# in Rack, rack-test or ActionPack.
-# https://github.com/ruby/ruby/commit/656f25987cf2885104d5b13c8d3f5b7d32f1b333
-Patch29: ruby-3.2.0-ruby-cgi-Fix-test_cgi_cookie_new_with_domain-to-pass.patch
-# https://github.com/ruby/cgi/pull/29
-# https://github.com/ruby/ruby/commit/745dcf5326ea2c8e2047a3bddeb0fbb7e7d07649
-Patch30: ruby-3.2.0-ruby-cgi-Loosen-the-domain-regex-to-accept.patch
-# Fix Time Zone Database 2022g.
-# https://bugs.ruby-lang.org/issues/19187
-# https://github.com/ruby/ruby/commit/a1124dc162810f86cb0bff58cde24064cfc561bc
-Patch31: ruby-3.1.3-Fix-for-tzdata-2022g.patch
 
 Requires: %{name}-libs = %{version}-%{release}
 Suggests: rubypick
@@ -236,7 +225,6 @@ License:    Ruby or BSD
 Provides:   ruby(release) = %{ruby_release}
 
 # Virtual provides for CCAN copylibs.
-# https://fedorahosted.org/fpc/ticket/364
 Provides: bundled(ccan-build_assert)
 Provides: bundled(ccan-check_type)
 Provides: bundled(ccan-container_of)
@@ -252,7 +240,6 @@ Obsoletes: ruby-tcltk < 2.4.0
 
 # The Net::Telnet and XMLRPC were removed in Ruby 2.8, i.e. F34 timeframe.
 # https://bugs.ruby-lang.org/issues/16484
-# TODO: Update the versions prior landing in Fedora.
 Obsoletes: rubygem-net-telnet < 0.2.0-%{release}
 Obsoletes: rubygem-xmlrpc < 0.3.0-%{release}
 
@@ -648,9 +635,6 @@ rm -rf ext/fiddle/libffi*
 %patch24 -p1
 %patch27 -p1
 %patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
 
 # Provide an example of usage of the tapset:
 cp -a %{SOURCE3} .
@@ -684,8 +668,6 @@ autoconf
 %make_build COPY="cp -p"
 
 %install
-rm -rf %{buildroot}
-
 %make_install
 
 # TODO: Regenerate RBS parser in lib/rbs/parser.rb
@@ -817,6 +799,9 @@ mv %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/doc/rake.1 %{buildroot}%{_ma
 cp -a %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version}/lib/bundler/man/*.1 %{buildroot}%{_mandir}/man1
 cp -a %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version}/lib/bundler/man/*.5 %{buildroot}%{_mandir}/man5
 
+# Install gemrc into /etc
+install -m0644 -p -D %{SOURCE101} %{buildroot}%{_sysconfdir}/gemrc
+
 %if %{with systemtap}
 # Install a tapset and fix up the path to the library.
 mkdir -p %{buildroot}%{_systemtap_tapsetdir}
@@ -947,19 +932,19 @@ MSPECOPTS=""
 # Avoid `hostname' dependency.
 %{!?with_hostname:MSPECOPTS="-P 'Socket.gethostname returns the host name'"}
 
-%ifarch armv7hl
-# TestReadline#test_interrupt_in_other_thread fails on 32 bit arches according
-# to upstream, but the test is disabled just on Travis, not in test suite.
-# https://bugs.ruby-lang.org/issues/18393
-DISABLE_TESTS="$DISABLE_TESTS -n !/TestReadline#test_interrupt_in_other_thread/"
-%endif
-
 # Several test broken by libffi-3.4.2. There should be fix in libffi, once
 # other components are fixed.
 mv test/fiddle/test_import.rb{,.disable}
 mv test/fiddle/test_closure.rb{,.disable}
 DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunc#test_qsort1/"
 DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/"
+DISABLE_TESTS="$DISABLE_TESTS -n !/TestResolvAddr#test_valid_socket_ip_address_list/"
+
+# Do not test bug19529 under aarch64 (2023-04-05 an23)
+# It produces "NotImplementedError: Compaction isn't available on this platform"
+%ifarch aarch64
+DISABLE_TESTS="$DISABLE_TESTS -n !/TestWeakMap#test_compaction_bug_19529/"
+%endif
 
 # Give an option to increase the timeout in tests.
 # https://bugs.ruby-lang.org/issues/16921
@@ -1185,6 +1170,7 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/"
 %{?with_systemtap:%{_systemtap_datadir}}
 
 %files -n rubygems
+%config(noreplace) %{_sysconfdir}/gemrc
 %{_bindir}/gem
 %dir %{rubygems_dir}
 %{rubygems_dir}/rubygems
@@ -1217,7 +1203,7 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/"
 %{gem_dir}/specifications/default/abbrev-0.1.0.gemspec
 %{gem_dir}/specifications/default/base64-0.1.1.gemspec
 %{gem_dir}/specifications/default/benchmark-0.2.0.gemspec
-%{gem_dir}/specifications/default/cgi-0.3.5.gemspec
+%{gem_dir}/specifications/default/cgi-0.3.6.gemspec
 %{gem_dir}/specifications/default/csv-3.2.5.gemspec
 %{gem_dir}/specifications/default/date-3.2.2.gemspec
 %{gem_dir}/specifications/default/delegate-0.2.0.gemspec
@@ -1268,14 +1254,13 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/"
 %{gem_dir}/specifications/default/strscan-3.0.1.gemspec
 %{gem_dir}/specifications/default/syslog-0.1.0.gemspec
 %{gem_dir}/specifications/default/tempfile-0.1.2.gemspec
-%{gem_dir}/specifications/default/time-0.2.0.gemspec
+%{gem_dir}/specifications/default/time-0.2.2.gemspec
 %{gem_dir}/specifications/default/timeout-0.2.0.gemspec
 %{gem_dir}/specifications/default/tmpdir-0.1.2.gemspec
 %{gem_dir}/specifications/default/tsort-0.1.0.gemspec
 %{gem_dir}/specifications/default/un-0.2.0.gemspec
-%{gem_dir}/specifications/default/uri-0.11.0.gemspec
+%{gem_dir}/specifications/default/uri-0.12.1.gemspec
 %{gem_dir}/specifications/default/weakref-0.1.1.gemspec
-#%%{gem_dir}/specifications/default/win32ole-1.8.8.gemspec
 %{gem_dir}/specifications/default/yaml-0.2.0.gemspec
 %{gem_dir}/specifications/default/zlib-2.1.1.gemspec
 
@@ -1513,6 +1498,10 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/"
 
 
 %changelog
+* Wed Apr 5 2023 Funda Wang <fundawang@yeah.net> - 3.1.4-6
+- New version 3.1.4
+- Default to use aliyun gems mirror
+
 * Tue Mar 28 2023 Chunmei Xu <xuchunmei@linux.alibaba.com> - 3.1.3-5
 - remove multilib related codes