Update ruby-fcgi to 0.9.2.1.

* Raise exception for syscall errors.  rb_sys_fail can't be catched in
  ruby, but there is no reason to terminate the process.

* ruby references to FCGX_Stream must keep the FCGX_Request alive.
  finshing the request must invalidate the streams.

* fix memory and fd leaks

* [ruby20] switch from rb_thread_select() to select() to avoid breakage
  in the future.

4 files changed, 24 insertions, 15 deletions

diff --git a/www/ruby-fcgi/Makefile b/www/ruby-fcgi/Makefile
index 174604d0b1f..de20025b5d8 100644
--- a/www/ruby-fcgi/Makefile
+++ b/www/ruby-fcgi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2014/03/13 11:08:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2015/02/05 15:46:57 taca Exp $
 
-DISTNAME=		fcgi-0.8.8
+DISTNAME=		fcgi-0.9.2.1
 PKGNAME=		${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=		2
 CATEGORIES=		devel www
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -13,6 +12,10 @@ LICENSE=		gnu-gpl-v2 OR ruby-license
 USE_GCC_RUNTIME=	yes
 
 CONFIGURE_ARGS+=	--with-fcgi-dir=${BUILDLINK_PREFIX.fcgi:Q}
+OVERRIDE_GEMSPEC+=	:files ext/fcgi/Makefile=
+
+pre-configure:
+	${RM} -f ${WRKSRC}/ext/fcgi/Makefile
 
 .include "../../lang/ruby/gem.mk"
 .include "../../www/fcgi/buildlink3.mk"
diff --git a/www/ruby-fcgi/PLIST b/www/ruby-fcgi/PLIST
index b6a775377fe..ab04d8f2367 100644
--- a/www/ruby-fcgi/PLIST
+++ b/www/ruby-fcgi/PLIST
@@ -1,13 +1,17 @@
-@comment $NetBSD: PLIST,v 1.6 2014/03/17 14:37:16 taca Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/02/05 15:46:57 taca Exp $
 ${GEM_HOME}/build_info/${GEM_NAME}.info
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_EXTSDIR}/fcgi.${RUBY_DLEXT}
-${GEM_LIBDIR}/ChangeLog
-${GEM_LIBDIR}/README
+${GEM_LIBDIR}/LICENSE
+${GEM_LIBDIR}/README.rdoc
 ${GEM_LIBDIR}/README.signals
+${GEM_LIBDIR}/VERSION
 ${GEM_LIBDIR}/ext/fcgi/MANIFEST
 ${GEM_LIBDIR}/ext/fcgi/extconf.rb
 ${GEM_LIBDIR}/ext/fcgi/fcgi.c
+${GEM_LIBDIR}/fcgi.gemspec
 ${GEM_LIBDIR}/lib/fcgi.rb
 ${GEM_LIBDIR}/lib/fcgi.${RUBY_DLEXT}
+${GEM_LIBDIR}/test/helper.rb
+${GEM_LIBDIR}/test/test_fcgi.rb
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/www/ruby-fcgi/distinfo b/www/ruby-fcgi/distinfo
index f72791ece71..58432346f11 100644
--- a/www/ruby-fcgi/distinfo
+++ b/www/ruby-fcgi/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2010/09/10 13:09:18 taca Exp $
+$NetBSD: distinfo,v 1.10 2015/02/05 15:46:57 taca Exp $
 
-SHA1 (fcgi-0.8.8.gem) = b45a76d1ea33430195a150002d689d3b6d247e95
-RMD160 (fcgi-0.8.8.gem) = b519e51b26b9f86ae642bdb720d797c75960aa77
-Size (fcgi-0.8.8.gem) = 13312 bytes
-SHA1 (patch-aa) = 0a4c7e25dcaad0fcc044aef96db89fae837a9067
+SHA1 (fcgi-0.9.2.1.gem) = 66d656e5e2b2da4118a9cc07394563c11e1b0a5e
+RMD160 (fcgi-0.9.2.1.gem) = fc4f4d85783b9bf1212d0fd25e63a3c38691dc76
+Size (fcgi-0.9.2.1.gem) = 15872 bytes
+SHA1 (patch-aa) = 31dc497403158c270af3892a1d98b2e037d9b7a4
diff --git a/www/ruby-fcgi/patches/patch-aa b/www/ruby-fcgi/patches/patch-aa
index 9f2c3b0cf70..29a17ef0b54 100644
--- a/www/ruby-fcgi/patches/patch-aa
+++ b/www/ruby-fcgi/patches/patch-aa
@@ -1,12 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2005/12/30 13:01:57 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2015/02/05 15:46:57 taca Exp $
 
---- ext/fcgi/fcgi.c.orig	2005-12-30 12:59:27.000000000 +0000
+Remove legacy errno declaration.
+
+--- ext/fcgi/fcgi.c.orig	2015-01-19 12:50:20.000000000 +0000
 +++ ext/fcgi/fcgi.c
-@@ -164,7 +164,6 @@ static VALUE fcgi_finish(VALUE self)
+@@ -223,7 +223,6 @@ static VALUE fcgi_finish(VALUE self)
  
  #define CHECK_STREAM_ERROR(stream) {\
    int err = FCGX_GetError(stream);\
 -	extern int errno; \
    if (err) {\
      if (err > 0) {\
- 			errno = err;\
+       rb_raise(eFCGIStreamError, "unknown error (syscall error)");\