Wed Oct 10 10:27:48 2012 UTC ()
Pullup ticket #3939 - requested by taca
lang/ruby193-base: security patch

Revisions pulled up:
- lang/ruby193-base/Makefile                                    1.18-1.19
- lang/ruby193-base/distinfo                                    1.9-1.10
- lang/ruby193-base/patches/patch-error.c                       1.1-1.2

---
   Module Name:	pkgsrc
   Committed By:	asau
   Date:		Tue Oct  2 20:11:57 UTC 2012

   Modified Files:
   	pkgsrc/lang/ruby193-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:20:35 UTC 2012

   Modified Files:
   	pkgsrc/lang/ruby193-base: Makefile distinfo
   Added Files:
   	pkgsrc/lang/ruby193-base/patches: patch-error.c

   Log Message:
   Add a patch to fix CVE-2011-1005 security problem which found out that
   it affected Ruby 1.9.x, too.

   Now it

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sat Oct  6 16:27:54 UTC 2012

   Modified Files:
   	pkgsrc/lang/ruby193-base: distinfo
   	pkgsrc/lang/ruby193-base/patches: patch-error.c

   Log Message:
   Add short note to patches/patch-error.c about CVE-2012-4464 and CVE-2012-4466.


(tron)
diff -r1.17 -r1.17.2.1 pkgsrc/lang/ruby193-base/Makefile
diff -r1.8 -r1.8.2.1 pkgsrc/lang/ruby193-base/distinfo
diff -r0 -r1.2.2.2 pkgsrc/lang/ruby193-base/patches/patch-error.c
cvs diff -r1.17 -r1.17.2.1 pkgsrc/lang/ruby193-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby193-base/Attic/Makefile 2012/09/22 11:43:28 1.17
+++ pkgsrc/lang/ruby193-base/Attic/Makefile 2012/10/10 10:27:48 1.17.2.1
@@ -1,32 +1,30 @@ @@ -1,32 +1,30 @@
1# $NetBSD: Makefile,v 1.17 2012/09/22 11:43:28 obache Exp $ 1# $NetBSD: Makefile,v 1.17.2.1 2012/10/10 10:27:48 tron Exp $
2# 2#
3 3
4DISTNAME= ${RUBY_DISTNAME} 4DISTNAME= ${RUBY_DISTNAME}
5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} 5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
6PKGREVISION= 2 6PKGREVISION= 3
7CATEGORIES= lang ruby 7CATEGORIES= lang ruby
8MASTER_SITES= ${MASTER_SITE_RUBY} 8MASTER_SITES= ${MASTER_SITE_RUBY}
9DIST_SUBDIR= ruby193-base-201202170 9DIST_SUBDIR= ruby193-base-201202170
10 10
11MAINTAINER= taca@NetBSD.org 11MAINTAINER= taca@NetBSD.org
12HOMEPAGE= ${RUBY_HOMEPAGE} 12HOMEPAGE= ${RUBY_HOMEPAGE}
13COMMENT= Ruby ${RUBY_VERSION} release minimum base package 13COMMENT= Ruby ${RUBY_VERSION} release minimum base package
14LICENSE= ${RUBY_LICENSE} 14LICENSE= ${RUBY_LICENSE}
15 15
16RUBY_VERSION_SUPPORTED= 193 16RUBY_VERSION_SUPPORTED= 193
17 17
18PKG_DESTDIR_SUPPORT= user-destdir 
19 
20MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no
21USE_LANGUAGES= c 19USE_LANGUAGES= c
22USE_TOOLS+= pax yacc 20USE_TOOLS+= pax yacc
23GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
24TEST_TARGET= test 22TEST_TARGET= test
25CONFIGURE_ARGS+= --enable-shared 23CONFIGURE_ARGS+= --enable-shared
26WRKSRC= ${RUBY_WRKSRC} 24WRKSRC= ${RUBY_WRKSRC}
27 25
28MAKE_DIRS= ${RUBY_SITEARCHLIB} ${RUBY_VENDORARCHLIB} 26MAKE_DIRS= ${RUBY_SITEARCHLIB} ${RUBY_VENDORARCHLIB}
29 27
30# 28#
31# Don't refrect pkgsrc's INSTALL macro since Ruby expect it could 29# Don't refrect pkgsrc's INSTALL macro since Ruby expect it could
32# execute by unprivileged user. 30# execute by unprivileged user.
cvs diff -r1.8 -r1.8.2.1 pkgsrc/lang/ruby193-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby193-base/Attic/distinfo 2012/07/25 14:26:57 1.8
+++ pkgsrc/lang/ruby193-base/Attic/distinfo 2012/10/10 10:27:48 1.8.2.1
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1$NetBSD: distinfo,v 1.8 2012/07/25 14:26:57 bsiegert Exp $ 1$NetBSD: distinfo,v 1.8.2.1 2012/10/10 10:27:48 tron Exp $
2 2
3SHA1 (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = afb497dc10ea3d83ecbe3ccd9ed45fba1457721c 3SHA1 (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = afb497dc10ea3d83ecbe3ccd9ed45fba1457721c
4RMD160 (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = bca45d750cfd8523e838903c8693749652960d60 4RMD160 (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = bca45d750cfd8523e838903c8693749652960d60
5Size (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = 9841223 bytes 5Size (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = 9841223 bytes
6SHA1 (patch-configure) = 3ab88504dda0c244b6c58dc42778d9a63f1e4d23 6SHA1 (patch-configure) = 3ab88504dda0c244b6c58dc42778d9a63f1e4d23
7SHA1 (patch-configure.in) = f743324dda92bd4c490a7214f4822b4cc9a4c5dc 7SHA1 (patch-configure.in) = f743324dda92bd4c490a7214f4822b4cc9a4c5dc
8SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5 8SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
 9SHA1 (patch-error.c) = c825fc775fa28acfd9f965d2d801389e3ea42922
9SHA1 (patch-lib_mkmf.rb) = a4547a4bcbf1f533e264578c455ef1c7e6c9aa74 10SHA1 (patch-lib_mkmf.rb) = a4547a4bcbf1f533e264578c455ef1c7e6c9aa74
10SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8 11SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
11SHA1 (patch-lib_rubygems.rb) = cc02e3a296d88605ef8444d64ca805ddebb524c6 12SHA1 (patch-lib_rubygems.rb) = cc02e3a296d88605ef8444d64ca805ddebb524c6
12SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3 13SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3
13SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 85b666544fc0787e67bb54071d8660cbfe3015d6 14SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 85b666544fc0787e67bb54071d8660cbfe3015d6
14SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 7d8dd07d332f0e89822d06f2d71e7552358107cc 15SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 7d8dd07d332f0e89822d06f2d71e7552358107cc
15SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = b8e18f1feedb7966e2a5280d6020c6134a7d83a3 16SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = b8e18f1feedb7966e2a5280d6020c6134a7d83a3
16SHA1 (patch-lib_rubygems_config__file.rb) = ed4ff25ea89a2d13ee601c7edfda0902f08fe29c 17SHA1 (patch-lib_rubygems_config__file.rb) = ed4ff25ea89a2d13ee601c7edfda0902f08fe29c
17SHA1 (patch-lib_rubygems_defaults.rb) = 101a6e653ef3811cdda3ed333b50448c0d3f0d26 18SHA1 (patch-lib_rubygems_defaults.rb) = 101a6e653ef3811cdda3ed333b50448c0d3f0d26
18SHA1 (patch-lib_rubygems_dependency__installer.rb) = 572775dd430619f93168732ad312d06819b6f1d7 19SHA1 (patch-lib_rubygems_dependency__installer.rb) = 572775dd430619f93168732ad312d06819b6f1d7
19SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc742d3 20SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc742d3
20SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180 21SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180
21SHA1 (patch-lib_rubygems_installer.rb) = cec82bd0c5255a2a23799273c7a2835e2bef7e33 22SHA1 (patch-lib_rubygems_installer.rb) = cec82bd0c5255a2a23799273c7a2835e2bef7e33
File Added: pkgsrc/lang/ruby193-base/patches/Attic/patch-error.c
$NetBSD$

Fix for CVE-2011-1005 which turned out affected to Ruby 1.9.3  from
Ruby's repository r37068.  Now it assigned CVE-2012-4464 and CVE-2012-4466.

--- error.c.orig	2012-02-25 12:32:19.000000000 +0000
+++ error.c
@@ -569,7 +569,6 @@ exc_to_s(VALUE exc)
 
     if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
     r = rb_String(mesg);
-    OBJ_INFECT(r, exc);
     return r;
 }
 
@@ -853,11 +852,7 @@ name_err_to_s(VALUE exc)
 
     if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
     StringValue(str);
-    if (str != mesg) {
-	rb_iv_set(exc, "mesg", mesg = str);
-    }
-    OBJ_INFECT(mesg, exc);
-    return mesg;
+    return str;
 }
 
 /*
@@ -988,7 +983,6 @@ name_err_mesg_to_str(VALUE obj)
 	args[2] = d;
 	mesg = rb_f_sprintf(NAME_ERR_MESG_COUNT, args);
     }
-    OBJ_INFECT(mesg, obj);
     return mesg;
 }