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
cvs diff -r1.73 -r1.73.2.1 pkgsrc/lang/ruby18-base/Attic/Makefile (expand / switch to unified diff)

--- 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,37 +1,35 @@ @@ -1,37 +1,35 @@
1# $NetBSD: Makefile,v 1.73 2012/09/14 15:56:23 taca Exp $ 1# $NetBSD: Makefile,v 1.73.2.1 2012/10/10 12:13:08 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= 1 6PKGREVISION= 2
7CATEGORIES= lang ruby 7CATEGORIES= lang ruby
8MASTER_SITES= ${MASTER_SITE_RUBY} 8MASTER_SITES= ${MASTER_SITE_RUBY}
9 9
10MAINTAINER= taca@NetBSD.org 10MAINTAINER= taca@NetBSD.org
11HOMEPAGE= ${RUBY_HOMEPAGE} 11HOMEPAGE= ${RUBY_HOMEPAGE}
12COMMENT= Ruby 1.8 based release minimum package 12COMMENT= Ruby 1.8 based release minimum package
13LICENSE= gnu-gpl-v2 OR ruby-license 13LICENSE= gnu-gpl-v2 OR ruby-license
14 14
15RUBY_VERSION_SUPPORTED= 18 15RUBY_VERSION_SUPPORTED= 18
16 16
17CONFLICTS= ${RUBY_PKGPREFIX}-dbm-[0-9]* \ 17CONFLICTS= ${RUBY_PKGPREFIX}-dbm-[0-9]* \
18 ${RUBY_PKGPREFIX}-digest-[0-9]* \ 18 ${RUBY_PKGPREFIX}-digest-[0-9]* \
19 ${RUBY_PKGPREFIX}-iconv-[0-9]* \ 19 ${RUBY_PKGPREFIX}-iconv-[0-9]* \
20 ${RUBY_PKGPREFIX}-openssl-[0-9]* \ 20 ${RUBY_PKGPREFIX}-openssl-[0-9]* \
21 ${RUBY_PKGPREFIX}-tcltk-[0-9]* 21 ${RUBY_PKGPREFIX}-tcltk-[0-9]*
22 22
23PKG_DESTDIR_SUPPORT= user-destdir 
24 
25USE_LANGUAGES= c 23USE_LANGUAGES= c
26USE_TOOLS+= pax yacc 24USE_TOOLS+= pax yacc
27GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
28TEST_TARGET= test 26TEST_TARGET= test
29CONFIGURE_ARGS+= --enable-shared \ 27CONFIGURE_ARGS+= --enable-shared \
30 --with-ssl-include="${BUILDLINK_PREFIX.openssl}/include" \ 28 --with-ssl-include="${BUILDLINK_PREFIX.openssl}/include" \
31 --with-ssl-lib="${BUILDLINK_PREFIX.openssl}/lib" 29 --with-ssl-lib="${BUILDLINK_PREFIX.openssl}/lib"
32WRKSRC= ${RUBY_WRKSRC} 30WRKSRC= ${RUBY_WRKSRC}
33 31
34# 32#
35# Don't refrect pkgsrc's INSTALL macro since Ruby expect it could 33# Don't refrect pkgsrc's INSTALL macro since Ruby expect it could
36# execute by unprivileged user. 34# execute by unprivileged user.
37# 35#
cvs diff -r1.56 -r1.56.2.1 pkgsrc/lang/ruby18-base/Attic/distinfo (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.56 2012/09/14 16:34:09 taca Exp $ 1$NetBSD: distinfo,v 1.56.2.1 2012/10/10 12:13:08 tron Exp $
2 2
3SHA1 (ruby-1.8.7-p370.tar.bz2) = 92770a8159cd9049ffc5bc3ce4777b701eb19d7b 3SHA1 (ruby-1.8.7-p370.tar.bz2) = 92770a8159cd9049ffc5bc3ce4777b701eb19d7b
4RMD160 (ruby-1.8.7-p370.tar.bz2) = 0c35ed92e4e77c6e6859d39244489c93f4efad50 4RMD160 (ruby-1.8.7-p370.tar.bz2) = 0c35ed92e4e77c6e6859d39244489c93f4efad50
5Size (ruby-1.8.7-p370.tar.bz2) = 4211597 bytes 5Size (ruby-1.8.7-p370.tar.bz2) = 4211597 bytes
6SHA1 (patch-aa) = 9f0ffa6fd0bcf2f59eba2604d2b6a4aaad075231 6SHA1 (patch-aa) = 9f0ffa6fd0bcf2f59eba2604d2b6a4aaad075231
7SHA1 (patch-ab) = 1466b6179cb6ac3a8ee3255eab98a1d3065a12ed 7SHA1 (patch-ab) = 1466b6179cb6ac3a8ee3255eab98a1d3065a12ed
8SHA1 (patch-ac) = 0119134d778bb85c58ef5bfe30d337dc76ed47e0 8SHA1 (patch-ac) = 0119134d778bb85c58ef5bfe30d337dc76ed47e0
9SHA1 (patch-ad) = 2b194a26f3a7b9bdf3afcc0819ab239479f47c5b 9SHA1 (patch-ad) = 2b194a26f3a7b9bdf3afcc0819ab239479f47c5b
10SHA1 (patch-aw) = d3dc491da64426ff72a9417a65eb99bee2d21044 10SHA1 (patch-aw) = d3dc491da64426ff72a9417a65eb99bee2d21044
11SHA1 (patch-az) = 55c9cba404add5293168ae7fae7ae7aaf4df6550 11SHA1 (patch-az) = 55c9cba404add5293168ae7fae7ae7aaf4df6550
12SHA1 (patch-bd) = 4bdf2230fd8a6ea21f28150ba5705ebd0db4af99 12SHA1 (patch-bd) = 4bdf2230fd8a6ea21f28150ba5705ebd0db4af99
13SHA1 (patch-be) = 2286b14b5992686481d1d7a964c43cfc72118a45 13SHA1 (patch-be) = 2286b14b5992686481d1d7a964c43cfc72118a45
14SHA1 (patch-dj) = 9d67b57daf6111361c478481f39ee8764a861106 14SHA1 (patch-dj) = 9d67b57daf6111361c478481f39ee8764a861106
@@ -31,21 +31,22 @@ SHA1 (patch-ee) = 8240954e7f07d94bd3e87a @@ -31,21 +31,22 @@ SHA1 (patch-ee) = 8240954e7f07d94bd3e87a
31SHA1 (patch-ef) = ffc28b86ddce44483fcb7967fdc9a4483b61e0a0 31SHA1 (patch-ef) = ffc28b86ddce44483fcb7967fdc9a4483b61e0a0
32SHA1 (patch-eg) = 12e5fdc31adfc578cdbc3efec5b3d6fae58ad767 32SHA1 (patch-eg) = 12e5fdc31adfc578cdbc3efec5b3d6fae58ad767
33SHA1 (patch-eh) = a6ff0e0baaf03b5bde8c98a91220dfbf4c08fc61 33SHA1 (patch-eh) = a6ff0e0baaf03b5bde8c98a91220dfbf4c08fc61
34SHA1 (patch-ei) = 95c921cecd9a6d5d4557066d2a160276a37634b0 34SHA1 (patch-ei) = 95c921cecd9a6d5d4557066d2a160276a37634b0
35SHA1 (patch-ej) = c8f2c5dbf2ba463d852b94fecf6014bb5ef1e3f8 35SHA1 (patch-ej) = c8f2c5dbf2ba463d852b94fecf6014bb5ef1e3f8
36SHA1 (patch-ek) = a5de28017bc57d4e01ec986b6a5602cba2b75670 36SHA1 (patch-ek) = a5de28017bc57d4e01ec986b6a5602cba2b75670
37SHA1 (patch-el) = c071250196cff37c413e724ce4fc149b920e6dde 37SHA1 (patch-el) = c071250196cff37c413e724ce4fc149b920e6dde
38SHA1 (patch-em) = 13ccef1c981c9bf312a104c9eb0a9e2339f38461 38SHA1 (patch-em) = 13ccef1c981c9bf312a104c9eb0a9e2339f38461
39SHA1 (patch-en) = 5f92c80c321149055b962a4c2ba97105c00706e2 39SHA1 (patch-en) = 5f92c80c321149055b962a4c2ba97105c00706e2
40SHA1 (patch-eo) = 41a1ff4e1037415eb50373eff64322f6e1423e27 40SHA1 (patch-eo) = 41a1ff4e1037415eb50373eff64322f6e1423e27
41SHA1 (patch-ep) = f881aece8ec0836c75df3be567d57ffc3ad8bce1 41SHA1 (patch-ep) = f881aece8ec0836c75df3be567d57ffc3ad8bce1
42SHA1 (patch-eq) = d9dfa070d1f12de4f5f48f07d5a32d649035a657 42SHA1 (patch-eq) = d9dfa070d1f12de4f5f48f07d5a32d649035a657
43SHA1 (patch-er) = 666fc6c22544c7f74f7c17ffef30563effcb4df7 43SHA1 (patch-er) = 666fc6c22544c7f74f7c17ffef30563effcb4df7
 44SHA1 (patch-error.c) = b756a8f7c3368a296715d035d544657e8f832ada
44SHA1 (patch-et) = eba90415e5279c9eb8bea67635f5f8cab5d1e7ac 45SHA1 (patch-et) = eba90415e5279c9eb8bea67635f5f8cab5d1e7ac
45SHA1 (patch-eu) = dbf65258dcdc619d220ab39864389c4ec4c5c625 46SHA1 (patch-eu) = dbf65258dcdc619d220ab39864389c4ec4c5c625
46SHA1 (patch-ev) = 6178be681ca1cf2647cab9a61c8ef989ff5b23cb 47SHA1 (patch-ev) = 6178be681ca1cf2647cab9a61c8ef989ff5b23cb
47SHA1 (patch-ew) = 3f23697dddbb11a10d1f0c3e47fb602822ecd11f 48SHA1 (patch-ew) = 3f23697dddbb11a10d1f0c3e47fb602822ecd11f
48SHA1 (patch-ga) = 73f50504baf74ee77d00dcfb5a9446bbaf122726 49SHA1 (patch-ga) = 73f50504baf74ee77d00dcfb5a9446bbaf122726
49SHA1 (patch-gb) = 345ad3e5df6fd9febe7b398f091662fd7c300dc4 50SHA1 (patch-gb) = 345ad3e5df6fd9febe7b398f091662fd7c300dc4
50SHA1 (patch-lib_rdoc_options.rb) = 0f14417733ad6fc6fbc93af1c8463ecd59abce7c 51SHA1 (patch-lib_rdoc_options.rb) = 0f14417733ad6fc6fbc93af1c8463ecd59abce7c
51SHA1 (patch-lib_rdoc_rdoc.rb) = bef895245cc06ca84fd1e5d506c3c65932921b3a 52SHA1 (patch-lib_rdoc_rdoc.rb) = bef895245cc06ca84fd1e5d506c3c65932921b3a
File Added: pkgsrc/lang/ruby18-base/patches/Attic/patch-error.c
$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;
 }