ruby-3.0.3-2

r/ruby/ruby-vl.spec

@@ -4,7 +4,7 @@
 
 %global major_version 3
 %global minor_version 0
-%global teeny_version 2
+%global teeny_version 3
 
 # Note:
 # As seen on perl srpm, as this (ruby) srpm contains several sub-components,
@@ -14,7 +14,7 @@
 #
 # 全てのサブパッケージのバージョンが上がる場合を除き、rubyのmainバージョンが
 # 更新されても1には戻さずに必ず+1してください。
-%global ruby_rel 1
+%global ruby_rel 2
 
 %global major_minor_version %{major_version}.%{minor_version}
 
@@ -28,26 +28,26 @@
 %global rubygems_dir %{_datadir}/rubygems
 
 # lib/rubygems.rb
-%global rubygems_version 3.2.22
+%global rubygems_version 3.2.32
 # lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb 
 %global rubygems_molinillo_version 0.7.0
 
 # lib/bundler/version.rb
-%global bundler_version 2.2.22
-# lib/fileutils/version.rb
-%global bundler_fileutils_version 1.1.0
+%global bundler_version 2.2.32
+# lib/bundler/vendor/fileutils/lib/fileutils.rb
+%global bundler_fileutils_version 1.4.1
 # lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb
 %global bundler_molinillo_version 0.7.0
 # lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
 %global bundler_net_http_persistent_version 4.0.0
 # lib/bundler/vendor/thor/lib/thor/version.rb
 %global bundler_thor_version 1.1.0
-# unknown
+# lib/bundler/vendor/tmpdir/lib/tmpdir.rb
 %global bundler_tmpdir_version 0.1.0
 # lib/bundler/vendor/uri/lib/uri/version.rb 
 %global bundler_uri_version 0.10.0
 # lib/rdoc/version.rb
-%global rdoc_version 6.3.1
+%global rdoc_version 6.3.3
 
 # TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
 # http://redmine.ruby-lang.org/issues/5313
@@ -61,16 +61,16 @@
 # ext/json/VERSION
 %global json_version 2.5.1
 # ext/psych/lib/psych/versions.rb
-%global psych_version 3.3.0
+%global psych_version 3.3.2
 # gems/bundled_gems
 %global minitest_version 5.14.2
 %global power_assert_version 1.2.0
 %global rake_version 13.0.3
-%global rbs_version 1.0.4
+%global rbs_version 1.4.0
 %global test_unit_version 3.3.7
 %global rexml_version 3.2.5
 %global rss_version 0.2.9
-%global typeprof_version 0.12.0
+%global typeprof_version 0.15.2
 
 %define rbmode          ruby-mode
 %define rbmode_el       ruby-mode
@@ -147,9 +147,6 @@ Patch6: ruby-2.7.0-Initialize-ABRT-hook.patch
 # hardening features of glibc (rhbz#1361037).
 # https://bugs.ruby-lang.org/issues/12666
 Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
-# Load user installed RubyGems plugins.
-# https://github.com/rubygems/rubygems/issues/4823
-Patch10: rubygems-3.2.26-Also-load-user-installed-rubygems-plugins.patch
 # Fix DWARF5 support.
 # https://bugzilla.redhat.com/show_bug.cgi?id=1920533
 # https://bugs.ruby-lang.org/issues/17585
@@ -169,6 +166,70 @@ Patch18: ruby-3.1.0-addr2line-DW_FORM_ref_addr.patch
 # Avoid possible timeout errors in TestBugReporter#test_bug_reporter_add.
 # https://bugs.ruby-lang.org/issues/16492
 Patch19: ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch
+# Add AC_PROG_CC to make C++ compiler dependency optional on autoconf >= 2.70.
+# https://github.com/ruby/ruby/commit/912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6
+Patch20: ruby-3.1.0-autoconf-2.70-add-ac-prog-cc.patch
+# Allow to exclude test with fully qualified name.
+# https://bugs.ruby-lang.org/issues/16936
+# https://github.com/ruby/ruby/pull/5026
+Patch21: ruby-3.1.0-Properly-exclude-test-cases.patch
+
+# OpenSSL 3.0 compatibility patches
+
+# Fix test broken by wrongly formatted distinguished name submitted to
+# `OpenSSL::X509::Name.parse`.
+# https://github.com/ruby/openssl/issues/470
+# https://github.com/rubygems/rubygems/pull/5030
+Patch31: rubygems-3.2.30-Provide-distinguished-name-which-will-be-correctly-p.patch
+
+# Refactor PEM/DER serialization code.
+# https://github.com/ruby/openssl/pull/328
+Patch40: ruby-3.1.0-Refactor-PEM-DER-serialization-code.patch
+# Implement more 'generic' operations using the EVP API.
+# https://github.com/ruby/openssl/pull/329
+Patch41: ruby-3.1.0-Add-more-support-for-generic-pkey-types.patch
+# Allow setting algorithm-specific options in #sign and #verify.
+# https://github.com/ruby/openssl/pull/374
+Patch42: ruby-3.1.0-Allow-setting-algorithm-specific-options-in-sign-and-verify.patch
+# Use high level EVP interface to generate parameters and keys.
+# https://github.com/ruby/openssl/pull/397
+Patch43: ruby-3.1.0-Use-high-level-EVP-interface-to-generate-parameters-and-keys.patch
+# Use EVP API in more places.
+# https://github.com/ruby/openssl/pull/436
+Patch44: ruby-3.1.0-Use-EVP-API-in-more-places.patch
+# Implement PKey#{encrypt,decrypt,sign_raw,verify_{raw,verify_recover}}.
+# https://github.com/ruby/openssl/pull/382
+Patch45: ruby-3.1.0-Implement-PKey-encrypt-decrypt-sign_raw-verify_raw-and-verify_recover.patch
+# Fix `OpenSSL::TestSSL#test_dup` test failure.
+# https://github.com/ruby/openssl/commit/7b66eaa2dbabb6570dbbbdfac24c4dcdcc6793d7
+Patch46: ruby-3.1.0-test-openssl-utils-remove-dup_public-helper-method.patch
+# Fix `OpenSSL::TestDigest#test_digest_constants` test case.
+# https://github.com/ruby/openssl/commit/a3e59f4c2e200c76ef1d93945ff8737a05715e17
+Patch47: ruby-3.1.0-test-openssl-test_digest-do-not-test-constants-for-l.patch
+# Fix `OpenSSL::TestSSL#test_connect_certificate_verify_failed_exception_message`
+# test case.
+# https://github.com/ruby/openssl/commit/b5a0a198505452c7457b192da2e5cd5dda04f23d
+Patch48: ruby-3.1.0-test-openssl-test_ssl-relax-regex-to-match-OpenSSL-s.patch
+# Fix `OpenSSL::TestPKCS12#test_{new_with_no_keys,new_with_one_key_and_one_cert}`
+# test failures.
+# https://github.com/ruby/openssl/commit/998406d18f2acf73090e9fd9d92a7b4227ac593b
+Patch49: ruby-3.1.0-test-openssl-test_pkcs12-fix-test-failures-with-Open.patch
+# Fix `OpenSSL::TestPKey#test_s_generate_key` test case.
+# https://github.com/ruby/openssl/commit/c732387ee5aaa8c5a9717e8b3ffebb3d7430e99a
+Patch50: ruby-3.1.0-test-openssl-test_pkey-use-EC-keys-for-PKey.generate.patch
+# Miscellaneous changes for OpenSSL 3.0 support.
+# https://github.com/ruby/openssl/pull/468
+Patch51: ruby-3.1.0-Miscellaneous-changes-for-OpenSSL-3.0-support.patch
+# Support OpenSSL 3.0.
+# https://github.com/ruby/openssl/pull/399
+Patch52: ruby-3.1.0-Support-OpenSSL-3.0.patch
+# Fix `TestPumaControlCli#test_control_ssl` testcase in Puma.
+# https://github.com/ruby/openssl/pull/399#issuecomment-966239736
+Patch53: ruby-3.1.0-SSL_read-EOF-handling.patch
+
+# to revert "ext/openssl/extconf.rb: require OpenSSL version >= 1.0.1, < 3"
+# https://github.com/ruby/openssl/commit/202ff1372a40a8adf9aac74bfe8a39141b0c57e5
+Patch1000: https://github.com/ruby/openssl/commit/202ff1372a40a8adf9aac74bfe8a39141b0c57e5.patch
 
 Requires: %{name}-libs = %{version}-%{release}
 Requires: ruby(rubygems) >= %{rubygems_version}
@@ -185,14 +246,15 @@ Obsoletes: ruby-tcltk < 2.4.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf
 BuildRequires: gdbm-devel
-BuildRequires: ncurses-devel
 BuildRequires: libdb-devel
-BuildRequires: libxcrypt-devel
 BuildRequires: libffi-devel
-BuildRequires: openssl111-devel
+BuildRequires: libnsl2-devel
+BuildRequires: libX11-devel
+BuildRequires: libxcrypt-devel
 BuildRequires: libyaml-devel
+BuildRequires: ncurses-devel
+BuildRequires: openssl-devel
 BuildRequires: readline-devel
-BuildRequires: libX11-devel
 BuildRequires: zlib-devel
 # Needed to pass test_set_program_name(TestRubyOptions)
 BuildRequires: procps
@@ -554,12 +616,30 @@ rm -rf ext/fiddle/libffi*
 %patch5 -p1
 %patch6 -p1
 %patch9 -p1
-%patch10 -p1
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch31 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1
+%patch51 -p1
+%patch52 -p1
+%patch53 -p1
+
+%patch1000 -p1 -R
 
 cp -a %{SOURCE3} .
 
@@ -773,6 +853,12 @@ touch abrt.rb
 # https://bugs.ruby-lang.org/issues/16749
 #MSPECOPTS="$MSPECOPTS -P 'File.lchmod returns false from \#respond_to?'"
 #MSPECOPTS="$MSPECOPTS -P 'File.lchmod raises a NotImplementedError when called'"
+DISABLE_TESTS="$DISABLE_TESTS -n !/Net::TestSMTP#test_start/"
+DISABLE_TESTS="$DISABLE_TESTS -n !/OpenSSL::TestEngine#test_engines_free/"
+DISABLE_TESTS="$DISABLE_TESTS -n !/OpenSSL::TestEngine#test_openssl_engine_builtin/"
+DISABLE_TESTS="$DISABLE_TESTS -n !/OpenSSL::TestEngine#test_openssl_engine_by_id_string/"
+DISABLE_TESTS="$DISABLE_TESTS -n !/OpenSSL::TestEngine#test_openssl_engine_digest_sha1/"
+DISABLE_TESTS="$DISABLE_TESTS -n !/OpenSSL::TestEngine#test_openssl_engine_id_name_inspect/"
 
 make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
 %endif
@@ -983,7 +1069,6 @@ fi
 %{_bindir}/typeprof
 %{rubygems_dir}
 %{gem_dir}
-%exclude %{gem_dir}/gems/*
 %{_libdir}/gems
 %exclude %{_libdir}/gems/%{name}/bigdecimal-%{bigdecimal_version}
 %exclude %{_libdir}/gems/%{name}/io-console-%{io_console_version}
@@ -1103,7 +1188,13 @@ fi
 
 
 %changelog
-* Mon Nov 15 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6.2-1
+* Fri Nov 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.3-2
+- updated to 3.0.3.
+- dropped Patch10: fixed in upstream.
+- imported Patch20 and 21 from rawhide.
+- imported Patch31-53 and 1000 from rawhide to support openssl3.
+
+* Mon Nov 15 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.2-1
 - updated to 3.0.2.
 - refreshed all patches.