[pkgsrc/pkgsrc-2006Q3]: pkgsrc/lang/ruby18-base Pullup ticket 1897 - requeste...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0be9a766312b
branches:  pkgsrc-2006Q3
changeset: 519171:0be9a766312b
user:      salo <salo%pkgsrc.org@localhost>
date:      Sun Nov 05 19:28:55 2006 +0000

description:
Pullup ticket 1897 - requested by taca
security fix for ruby18-base

Revisions pulled up:
- pkgsrc/lang/ruby18-base/Makefile                      1.28
- pkgsrc/lang/ruby18-base/distinfo                      1.16
- pkgsrc/lang/ruby18-base/patches/patch-bl              1.3

   Module Name:         pkgsrc
   Committed By:        taca
   Date:                Fri Nov  3 05:36:23 UTC 2006

   Modified Files:
        pkgsrc/lang/ruby18-base: Makefile distinfo
   Added Files:
        pkgsrc/lang/ruby18-base/patches: patch-bl

   Log Message:
   Add patch to cgi.rb for fixing security problem (CVE-2006-5467).

   Bump PKGREVISION.

diffstat:

 lang/ruby18-base/Makefile         |   4 ++--
 lang/ruby18-base/distinfo         |   3 ++-
 lang/ruby18-base/patches/patch-bl |  13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r f3f60be53166 -r 0be9a766312b lang/ruby18-base/Makefile
--- a/lang/ruby18-base/Makefile Sun Nov 05 19:17:54 2006 +0000
+++ b/lang/ruby18-base/Makefile Sun Nov 05 19:28:55 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26.2.1 2006/11/05 19:17:54 salo Exp $
+# $NetBSD: Makefile,v 1.26.2.2 2006/11/05 19:28:55 salo Exp $
 #
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
diff -r f3f60be53166 -r 0be9a766312b lang/ruby18-base/distinfo
--- a/lang/ruby18-base/distinfo Sun Nov 05 19:17:54 2006 +0000
+++ b/lang/ruby18-base/distinfo Sun Nov 05 19:28:55 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14.2.1 2006/11/05 19:17:54 salo Exp $
+$NetBSD: distinfo,v 1.14.2.2 2006/11/05 19:28:55 salo Exp $
 
 SHA1 (ruby-1.8.5-base-20060906.patch.bz2) = 99c283e6d9df4f90ab6d765041b91d37c70dd3ee
 RMD160 (ruby-1.8.5-base-20060906.patch.bz2) = 3b51a6b1d9badd76dc50735971411fa0800d2e85
@@ -9,3 +9,4 @@
 SHA1 (patch-aa) = c5413c506b93657d909bc3cbdcdb51e7c216491e
 SHA1 (patch-ab) = a1a76abd093a08e76be61678febd5f8c8cba164d
 SHA1 (patch-ae) = dfa9c5296c75f6193c790fca8d3eb15ad4a9f228
+SHA1 (patch-bl) = cfb31ebef08aebf9ce3bc6e44c83e1727950ef76
diff -r f3f60be53166 -r 0be9a766312b lang/ruby18-base/patches/patch-bl
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ruby18-base/patches/patch-bl Sun Nov 05 19:28:55 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-bl,v 1.2.6.1 2006/11/05 19:28:55 salo Exp $
+
+--- lib/cgi.rb.orig    2006-11-02 22:44:37.000000000 +0900
++++ lib/cgi.rb
+@@ -1018,7 +1018,7 @@ class CGI
+               else
+                 stdinput.read(content_length)
+               end
+-          if c.nil?
++          if c.nil? || c.empty?
+             raise EOFError, "bad content body"
+           end
+           buf.concat(c)