diff options
| author | sevan <sevan@pkgsrc.org> | 2015-10-14 18:42:34 +0000 |
|---|---|---|
| committer | sevan <sevan@pkgsrc.org> | 2015-10-14 18:42:34 +0000 |
| commit | 118e6b2bd6bde9db2382b4d4ef63bb866b781b22 (patch) | |
| tree | 47f69edda04286dc2935d0df272fff51797bb965 /lang | |
| parent | 60017d4657f5c3b4bfcf9419c95d0cf9b69e8f61 (diff) | |
| download | pkgsrc-118e6b2bd6bde9db2382b4d4ef63bb866b781b22.tar.gz | |
Missed new additions in previous commit
Add checks for the presence of SSLv3 in OpenSSL/LibreSSL - obtained from
http://www.libressl.org/patches.html
Diffstat (limited to 'lang')
4 files changed, 70 insertions, 0 deletions
diff --git a/lang/ruby193-base/patches/patch-ext_openssl_extconf.rb b/lang/ruby193-base/patches/patch-ext_openssl_extconf.rb new file mode 100644 index 00000000000..d65dfc10815 --- /dev/null +++ b/lang/ruby193-base/patches/patch-ext_openssl_extconf.rb @@ -0,0 +1,16 @@ +$NetBSD: patch-ext_openssl_extconf.rb,v 1.1 2015/10/14 18:42:34 sevan Exp $ + +Check for SSLv3 support as it may nolonger be available + +--- ext/openssl/extconf.rb.orig Thu Oct 8 12:36:41 2015 ++++ ext/openssl/extconf.rb +@@ -104,6 +104,9 @@ have_func("OPENSSL_cleanse") + 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") + unless have_func("SSL_set_tlsext_host_name", ['openssl/ssl.h']) + have_macro("SSL_set_tlsext_host_name", ['openssl/ssl.h']) && $defs.push("-DHAVE_SSL_SET_TLSEXT_HOST_NAME") + end diff --git a/lang/ruby193-base/patches/patch-ext_openssl_ossl_ssl.c b/lang/ruby193-base/patches/patch-ext_openssl_ossl_ssl.c new file mode 100644 index 00000000000..0ad95911566 --- /dev/null +++ b/lang/ruby193-base/patches/patch-ext_openssl_ossl_ssl.c @@ -0,0 +1,19 @@ +$NetBSD: patch-ext_openssl_ossl_ssl.c,v 1.1 2015/10/14 18:42:34 sevan Exp $ + +Only enable SSLv3 methods if Library provides support + +--- ext/openssl/ossl_ssl.c.orig Thu Oct 8 12:43:06 2015 ++++ ext/openssl/ossl_ssl.c +@@ -113,9 +113,12 @@ struct { + 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), diff --git a/lang/ruby200-base/patches/patch-ext_openssl_extconf.rb b/lang/ruby200-base/patches/patch-ext_openssl_extconf.rb new file mode 100644 index 00000000000..1b9a1f10923 --- /dev/null +++ b/lang/ruby200-base/patches/patch-ext_openssl_extconf.rb @@ -0,0 +1,16 @@ +$NetBSD: patch-ext_openssl_extconf.rb,v 1.1 2015/10/14 18:43:11 sevan Exp $ + +Check for SSLv3 support as it may nolonger be available. + +--- ext/openssl/extconf.rb.orig Sat Oct 10 17:10:39 2015 ++++ ext/openssl/extconf.rb +@@ -103,6 +103,9 @@ have_func("OPENSSL_cleanse") + 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") diff --git a/lang/ruby200-base/patches/patch-ext_openssl_ossl_ssl.c b/lang/ruby200-base/patches/patch-ext_openssl_ossl_ssl.c new file mode 100644 index 00000000000..7c6ee9da924 --- /dev/null +++ b/lang/ruby200-base/patches/patch-ext_openssl_ossl_ssl.c @@ -0,0 +1,19 @@ +$NetBSD: patch-ext_openssl_ossl_ssl.c,v 1.1 2015/10/14 18:43:11 sevan Exp $ + +Only enable SSLv3 methods if library provides support. + +--- ext/openssl/ossl_ssl.c.orig Sat Oct 10 17:17:33 2015 ++++ ext/openssl/ossl_ssl.c +@@ -129,9 +129,12 @@ struct { + 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), |