This updates ruby 1.8 to the latest patch level release, and just
contains some bugfixes.  For there differences between the versions,
see https://github.com/ruby/ruby/compare/v1_8_7_358...v1_8_7_370

One of our local patches that backported a security fix is being
removed, as it was reverted upstream:
https://github.com/ruby/ruby/commit/15fbb87b594a47ed622829cfdd6891eb97ea4726

Tested on i386 and amd64.  Would like to get some OKs for this, but I
still plan to commit early next week.

Thanks,
Jeremy

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ruby/1.8/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile    30 Mar 2012 19:03:24 -0000      1.23
+++ Makefile    29 Jun 2012 14:54:30 -0000
@@ -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}
@@ -15,8 +15,6 @@ PKGNAME-iconv=                ruby-iconv-${VERSION}.${
 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
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/ruby/1.8/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo    28 Feb 2012 00:17:17 -0000      1.6
+++ distinfo    29 Jun 2012 14:55:29 -0000
@@ -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
Index: patches/patch-ext_bigdecimal_bigdecimal_c
===================================================================
RCS file: patches/patch-ext_bigdecimal_bigdecimal_c
diff -N patches/patch-ext_bigdecimal_bigdecimal_c
--- patches/patch-ext_bigdecimal_bigdecimal_c   25 May 2011 18:20:43 -0000      
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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);
-     }

Reply via email to