From f062bebd6bc06413cadd65c65f0a88f86f2f2d202bffb6fce77b9992fafa3f2d Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sat, 26 Dec 2009 10:35:20 +0000 Subject: [PATCH] Accepting request 27556 from devel:libraries:c_c++ Copy from devel:libraries:c_c++/FastCGI based on submit request 27556 from user coolo OBS-URL: https://build.opensuse.org/request/show/27556 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/FastCGI?expand=0&rev=6 --- FastCGI.changes | 15 +++++++ FastCGI.spec | 47 ++++++---------------- fastcgi-2.4.0_missing_call_to_fclose.patch | 12 ++++++ 3 files changed, 39 insertions(+), 35 deletions(-) create mode 100644 fastcgi-2.4.0_missing_call_to_fclose.patch diff --git a/FastCGI.changes b/FastCGI.changes index f876f7d..f6429f5 100644 --- a/FastCGI.changes +++ b/FastCGI.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sun Dec 20 18:13:46 CET 2009 - jengelh@medozas.de + +- enable parallel build + +------------------------------------------------------------------- +Thu Sep 17 18:23:25 CEST 2009 - mrueckert@suse.de + +- add fastcgi-2.4.0_missing_call_to_fclose.patch (bnc#525009) + +------------------------------------------------------------------- +Thu Jun 26 05:14:15 CEST 2009 - crrodriguez@suse.de + +- disable static libraries + ------------------------------------------------------------------- Mon Feb 16 19:53:18 CET 2009 - coolo@suse.de diff --git a/FastCGI.spec b/FastCGI.spec index 2c52854..4e51a34 100644 --- a/FastCGI.spec +++ b/FastCGI.spec @@ -20,7 +20,7 @@ Name: FastCGI Version: 2.4.0 -Release: 138 +Release: 139 # Group: Development/Languages/C and C++ License: Open Market Permissive License @@ -34,7 +34,8 @@ Source1: README.supervise Patch0: FastCGI-makefile.am_cppflags.patch Patch1: FastCGI-clientdata_pointer.patch Patch2: FastCGI-supervise_cgi-fcgi.patch -Patch3: FastCGI-gcc44.patch +Patch3: fastcgi-2.4.0_missing_call_to_fclose.patch +Patch4: FastCGI-gcc44.patch # Summary: A Scalable, Open Extension to CGI @@ -46,7 +47,7 @@ APIs. %package devel -License: Any permissive; Open Market Permissive License +License: PERMISSIVE-OSI-COMPLIANT ; Open Market Permissive License Group: Development/Languages/C and C++ Summary: A scalable, open extension to CGI Requires: %{name} = %{version} @@ -60,7 +61,7 @@ APIs. %package -n perl-FastCGI -License: Other uncritical OpenSource License; Open Market Permissive License +License: Other uncritical OpenSource License ; Open Market Permissive License Group: Development/Languages/C and C++ Summary: A scalable, open extension to CGI Requires: %{name} = %{version} @@ -78,17 +79,18 @@ APIs. %patch1 %patch2 %patch3 +%patch4 touch NEWS AUTHORS ChangeLog COPYING find doc/{fastcgi-prog-guide,fastcgi-whitepaper} -type f -print0 | xargs -r0 chmod 0644 %build autoreconf -fi -%configure --includedir=%{_includedir}/fastcgi +%configure --disable-static --with-pic --includedir=%{_includedir}/fastcgi %{__make} all pushd perl - %configure --includedir=%{_includedir}/fastcgi + %configure --disable-static --with-pic --includedir=%{_includedir}/fastcgi %{__perl} Makefile.PL - %{__make} all + %{__make} %{?jobs:-j%jobs} all popd %install @@ -112,6 +114,7 @@ popd %{__install} -m 0644 perl/ChangeLog %{buildroot}%{_docdir}/%{name}/ChangeLog.perl %{__cp} -vr doc/{fastcgi-prog-guide,fastcgi-whitepaper} java %{S:1} \ %{buildroot}%{_docdir}/%{name}/ +rm -f %{buildroot}%{_libdir}/libfcgi*.la %clean %{__rm} -rf %{buildroot}; @@ -123,14 +126,13 @@ popd %files %defattr(-,root,root) %{_bindir}/cgi-fcgi -%{_libdir}/libfcgi*.so* +%{_libdir}/libfcgi*.so.* %{_mandir}/man1/*.1.gz %doc %{_docdir}/%{name} %files devel %defattr(-,root,root) -%{_libdir}/libfcgi*.a -%{_libdir}/libfcgi*.la +%{_libdir}/libfcgi*.so %dir %{_includedir}/fastcgi/ %{_includedir}/fastcgi/* %{_mandir}/man3/*.3.gz @@ -145,28 +147,3 @@ popd %{_var}/adm/perl-modules/%{name} %changelog -* Mon Feb 16 2009 coolo@suse.de -- fix build with gcc 4.4 -* Fri Oct 20 2006 mrueckert@suse.de -- remove perl_make_install for now ... i wont build for fedora - any time soon. -* Fri Sep 15 2006 mrueckert@suse.de -- add perl_make_install for all distros other than suse. -* Fri Sep 08 2006 mrueckert@suse.de -- add README.supervise -- small spec file cleanup -* Thu Sep 07 2006 mrueckert@suse.de -- applied patch from - http://rubyists.com/articles/2005/05/03/spawn-fcgi-in-the-foreground - to run fastcgi application in foreground this is useful for tools - like runit/daemontools/initng -* Thu Aug 24 2006 mrueckert@suse.de -- run ldconfig -* Wed Mar 08 2006 mrueckert@suse.de -- readded gcc-c++ to the BuildRequires - Seems it got lost in the automatic BuildRequires conversion. - fixes C++ bindings. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Wed Aug 17 2005 mrueckert@suse.de -- Initial package with version 2.4.0 diff --git a/fastcgi-2.4.0_missing_call_to_fclose.patch b/fastcgi-2.4.0_missing_call_to_fclose.patch new file mode 100644 index 0000000..2878cf6 --- /dev/null +++ b/fastcgi-2.4.0_missing_call_to_fclose.patch @@ -0,0 +1,12 @@ +Index: cgi-fcgi/cgi-fcgi.c +=================================================================== +--- cgi-fcgi/cgi-fcgi.c.orig 2009-09-17 18:14:16.000000000 +0200 ++++ cgi-fcgi/cgi-fcgi.c 2009-09-17 18:19:16.139029013 +0200 +@@ -651,6 +651,7 @@ static int ParseArgs(int argc, char *arg + tp1 = tp2; + } + } ++ fclose(fp); + err = ParseArgs(ac, av, doBindPtr, doStartPtr, + connectPathPtr, appPathPtr, nServersPtr, doDaemonPtr); + for(x = 1; x < ac; x++) {