diff options
| author | Pavel Vinogradov | 2015-11-09 23:01:01 -0500 |
|---|---|---|
| committer | Pavel Vinogradov | 2015-11-09 23:01:01 -0500 |
| commit | 88e2346ac749571dac5f51300ad8ab7d253a7843 (patch) | |
| tree | 38a33b2a9bcdd41e7ff26f629985045d971c975c /ruby-raa | |
| parent | 58d1f2813d99581d0bf8547cad34fbea9258c9b3 (diff) | |
ruby-raa/ruby-2.2: added patch to detect SSLv3 methods in open/libressl
Diffstat (limited to 'ruby-raa')
| -rw-r--r-- | ruby-raa/ruby-2.2/HISTORY | 5 | ||||
| -rwxr-xr-x | ruby-raa/ruby-2.2/PRE_BUILD | 5 | ||||
| -rw-r--r-- | ruby-raa/ruby-2.2/ruby-sslv3.diff | 31 |
3 files changed, 41 insertions, 0 deletions
diff --git a/ruby-raa/ruby-2.2/HISTORY b/ruby-raa/ruby-2.2/HISTORY index 70176f3ac8..750584d497 100644 --- a/ruby-raa/ruby-2.2/HISTORY +++ b/ruby-raa/ruby-2.2/HISTORY @@ -1,3 +1,8 @@ +2015-11-09 Pavel Vinogradov <public@sourcemage.org> + * PRE_BUILD, ruby-sslv3.diff: added patch to detect SSLv3 methods + availability in open/libressl, + see https://bugs.ruby-lang.org/issues/11376 + 2015-09-30 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.2.3 SECURITY_PATCH++ fixes CVE-2015-3900 diff --git a/ruby-raa/ruby-2.2/PRE_BUILD b/ruby-raa/ruby-2.2/PRE_BUILD new file mode 100755 index 0000000000..e760253a65 --- /dev/null +++ b/ruby-raa/ruby-2.2/PRE_BUILD @@ -0,0 +1,5 @@ +default_pre_build && +cd ${SOURCE_DIRECTORY} && + +# Remove this on the next update +patch -p0 < ${SPELL_DIRECTORY}/ruby-sslv3.diff diff --git a/ruby-raa/ruby-2.2/ruby-sslv3.diff b/ruby-raa/ruby-2.2/ruby-sslv3.diff new file mode 100644 index 0000000000..c829029518 --- /dev/null +++ b/ruby-raa/ruby-2.2/ruby-sslv3.diff @@ -0,0 +1,31 @@ +Index: ext/openssl/extconf.rb +=================================================================== +--- ext/openssl/extconf.rb (revision 51718) ++++ ext/openssl/extconf.rb (working copy) +@@ -104,6 +104,9 @@ + have_func("SSLv2_method") + have_func("SSLv2_server_method") + have_func("SSLv2_client_method") ++have_func("SSLv3_method") ++have_func("SSLv3_server_method") ++have_func("SSLv3_client_method") + have_func("TLSv1_1_method") + have_func("TLSv1_1_server_method") + have_func("TLSv1_1_client_method") +Index: ext/openssl/ossl_ssl.c +=================================================================== +--- ext/openssl/ossl_ssl.c (revision 51718) ++++ ext/openssl/ossl_ssl.c (working copy) +@@ -109,9 +109,12 @@ + OSSL_SSL_METHOD_ENTRY(SSLv2_server), + OSSL_SSL_METHOD_ENTRY(SSLv2_client), + #endif ++#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \ ++ defined(HAVE_SSLV3_CLIENT_METHOD) + OSSL_SSL_METHOD_ENTRY(SSLv3), + OSSL_SSL_METHOD_ENTRY(SSLv3_server), + OSSL_SSL_METHOD_ENTRY(SSLv3_client), ++#endif + OSSL_SSL_METHOD_ENTRY(SSLv23), + OSSL_SSL_METHOD_ENTRY(SSLv23_server), + OSSL_SSL_METHOD_ENTRY(SSLv23_client), |