diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby18-base/Makefile | 4 | ||||
| -rw-r--r-- | lang/ruby18-base/distinfo | 3 | ||||
| -rw-r--r-- | lang/ruby18-base/patches/patch-error.c | 16 |
3 files changed, 20 insertions, 3 deletions
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile index fd7b2dcf7da..dbf02333302 100644 --- a/lang/ruby18-base/Makefile +++ b/lang/ruby18-base/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.74 2012/10/02 20:11:52 asau Exp $ +# $NetBSD: Makefile,v 1.75 2012/10/06 16:30:28 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo index f10b68eed57..d2e0f850d3a 100644 --- a/lang/ruby18-base/distinfo +++ b/lang/ruby18-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.56 2012/09/14 16:34:09 taca Exp $ +$NetBSD: distinfo,v 1.57 2012/10/06 16:30:28 taca Exp $ SHA1 (ruby-1.8.7-p370.tar.bz2) = 92770a8159cd9049ffc5bc3ce4777b701eb19d7b RMD160 (ruby-1.8.7-p370.tar.bz2) = 0c35ed92e4e77c6e6859d39244489c93f4efad50 @@ -41,6 +41,7 @@ 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 new file mode 100644 index 00000000000..de32ebbf8f7 --- /dev/null +++ b/lang/ruby18-base/patches/patch-error.c @@ -0,0 +1,16 @@ +$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; + } + |