Update ruby23 and ruby23-base to 2.3.1.

Ruby 2.3.1 Released			Posted by nagachika on 26 Apr 2016

Ruby 2.3.1 has been released.

This is the first TEENY version release of the stable 2.3 series.

There are many bugfixes. See the ChangeLog for details.

5 files changed, 23 insertions, 51 deletions

diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index ff584e502dc..b153fc7926f 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.162 2016/05/15 14:15:14 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.163 2016/05/15 14:19:56 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -225,13 +225,13 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/}
 RUBY18_VERSION=		1.8.7
 RUBY21_VERSION=		2.1.10
 RUBY22_VERSION=		2.2.5
-RUBY23_VERSION=		2.3.0
+RUBY23_VERSION=		2.3.1
 
 # patch level
 RUBY18_PATCHLEVEL=	pl374
 #RUBY21_PATCHLEVEL=	p492
 #RUBY22_PATCHLEVEL=	p319
-#RUBY23_PATCHLEVEL=	p0
+#RUBY23_PATCHLEVEL=	p112
 
 # current API compatible version; used for version of shared library
 RUBY18_API_VERSION=	1.8.7
diff --git a/lang/ruby23-base/Makefile b/lang/ruby23-base/Makefile
index 398057f8f59..8d6a455c3a5 100644
--- a/lang/ruby23-base/Makefile
+++ b/lang/ruby23-base/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2016/03/17 07:55:43 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/05/15 14:19:56 taca Exp $
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
-PKGREVISION=	2
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
diff --git a/lang/ruby23-base/distinfo b/lang/ruby23-base/distinfo
index 667e6527c76..eeca9d75edc 100644
--- a/lang/ruby23-base/distinfo
+++ b/lang/ruby23-base/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.3 2016/03/24 16:29:24 taca Exp $
+$NetBSD: distinfo,v 1.4 2016/05/15 14:19:56 taca Exp $
 
-SHA1 (ruby-2.3.0.tar.bz2) = 6c8a832d49d22755ea8c45b6d53faf2ccc6d6ac9
-RMD160 (ruby-2.3.0.tar.bz2) = 4e9066b169b1b00435ba154069416e14457fe22e
-SHA512 (ruby-2.3.0.tar.bz2) = 77b707359e754c3616699d21697752741497c719dc3d6fdfb55ed639e76d52560d293ae54cbe5c63be78dc73fbe60f1b8615d704d017bdfe1994aa9747d26a6c
-Size (ruby-2.3.0.tar.bz2) = 14185617 bytes
-SHA1 (patch-configure) = ccddb80f90f75a09dc7d802d1ddad6255ba13ffa
+SHA1 (ruby-2.3.1.tar.bz2) = 4ee76c7c1b12d5c5b0245fc71595c5635d2217c9
+RMD160 (ruby-2.3.1.tar.bz2) = 1b7a7105765f6dfb5d72d67e30fe636b87cc9bd5
+SHA512 (ruby-2.3.1.tar.bz2) = a8659b96a3a481a3dbdbb6997eb18ff1f8cd926a9707a90d071e937315c21d372c89252f0d44732ae5007d2678fda8c8fbceafa4e4b4ff500d236fb796284d8d
+Size (ruby-2.3.1.tar.bz2) = 14432088 bytes
+SHA1 (patch-configure) = e1af70b87cfbb7c61a2bf65109b6e18efb825f0f
 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
 SHA1 (patch-lib_rubygems.rb) = d8968f54bdc973379675a3ebb5ca68325cff6644
diff --git a/lang/ruby23-base/patches/patch-configure b/lang/ruby23-base/patches/patch-configure
index 9e5f82092f8..785913ee1d9 100644
--- a/lang/ruby23-base/patches/patch-configure
+++ b/lang/ruby23-base/patches/patch-configure
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.1 2015/12/30 14:59:42 taca Exp $
+$NetBSD: patch-configure,v 1.2 2016/05/15 14:19:56 taca Exp $
 
 * Adding Interix support.
 * Ignore doxygen.
 
---- configure.orig	2015-12-24 16:44:18.000000000 +0000
+--- configure.orig	2016-04-25 18:08:47.000000000 +0000
 +++ configure
-@@ -5676,7 +5676,7 @@ esac
+@@ -5678,7 +5678,7 @@ esac
  else
      if test x"$target_alias" = x; then
  	case "$target_os" in #(
@@ -14,9 +14,9 @@ $NetBSD: patch-configure,v 1.1 2015/12/30 14:59:42 taca Exp $
  
  	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
  $as_echo_n "checking for real target cpu... " >&6; }
-@@ -9172,6 +9172,10 @@ esac
- 		ac_cv_func_isinf=yes
- 		ac_cv_func_isnan=yes
+@@ -9179,6 +9179,10 @@ esac
+     	LIBS="-lm $LIBS"
+ 		ac_cv_func_round=no
  		 ;; #(
 +  interix*) :
 +	LIBS="-lm $LIBS"
@@ -25,7 +25,7 @@ $NetBSD: patch-configure,v 1.1 2015/12/30 14:59:42 taca Exp $
    nacl) :
  
    LIBS="-lm $LIBS"
-@@ -17900,6 +17904,8 @@ else
+@@ -17907,6 +17911,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -34,7 +34,7 @@ $NetBSD: patch-configure,v 1.1 2015/12/30 14:59:42 taca Exp $
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -22340,7 +22346,9 @@ esac ;; #(
+@@ -22407,7 +22413,9 @@ esac ;; #(
    interix*) :
      	: ${LDSHARED='$(CC) -shared'}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -44,7 +44,7 @@ $NetBSD: patch-configure,v 1.1 2015/12/30 14:59:42 taca Exp $
  			rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -23518,7 +23526,7 @@ esac
+@@ -23585,7 +23593,7 @@ esac
    freebsd*|dragonfly*) :
  
  	SOLIBS='$(LIBS)'
@@ -53,7 +53,7 @@ $NetBSD: patch-configure,v 1.1 2015/12/30 14:59:42 taca Exp $
  	if test "$rb_cv_binary_elf" != "yes" ; then
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
-@@ -23587,7 +23595,12 @@ esac
+@@ -23654,7 +23662,12 @@ esac
  	 ;; #(
    interix*) :
  
@@ -67,7 +67,7 @@ $NetBSD: patch-configure,v 1.1 2015/12/30 14:59:42 taca Exp $
  	 ;; #(
    mingw*|cygwin*|mswin*) :
  
-@@ -23755,7 +23768,7 @@ if test "$enable_rpath" = yes; then
+@@ -23822,7 +23835,7 @@ if test "$enable_rpath" = yes; then
  esac
      rpathflag=`IFS="$PATH_SEPARATOR"
          echo x "$rpathflag" |
@@ -76,7 +76,7 @@ $NetBSD: patch-configure,v 1.1 2015/12/30 14:59:42 taca Exp $
      `
      LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -24146,11 +24159,7 @@ if test "$install_doc" != no; then
+@@ -24213,11 +24226,7 @@ if test "$install_doc" != no; then
      else
  	RDOCTARGET="nodoc"
      fi
@@ -89,7 +89,7 @@ $NetBSD: patch-configure,v 1.1 2015/12/30 14:59:42 taca Exp $
  else
      RDOCTARGET="nodoc"
      CAPITARGET="nodoc"
-@@ -26183,17 +26192,7 @@ which seems to be undefined.  Please mak
+@@ -26250,17 +26259,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {
diff --git a/lang/ruby23-base/patches/patch-ext_socket_option.c b/lang/ruby23-base/patches/patch-ext_socket_option.c
deleted file mode 100644
index f208564f2a4..00000000000
--- a/lang/ruby23-base/patches/patch-ext_socket_option.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ext_socket_option.c,v 1.1 2016/03/17 07:55:43 wiz Exp $
-
-SVN 54139:
-
-Thu Mar 17 11:36:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-       * ext/socket/option.c (inspect_tcpi_msec): more accurate condition
-         for TCPI msec member inspection function.
-         [ruby-core:74388] [Bug #12185]
-
---- ext/socket/option.c.orig	2015-08-15 04:32:15.000000000 +0000
-+++ ext/socket/option.c
-@@ -928,7 +928,12 @@ inspect_tcpi_usec(VALUE ret, const char 
-     rb_str_catf(ret, "%s%u.%06us", prefix, t / 1000000, t % 1000000);
- }
- 
--#if defined(__linux__) || defined(__sun)
-+#if !defined __FreeBSD__ && ( \
-+    defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_SENT || \
-+    defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_RECV || \
-+    defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_SENT  || \
-+    defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_RECV  || \
-+    0)
- static void
- inspect_tcpi_msec(VALUE ret, const char *prefix, uint32_t t)
- {