Sun Nov 2 17:14:33 2014 UTC ()
Pullup ticket #4533 - requested by taca
lang/ruby193-base: security update

Revisions pulled up:
- lang/ruby/rubyversion.mk                                      1.125
- lang/ruby193-base/Makefile                                    1.46-1.47
- lang/ruby193-base/distinfo                                    1.36-1.37
- lang/ruby193-base/patches/patch-pack.c                        1.2

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Oct  2 08:50:12 UTC 2014

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

   Log Message:
   Fix typo in comment in a patch file.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Oct 27 16:11:18 UTC 2014

   Modified Files:
   	pkgsrc/lang/ruby: rubyversion.mk
   	pkgsrc/lang/ruby193-base: Makefile distinfo

   Log Message:
   Update ruby193-base and related packages to 1.9.3p550 (Ruby 1.9.3-p550).

   Ruby 1.9.3-p550 Released

   We are pleased to announce the release of Ruby 1.9.3-p550.

   This release includes a security fix for DoS vulnerability of REXML.

       * CVE-2014-8080: Denial Of Service XML Expansion

   This release also includes the change of default settings of
   ext/openssl. Insecure SSL/TLS options are now turn off by default.

       * Changed default settings of ext/openssl

   And, in addition, bandled jQuery for darkfish template of RDoc is also
   updated.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Oct 28 07:48:19 UTC 2014

   Modified Files:
   	pkgsrc/lang/ruby193-base: Makefile

   Log Message:
   Not MAKE_JOBS_SAFE (two tries with MAKE_JOBS=8 failed for me in a row).


(tron)
diff -r1.124.2.1 -r1.124.2.2 pkgsrc/lang/ruby/rubyversion.mk
diff -r1.45 -r1.45.2.1 pkgsrc/lang/ruby193-base/Makefile
diff -r1.35 -r1.35.2.1 pkgsrc/lang/ruby193-base/distinfo
diff -r1.1 -r1.1.2.1 pkgsrc/lang/ruby193-base/patches/patch-pack.c
cvs diff -r1.124.2.1 -r1.124.2.2 pkgsrc/lang/ruby/rubyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2014/11/01 19:17:24 1.124.2.1
+++ pkgsrc/lang/ruby/rubyversion.mk 2014/11/02 17:14:33 1.124.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rubyversion.mk,v 1.124.2.1 2014/11/01 19:17:24 tron Exp $ 1# $NetBSD: rubyversion.mk,v 1.124.2.2 2014/11/02 17:14:33 tron 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 200 21 13# Possible values: 18 193 200 21
14# Default: 200 14# Default: 200
@@ -217,27 +217,27 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/rub @@ -217,27 +217,27 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/rub
217RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/} 217RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/}
218. endif 218. endif
219. endif 219. endif
220.endif 220.endif
221 221
222# current supported Ruby's version 222# current supported Ruby's version
223RUBY18_VERSION= 1.8.7 223RUBY18_VERSION= 1.8.7
224RUBY193_VERSION= 1.9.3 224RUBY193_VERSION= 1.9.3
225RUBY200_VERSION= 2.0.0 225RUBY200_VERSION= 2.0.0
226RUBY21_VERSION= 2.1.2 226RUBY21_VERSION= 2.1.2
227 227
228# patch 228# patch
229RUBY18_PATCHLEVEL= pl374 229RUBY18_PATCHLEVEL= pl374
230RUBY193_PATCHLEVEL= p547 230RUBY193_PATCHLEVEL= p550
231RUBY200_PATCHLEVEL= p594 231RUBY200_PATCHLEVEL= p594
232#RUBY21_PATCHLEVEL= p95 232#RUBY21_PATCHLEVEL= p95
233 233
234# current API compatible version; used for version of shared library 234# current API compatible version; used for version of shared library
235RUBY18_API_VERSION= 1.8.7 235RUBY18_API_VERSION= 1.8.7
236RUBY193_API_VERSION= 1.9.1 236RUBY193_API_VERSION= 1.9.1
237RUBY200_API_VERSION= 2.0.0 237RUBY200_API_VERSION= 2.0.0
238RUBY21_API_VERSION= 2.1.0 238RUBY21_API_VERSION= 2.1.0
239 239
240# 240#
241RUBY_VERSION_DEFAULT?= 200 241RUBY_VERSION_DEFAULT?= 200
242 242
243RUBY_VERSION_SUPPORTED?= 200 193 18 21 243RUBY_VERSION_SUPPORTED?= 200 193 18 21
cvs diff -r1.45 -r1.45.2.1 pkgsrc/lang/ruby193-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby193-base/Attic/Makefile 2014/09/30 10:40:08 1.45
+++ pkgsrc/lang/ruby193-base/Attic/Makefile 2014/11/02 17:14:33 1.45.2.1
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.45 2014/09/30 10:40:08 taca Exp $ 1# $NetBSD: Makefile,v 1.45.2.1 2014/11/02 17:14:33 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 
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 ${RUBY_VERSION} release minimum base package 11COMMENT= Ruby ${RUBY_VERSION} release minimum base package
13LICENSE= ${RUBY_LICENSE} 12LICENSE= ${RUBY_LICENSE}
14 13
15RUBY_VERSION_SUPPORTED= 193 14RUBY_VERSION_SUPPORTED= 193
16 15
17USE_GCC_RUNTIME= yes 16USE_GCC_RUNTIME= yes
18USE_LANGUAGES= c 17USE_LANGUAGES= c
19USE_TOOLS+= pax yacc 18USE_TOOLS+= pax yacc
20GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
21TEST_TARGET= test 20TEST_TARGET= test
22CONFIGURE_ARGS+= --enable-shared 21CONFIGURE_ARGS+= --enable-shared
23WRKSRC= ${RUBY_WRKSRC} 22WRKSRC= ${RUBY_WRKSRC}
 23MAKE_JOBS_SAFE= no
24 24
25MAKE_DIRS= ${RUBY_SITEARCHLIB} ${RUBY_VENDORARCHLIB} 25MAKE_DIRS= ${RUBY_SITEARCHLIB} ${RUBY_VENDORARCHLIB}
26 26
27# 27#
28# Don't refrect pkgsrc's INSTALL macro since Ruby expect it could 28# Don't refrect pkgsrc's INSTALL macro since Ruby expect it could
29# execute by unprivileged user. 29# execute by unprivileged user.
30# 30#
31CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \ 31CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \
32 INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT= 32 INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT=
33 33
34.include "../../mk/compiler.mk" 34.include "../../mk/compiler.mk"
35 35
36.if !empty(PKGSRC_COMPILER:Msunpro) 36.if !empty(PKGSRC_COMPILER:Msunpro)
cvs diff -r1.35 -r1.35.2.1 pkgsrc/lang/ruby193-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby193-base/Attic/distinfo 2014/09/30 10:40:08 1.35
+++ pkgsrc/lang/ruby193-base/Attic/distinfo 2014/11/02 17:14:33 1.35.2.1
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1$NetBSD: distinfo,v 1.35 2014/09/30 10:40:08 taca Exp $ 1$NetBSD: distinfo,v 1.35.2.1 2014/11/02 17:14:33 tron Exp $
2 2
3SHA1 (ruby-1.9.3-p547.tar.bz2) = 972ea65ab50c697a60c672888a143e0bc84b4d6e 3SHA1 (ruby-1.9.3-p550.tar.bz2) = d4f1574a7fbcd402407b6c0ebf6ebea9c0c7d55a
4RMD160 (ruby-1.9.3-p547.tar.bz2) = 827473dd20e4dad7704eb5da19f13ce5c105bddf 4RMD160 (ruby-1.9.3-p550.tar.bz2) = bcc30a2a4d602f42222544d0ed00b0446978920b
5Size (ruby-1.9.3-p547.tar.bz2) = 10036828 bytes 5Size (ruby-1.9.3-p550.tar.bz2) = 10053787 bytes
6SHA1 (patch-configure) = 0ef7e10bbff37118c48053e7189f87528a3e408b 6SHA1 (patch-configure) = 0ef7e10bbff37118c48053e7189f87528a3e408b
7SHA1 (patch-configure.in) = 09dfe819b6a9bd7c9af704eeaef659857d33d0c3 7SHA1 (patch-configure.in) = 09dfe819b6a9bd7c9af704eeaef659857d33d0c3
8SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5 8SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
9SHA1 (patch-ext_dl_extconf.rb) = aed210606893d2b9c463d794df039f06003848e4 9SHA1 (patch-ext_dl_extconf.rb) = aed210606893d2b9c463d794df039f06003848e4
10SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8 10SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
11SHA1 (patch-lib_rubygems.rb) = e472c981e544b75c3762385895c9a0197be9badd 11SHA1 (patch-lib_rubygems.rb) = e472c981e544b75c3762385895c9a0197be9badd
12SHA1 (patch-lib_rubygems_command.rb) = 916a93372e714b56a741acc15350536194f34c77 12SHA1 (patch-lib_rubygems_command.rb) = 916a93372e714b56a741acc15350536194f34c77
13SHA1 (patch-lib_rubygems_command__manager.rb) = 4fabf9a6c8bf5e47a4fb3bb3d398105b4452ec7e 13SHA1 (patch-lib_rubygems_command__manager.rb) = 4fabf9a6c8bf5e47a4fb3bb3d398105b4452ec7e
14SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3 14SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3
15SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 85b666544fc0787e67bb54071d8660cbfe3015d6 15SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 85b666544fc0787e67bb54071d8660cbfe3015d6
16SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 7d8dd07d332f0e89822d06f2d71e7552358107cc 16SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 7d8dd07d332f0e89822d06f2d71e7552358107cc
17SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = b8e18f1feedb7966e2a5280d6020c6134a7d83a3 17SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = b8e18f1feedb7966e2a5280d6020c6134a7d83a3
18SHA1 (patch-lib_rubygems_config__file.rb) = ed4ff25ea89a2d13ee601c7edfda0902f08fe29c 18SHA1 (patch-lib_rubygems_config__file.rb) = ed4ff25ea89a2d13ee601c7edfda0902f08fe29c
19SHA1 (patch-lib_rubygems_defaults.rb) = 101a6e653ef3811cdda3ed333b50448c0d3f0d26 19SHA1 (patch-lib_rubygems_defaults.rb) = 101a6e653ef3811cdda3ed333b50448c0d3f0d26
20SHA1 (patch-lib_rubygems_dependency__installer.rb) = 8832e6d0157191b1c137ad7ad7ba5429bcfadd5a 20SHA1 (patch-lib_rubygems_dependency__installer.rb) = 8832e6d0157191b1c137ad7ad7ba5429bcfadd5a
21SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc742d3 21SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc742d3
22SHA1 (patch-lib_rubygems_gem__runner.rb) = 03ff2f0b72004ef7e09b5ba9d56752109e4e6b73 22SHA1 (patch-lib_rubygems_gem__runner.rb) = 03ff2f0b72004ef7e09b5ba9d56752109e4e6b73
23SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180 23SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180
24SHA1 (patch-lib_rubygems_installer.rb) = fe1c97abaf0b7a3fbecf8327a6d1ccd697cb62cc 24SHA1 (patch-lib_rubygems_installer.rb) = fe1c97abaf0b7a3fbecf8327a6d1ccd697cb62cc
25SHA1 (patch-lib_rubygems_platform.rb) = dff117b80a004325e7012575e838f49740a37dba 25SHA1 (patch-lib_rubygems_platform.rb) = dff117b80a004325e7012575e838f49740a37dba
26SHA1 (patch-lib_rubygems_specification.rb) = 3da23596f701c1966bc12f2341c82f2f2c646779 26SHA1 (patch-lib_rubygems_specification.rb) = 3da23596f701c1966bc12f2341c82f2f2c646779
27SHA1 (patch-lib_rubygems_uninstaller.rb) = 038df207f0ad4ef674ff60976fcda969d50c3c4e 27SHA1 (patch-lib_rubygems_uninstaller.rb) = 038df207f0ad4ef674ff60976fcda969d50c3c4e
28SHA1 (patch-man_erb.1) = a8f69ebb02b4d5e1c80b270a3d683c23d8dfbcf1 28SHA1 (patch-man_erb.1) = a8f69ebb02b4d5e1c80b270a3d683c23d8dfbcf1
29SHA1 (patch-man_irb.1) = 58fcccbb5f5f76450715cbf246a018af58d9b57e 29SHA1 (patch-man_irb.1) = 58fcccbb5f5f76450715cbf246a018af58d9b57e
30SHA1 (patch-man_ri.1) = 25d82d08a9eb74ccc1cbbc1fc324d23f1a56ed64 30SHA1 (patch-man_ri.1) = 25d82d08a9eb74ccc1cbbc1fc324d23f1a56ed64
31SHA1 (patch-man_ruby.1) = 43c638a38bed8257f33d8f5a491acd77a18032b7 31SHA1 (patch-man_ruby.1) = 43c638a38bed8257f33d8f5a491acd77a18032b7
32SHA1 (patch-pack.c) = 1fa428ded4e95a8511333d7d1eaa4ff80f0f919d 32SHA1 (patch-pack.c) = d1e2c9871d2ba012a9136bdf708c2d42588d863c
33SHA1 (patch-test_rubygems_test__gem.rb) = fe8b8e436b255595122d2a01462ba0a686575f24 33SHA1 (patch-test_rubygems_test__gem.rb) = fe8b8e436b255595122d2a01462ba0a686575f24
34SHA1 (patch-tool_rbinstall.rb) = f0497085a09b31145f57028b30e335b09acabcff 34SHA1 (patch-tool_rbinstall.rb) = f0497085a09b31145f57028b30e335b09acabcff
35SHA1 (patch-vsnprintf.c) = 7bb4ca07381536717518143ef7803634168ca9fa 35SHA1 (patch-vsnprintf.c) = 7bb4ca07381536717518143ef7803634168ca9fa
cvs diff -r1.1 -r1.1.2.1 pkgsrc/lang/ruby193-base/patches/Attic/patch-pack.c (expand / switch to unified diff)

--- pkgsrc/lang/ruby193-base/patches/Attic/patch-pack.c 2014/09/30 10:40:08 1.1
+++ pkgsrc/lang/ruby193-base/patches/Attic/patch-pack.c 2014/11/02 17:14:33 1.1.2.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-pack.c,v 1.1 2014/09/30 10:40:08 taca Exp $ 1$NetBSD: patch-pack.c,v 1.1.2.1 2014/11/02 17:14:33 tron Exp $
2 2
3Fix for CVS-2014-4975 from revision #46806 in ruby_2_1 branch. 3Fix for CVE-2014-4975 from revision #46806 in ruby_2_1 branch.
4 4
5--- pack.c.orig 2012-08-09 13:49:27.000000000 +0000 5--- pack.c.orig 2012-08-09 13:49:27.000000000 +0000
6+++ pack.c 6+++ pack.c
7@@ -1068,7 +1068,8 @@ static const char b64_table[] = 7@@ -1068,7 +1068,8 @@ static const char b64_table[] =
8 static void 8 static void
9 encodes(VALUE str, const char *s, long len, int type, int tail_lf) 9 encodes(VALUE str, const char *s, long len, int type, int tail_lf)
10 { 10 {
11- char buff[4096]; 11- char buff[4096];
12+ enum {buff_size = 4096, encoded_unit = 4}; 12+ enum {buff_size = 4096, encoded_unit = 4};
13+ char buff[buff_size + 1]; /* +1 for tail_lf */ 13+ char buff[buff_size + 1]; /* +1 for tail_lf */
14 long i = 0; 14 long i = 0;
15 const char *trans = type == 'u' ? uu_table : b64_table; 15 const char *trans = type == 'u' ? uu_table : b64_table;
16 int padding; 16 int padding;