Wed Oct 10 12:13:08 2012 UTC ()
Pullup ticket #3940 - requested by taca
lang/ruby18-base: security patch
Revisions pulled up:
- lang/ruby18-base/Makefile 1.74-1.75
- lang/ruby18-base/distinfo 1.57
- lang/ruby18-base/patches/patch-error.c 1.1
---
Module Name: pkgsrc
Committed By: asau
Date: Tue Oct 2 20:11:57 UTC 2012
Modified Files:
pkgsrc/lang/ruby18-base: Makefile
Log Message:
Drop superfluous PKG_DESTDIR_SUPPORT, "user-destdir" is default these days.
---
Module Name: pkgsrc
Committed By: taca
Date: Sat Oct 6 16:30:29 UTC 2012
Modified Files:
pkgsrc/lang/ruby18-base: Makefile distinfo
Added Files:
pkgsrc/lang/ruby18-base/patches: patch-error.c
Log Message:
Add additional fix to CVE-2011-1005 from discuttion on oss-security
mailing list.
Bump PKGREVISION.
(tron)
diff -r1.73 -r1.73.2.1 pkgsrc/lang/ruby18-base/Makefile
diff -r1.56 -r1.56.2.1 pkgsrc/lang/ruby18-base/distinfo
diff -r0 -r1.1.2.2 pkgsrc/lang/ruby18-base/patches/patch-error.c
--- pkgsrc/lang/ruby18-base/Attic/Makefile 2012/09/14 15:56:23 1.73
+++ pkgsrc/lang/ruby18-base/Attic/Makefile 2012/10/10 12:13:08 1.73.2.1
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.73 2012/09/14 15:56:23 taca Exp $
+# $NetBSD: Makefile,v 1.73.2.1 2012/10/10 12:13:08 tron Exp $
#
DISTNAME= ${RUBY_DISTNAME}
PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
@@ -19,8 +19,6 @@
${RUBY_PKGPREFIX}-iconv-[0-9]* \
${RUBY_PKGPREFIX}-openssl-[0-9]* \
${RUBY_PKGPREFIX}-tcltk-[0-9]*
-
-PKG_DESTDIR_SUPPORT= user-destdir
USE_LANGUAGES= c
USE_TOOLS+= pax yacc
--- pkgsrc/lang/ruby18-base/Attic/distinfo 2012/09/14 16:34:09 1.56
+++ pkgsrc/lang/ruby18-base/Attic/distinfo 2012/10/10 12:13:08 1.56.2.1
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2012/09/14 16:34:09 taca Exp $
+$NetBSD: distinfo,v 1.56.2.1 2012/10/10 12:13:08 tron 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-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
$NetBSD: patch-error.c,v 1.1.2.2 2012/10/10 12:13:08 tron 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;
}