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 (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,170 +1,168 @@ @@ -1,170 +1,168 @@
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#
38CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \ 36CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \
39 INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT= 37 INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT=
40 38
41.include "../../mk/compiler.mk" 39.include "../../mk/compiler.mk"
42 40
43.if !empty(PKGSRC_COMPILER:Msunpro) 41.if !empty(PKGSRC_COMPILER:Msunpro)
44LIBS.SunOS+= -B static -lsunmath -B dynamic -lm 42LIBS.SunOS+= -B static -lsunmath -B dynamic -lm
45LDFLAGS.SunOS+= -L${SUNWSPROBASE}/lib ${COMPILER_RPATH_FLAG}${SUNWSPROBASE}/lib 43LDFLAGS.SunOS+= -L${SUNWSPROBASE}/lib ${COMPILER_RPATH_FLAG}${SUNWSPROBASE}/lib
46CONFIGURE_ENV+= LDSHARED="${CC} -G" 44CONFIGURE_ENV+= LDSHARED="${CC} -G"
47.else 45.else
48LIBS.SunOS+= -lm 46LIBS.SunOS+= -lm
49.endif 47.endif
50 48
51.if !empty(PKGSRC_COMPILER:Mclang) 49.if !empty(PKGSRC_COMPILER:Mclang)
52CONFIGURE_ARGS+= --enable-frame-address 50CONFIGURE_ARGS+= --enable-frame-address
53.endif 51.endif
54 52
55# Avoid segfaults as per https://bugs.ruby-lang.org/issues/6383 53# Avoid segfaults as per https://bugs.ruby-lang.org/issues/6383
56.if !empty(CC_VERSION:Mgcc-4.[7-9].*) 54.if !empty(CC_VERSION:Mgcc-4.[7-9].*)
57CFLAGS+= -fno-tree-dce -fno-optimize-sibling-calls 55CFLAGS+= -fno-tree-dce -fno-optimize-sibling-calls
58.endif 56.endif
59 57
60# Ruby build process depends on config.status's content 58# Ruby build process depends on config.status's content
61CONFIG_STATUS_OVERRIDE= # empty 59CONFIG_STATUS_OVERRIDE= # empty
62 60
63MAKE_DIRS+= ${RUBY_SITERIDIR} 61MAKE_DIRS+= ${RUBY_SITERIDIR}
64FILES_SUBST+= DATE=${DATE:Q} 62FILES_SUBST+= DATE=${DATE:Q}
65 63
66.include "options.mk" 64.include "options.mk"
67 65
68.include "../../lang/ruby/rubyversion.mk" 66.include "../../lang/ruby/rubyversion.mk"
69 67
70.if !empty(RUBY_SUFFIX) 68.if !empty(RUBY_SUFFIX)
71CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX:Q} 69CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX:Q}
72.endif 70.endif
73 71
74# 72#
75# IRIX work around which should be fixed. 73# IRIX work around which should be fixed.
76# 74#
77PLIST_VARS+= io 75PLIST_VARS+= io
78.if ${OPSYS} != "IRIX" 76.if ${OPSYS} != "IRIX"
79PLIST.io= yes 77PLIST.io= yes
80.endif 78.endif
81 79
82# 80#
83# Work around for ucontext(3). It was broken in older DragonFly 81# Work around for ucontext(3). It was broken in older DragonFly
84# versions and is slow in newer ones. 82# versions and is slow in newer ones.
85# 83#
86.if ${OPSYS} == "DragonFly" 84.if ${OPSYS} == "DragonFly"
87CONFIGURE_ENV+= ac_cv_header_ucontext_h=no 85CONFIGURE_ENV+= ac_cv_header_ucontext_h=no
88.endif 86.endif
89 87
90# 88#
91# work around for getaddrinfo(3) 89# work around for getaddrinfo(3)
92# 90#
93.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.[6-9]) 91.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.[6-9])
94CONFIGURE_ARGS+= --enable-wide-getaddrinfo 92CONFIGURE_ARGS+= --enable-wide-getaddrinfo
95.endif 93.endif
96 94
97DOCS= COPYING COPYING.ja ChangeLog NEWS README \ 95DOCS= COPYING COPYING.ja ChangeLog NEWS README \
98 README.EXT README.EXT.ja README.ja ToDo \ 96 README.EXT README.EXT.ja README.ja ToDo \
99 doc/ChangeLog-1.8.0 doc/NEWS-1.8.0 \ 97 doc/ChangeLog-1.8.0 doc/NEWS-1.8.0 \
100 doc/forwardable.rd doc/forwardable.rd.ja \ 98 doc/forwardable.rd doc/forwardable.rd.ja \
101 doc/irb/irb-tools.rd.ja doc/irb/irb.rd doc/irb/irb.rd.ja \ 99 doc/irb/irb-tools.rd.ja doc/irb/irb.rd doc/irb/irb.rd.ja \
102 doc/shell.rd doc/shell.rd.ja 100 doc/shell.rd doc/shell.rd.ja
103EXT_DOCS= bigdecimal/bigdecimal_en.html bigdecimal/bigdecimal_ja.html \ 101EXT_DOCS= bigdecimal/bigdecimal_en.html bigdecimal/bigdecimal_ja.html \
104 dl/doc/dl.txt etc/etc.txt etc/etc.txt.ja syslog/syslog.txt \ 102 dl/doc/dl.txt etc/etc.txt etc/etc.txt.ja syslog/syslog.txt \
105 zlib/doc/zlib.rd 103 zlib/doc/zlib.rd
106 104
107BIGDECIMAL_EXAMPLES= linear.rb nlsolve.rb pi.rb 105BIGDECIMAL_EXAMPLES= linear.rb nlsolve.rb pi.rb
108DL_EXAMPLES= c++sample.C c++sample.rb drives.rb getch.rb libc.rb \ 106DL_EXAMPLES= c++sample.C c++sample.rb drives.rb getch.rb libc.rb \
109 msgbox.rb msgbox2.rb stream.rb 107 msgbox.rb msgbox2.rb stream.rb
110OPENSSL_EXAMPLES= c_rehash.rb cert2text.rb cert_store_view.rb \ 108OPENSSL_EXAMPLES= c_rehash.rb cert2text.rb cert_store_view.rb \
111 certstore.rb cipher.rb crlstore.rb echo_cli.rb \ 109 certstore.rb cipher.rb crlstore.rb echo_cli.rb \
112 echo_svr.rb gen_csr.rb smime_read.rb smime_write.rb \ 110 echo_svr.rb gen_csr.rb smime_read.rb smime_write.rb \
113 wget.rb 111 wget.rb
114PTY_EXAMPLES= expect_sample.rb script.rb shl.rb 112PTY_EXAMPLES= expect_sample.rb script.rb shl.rb
115 113
116REPLACE_RUBY_DIRS= bin ext lib sample 114REPLACE_RUBY_DIRS= bin ext lib sample
117REPLACE_RUBY= ext/dl/h2rb 115REPLACE_RUBY= ext/dl/h2rb
118INSTALLATION_DIRS= bin ${RUBY_ARCHLIB} ${RUBY_DOC}/irb ${RUBY_DOC}/pty \ 116INSTALLATION_DIRS= bin ${RUBY_ARCHLIB} ${RUBY_DOC}/irb ${RUBY_DOC}/pty \
119 ${RUBY_EG}/bigdecimal ${RUBY_EG}/dl \ 117 ${RUBY_EG}/bigdecimal ${RUBY_EG}/dl \
120 ${RUBY_EG}/openssl ${RUBY_EG}/pty 118 ${RUBY_EG}/openssl ${RUBY_EG}/pty
121FIX_PERM= ${RUBY_ARCHLIB}/digest.h ${RUBY_ARCHLIB}/dl.h \ 119FIX_PERM= ${RUBY_ARCHLIB}/digest.h ${RUBY_ARCHLIB}/dl.h \
122 ${RUBY_ARCHLIB}/dlconfig.h 120 ${RUBY_ARCHLIB}/dlconfig.h
123 121
124pre-configure: 122pre-configure:
125 ${RM} -f ${WRKSRC}/ext/curses/extconf.rb 123 ${RM} -f ${WRKSRC}/ext/curses/extconf.rb
126 ${RM} -f ${WRKSRC}/ext/gdbm/extconf.rb 124 ${RM} -f ${WRKSRC}/ext/gdbm/extconf.rb
127 ${RM} -f ${WRKSRC}/ext/readline/extconf.rb 125 ${RM} -f ${WRKSRC}/ext/readline/extconf.rb
128 ${RM} -f ${WRKSRC}/ext/tk/extconf.rb 126 ${RM} -f ${WRKSRC}/ext/tk/extconf.rb
129 127
130pre-install: 128pre-install:
131 cd ${WRKSRC}; ${FIND} . \( -name '*.orig' -o -name '*.orig_dist' \) \ 129 cd ${WRKSRC}; ${FIND} . \( -name '*.orig' -o -name '*.orig_dist' \) \
132 -exec ${RM} -f {} \; 130 -exec ${RM} -f {} \;
133 131
134post-install: 132post-install:
135 ${INSTALL_DATA} ${FILESDIR}/CHANGES.pkgsrc ${DESTDIR}${PREFIX}/${RUBY_DOC} 133 ${INSTALL_DATA} ${FILESDIR}/CHANGES.pkgsrc ${DESTDIR}${PREFIX}/${RUBY_DOC}
136.for f in ${DOCS} 134.for f in ${DOCS}
137 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/${f:C/^doc\///} 135 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/${f:C/^doc\///}
138.endfor 136.endfor
139 ${INSTALL_SCRIPT} ${WRKSRC}/ext/dl/h2rb ${DESTDIR}${PREFIX}/bin/h2rb${RUBY_VER} 137 ${INSTALL_SCRIPT} ${WRKSRC}/ext/dl/h2rb ${DESTDIR}${PREFIX}/bin/h2rb${RUBY_VER}
140.for f in ${EXT_DOCS} 138.for f in ${EXT_DOCS}
141 ${INSTALL_DATA} ${WRKSRC}/ext/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC} 139 ${INSTALL_DATA} ${WRKSRC}/ext/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}
142.endfor 140.endfor
143 cd ${WRKSRC}/ext/pty; ${PAX} -rw README.* ${DESTDIR}${PREFIX}/${RUBY_DOC}/pty 141 cd ${WRKSRC}/ext/pty; ${PAX} -rw README.* ${DESTDIR}${PREFIX}/${RUBY_DOC}/pty
144 cd ${WRKSRC}/sample; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_EG} 142 cd ${WRKSRC}/sample; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_EG}
145.for f in ${BIGDECIMAL_EXAMPLES} 143.for f in ${BIGDECIMAL_EXAMPLES}
146 ${INSTALL_DATA} ${RUBY_WRKSRC}/ext/bigdecimal/sample/${f} \ 144 ${INSTALL_DATA} ${RUBY_WRKSRC}/ext/bigdecimal/sample/${f} \
147 ${DESTDIR}${PREFIX}/${RUBY_EG}/bigdecimal 145 ${DESTDIR}${PREFIX}/${RUBY_EG}/bigdecimal
148.endfor 146.endfor
149.for f in ${DL_EXAMPLES} 147.for f in ${DL_EXAMPLES}
150 ${INSTALL_DATA} ${RUBY_WRKSRC}/ext/dl/sample/${f} \ 148 ${INSTALL_DATA} ${RUBY_WRKSRC}/ext/dl/sample/${f} \
151 ${DESTDIR}${PREFIX}/${RUBY_EG}/dl 149 ${DESTDIR}${PREFIX}/${RUBY_EG}/dl
152.endfor 150.endfor
153.for f in ${OPENSSL_EXAMPLES} 151.for f in ${OPENSSL_EXAMPLES}
154 ${INSTALL_DATA} ${RUBY_WRKSRC}/sample/openssl/${f} \ 152 ${INSTALL_DATA} ${RUBY_WRKSRC}/sample/openssl/${f} \
155 ${DESTDIR}${PREFIX}/${RUBY_EG}/openssl 153 ${DESTDIR}${PREFIX}/${RUBY_EG}/openssl
156.endfor 154.endfor
157.for f in ${PTY_EXAMPLES} 155.for f in ${PTY_EXAMPLES}
158 ${INSTALL_DATA} ${WRKSRC}/ext/pty/${f} ${DESTDIR}${PREFIX}/${RUBY_EG}/pty 156 ${INSTALL_DATA} ${WRKSRC}/ext/pty/${f} ${DESTDIR}${PREFIX}/${RUBY_EG}/pty
159.endfor 157.endfor
160.for f in ${FIX_PERM} 158.for f in ${FIX_PERM}
161 ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/${f} 159 ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/${f}
162.endfor 160.endfor
163 ${RUBY_GENERATE_PLIST} 161 ${RUBY_GENERATE_PLIST}
164 162
165.include "../../mk/bdb.buildlink3.mk" 163.include "../../mk/bdb.buildlink3.mk"
166.include "../../converters/libiconv/buildlink3.mk" 164.include "../../converters/libiconv/buildlink3.mk"
167.include "../../devel/zlib/buildlink3.mk" 165.include "../../devel/zlib/buildlink3.mk"
168.include "../../security/openssl/buildlink3.mk" 166.include "../../security/openssl/buildlink3.mk"
169.include "../../lang/ruby/Makefile.common" 167.include "../../lang/ruby/Makefile.common"
170.include "../../mk/bsd.pkg.mk" 168.include "../../mk/bsd.pkg.mk"

cvs diff -r1.56 -r1.56.2.1 pkgsrc/lang/ruby18-base/Attic/distinfo (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,51 +1,52 @@ @@ -1,51 +1,52 @@
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
15SHA1 (patch-dk) = ee85c9489f6074e6818713746691ce99ef778159 15SHA1 (patch-dk) = ee85c9489f6074e6818713746691ce99ef778159
16SHA1 (patch-dl) = 0a5010f57e0f21170530fd4f940e66608c6d9630 16SHA1 (patch-dl) = 0a5010f57e0f21170530fd4f940e66608c6d9630
17SHA1 (patch-dn) = 3cd429fcd4f48ad0ab784058a4ac8672f6ae17db 17SHA1 (patch-dn) = 3cd429fcd4f48ad0ab784058a4ac8672f6ae17db
18SHA1 (patch-do) = d2b190074647a591106797922e2ec907f6b3efde 18SHA1 (patch-do) = d2b190074647a591106797922e2ec907f6b3efde
19SHA1 (patch-dp) = ebdc27a84c24d3373769250bf4b7052058f89d9b 19SHA1 (patch-dp) = ebdc27a84c24d3373769250bf4b7052058f89d9b
20SHA1 (patch-dq) = 4cd59c9a965c70ed5ee50dc2e8cebe3bce094fbd 20SHA1 (patch-dq) = 4cd59c9a965c70ed5ee50dc2e8cebe3bce094fbd
21SHA1 (patch-dr) = ed734e802f2d1cb59c2b49952d646849c9226d1e 21SHA1 (patch-dr) = ed734e802f2d1cb59c2b49952d646849c9226d1e
22SHA1 (patch-ds) = e60434cb299d070289a3c80765187e4058a65f99 22SHA1 (patch-ds) = e60434cb299d070289a3c80765187e4058a65f99
23SHA1 (patch-dt) = 59c09f6ea19cc02a1d8ca92a99eed7f8c30a5f10 23SHA1 (patch-dt) = 59c09f6ea19cc02a1d8ca92a99eed7f8c30a5f10
24SHA1 (patch-du) = e3703b678f3b09f2878389a0a0ecbd453bae59d0 24SHA1 (patch-du) = e3703b678f3b09f2878389a0a0ecbd453bae59d0
25SHA1 (patch-dv) = c3eeeaf6e52e27ce945d29494d42ee4d7b11a14b 25SHA1 (patch-dv) = c3eeeaf6e52e27ce945d29494d42ee4d7b11a14b
26SHA1 (patch-dy) = 4daf6f49dbcc4f07dc43df811aec03639d636d8a 26SHA1 (patch-dy) = 4daf6f49dbcc4f07dc43df811aec03639d636d8a
27SHA1 (patch-eb) = e5105edd12906a5599668e96a424132abe523871 27SHA1 (patch-eb) = e5105edd12906a5599668e96a424132abe523871
28SHA1 (patch-ec) = 0fcd05fea21d480a6536e2f711021ac4c1448771 28SHA1 (patch-ec) = 0fcd05fea21d480a6536e2f711021ac4c1448771
29SHA1 (patch-ed) = 70b8ec8b2d466a3868556cbe1c19bf50462bae6d 29SHA1 (patch-ed) = 70b8ec8b2d466a3868556cbe1c19bf50462bae6d
30SHA1 (patch-ee) = 8240954e7f07d94bd3e87abc1946ea5cef2d854a 30SHA1 (patch-ee) = 8240954e7f07d94bd3e87abc1946ea5cef2d854a
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;
 }