Rev bump for Memory leak (Bug #86366)

(Portage version: 2.0.51.19)

5 files changed, 90 insertions, 2 deletions

diff --git a/dev-ruby/ruby-fcgi/ChangeLog b/dev-ruby/ruby-fcgi/ChangeLog
index d9f84637ee45..30c839da4986 100644
--- a/dev-ruby/ruby-fcgi/ChangeLog
+++ b/dev-ruby/ruby-fcgi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/ruby-fcgi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-fcgi/ChangeLog,v 1.3 2005/02/01 08:04:44 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-fcgi/ChangeLog,v 1.4 2005/03/23 12:15:51 caleb Exp $
+
+*ruby-fcgi-0.8.5-r1 (23 Mar 2005)
+
+  23 Mar 2005; Caleb Tennis <caleb@gentoo.org> +ruby-fcgi-0.8.5-r1.ebuild:
+  Bump for memory leak (Bug #86366)
 
 *ruby-fcgi-0.8.5 (01 Feb 2005)
 
diff --git a/dev-ruby/ruby-fcgi/Manifest b/dev-ruby/ruby-fcgi/Manifest
index af9eea4f4e59..95b26d28ab5a 100644
--- a/dev-ruby/ruby-fcgi/Manifest
+++ b/dev-ruby/ruby-fcgi/Manifest
@@ -1,7 +1,10 @@
 MD5 951a04387863c2fc014a7d1644b22dce ruby-fcgi-0.8.4.ebuild 494
-MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 98be58a0d35b2d7041531c2a1982da60 ruby-fcgi-0.8.5-r1.ebuild 580
 MD5 6f9c52525c73888d75721b8692d1d923 ChangeLog 794
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 48197c357c0d728cd8b6bd56fdb4ca86 ruby-fcgi-0.8.5.ebuild 537
+MD5 e23d001e3dd969b126193cd686e9a71f files/ruby-fcgi-leak.patch 1341
+MD5 13d8759a437f19b78ac7c9d6a1af99a5 files/digest-ruby-fcgi-0.8.5-r1 66
 MD5 4eea712873b2f18a1972a94c6f1f59aa files/digest-ruby-fcgi-0.8.4 66
 MD5 13d8759a437f19b78ac7c9d6a1af99a5 files/digest-ruby-fcgi-0.8.5 66
 MD5 c230547a3d1a9b39d37f221583855ce1 files/ruby-fcgi-sigabrt.patch 497
diff --git a/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.5-r1 b/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.5-r1
new file mode 100644
index 000000000000..44cb9099cdec
--- /dev/null
+++ b/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.5-r1
@@ -0,0 +1 @@
+MD5 896007e727153c6d05c380dd2d7fb109 ruby-fcgi-0.8.5.tar.gz 15483
diff --git a/dev-ruby/ruby-fcgi/files/ruby-fcgi-leak.patch b/dev-ruby/ruby-fcgi/files/ruby-fcgi-leak.patch
new file mode 100644
index 000000000000..09acc768d1e8
--- /dev/null
+++ b/dev-ruby/ruby-fcgi/files/ruby-fcgi-leak.patch
@@ -0,0 +1,60 @@
+--- ext/fcgi/fcgi.c.orig	2003-08-27 20:28:35.000000000 +0900
++++ ext/fcgi/fcgi.c	2005-02-01 16:57:39.741372024 +0900
+@@ -37,6 +37,12 @@
+   rb_gc_mark(data->env);
+ }
+ 
++static void fcgi_free_req(fcgi_data *data)
++{
++  free(data->req);
++  free(data);
++}
++
+ static VALUE fcgi_s_accept(VALUE self)
+ {
+   int status;
+@@ -64,7 +70,7 @@
+     VALUE obj,key, value;
+     char *pkey,*pvalue;
+     
+-    obj = Data_Make_Struct(self, fcgi_data, fcgi_mark, 0, data);
++    obj = Data_Make_Struct(self, fcgi_data, fcgi_mark, fcgi_free_req, data);
+     data->req = req;
+     data->in  = Data_Wrap_Struct(cFCGIStream, 0, 0, req->in);
+     data->out = Data_Wrap_Struct(cFCGIStream, 0, 0, req->out);
+@@ -379,7 +385,10 @@
+     buff = ALLOC_N(char, 16384);
+     n = FCGX_GetStr(buff, 16384, stream);
+     CHECK_STREAM_ERROR(stream);
+-    if (n == 0) return Qnil;
++    if (n == 0) {
++      free(buff);
++      return  Qnil;
++    }
+     str = rb_str_new(buff, n);
+     OBJ_TAINT(str);
+     
+@@ -389,9 +398,11 @@
+       if (n > 0) {
+         rb_str_cat(str, buff, n);
+       } else {
++        free(buff);
+         return Qnil;
+       }
+     }
++    free(buff);
+     return str;
+   }
+ 
+@@ -404,9 +415,11 @@
+   if (n > 0) {
+     str = rb_str_new(buff, n);
+     OBJ_TAINT(str);
++    free(buff);
+     return str;
+   }
+   else {
++    free(buff);
+     return Qnil;
+   }
+ }
diff --git a/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.5-r1.ebuild b/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.5-r1.ebuild
new file mode 100644
index 000000000000..8b68ffb5c868
--- /dev/null
+++ b/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.5-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.5-r1.ebuild,v 1.1 2005/03/23 12:15:51 caleb Exp $
+
+inherit ruby
+
+DESCRIPTION="FastCGI library for Ruby"
+HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=fcgi"
+SRC_URI="http://www.moonwolf.com/ruby/archive/${P}.tar.gz"
+
+USE_RUBY="ruby16 ruby18 ruby19"
+KEYWORDS="~x86 ~ppc ~amd64"
+LICENSE="Ruby"
+
+DEPEND="dev-libs/fcgi"
+
+IUSE=""
+
+PATCHES="${FILESDIR}/${PN}-leak.patch ${FILESDIR}/${PN}-sigabrt.patch"