[packages/ruby-fcgi] Up to 0.9.2.2

arekm arekm at pld-linux.org
Fri Mar 20 20:50:37 CET 2026


commit 497809e035c825f5e6d305f268a62ef1dcf68749
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Mar 20 20:50:12 2026 +0100

    Up to 0.9.2.2

 ruby-fcgi-ruby1.9.patch | 69 -------------------------------------------------
 ruby-fcgi.spec          | 51 +++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 96 deletions(-)
---
diff --git a/ruby-fcgi.spec b/ruby-fcgi.spec
index 2ec0d4d..6500c91 100644
--- a/ruby-fcgi.spec
+++ b/ruby-fcgi.spec
@@ -1,20 +1,17 @@
-# TODO: optflags
 Summary:	Ruby FastCGI Library
 Summary(pl.UTF-8):	Biblioteka FastCGI dla języka Ruby
 Name:		ruby-fcgi
-Version:	0.8.7
-Release:	11
-License:	GPL
-Group:		Development/Libraries
-Source0:	http://www.moonwolf.com/ruby/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	fe4d4a019785e8108668a3e81a5df5e1
-Patch0:		%{name}-ruby1.9.patch
-URL:		http://sugi.nemui.org/prod/ruby-fcgi/
+Version:	0.9.2.2
+Release:	1
+License:	MIT
+Group:		Development/Languages
+Source0:	https://rubygems.org/downloads/fcgi-%{version}.gem
+# Source0-md5:	2fd822dcd51814a575f07c5ae269e901
+URL:		https://rubygems.org/gems/fcgi
 BuildRequires:	fcgi-devel
 BuildRequires:	rpm-rubyprov
-BuildRequires:	rpmbuild(macros) >= 1.729
-BuildRequires:	ruby-devel >= 1:1.8.4
-BuildRequires:	setup.rb >= 3.4.1-6
+BuildRequires:	rpmbuild(macros) >= 1.665
+BuildRequires:	ruby-devel
 Obsoletes:	ruby-fcgi-minero
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,28 +48,27 @@ ri documentation for %{name}.
 Dokumentacji w formacie ri dla %{name}.
 
 %prep
-%setup -q
-%patch -P0 -p1
-
-cp %{_datadir}/setup.rb .
+%setup -q -n fcgi-%{version}
 
 %build
-%{__ruby} setup.rb config \
-	--site-ruby=%{ruby_vendorlibdir} \
-	--so-dir=%{ruby_vendorarchdir}
-
-%{__ruby} setup.rb setup
-
-rdoc --ri --op ri lib ext
-rdoc --op rdoc lib ext
+cd ext/fcgi
+%{__ruby} extconf.rb
+%{__make} \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags} -fPIC"
+
+cd ../..
+rdoc --ri --op ri lib
+rdoc --op rdoc lib
 rm ri/created.rid
 rm ri/cache.ri
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_ridir},%{ruby_rdocdir}}
-%{__ruby} setup.rb install \
-	--prefix=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_vendorarchdir},%{ruby_ridir},%{ruby_rdocdir}}
+
+cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
+install -p ext/fcgi/fcgi.so $RPM_BUILD_ROOT%{ruby_vendorarchdir}
 
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
@@ -82,6 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc LICENSE README.rdoc README.signals
 %attr(755,root,root) %{ruby_vendorarchdir}/fcgi.so
 %{ruby_vendorlibdir}/fcgi.rb
 
diff --git a/ruby-fcgi-ruby1.9.patch b/ruby-fcgi-ruby1.9.patch
deleted file mode 100644
index b5a1e1a..0000000
--- a/ruby-fcgi-ruby1.9.patch
+++ /dev/null
@@ -1,69 +0,0 @@
- ext/fcgi/fcgi.c |   23 +++++++++++++----------
- 1 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/ext/fcgi/fcgi.c b/ext/fcgi/fcgi.c
-index 8539890..0e26b79 100755
---- a/ext/fcgi/fcgi.c
-+++ b/ext/fcgi/fcgi.c
-@@ -222,7 +222,7 @@ static VALUE fcgi_stream_write(VALUE self, VALUE str)
-   rb_secure(4);
-   Data_Get_Struct(self, FCGX_Stream, stream);
-   str = rb_obj_as_string(str);
--  len = FCGX_PutStr(RSTRING(str)->ptr, RSTRING(str)->len, stream);
-+  len = FCGX_PutStr(RSTRING_PTR(str), RSTRING_LEN(str), stream);
-   if (len == EOF) CHECK_STREAM_ERROR(stream);
-   return INT2NUM(len);
- }
-@@ -266,16 +266,19 @@ static VALUE fcgi_stream_printf(int argc, VALUE *argv, VALUE out)
- 
- static VALUE fcgi_stream_puts _((int, VALUE*, VALUE));
- 
--static VALUE fcgi_stream_puts_ary(VALUE ary, VALUE out)
-+static VALUE fcgi_stream_puts_ary(VALUE ary, VALUE out, int recur)
- {
-   VALUE tmp;
-   int i;
- 
--  for (i=0; i<RARRAY(ary)->len; i++) {
--    tmp = RARRAY(ary)->ptr[i];
--    if (rb_inspecting_p(tmp)) {
--      tmp = rb_str_new2("[...]");
--    }
-+  if (recur) {
-+    tmp = rb_str_new2("[...]");
-+    fcgi_stream_puts(1, &tmp, out);
-+    return Qnil;
-+  }
-+
-+  for (i=0; i<RARRAY_LEN(ary); i++) {
-+    tmp = RARRAY_PTR(ary)[i];
-     fcgi_stream_puts(1, &tmp, out);
-   }
-   return Qnil;
-@@ -297,7 +300,7 @@ static VALUE fcgi_stream_puts(int argc, VALUE *argv, VALUE out)
-       line = rb_str_new2("nil");
-       break;
-     case T_ARRAY:
--      rb_protect_inspect(fcgi_stream_puts_ary, argv[i], out);
-+      rb_exec_recursive(fcgi_stream_puts_ary, argv[i], out);
-       continue;
-     default:
-       line = argv[i];
-@@ -305,7 +308,7 @@ static VALUE fcgi_stream_puts(int argc, VALUE *argv, VALUE out)
-     }
-     line = rb_obj_as_string(line);
-     fcgi_stream_write(out, line);
--    if (RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') {
-+    if (RSTRING_PTR(line)[RSTRING_LEN(line)-1] != '\n') {
-       fcgi_stream_write(out, rb_default_rs);
-     }
-   }
-@@ -379,7 +382,7 @@ static VALUE fcgi_stream_gets(VALUE self)
-     rb_str_cat(str, buff, strlen(buff));
-     if (strchr(buff, '\n')) break;
-   }
--  if (RSTRING(str)->len > 0)
-+  if (RSTRING_LEN(str) > 0)
-     return str;
-   else
-     return Qnil;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-fcgi.git/commitdiff/497809e035c825f5e6d305f268a62ef1dcf68749



More information about the pld-cvs-commit mailing list