- up to 2.6.6 (fixes CVE-2020-16255, CVE-2020-10933)

diff --git a/custom-rubygems-location.patch b/custom-rubygems-location.patch
index c4893da87f7c85043db089a11f5438ffd1030f38..431ce5b6a2118011b347529e57a44fa0d9dcefc1 100644 (file)
--- a/custom-rubygems-location.patch
+++ b/custom-rubygems-location.patch
@@ -67,14 +67,14 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
 index b47b6e1..0b99408 100755
 --- a/tool/rbinstall.rb
 +++ b/tool/rbinstall.rb
-@@ -334,6 +334,7 @@ def CONFIG.[](name, mandatory = false)
- sitearchlibdir = CONFIG["sitearchdir"]
- vendorlibdir = CONFIG["vendorlibdir"]
- vendorarchlibdir = CONFIG["vendorarchdir"]
+@@ -330,6 +330,7 @@
+ archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + CONFIG['arch'])
+ rubylibdir = CONFIG["rubylibdir", true]
+ archlibdir = CONFIG["rubyarchdir", true]
 +rubygemsdir = CONFIG["rubygemsdir"]
- mandir = CONFIG["mandir", true]
- docdir = CONFIG["docdir", true]
- enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
+ if CONFIG["sitedir"]
+   sitelibdir = CONFIG["sitelibdir"]
+   sitearchlibdir = CONFIG["sitearchdir"]
 @@ -560,7 +561,16 @@ def stub
  install?(:local, :comm, :lib) do
    prepare "library scripts", rubylibdir

diff --git a/ruby.spec b/ruby.spec
index cd5e9b8d54b7706e9d62b6b2070e70ff0e52acc7..25bd2e524df455e60c2b9523a1b98c3b062016d8 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -13,7 +13,7 @@
 
 %define                rel             1
 %define                ruby_version    2.6
-%define                patchlevel      5
+%define                patchlevel      6
 %define                pkg_version     %{ruby_version}.%{patchlevel}
 %define                ruby_suffix %{!?with_default_ruby:%{ruby_version}}
 %define                doc_version     2_6_5
@@ -35,11 +35,11 @@ License:    (Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD
 Group:         Development/Languages
 # https://www.ruby-lang.org/en/downloads/
 Source0:       https://cache.ruby-lang.org/pub/ruby/%{ruby_version}/%{oname}-%{pkg_version}.tar.xz
-# Source0-md5: b8a4e2bdbb76485c3d6690e57be67750
+# Source0-md5: 1aa8bd34dcaf5c4b58d563546de16919
 Source2:       http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
 # Source2-md5: bd93bce0a482dada63ac238f2e4596cf
 Source3:       http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_core_rdocs.tgz
-# Source3-md5: 86322c0f335e8ecc9008f740807362dd
+# Source3-md5: b6c1aa7baecd141071e2bc8e7bd39a2a
 Source50:      http://www.unicode.org/Public/9.0.0/ucd/CaseFolding.txt
 # Source50-md5:        e3fbf2f626f10070000fe66f3a2ff5ef
 Source51:      http://www.unicode.org/Public/9.0.0/ucd/CompositionExclusions.txt
@@ -113,7 +113,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define        net_telnet_ver          0.2.0
 %define        power_assert_ver        1.1.3
 %define        psych_ver               3.1.0
-%define        rake_ver                12.3.2
+%define        rake_ver                12.3.3
 %define        rdoc_ver                6.1.2
 %define        rubygems_ver            3.0.3
 %define        test_unit_ver           3.2.9
@@ -983,7 +983,7 @@ done
 %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/{[A-Z]*,test,.autotest}
 %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/net-telnet-%{net_telnet_ver}/{[A-Z]*,bin,net-telnet.gemspec,.*}
 %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/power_assert-%{power_assert_ver}/{[A-Z]*,bin,power_assert.gemspec,.*}
-%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/rake-%{rake_ver}/{[A-Z]*,bin,doc,rake.gemspec,.*}
+%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/rake-%{rake_ver}/{[A-Z]*,bin,doc,rake.gemspec,azure-pipelines.yml}
 %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/{[A-Z]*,doc,sample,test}
 %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/xmlrpc-%{xmlrpc_ver}/{[A-Z]*,bin,xmlrpc.gemspec,.*}