Fri Oct 12 15:27:48 2012 UTC ()
Update ruby18-base and ruby18 to 1.8.7.371 (Ruby 1.8.7-p371).

Additional fix to CVE-2011-1005 was incorporated.
So, there is no change to ruby18/ruby18-base packages of pkgsrc except
version.


(taca)
diff -r1.90 -r1.91 pkgsrc/lang/ruby/rubyversion.mk
diff -r1.75 -r1.76 pkgsrc/lang/ruby18-base/Makefile
diff -r1.57 -r1.58 pkgsrc/lang/ruby18-base/distinfo
diff -r1.1 -r0 pkgsrc/lang/ruby18-base/patches/patch-error.c
cvs diff -r1.90 -r1.91 pkgsrc/lang/ruby/rubyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2012/10/12 14:51:31 1.90
+++ pkgsrc/lang/ruby/rubyversion.mk 2012/10/12 15:27:48 1.91
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rubyversion.mk,v 1.90 2012/10/12 14:51:31 taca Exp $ 1# $NetBSD: rubyversion.mk,v 1.91 2012/10/12 15:27:48 taca Exp $
2# 2#
3 3
4# This file determines which Ruby version is used as a dependency for 4# This file determines which Ruby version is used as a dependency for
5# a package. 5# a package.
6# 6#
7# 7#
8# === User-settable variables === 8# === User-settable variables ===
9# 9#
10# RUBY_VERSION_DEFAULT 10# RUBY_VERSION_DEFAULT
11# The preferered Ruby version to use. 11# The preferered Ruby version to use.
12# 12#
13# Possible values: 18 193 13# Possible values: 18 193
14# Default: 193 14# Default: 193
@@ -195,27 +195,27 @@ @@ -195,27 +195,27 @@
195# Keywords: ruby 195# Keywords: ruby
196# 196#
197 197
198.if !defined(_RUBYVERSION_MK) 198.if !defined(_RUBYVERSION_MK)
199_RUBYVERSION_MK= # defined 199_RUBYVERSION_MK= # defined
200 200
201.include "../../mk/bsd.prefs.mk" 201.include "../../mk/bsd.prefs.mk"
202 202
203# current supported Ruby's version 203# current supported Ruby's version
204RUBY18_VERSION= 1.8.7 204RUBY18_VERSION= 1.8.7
205RUBY193_VERSION= 1.9.3 205RUBY193_VERSION= 1.9.3
206 206
207# patch 207# patch
208RUBY18_PATCHLEVEL= pl370 208RUBY18_PATCHLEVEL= pl371
209RUBY193_PATCHLEVEL= p286 209RUBY193_PATCHLEVEL= p286
210 210
211# current API compatible version; used for version of shared library 211# current API compatible version; used for version of shared library
212RUBY18_API_VERSION= 1.8.7 212RUBY18_API_VERSION= 1.8.7
213RUBY193_API_VERSION= 1.9.1 213RUBY193_API_VERSION= 1.9.1
214 214
215# 215#
216RUBY_VERSION_DEFAULT?= 193 216RUBY_VERSION_DEFAULT?= 193
217 217
218RUBY_VERSION_SUPPORTED?= 193 18 218RUBY_VERSION_SUPPORTED?= 193 18
219RUBY_VER?= ${RUBY_VERSION_DEFAULT} 219RUBY_VER?= ${RUBY_VERSION_DEFAULT}
220 220
221# If package support only one version, use it. 221# If package support only one version, use it.
cvs diff -r1.75 -r1.76 pkgsrc/lang/ruby18-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby18-base/Attic/Makefile 2012/10/06 16:30:28 1.75
+++ pkgsrc/lang/ruby18-base/Attic/Makefile 2012/10/12 15:27:48 1.76
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.75 2012/10/06 16:30:28 taca Exp $ 1# $NetBSD: Makefile,v 1.76 2012/10/12 15:27:48 taca 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 
7CATEGORIES= lang ruby 6CATEGORIES= lang ruby
8MASTER_SITES= ${MASTER_SITE_RUBY} 7MASTER_SITES= ${MASTER_SITE_RUBY}
9 8
10MAINTAINER= taca@NetBSD.org 9MAINTAINER= taca@NetBSD.org
11HOMEPAGE= ${RUBY_HOMEPAGE} 10HOMEPAGE= ${RUBY_HOMEPAGE}
12COMMENT= Ruby 1.8 based release minimum package 11COMMENT= Ruby 1.8 based release minimum package
13LICENSE= gnu-gpl-v2 OR ruby-license 12LICENSE= gnu-gpl-v2 OR ruby-license
14 13
15RUBY_VERSION_SUPPORTED= 18 14RUBY_VERSION_SUPPORTED= 18
16 15
17CONFLICTS= ${RUBY_PKGPREFIX}-dbm-[0-9]* \ 16CONFLICTS= ${RUBY_PKGPREFIX}-dbm-[0-9]* \
18 ${RUBY_PKGPREFIX}-digest-[0-9]* \ 17 ${RUBY_PKGPREFIX}-digest-[0-9]* \
19 ${RUBY_PKGPREFIX}-iconv-[0-9]* \ 18 ${RUBY_PKGPREFIX}-iconv-[0-9]* \
cvs diff -r1.57 -r1.58 pkgsrc/lang/ruby18-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby18-base/Attic/distinfo 2012/10/06 16:30:28 1.57
+++ pkgsrc/lang/ruby18-base/Attic/distinfo 2012/10/12 15:27:48 1.58
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.57 2012/10/06 16:30:28 taca Exp $ 1$NetBSD: distinfo,v 1.58 2012/10/12 15:27:48 taca Exp $
2 2
3SHA1 (ruby-1.8.7-p370.tar.bz2) = 92770a8159cd9049ffc5bc3ce4777b701eb19d7b 3SHA1 (ruby-1.8.7-p371.tar.bz2) = 2a709358417330cfacba6b9f8206eab577640b2b
4RMD160 (ruby-1.8.7-p370.tar.bz2) = 0c35ed92e4e77c6e6859d39244489c93f4efad50 4RMD160 (ruby-1.8.7-p371.tar.bz2) = ad1da5b8b8e818d6a77b70ab81586a37099cbac0
5Size (ruby-1.8.7-p370.tar.bz2) = 4211597 bytes 5Size (ruby-1.8.7-p371.tar.bz2) = 4248262 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
@@ -31,22 +31,21 @@ SHA1 (patch-ee) = 8240954e7f07d94bd3e87a @@ -31,22 +31,21 @@ 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 
45SHA1 (patch-et) = eba90415e5279c9eb8bea67635f5f8cab5d1e7ac 44SHA1 (patch-et) = eba90415e5279c9eb8bea67635f5f8cab5d1e7ac
46SHA1 (patch-eu) = dbf65258dcdc619d220ab39864389c4ec4c5c625 45SHA1 (patch-eu) = dbf65258dcdc619d220ab39864389c4ec4c5c625
47SHA1 (patch-ev) = 6178be681ca1cf2647cab9a61c8ef989ff5b23cb 46SHA1 (patch-ev) = 6178be681ca1cf2647cab9a61c8ef989ff5b23cb
48SHA1 (patch-ew) = 3f23697dddbb11a10d1f0c3e47fb602822ecd11f 47SHA1 (patch-ew) = 3f23697dddbb11a10d1f0c3e47fb602822ecd11f
49SHA1 (patch-ga) = 73f50504baf74ee77d00dcfb5a9446bbaf122726 48SHA1 (patch-ga) = 73f50504baf74ee77d00dcfb5a9446bbaf122726
50SHA1 (patch-gb) = 345ad3e5df6fd9febe7b398f091662fd7c300dc4 49SHA1 (patch-gb) = 345ad3e5df6fd9febe7b398f091662fd7c300dc4
51SHA1 (patch-lib_rdoc_options.rb) = 0f14417733ad6fc6fbc93af1c8463ecd59abce7c 50SHA1 (patch-lib_rdoc_options.rb) = 0f14417733ad6fc6fbc93af1c8463ecd59abce7c
52SHA1 (patch-lib_rdoc_rdoc.rb) = bef895245cc06ca84fd1e5d506c3c65932921b3a 51SHA1 (patch-lib_rdoc_rdoc.rb) = bef895245cc06ca84fd1e5d506c3c65932921b3a
File Deleted: pkgsrc/lang/ruby18-base/patches/Attic/patch-error.c