don't define SSLV23_PADDING when building against openssl3; rel 2

[packages/ruby.git] / ruby.spec

diff --git a/ruby.spec b/ruby.spec
index aba71b6a1035ec1fb4e61b123de411019e40e2fd..899b155617ddd70a40f85584d5350e7b6a34880e 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -12,12 +12,12 @@
 %bcond_with    bootstrap       # build bootstrap version
 %bcond_with    tests           # build without tests
 
-%define                rel             3
+%define                rel             2
 %define                ruby_version    2.6
-%define                patchlevel      6
+%define                patchlevel      8
 %define                pkg_version     %{ruby_version}.%{patchlevel}
 %define                ruby_suffix %{!?with_default_ruby:%{ruby_version}}
-%define                doc_version     2_6_6
+%define                doc_version     2_6_7
 %define                oname   ruby
 Summary:       Ruby - interpreted scripting language
 Summary(ja.UTF-8):     オブジェクト指向言語Rubyインタプリタ
@@ -36,30 +36,32 @@ 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: 1aa8bd34dcaf5c4b58d563546de16919
-Source2:       http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
-# Source2-md5: 0b93f02fc4c1b24b1c9d5ec165f66ced
-Source3:       http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_core_rdocs.tgz
-# Source3-md5: 3ab26881456819d3c6226852c1a2bfd5
-Source50:      http://www.unicode.org/Public/9.0.0/ucd/CaseFolding.txt
+# Source0-md5: 4dc6e5e1988364898b082416a0c477c7
+Source2:       https://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
+# Source2-md5: 1e70282bfffc377d0efe5bcbca4b8127
+Source3:       https://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_core_rdocs.tgz
+# Source3-md5: 004471ae881d8a7851c11c4c83c14ca3
+Source50:      https://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
+Source51:      https://www.unicode.org/Public/9.0.0/ucd/CompositionExclusions.txt
 # Source51-md5:        263381d7b4b5e2d52a91e1bbbd4722d4
-Source52:      http://www.unicode.org/Public/9.0.0/ucd/NormalizationTest.txt
+Source52:      https://www.unicode.org/Public/9.0.0/ucd/NormalizationTest.txt
 # Source52-md5:        aacb8a8acfc449d09136fe39f3f97cf1
-Source53:      http://www.unicode.org/Public/9.0.0/ucd/SpecialCasing.txt
+Source53:      https://www.unicode.org/Public/9.0.0/ucd/SpecialCasing.txt
 # Source53-md5:        fea30f45a2f81ffa474fd984d297e2ea
-Source54:      http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt
+Source54:      https://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt
 # Source54-md5:        dde25b1cf9bbb4ba1140ac12e4128b0b
 Source4:       rdoc.1
 Source5:       testrb.1
 Source6:       operating_system.rb
 Patch0:                autoconf2.70.patch
+Patch1:                bison3.59.patch
 Patch2:                fix-bison-invocation.patch
 Patch3:                mkmf-verbose.patch
 Patch4:                strip-ccache.patch
 Patch5:                ruby-version.patch
 Patch6:                duplicated-paths.patch
+Patch7:                openssl3.patch
 # obsolete?
 Patch8:                rubygems-2.0.0-binary-extensions.patch
 Patch9:                custom-rubygems-location.patch
@@ -117,8 +119,8 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define        power_assert_ver        1.1.3
 %define        psych_ver               3.1.0
 %define        rake_ver                12.3.3
-%define        rdoc_ver                6.1.2
-%define        rubygems_ver            3.0.3
+%define        rdoc_ver                6.1.2.1
+%define        rubygems_ver            3.0.3.1
 %define        test_unit_ver           3.2.9
 %define        xmlrpc_ver              0.3.0
 # default modules, separated
@@ -142,7 +144,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define        ostruct_ver             0.1.0
 %define        openssl_ver             2.1.2
 %define        prime_ver               0.1.0
-%define        rexml_ver               3.1.9
+%define        rexml_ver               3.1.9.1
 %define        rss_ver                 0.2.7
 %define        scanf_ver               1.0.0
 %define        sdbm_ver                1.0.0
@@ -152,7 +154,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define        sync_ver                0.5.0
 %define        thwait_ver              0.1.0
 %define        tracer_ver              0.1.0
-%define        webrick_ver             1.4.2
+%define        webrick_ver             1.4.4
 %define        zlib_ver                1.0.0
 
 %define        ruby_ridir              %{_datadir}/ri/system
@@ -680,11 +682,13 @@ wywołującego je. Aby to osiągnąć wystarczy bardzo mało kodu.
 %prep
 %setup -q -n %{oname}-%{pkg_version} -a2 -a3
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 #%patch8 -p1
 %patch9 -p1
 %patch12 -p1
@@ -819,8 +823,6 @@ sed -i -e 's/Version: \${ruby_version}/Version: %{ruby_version}/' $RPM_BUILD_ROO
 
 # Kill bundled certificates, as they should be part of ca-certificates.
 for cert in \
-       AddTrustExternalCARoot.pem \
-       DigiCertHighAssuranceEVRootCA.pem \
        GlobalSignRootCA.pem \
 ; do
        %{__rm} $RPM_BUILD_ROOT%{rubygems_dir}/rubygems/ssl_certs/*/$cert