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

changes api but it's used with SSLv2 only. openssl ref:

https://github.com/openssl/openssl/issues/14216

diff --git a/openssl3.patch b/openssl3.patch
new file mode 100644 (file)
index 0000000..acc7d3c
--- /dev/null
+++ b/openssl3.patch
@@ -0,0 +1,12 @@
+--- ruby-2.6.8/ext/openssl/ossl_pkey_rsa.c.orig        2021-07-07 12:38:58.000000000 +0200
++++ ruby-2.6.8/ext/openssl/ossl_pkey_rsa.c     2021-10-13 12:03:34.317085257 +0200
+@@ -939,7 +939,9 @@
+     rb_define_method(cRSA, "params", ossl_rsa_get_params, 0);
+ 
+     DefRSAConst(PKCS1_PADDING);
++#if OPENSSL_VERSION_MAJOR < 3
+     DefRSAConst(SSLV23_PADDING);
++#endif
+     DefRSAConst(NO_PADDING);
+     DefRSAConst(PKCS1_OAEP_PADDING);
+ 

diff --git a/ruby.spec b/ruby.spec
index 693d049b424d8104aa63c0b0e2f09f17056e7899..899b155617ddd70a40f85584d5350e7b6a34880e 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -12,7 +12,7 @@
 %bcond_with    bootstrap       # build bootstrap version
 %bcond_with    tests           # build without tests
 
 %bcond_with    bootstrap       # build bootstrap version
 %bcond_with    tests           # build without tests
 

-%define                rel             1
+%define                rel             2

 %define                ruby_version    2.6
 %define                patchlevel      8
 %define                pkg_version     %{ruby_version}.%{patchlevel}
 %define                ruby_version    2.6
 %define                patchlevel      8
 %define                pkg_version     %{ruby_version}.%{patchlevel}


@@ -61,6 +61,7 @@ Patch3:               mkmf-verbose.patch
 Patch4:                strip-ccache.patch
 Patch5:                ruby-version.patch
 Patch6:                duplicated-paths.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
 # obsolete?
 Patch8:                rubygems-2.0.0-binary-extensions.patch
 Patch9:                custom-rubygems-location.patch


@@ -687,6 +688,7 @@ wywołującego je. Aby to osiągnąć wystarczy bardzo mało kodu.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1

+%patch7 -p1

 #%patch8 -p1
 %patch9 -p1
 %patch12 -p1
 #%patch8 -p1
 %patch9 -p1
 %patch12 -p1