Try to fix build error by recent OpenSSL change on NetBSD,

reported as PR pkg/50971.

8 files changed, 76 insertions, 23 deletions

diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
index c32fc7bf0ac..77053b6a1ab 100644
--- a/lang/ruby18-base/distinfo
+++ b/lang/ruby18-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2016/02/22 12:53:32 jperkin Exp $
+$NetBSD: distinfo,v 1.65 2016/03/24 16:30:11 taca Exp $
 
 SHA1 (ruby-1.8.7-p374.tar.bz2) = cf82b6cbeed8e389705aa6b66c2a8141626705c3
 RMD160 (ruby-1.8.7-p374.tar.bz2) = 314efaa961c80c9294202c6e40dec0e38865ed94
@@ -18,7 +18,7 @@ SHA1 (patch-dl) = 0a5010f57e0f21170530fd4f940e66608c6d9630
 SHA1 (patch-dn) = 3cd429fcd4f48ad0ab784058a4ac8672f6ae17db
 SHA1 (patch-do) = d2b190074647a591106797922e2ec907f6b3efde
 SHA1 (patch-dp) = ebdc27a84c24d3373769250bf4b7052058f89d9b
-SHA1 (patch-dq) = 24f4f2785d939559e85e5a42638092eea935e324
+SHA1 (patch-dq) = 00ea4682b13ce3689def163c8ccda8a597a280fb
 SHA1 (patch-dr) = ed734e802f2d1cb59c2b49952d646849c9226d1e
 SHA1 (patch-ds) = e60434cb299d070289a3c80765187e4058a65f99
 SHA1 (patch-dt) = 59c09f6ea19cc02a1d8ca92a99eed7f8c30a5f10
diff --git a/lang/ruby18-base/patches/patch-dq b/lang/ruby18-base/patches/patch-dq
index 4210a0763fa..36d7094f97f 100644
--- a/lang/ruby18-base/patches/patch-dq
+++ b/lang/ruby18-base/patches/patch-dq
@@ -1,4 +1,4 @@
-$NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
+$NetBSD: patch-dq,v 1.4 2016/03/24 16:30:11 taca Exp $
 
 * r18172: suppress warnings.
 * r20494: (ossl_ssl_read_nonblock): OpenSSL::SSL::SSLSocket should implement
@@ -11,7 +11,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
 * Constify (some cases are depends on OpenSSL's version).
 * Only enable SSLv3 methods if library provides support.
 
---- ext/openssl/ossl_ssl.c.orig	Wed Feb  8 06:09:40 2012
+--- ext/openssl/ossl_ssl.c.orig	2012-02-08 06:09:40.000000000 +0000
 +++ ext/openssl/ossl_ssl.c
 @@ -26,6 +26,12 @@
  #  define TO_SOCKET(s) s
@@ -26,7 +26,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
  VALUE mSSL;
  VALUE eSSLError;
  VALUE cSSLContext;
-@@ -69,6 +75,9 @@ static const char *ossl_sslctx_attrs[] = {
+@@ -69,6 +75,9 @@ static const char *ossl_sslctx_attrs[] =
      "verify_callback", "options", "cert_store", "extra_chain_cert",
      "client_cert_cb", "tmp_dh_callback", "session_id_context",
      "session_get_cb", "session_new_cb", "session_remove_cb",
@@ -36,7 +36,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
  };
  
  #define ossl_ssl_get_io(o)           rb_iv_get((o),"@io")
-@@ -86,7 +95,12 @@ static const char *ossl_sslctx_attrs[] = {
+@@ -86,7 +95,12 @@ static const char *ossl_sslctx_attrs[] =
  #define ossl_ssl_set_tmp_dh(o,v)     rb_iv_set((o),"@tmp_dh",(v))
  
  static const char *ossl_ssl_attr_readers[] = { "io", "context", };
@@ -50,7 +50,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
  
  ID ID_callback_state;
  
-@@ -95,7 +109,7 @@ ID ID_callback_state;
+@@ -95,21 +109,24 @@ ID ID_callback_state;
   */
  struct {
      const char *name;
@@ -59,7 +59,12 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
  } ossl_ssl_method_tab[] = {
  #define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method }
      OSSL_SSL_METHOD_ENTRY(TLSv1),
-@@ -107,9 +121,12 @@ struct {
+     OSSL_SSL_METHOD_ENTRY(TLSv1_server),
+     OSSL_SSL_METHOD_ENTRY(TLSv1_client),
+-#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
++#if !defined(OPENSSL_NO_SSL2) && defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
+         defined(HAVE_SSLV2_CLIENT_METHOD)	
+     OSSL_SSL_METHOD_ENTRY(SSLv2),
      OSSL_SSL_METHOD_ENTRY(SSLv2_server),
      OSSL_SSL_METHOD_ENTRY(SSLv2_client),
  #endif
@@ -81,7 +86,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
      const char *s;
      int i;
  
-@@ -299,7 +316,7 @@ ossl_ssl_verify_callback(int preverify_ok, X509_STORE_
+@@ -299,7 +316,7 @@ ossl_ssl_verify_callback(int preverify_o
  static VALUE
  ossl_call_session_get_cb(VALUE ary)
  {
@@ -90,7 +95,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
      
      Check_Type(ary, T_ARRAY);
      ssl_obj = rb_ary_entry(ary, 0);
-@@ -327,7 +344,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *bu
+@@ -327,7 +344,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, uns
      ssl_obj = (VALUE)ptr;
      ary = rb_ary_new2(2);
      rb_ary_push(ary, ssl_obj);
@@ -99,7 +104,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
  
      ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_get_cb, ary, &state);
      if (state) {
-@@ -346,7 +363,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *bu
+@@ -346,7 +363,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, uns
  static VALUE
  ossl_call_session_new_cb(VALUE ary)
  {
@@ -108,7 +113,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
      
      Check_Type(ary, T_ARRAY);
      ssl_obj = rb_ary_entry(ary, 0);
-@@ -389,10 +406,11 @@ ossl_sslctx_session_new_cb(SSL *ssl, SSL_SESSION *sess
+@@ -389,10 +406,11 @@ ossl_sslctx_session_new_cb(SSL *ssl, SSL
      return RTEST(ret_obj) ? 1 : 0;
  }
  
@@ -129,7 +134,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
  
  static void
  ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess)
-@@ -448,6 +467,66 @@ ossl_sslctx_add_extra_chain_cert_i(VALUE i, VALUE arg)
+@@ -448,6 +467,66 @@ ossl_sslctx_add_extra_chain_cert_i(VALUE
      return i;
  }
  
@@ -249,7 +254,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
          rb_ary_push(ary, ossl_ssl_cipher_to_ary(cipher));
      }
      return ary;
-@@ -821,7 +909,6 @@ ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALU
+@@ -821,7 +909,6 @@ ossl_sslctx_flush_sessions(int argc, VAL
      VALUE arg1;
      SSL_CTX *ctx;
      time_t tm = 0;
@@ -257,7 +262,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
  
      rb_scan_args(argc, argv, "01", &arg1);
  
-@@ -895,6 +982,8 @@ ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
+@@ -895,6 +982,8 @@ ossl_ssl_initialize(int argc, VALUE *arg
      ossl_sslctx_setup(ctx);
      rb_call_super(0, 0);
  
@@ -290,7 +295,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
          io = ossl_ssl_get_io(self);
          GetOpenFile(io, fptr);
          rb_io_check_readable(fptr);
-@@ -953,7 +1052,15 @@ ossl_start_ssl(VALUE self, int (*func)(), const char *
+@@ -953,7 +1052,15 @@ ossl_start_ssl(VALUE self, int (*func)()
      Data_Get_Struct(self, SSL, ssl);
      GetOpenFile(ossl_ssl_get_io(self), fptr);
      for(;;){
@@ -307,7 +312,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
  	switch((ret2 = ssl_get_error(ssl, ret))){
  	case SSL_ERROR_WANT_WRITE:
              rb_io_wait_writable(FPTR_TO_FD(fptr));
-@@ -969,10 +1076,6 @@ ossl_start_ssl(VALUE self, int (*func)(), const char *
+@@ -969,10 +1076,6 @@ ossl_start_ssl(VALUE self, int (*func)()
  	}
      }
  
@@ -391,7 +396,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
      SSL *ssl;
      int ilen, nread = 0;
      VALUE len, str;
-@@ -1027,12 +1196,11 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self)
+@@ -1027,12 +1196,11 @@ ossl_ssl_read(int argc, VALUE *argv, VAL
  
      Data_Get_Struct(self, SSL, ssl);
      GetOpenFile(ossl_ssl_get_io(self), fptr);
@@ -406,7 +411,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
  	    case SSL_ERROR_NONE:
  		goto end;
  	    case SSL_ERROR_ZERO_RETURN:
-@@ -1041,7 +1209,7 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self)
+@@ -1041,7 +1209,7 @@ ossl_ssl_read(int argc, VALUE *argv, VAL
                  rb_io_wait_writable(FPTR_TO_FD(fptr));
                  continue;
  	    case SSL_ERROR_WANT_READ:
@@ -415,7 +420,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $
  		continue;
  	    case SSL_ERROR_SYSCALL:
  		if(ERR_peek_error() == 0 && nread == 0) rb_eof_error();
-@@ -1052,9 +1220,8 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self)
+@@ -1052,9 +1220,8 @@ ossl_ssl_read(int argc, VALUE *argv, VAL
          }
      }
      else {
diff --git a/lang/ruby21-base/distinfo b/lang/ruby21-base/distinfo
index 23d3e0dda0e..682e30087dc 100644
--- a/lang/ruby21-base/distinfo
+++ b/lang/ruby21-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2015/12/16 16:03:12 taca Exp $
+$NetBSD: distinfo,v 1.24 2016/03/24 16:29:50 taca Exp $
 
 SHA1 (ruby-2.1.8.tar.bz2) = 0284eaf42ac76a641abd5cd4b6bd933abeb9934e
 RMD160 (ruby-2.1.8.tar.bz2) = 3ab77f712adf6dfa270b9cebeab0863d31f5f694
@@ -8,6 +8,7 @@ SHA1 (patch-configure) = 7f1f6d2dc7d32c96d6ae65562a9bc6d50d2b79dd
 SHA1 (patch-eval.c) = a1e86d4ed1729398393e83d519e991259c6163de
 SHA1 (patch-eval__error.c) = cc313587bb24e16e4702f784b30e64618ae3f5a4
 SHA1 (patch-ext_dbm_extconf.rb) = 08520edd956e17cb6cc80b6ee2c77af77a834bd2
+SHA1 (patch-ext_openssl_ossl__ssl.c) = d6aa1a2036597e7b51411d6eed9501f6a264c26c
 SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132
 SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323
 SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = 24b9f282558200780adbf93e71edd1aa52d1c82b
diff --git a/lang/ruby21-base/patches/patch-ext_openssl_ossl__ssl.c b/lang/ruby21-base/patches/patch-ext_openssl_ossl__ssl.c
new file mode 100644
index 00000000000..fd280282cef
--- /dev/null
+++ b/lang/ruby21-base/patches/patch-ext_openssl_ossl__ssl.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_openssl_ossl__ssl.c,v 1.1 2016/03/24 16:29:50 taca Exp $
+
+Utilize OPENSSL_NO_SSL2.
+
+--- ext/openssl/ossl_ssl.c.orig	2015-11-18 11:34:19.000000000 +0000
++++ ext/openssl/ossl_ssl.c
+@@ -128,7 +128,7 @@ struct {
+     OSSL_SSL_METHOD_ENTRY(TLSv1_1_server),
+     OSSL_SSL_METHOD_ENTRY(TLSv1_1_client),
+ #endif
+-#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
++#if !defined(OPENSSL_NO_SSL2) && defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
+         defined(HAVE_SSLV2_CLIENT_METHOD)
+     OSSL_SSL_METHOD_ENTRY(SSLv2),
+     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
diff --git a/lang/ruby22-base/distinfo b/lang/ruby22-base/distinfo
index 7892933df74..365d96b0c06 100644
--- a/lang/ruby22-base/distinfo
+++ b/lang/ruby22-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2016/03/17 07:53:46 wiz Exp $
+$NetBSD: distinfo,v 1.14 2016/03/24 16:28:59 taca Exp $
 
 SHA1 (ruby-2.2.4.tar.bz2) = 6132840a859dbf2ac1498ba313021f299a870038
 RMD160 (ruby-2.2.4.tar.bz2) = 012fa73d430db36e5b807cd677a961d6e2700758
@@ -8,6 +8,7 @@ SHA1 (patch-configure) = 8abbc486b8cf30bb789ef58d1cb289191dcd1af6
 SHA1 (patch-eval.c) = a1e86d4ed1729398393e83d519e991259c6163de
 SHA1 (patch-eval__error.c) = cc313587bb24e16e4702f784b30e64618ae3f5a4
 SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959
+SHA1 (patch-ext_openssl_ossl__ssl.c) = e887a5576959921da116a5cee629c25610169593
 SHA1 (patch-ext_socket_option.c) = 8759eabfe884a891fd6adab6921418a1ab56d21f
 SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d
 SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
diff --git a/lang/ruby22-base/patches/patch-ext_openssl_ossl__ssl.c b/lang/ruby22-base/patches/patch-ext_openssl_ossl__ssl.c
new file mode 100644
index 00000000000..297283ed524
--- /dev/null
+++ b/lang/ruby22-base/patches/patch-ext_openssl_ossl__ssl.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_openssl_ossl__ssl.c,v 1.1 2016/03/24 16:28:59 taca Exp $
+
+Utilize OPENSSL_NO_SSL2.
+
+--- ext/openssl/ossl_ssl.c.orig	2015-11-27 21:24:30.000000000 +0000
++++ ext/openssl/ossl_ssl.c
+@@ -132,7 +132,7 @@ static const struct {
+     OSSL_SSL_METHOD_ENTRY(TLSv1_1_server),
+     OSSL_SSL_METHOD_ENTRY(TLSv1_1_client),
+ #endif
+-#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
++#if !defined(OPENSSL_NO_SSL2) && defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
+         defined(HAVE_SSLV2_CLIENT_METHOD)
+     OSSL_SSL_METHOD_ENTRY(SSLv2),
+     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
diff --git a/lang/ruby23-base/distinfo b/lang/ruby23-base/distinfo
index 00e882dec5c..667e6527c76 100644
--- a/lang/ruby23-base/distinfo
+++ b/lang/ruby23-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2016/03/17 07:55:43 wiz Exp $
+$NetBSD: distinfo,v 1.3 2016/03/24 16:29:24 taca Exp $
 
 SHA1 (ruby-2.3.0.tar.bz2) = 6c8a832d49d22755ea8c45b6d53faf2ccc6d6ac9
 RMD160 (ruby-2.3.0.tar.bz2) = 4e9066b169b1b00435ba154069416e14457fe22e
@@ -8,6 +8,7 @@ SHA1 (patch-configure) = ccddb80f90f75a09dc7d802d1ddad6255ba13ffa
 SHA1 (patch-eval.c) = 16e6eadca15c95ac3e2291a2003cb0fc606eafeb
 SHA1 (patch-eval__error.c) = 8ed04dec5c3c0bf4d9ca8516888b331676f7c957
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
+SHA1 (patch-ext_openssl_ossl__ssl.c) = 24e794aae278da6204e29212d9e2add0b0119ea4
 SHA1 (patch-ext_socket_option.c) = 210753a7db6ab7b8c459765f1ec656948da86e28
 SHA1 (patch-lib_mkmf.rb) = d01302bac014ec1d72bbf19df64bc2c93c07ec5e
 SHA1 (patch-lib_rdoc_ri_driver.rb) = bdbe04aa1dd1719d901233b16bcb318172a42b6c
diff --git a/lang/ruby23-base/patches/patch-ext_openssl_ossl__ssl.c b/lang/ruby23-base/patches/patch-ext_openssl_ossl__ssl.c
new file mode 100644
index 00000000000..9d1c8fbb3ba
--- /dev/null
+++ b/lang/ruby23-base/patches/patch-ext_openssl_ossl__ssl.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_openssl_ossl__ssl.c,v 1.1 2016/03/24 16:29:24 taca Exp $
+
+Utilize OPENSSL_NO_SSL2.
+
+--- ext/openssl/ossl_ssl.c.orig	2015-12-13 01:29:44.000000000 +0000
++++ ext/openssl/ossl_ssl.c
+@@ -102,7 +102,7 @@ static const struct {
+     OSSL_SSL_METHOD_ENTRY(TLSv1_1_server),
+     OSSL_SSL_METHOD_ENTRY(TLSv1_1_client),
+ #endif
+-#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
++#if !defined(OPENSSL_NO_SSL2) && defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
+         defined(HAVE_SSLV2_CLIENT_METHOD)
+     OSSL_SSL_METHOD_ENTRY(SSLv2),
+     OSSL_SSL_METHOD_ENTRY(SSLv2_server),