Update ruby19-base package to 192pl318, Ruby 1.9.2 patchlevel 318.

(It seems to the tag of subversion was created with wrong name.)

Ruby 1.9.2-p318 is released.

This release include a security fixes of the Ruby OpenSSL extension.
See [1] for more detail about this fix.
*1:
http://www.ruby-lang.org/en/news/2012/02/16/security-fix-for-ruby-openssl-module-allow-0n-splitting-as-a-prevention-for-the-tls-beast-attack-/

And many bugs are fixed in this release.
See [2] for more details:
*2: http://svn.ruby-lang.org/repos/ruby/tags/v1_9_2_381/ChangeLog

4 files changed, 12 insertions, 24 deletions

diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index ba3cd1bbd4e..1ad685ccbab 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.73 2012/02/16 16:43:38 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.74 2012/02/23 14:15:58 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -204,7 +204,7 @@ RUBY193_VERSION=	1.9.3
 
 # patch
 RUBY18_PATCHLEVEL=	pl358
-RUBY19_PATCHLEVEL=	pl290
+RUBY19_PATCHLEVEL=	pl318
 RUBY193_PATCHLEVEL=	p125
 
 # current API compatible version; used for version of shared library
diff --git a/lang/ruby19-base/Makefile b/lang/ruby19-base/Makefile
index 03290a43fb2..dd28e3fe1c5 100644
--- a/lang/ruby19-base/Makefile
+++ b/lang/ruby19-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2012/01/24 20:41:51 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2012/02/23 14:15:58 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
-PKGREVISION=	6
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 #PKGREVISION=
diff --git a/lang/ruby19-base/distinfo b/lang/ruby19-base/distinfo
index 30948ae631f..6a2f8ecddce 100644
--- a/lang/ruby19-base/distinfo
+++ b/lang/ruby19-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2012/01/24 20:41:51 joerg Exp $
+$NetBSD: distinfo,v 1.11 2012/02/23 14:15:58 taca Exp $
 
-SHA1 (ruby-1.9.2-p290.tar.bz2) = 8f25a74f50a10fdd9724e3c74ccd7bae596e198b
-RMD160 (ruby-1.9.2-p290.tar.bz2) = 9722a91445fa81a101a2a8ab5753780c4601cc5a
-Size (ruby-1.9.2-p290.tar.bz2) = 8811237 bytes
+SHA1 (ruby-1.9.2-p318.tar.bz2) = c66c124bd038271b9593ff839c1979d8a859a3f0
+RMD160 (ruby-1.9.2-p318.tar.bz2) = aa548763207907fdf75e670e3ff21912387e4057
+Size (ruby-1.9.2-p318.tar.bz2) = 8810015 bytes
 SHA1 (patch-aa) = b54c275b76302feaceadde71d0deec1749c50254
 SHA1 (patch-ab) = 8924a50b312b9b660f4460a65d4887e17ebb1976
 SHA1 (patch-ac) = c076c99eb886842dc5ac546e1105b7ef2a3edd68
@@ -21,7 +21,7 @@ SHA1 (patch-ao) = 90789a3e4cfa020a503fda61406883c9e3a26772
 SHA1 (patch-ap) = 1fdb7563c1ee43466f47a2a98bbdc6a242a84f0f
 SHA1 (patch-aq) = 740e5231beaa1e42f464f2ec7b52c3ed69bb5f39
 SHA1 (patch-ar) = 8a4b8ae18f9bdafc1bfbbd9ec62d18caf890571e
-SHA1 (patch-as) = 2005d2b5ca10d79188e8615383b881d5c9dfb616
+SHA1 (patch-as) = 8300fb5727d505f322a874c28fa71902f71d031b
 SHA1 (patch-at) = 532eebfda565d78b9d7ab572b7d8539933e431a3
 SHA1 (patch-au) = 45073c6d3461ee181e89228beb088d161af3d735
 SHA1 (patch-lib_rubygems_require__paths__builder.rb) = 90c2fb05a07934f74e39995380d08cc81c81aaaf
diff --git a/lang/ruby19-base/patches/patch-as b/lang/ruby19-base/patches/patch-as
index 91b0ff03980..66a48e2b345 100644
--- a/lang/ruby19-base/patches/patch-as
+++ b/lang/ruby19-base/patches/patch-as
@@ -1,10 +1,8 @@
-$NetBSD: patch-as,v 1.2 2011/02/07 11:15:28 taca Exp $
+$NetBSD: patch-as,v 1.3 2012/02/23 14:15:58 taca Exp $
 
 * Handle 64bit size of time_t.
-* On FreeBSD and DragonFly PTHREAD_STACK_MIN is too small. Taken from
-  FreeBSD ports
 
---- thread_pthread.c.orig	2010-07-22 13:13:57.000000000 +0000
+--- thread_pthread.c.orig	2012-02-13 15:29:27.000000000 +0000
 +++ thread_pthread.c
 @@ -17,6 +17,12 @@
  #include <sys/resource.h>
@@ -19,7 +17,7 @@ $NetBSD: patch-as,v 1.2 2011/02/07 11:15:28 taca Exp $
  static void native_mutex_lock(pthread_mutex_t *lock);
  static void native_mutex_unlock(pthread_mutex_t *lock);
  static int native_mutex_trylock(pthread_mutex_t *lock);
-@@ -620,7 +626,7 @@ native_sleep(rb_thread_t *th, struct tim
+@@ -645,7 +651,7 @@ native_sleep(rb_thread_t *th, struct tim
  	}
      }
  
@@ -28,7 +26,7 @@ $NetBSD: patch-as,v 1.2 2011/02/07 11:15:28 taca Exp $
      GVL_UNLOCK_BEGIN();
      {
  	pthread_mutex_lock(&th->interrupt_lock);
-@@ -642,8 +648,8 @@ native_sleep(rb_thread_t *th, struct tim
+@@ -667,8 +673,8 @@ native_sleep(rb_thread_t *th, struct tim
  	    }
  	    else {
  		int r;
@@ -39,12 +37,3 @@ $NetBSD: patch-as,v 1.2 2011/02/07 11:15:28 taca Exp $
  		r = pthread_cond_timedwait(&th->native_thread_data.sleep_cond,
  					   &th->interrupt_lock, &ts);
  		if (r && r != ETIMEDOUT) rb_bug_errno("pthread_cond_timedwait", r);
-@@ -822,7 +828,7 @@
- 	int err;
- 
- 	pthread_attr_init(&attr);
--#ifdef PTHREAD_STACK_MIN
-+#if defined(PTHREAD_STACK_MIN) && !defined(__FreeBSD__) && !defined(__DragonFly__)
- 	pthread_attr_setstacksize(&attr,
- 				  PTHREAD_STACK_MIN + (THREAD_DEBUG ? BUFSIZ : 0));
- #endif