From 88c8137132a8ee551fc18d53a5b496b7bc0e1ceb Mon Sep 17 00:00:00 2001
From: jeremy <jeremy@openbsd.org>
Date: Tue, 3 Jul 2012 19:58:39 +0000
Subject: [PATCH] Update to ruby 1.8.7-p370.

One of our local patches for a security fix was applied upstream, so
remove that patch.
---
 lang/ruby/1.8/Makefile                        |  6 ++----
 lang/ruby/1.8/distinfo                        | 10 +++++-----
 .../patches/patch-ext_bigdecimal_bigdecimal_c | 19 -------------------
 3 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 lang/ruby/1.8/patches/patch-ext_bigdecimal_bigdecimal_c

diff --git a/lang/ruby/1.8/Makefile b/lang/ruby/1.8/Makefile
index bbffe55a1e4..43e6cf38fa1 100644
--- a/lang/ruby/1.8/Makefile
+++ b/lang/ruby/1.8/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2012/03/30 19:03:24 phessler Exp $
+# $OpenBSD: Makefile,v 1.24 2012/07/03 19:58:39 jeremy Exp $
 
 COMMENT-main=		object oriented script language with threads
 COMMENT-iconv=		libiconv interface for ruby
@@ -7,7 +7,7 @@ COMMENT-tk=		tk interface for ruby
 COMMENT-ri_docs=	ri documentation files ruby
 
 VERSION=		1.8.7
-PATCHLEVEL=		358
+PATCHLEVEL=		370
 
 SHARED_LIBS=		ruby18 0.0
 PKGNAME-main=		ruby-${VERSION}.${PATCHLEVEL}
@@ -16,8 +16,6 @@ PKGNAME-gdbm=		ruby-gdbm-${VERSION}.${PATCHLEVEL}
 PKGNAME-tk=		ruby-tk-${VERSION}.${PATCHLEVEL}
 PKGNAME-ri_docs=	ruby-ri_docs-${VERSION}.${PATCHLEVEL}
 
-REVISION-main=		0
-
 PKG_ARCH-ri_docs=	*
 PKGSPEC-main=		ruby->=1.8,<1.9
 
diff --git a/lang/ruby/1.8/distinfo b/lang/ruby/1.8/distinfo
index c4902528bdd..55115574a73 100644
--- a/lang/ruby/1.8/distinfo
+++ b/lang/ruby/1.8/distinfo
@@ -1,5 +1,5 @@
-MD5 (ruby-1.8.7-p358.tar.gz) = Jr1VNYhHRZp3Uqzb0zpTXw==
-RMD160 (ruby-1.8.7-p358.tar.gz) = T/G3td47cV0IGIo8dv1m0HQBsgQ=
-SHA1 (ruby-1.8.7-p358.tar.gz) = ogpm7G19fOE7YhlBoODIxSQLWEo=
-SHA256 (ruby-1.8.7-p358.tar.gz) = nghW1Ygw4I8eOCM5R9hZiYrgnUeAyxpQIQjkEwjeM8s=
-SIZE (ruby-1.8.7-p358.tar.gz) = 4895206
+MD5 (ruby-1.8.7-p370.tar.gz) = mLALvRzd4xFhVe225VW3gQ==
+RMD160 (ruby-1.8.7-p370.tar.gz) = dtLpYn+11oui0FqRpFspvpqRzR8=
+SHA1 (ruby-1.8.7-p370.tar.gz) = /8VzYBnJqmkqBe2Vr3/pdq+z2hM=
+SHA256 (ruby-1.8.7-p370.tar.gz) = vNjbR6329eOCK2CgR4Xu2xuX1B+9fLWV0CdZ+qNlgcY=
+SIZE (ruby-1.8.7-p370.tar.gz) = 4897464
diff --git a/lang/ruby/1.8/patches/patch-ext_bigdecimal_bigdecimal_c b/lang/ruby/1.8/patches/patch-ext_bigdecimal_bigdecimal_c
deleted file mode 100644
index 815cf3880d5..00000000000
--- a/lang/ruby/1.8/patches/patch-ext_bigdecimal_bigdecimal_c
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-ext_bigdecimal_bigdecimal_c,v 1.1 2011/05/25 18:20:43 jasper Exp $
-
-Security fix for CVE-2011-0188
-Ruby BigDecimal Integer Truncation Vulnerability
-
-Fix from upstream svn:
-http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=30993
-
---- ext/bigdecimal/bigdecimal.c.orig	Wed May 25 19:46:25 2011
-+++ ext/bigdecimal/bigdecimal.c	Wed May 25 19:47:42 2011
-@@ -2032,7 +2032,7 @@ static int gnAlloc=0; /* Memory allocation counter */
- VP_EXPORT void *
- VpMemAlloc(U_LONG mb)
- {
--    void *p = xmalloc((unsigned int)mb);
-+    void *p = xmalloc(mb);
-     if(!p) {
-         VpException(VP_EXCEPTION_MEMORY,"failed to allocate memory",1);
-     }