diff options
author | taca <taca@pkgsrc.org> | 2014-10-27 16:29:57 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2014-10-27 16:29:57 +0000 |
commit | 81c1113861bd07cfd6621ce30d2cb35f4b9d521a (patch) | |
tree | ae1b84d9d667018797b2c2dcfb6bb7ca40da2c27 /lang | |
parent | ff8eb300dfed263fb8b4ee6c2c807957393e6df3 (diff) | |
download | pkgsrc-81c1113861bd07cfd6621ce30d2cb35f4b9d521a.tar.gz |
Update ruby21/ruby21-base package to 2.1.4.
Ruby 2.1.4 is released
Ruby 2.1.4 has been released.
This release includes security fixes for the following vulnerabilities:
* CVE-2014-8080: Denial Of Service XML Expansion
* Changed default settings of ext/openssl related to CVE-2014-3566
And there are some bug-fixes.
See tickets and ChangeLog for details.
Ruby 2.1.3 Released
We are pleased to announce the release of Ruby 2.1.3. This is a patchlevel
release of the stable 2.1 series.
This release contains a change of full GC timing to reduce memory consumption
(see Bug #9607), and many bugfixes.
See tickets and ChangeLog for details.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/ruby/rubyversion.mk | 6 | ||||
-rw-r--r-- | lang/ruby21-base/Makefile | 3 | ||||
-rw-r--r-- | lang/ruby21-base/PLIST | 6 | ||||
-rw-r--r-- | lang/ruby21-base/distinfo | 10 | ||||
-rw-r--r-- | lang/ruby21-base/patches/patch-ext_dl_extconf.rb | 12 | ||||
-rw-r--r-- | lang/ruby21-base/patches/patch-pack.c | 42 |
6 files changed, 11 insertions, 68 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 3b4747dd5ae..b7db83c4e61 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.126 2014/10/27 16:20:16 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.127 2014/10/27 16:29:57 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -223,13 +223,13 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/} RUBY18_VERSION= 1.8.7 RUBY193_VERSION= 1.9.3 RUBY200_VERSION= 2.0.0 -RUBY21_VERSION= 2.1.2 +RUBY21_VERSION= 2.1.4 # patch RUBY18_PATCHLEVEL= pl374 RUBY193_PATCHLEVEL= p550 RUBY200_PATCHLEVEL= p594 -#RUBY21_PATCHLEVEL= p95 +#RUBY21_PATCHLEVEL= p265 # current API compatible version; used for version of shared library RUBY18_API_VERSION= 1.8.7 diff --git a/lang/ruby21-base/Makefile b/lang/ruby21-base/Makefile index e57596a2542..1cc44cdbc70 100644 --- a/lang/ruby21-base/Makefile +++ b/lang/ruby21-base/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2014/09/02 14:03:36 jperkin Exp $ +# $NetBSD: Makefile,v 1.8 2014/10/27 16:29:57 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} -PKGREVISION= 1 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby21-base/PLIST b/lang/ruby21-base/PLIST index 57d970f36d4..715daca609c 100644 --- a/lang/ruby21-base/PLIST +++ b/lang/ruby21-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2014/05/21 03:19:57 taca Exp $ +@comment $NetBSD: PLIST,v 1.3 2014/10/27 16:29:57 taca Exp $ bin/erb${RUBY_SUFFIX} bin/gem${RUBY_SUFFIX} bin/irb${RUBY_SUFFIX} @@ -921,7 +921,7 @@ ${RUBY_ARCHLIB}/zlib.${RUBY_DLEXT} ${GEM_HOME}/gems/rake-10.1.0/bin/rake ${GEM_HOME}/gems/rdoc-4.1.0/bin/rdoc ${GEM_HOME}/gems/rdoc-4.1.0/bin/ri -${GEM_HOME}/gems/test-unit-2.1.2.0/bin/testrb +${GEM_HOME}/gems/test-unit-2.1.4.0/bin/testrb ${GEM_HOME}/specifications/default/bigdecimal-1.2.4.gemspec ${GEM_HOME}/specifications/default/io-console-0.4.2.gemspec ${GEM_HOME}/specifications/default/json-1.8.1.gemspec @@ -929,7 +929,7 @@ ${GEM_HOME}/specifications/default/minitest-4.7.5.gemspec ${GEM_HOME}/specifications/default/psych-2.0.5.gemspec ${GEM_HOME}/specifications/default/rake-10.1.0.gemspec ${GEM_HOME}/specifications/default/rdoc-4.1.0.gemspec -${GEM_HOME}/specifications/default/test-unit-2.1.2.0.gemspec +${GEM_HOME}/specifications/default/test-unit-2.1.4.0.gemspec man/man1/erb${RUBY_SUFFIX}.1 man/man1/irb${RUBY_SUFFIX}.1 man/man1/rake${RUBY_SUFFIX}.1 diff --git a/lang/ruby21-base/distinfo b/lang/ruby21-base/distinfo index 9cb3287b071..13fb020f6bd 100644 --- a/lang/ruby21-base/distinfo +++ b/lang/ruby21-base/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.8 2014/10/02 08:59:52 taca Exp $ +$NetBSD: distinfo,v 1.9 2014/10/27 16:29:57 taca Exp $ -SHA1 (ruby-2.1.2.tar.bz2) = 29a615966c7feb6554be736e7dcd590c770ee692 -RMD160 (ruby-2.1.2.tar.bz2) = 0bae9f1f62c0df44840355a880eb1907892f2b38 -Size (ruby-2.1.2.tar.bz2) = 11976939 bytes +SHA1 (ruby-2.1.4.tar.bz2) = c80ea0d5dddf1b0e7846b618fa7ae0e0cf7e55df +RMD160 (ruby-2.1.4.tar.bz2) = 24b8e9950873663e44174d2a5d57fb864dee4fe6 +Size (ruby-2.1.4.tar.bz2) = 11992171 bytes SHA1 (patch-configure) = 40da4aec83fcb9cf026d2b458ff3beb6dcf7776a -SHA1 (patch-ext_dl_extconf.rb) = f6c71db3c3076216c9b5db92692c7c8dad012af0 SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051 SHA1 (patch-lib_rubygems.rb) = 9d27fa8c96f285461fbb08df7491a0a48ed612e1 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e @@ -22,7 +21,6 @@ SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116 SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68d1f518caa054cfd900e0fedb7 SHA1 (patch-man_ri.1) = af855135020f18c361cc55af676adc75e26bf4d3 SHA1 (patch-man_ruby.1) = 5bc1e2e7c4c640659e33d0131d0982ce4e0d9fe0 -SHA1 (patch-pack.c) = ae46b0ab043b7f27bd0fa031eaf181981acdde7a SHA1 (patch-template_verconf.h.in) = 1f4c0676d1335a9fc32ccf8cbfa41678dde96dcd SHA1 (patch-test_rubygems_test__gem.rb) = 4d8cc50c2782e29eefea0ea6deedf295a7f09bc2 SHA1 (patch-tool_rbinstall.rb) = 845e5136dc2b5e3c41aeb833890e786544d6f5d5 diff --git a/lang/ruby21-base/patches/patch-ext_dl_extconf.rb b/lang/ruby21-base/patches/patch-ext_dl_extconf.rb deleted file mode 100644 index 5f022221498..00000000000 --- a/lang/ruby21-base/patches/patch-ext_dl_extconf.rb +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ext_dl_extconf.rb,v 1.1 2014/03/14 19:40:47 taca Exp $ - ---- ext/dl/extconf.rb.orig 2012-02-25 05:47:16.000000000 +0000 -+++ ext/dl/extconf.rb -@@ -1,7 +1,6 @@ - require 'mkmf' - - if RbConfig::CONFIG['GCC'] == 'yes' -- (have_macro("__clang__") ? $LDFLAGS : $CFLAGS) << " -fno-defer-pop" - $CFLAGS << " -fno-omit-frame-pointer" - end - diff --git a/lang/ruby21-base/patches/patch-pack.c b/lang/ruby21-base/patches/patch-pack.c deleted file mode 100644 index 50ce234e146..00000000000 --- a/lang/ruby21-base/patches/patch-pack.c +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-pack.c,v 1.2 2014/10/02 08:59:52 taca Exp $ - -Fix for CVE-2014-4975 from revision #46806 in ruby_2_1 branch. - ---- pack.c.orig 2013-11-08 02:37:47.000000000 +0000 -+++ pack.c -@@ -946,7 +946,8 @@ static const char b64_table[] = - static void - encodes(VALUE str, const char *s, long len, int type, int tail_lf) - { -- char buff[4096]; -+ enum {buff_size = 4096, encoded_unit = 4}; -+ char buff[buff_size + 1]; /* +1 for tail_lf */ - long i = 0; - const char *trans = type == 'u' ? uu_table : b64_table; - char padding; -@@ -959,7 +960,7 @@ encodes(VALUE str, const char *s, long l - padding = '='; - } - while (len >= 3) { -- while (len >= 3 && sizeof(buff)-i >= 4) { -+ while (len >= 3 && buff_size-i >= encoded_unit) { - buff[i++] = trans[077 & (*s >> 2)]; - buff[i++] = trans[077 & (((*s << 4) & 060) | ((s[1] >> 4) & 017))]; - buff[i++] = trans[077 & (((s[1] << 2) & 074) | ((s[2] >> 6) & 03))]; -@@ -967,7 +968,7 @@ encodes(VALUE str, const char *s, long l - s += 3; - len -= 3; - } -- if (sizeof(buff)-i < 4) { -+ if (buff_size-i < encoded_unit) { - rb_str_buf_cat(str, buff, i); - i = 0; - } -@@ -987,6 +988,7 @@ encodes(VALUE str, const char *s, long l - } - if (tail_lf) buff[i++] = '\n'; - rb_str_buf_cat(str, buff, i); -+ if ((size_t)i > sizeof(buff)) rb_bug("encodes() buffer overrun"); - } - - static const char hex_table[] = "0123456789ABCDEF"; |