diff options
| -rw-r--r-- | lang/ruby/rubyversion.mk | 4 | ||||
| -rw-r--r-- | lang/ruby18-base/Makefile | 3 | ||||
| -rw-r--r-- | lang/ruby18-base/distinfo | 9 | ||||
| -rw-r--r-- | lang/ruby18-base/patches/patch-error.c | 16 |
4 files changed, 7 insertions, 25 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 8758ec5f985..9a3d18ff677 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.90 2012/10/12 14:51:31 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.91 2012/10/12 15:27:48 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -205,7 +205,7 @@ RUBY18_VERSION= 1.8.7 RUBY193_VERSION= 1.9.3 # patch -RUBY18_PATCHLEVEL= pl370 +RUBY18_PATCHLEVEL= pl371 RUBY193_PATCHLEVEL= p286 # current API compatible version; used for version of shared library diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile index dbf02333302..761d7ad744f 100644 --- a/lang/ruby18-base/Makefile +++ b/lang/ruby18-base/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.75 2012/10/06 16:30:28 taca Exp $ +# $NetBSD: Makefile,v 1.76 2012/10/12 15:27:48 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/ruby18-base/distinfo b/lang/ruby18-base/distinfo index d2e0f850d3a..73d03325b0b 100644 --- a/lang/ruby18-base/distinfo +++ b/lang/ruby18-base/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.57 2012/10/06 16:30:28 taca Exp $ +$NetBSD: distinfo,v 1.58 2012/10/12 15:27:48 taca Exp $ -SHA1 (ruby-1.8.7-p370.tar.bz2) = 92770a8159cd9049ffc5bc3ce4777b701eb19d7b -RMD160 (ruby-1.8.7-p370.tar.bz2) = 0c35ed92e4e77c6e6859d39244489c93f4efad50 -Size (ruby-1.8.7-p370.tar.bz2) = 4211597 bytes +SHA1 (ruby-1.8.7-p371.tar.bz2) = 2a709358417330cfacba6b9f8206eab577640b2b +RMD160 (ruby-1.8.7-p371.tar.bz2) = ad1da5b8b8e818d6a77b70ab81586a37099cbac0 +Size (ruby-1.8.7-p371.tar.bz2) = 4248262 bytes SHA1 (patch-aa) = 9f0ffa6fd0bcf2f59eba2604d2b6a4aaad075231 SHA1 (patch-ab) = 1466b6179cb6ac3a8ee3255eab98a1d3065a12ed SHA1 (patch-ac) = 0119134d778bb85c58ef5bfe30d337dc76ed47e0 @@ -41,7 +41,6 @@ SHA1 (patch-eo) = 41a1ff4e1037415eb50373eff64322f6e1423e27 SHA1 (patch-ep) = f881aece8ec0836c75df3be567d57ffc3ad8bce1 SHA1 (patch-eq) = d9dfa070d1f12de4f5f48f07d5a32d649035a657 SHA1 (patch-er) = 666fc6c22544c7f74f7c17ffef30563effcb4df7 -SHA1 (patch-error.c) = b756a8f7c3368a296715d035d544657e8f832ada SHA1 (patch-et) = eba90415e5279c9eb8bea67635f5f8cab5d1e7ac SHA1 (patch-eu) = dbf65258dcdc619d220ab39864389c4ec4c5c625 SHA1 (patch-ev) = 6178be681ca1cf2647cab9a61c8ef989ff5b23cb diff --git a/lang/ruby18-base/patches/patch-error.c b/lang/ruby18-base/patches/patch-error.c deleted file mode 100644 index de32ebbf8f7..00000000000 --- a/lang/ruby18-base/patches/patch-error.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-error.c,v 1.1 2012/10/06 16:30:28 taca Exp $ - -More fix to CVE-2011-1005 from discuttion on oss-security mailing list. - ---- error.c.orig 2011-02-18 12:32:35.000000000 +0000 -+++ error.c -@@ -665,9 +665,6 @@ name_err_to_s(exc) - - if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc)); - StringValue(str); -- if (str != mesg) { -- OBJ_INFECT(str, mesg); -- } - return str; - } - |