Hello community, here is the log from the commit of package apache2-mod_fcgid for openSUSE:Factory checked in at Mon Sep 27 10:30:39 CEST 2010. -------- --- apache2-mod_fcgid/apache2-mod_fcgid.changes 2008-03-07 17:09:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/apache2-mod_fcgid/apache2-mod_fcgid.changes 2010-08-05 03:10:57.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Aug 5 01:06:32 UTC 2010 - mrueckert@suse.de + +- update to version 2.3.5 + mod_fcgid is now an official apache project. During the migration + the name of the configuration directives has changed. Please see + + /usr/share/doc/packages/apache2-mod_fcgid/CHANGES-FCGID + + to update your config to the new version. +- adapted config to the new directives + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- docs.tar.bz2 mod_fcgid.2.0-suse_paths.patch mod_fcgid.2.1-warnings.patch mod_fcgid.2.2.tgz New: ---- mod_fcgid-2.3.5.tar.bz2 mod_fcgid-2.3.5_suse_paths.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_fcgid.spec ++++++ --- /var/tmp/diff_new_pack.C3oQb1/_old 2010-09-27 10:30:29.000000000 +0200 +++ /var/tmp/diff_new_pack.C3oQb1/_new 2010-09-27 10:30:29.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package apache2-mod_fcgid (Version 2.2) +# spec file for package apache2-mod_fcgid (Version 2.3.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,25 +24,20 @@ %define apache_sysconfdir %(%{apxs} -q SYSCONFDIR) %define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) # -Version: 2.2 -Release: 95 +Version: 2.3.5 +Release: 1 # Group: Productivity/Networking/Web/Servers -License: GPL v2 or later +License: GPLv2+ # BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: apache2-devel Requires: apache2 %{apache_mmn} # -Url: http://fastcgi.coremail.cn/ -# gz2bz2 from Source: http://fastcgi.coremail.cn/mod_fcgid.%{version}.tar.gz -Source: http://prdownloads.sourceforge.net/mod-fcgid/mod_fcgid.%{version}.tgz -# wget --accept='.htm' -rkmp -np http://fastcgi.coremail.cn && \ -# mv fastcgi.coremail.cn docs && dos2unix docs/* && tar cfj docs{.tar.bz2,} -Source1: docs.tar.bz2 -Source2: apache2-mod_fcgid.conf -Patch0: mod_fcgid.2.1-warnings.patch -Patch1: mod_fcgid.2.0-suse_paths.patch +Url: http://httpd.apache.org/mod_fcgid/ +Source: http://mirror.synyx.de/apache/httpd/mod_fcgid/mod_fcgid-2.3.5.tar.bz2 +Source1: apache2-mod_fcgid.conf +Patch: mod_fcgid-2.3.5_suse_paths.patch # Summary: Alternative FastCGI module for Apache2 @@ -67,17 +62,16 @@ Pan qingfeng <pqf@tebie.com> %prep -%setup -n mod_fcgid.%{version} -a 1 -%patch0 -%patch1 +%setup -n mod_fcgid-%{version} +%patch %build -# we dont need to pass the CFLAGS. apxs2 will do that. +APXS="%{apxs}-prefork" ./configure.apxs %{__make} %install -%{__install} -D -m 0755 .libs/mod_fcgid.so %{buildroot}%{apache_libexecdir}/mod_fcgid.so -%{__install} -D -m 0644 %{S:2} %{buildroot}%{apache_sysconfdir}/conf.d/mod_fcgid.conf +%makeinstall +%{__install} -D -m 0644 %{S:1} %{buildroot}%{apache_sysconfdir}/conf.d/mod_fcgid.conf %{__install} -d -m 0755 %{buildroot}/var/lib/apache2/fcgid/ %clean @@ -87,7 +81,10 @@ %defattr(-,root,root) %{apache_libexecdir}/mod_fcgid.so %config(noreplace) %{apache_sysconfdir}/conf.d/mod_fcgid.conf -%doc ChangeLog docs/* +%doc CHANGES-FCGID LICENSE-FCGID NOTICE-FCGID README-FCGID STATUS-FCGID +%dir %{_datadir}/apache2/manual/ +%dir %{_datadir}/apache2/manual/mod/ +%{_datadir}/apache2/manual/mod/mod_fcgid* %attr(750,wwwrun,www) /var/lib/apache2/fcgid/ %changelog ++++++ apache2-mod_fcgid.conf ++++++ --- /var/tmp/diff_new_pack.C3oQb1/_old 2010-09-27 10:30:29.000000000 +0200 +++ /var/tmp/diff_new_pack.C3oQb1/_new 2010-09-27 10:30:29.000000000 +0200 @@ -9,51 +9,51 @@ ## ## An idle fastcgi application will be terminated after IdleTimeout seconds. ## -#IdleTimeout 300 +#FcgidIdleTimeout 300 ## ## The scan interval for idle fastcgi applications in seconds. ## -#IdleScanInterval 120 +#FcgidIdleScanInterval 120 ## ## a fastcgi application will be terminated if handing a single request longer ## than busy timeout. Value in seconds. ## -#BusyTimeout 300 +#FcgidBusyTimeout 300 ## ## The scan interval for busy timeout fastcgi applications. Value in seconds. ## -#BusyScanInterval 120 +#FcgidBusyScanInterval 120 ## ## The scan interval for exit pending fastcgi applications. fastcgi applications ## will be terminated within this scanning. Value in seconds. ## -#ErrorScanInterval 3 +#FcgidErrorScanInterval 3 ## ## The scan interval for zombie process. Value in seconds. ## -#ZombieScanInterval 3 +#FcgidZombieScanInterval 3 ## ## ## A fastcgi application will be terminated if lifetime expired, even no error ## is detected. Value in seconds. ## -#ProcessLifeTime 3600 +#FcgidProcessLifeTime 3600 ## ## The directory to put the UNIX domain socket. (UNIX only) ## -SocketPath /var/lib/apache2/fcgid/ +FcgidIPCDir /var/lib/apache2/fcgid/ ## ## The share memory file path. ## -SharememPath /var/lib/apache2/fcgid/shm +FcgidProcessTableFile /var/lib/apache2/fcgid/shm ## ## The spawn-speed control score up water limit. Score increases while a process @@ -61,45 +61,45 @@ ## higher than SpawnScoreUpLimit, the spawning will be held for a while. The ## higher this number is, the higher speed of the spawning can be. ## -#SpawnScoreUpLimit n (10) +#FcgidSpawnScoreUpLimit n (10) ## ## The weight of spawning. This weight will be plused to the spawn-control ## score on every spawn. The higher this number is, the lower speed of spawning ## can be. ## -#SpawnScore n (1) +#FcgidSpawnScore n (1) ## ## The weight of termination. This weight will be plused to the score while ## fastcgi process terminates. The higher this number is, the lower speed of ## spawning can be. ## -#TerminationScore n (2) +#FcgidTerminationScore n (2) ## ## The max count of total fastcgi process count. ## -#MaxProcessCount n (1000) +#FcgidMaxProcesses n (1000) ## ## The maximum number of fastcgi application instances allowed to run for any ## one fastcgi application. ## -#DefaultMaxClassProcessCount n (100) +#FcgidMaxProcessesPerClass n (100) ## ## The default environment variables before a fastcgi application is spawned. ## You can set this configuration more than once. ## -#DefaultInitEnv env_name env_value +#FcgidInitialEnv env_name env_value ## ## The connect timeout to a fastcgi application. Value in seconds. ## ## Default value: 2 ## -IPCConnectTimeout 10 +FcgidConnectTimeout 10 ## ## The communication timeout to a fastcgi application. Please increase this @@ -108,12 +108,12 @@ ## ## Default value: 5 ## -IPCCommTimeout 40 +FcgidIOTimeout 40 ## ## CGI output cache buffer size. Value in kilobytes. ## -#OutputBufferSize 64 +#FcgidOutputBufferSize 64 ## ## Associate .fcgi files with mod_fcgid @@ -127,7 +127,7 @@ ## #<FilesMatch "\.php$"> # AddHandler fcgid-script .php -# FCGIWrapper /srv/www/cgi-bin/php5 .php +# FcgidWrapper /srv/www/cgi-bin/php5 .php # Options +ExecCGI #</FilesMatch> ## ++++++ mod_fcgid-2.3.5_suse_paths.patch ++++++ Index: configure.apxs =================================================================== --- configure.apxs.orig +++ configure.apxs @@ -39,6 +39,7 @@ rel_libexecdir=`$APXS -q exp_libexecdir rel_sysconfdir=`$APXS -q exp_sysconfdir | sed -e "s#^$rel_fix_prefix/##;"` rel_logfiledir=`$APXS -q exp_logfiledir | sed -e "s#^$rel_fix_prefix/##;"` httpd_conffile=`$APXS -q exp_sysconfdir`/`$APXS -q progname`.conf +mpm_includedir=`$APXS -q exp_includedir` if test -z "$AWK"; then AWK=`$APXS -q AWK` @@ -55,6 +56,7 @@ for i in Makefile build/Makefile modules -e "s#^\(srcdir\)=.*#\1=$srcdir$l_r#;" \ -e "s#^\(builddir\)=.*#\1=$builddir$l_r#;" \ -e "s#^\(rel_libexecdir\)=.*#\1=$rel_libexecdir#;" \ + -e "s#^\(mpm_includedir\)=.*#\1=$mpm_includedir#;" \ -e "s#^\(rel_sysconfdir\)=.*#\1=$rel_sysconfdir#;" \ -e "s#^\(rel_logfiledir\)=.*#\1=$rel_logfiledir#;" \ -e "s#^\(httpd_conffile\)=.*#\1=$httpd_conffile#;" \ Index: modules/fcgid/Makefile.apxs =================================================================== --- modules/fcgid/Makefile.apxs.orig +++ modules/fcgid/Makefile.apxs @@ -15,7 +15,7 @@ fcgid_builddir=../.. fcgid_srcdir=../.. builddir=. srcdir=. - +mpm_includedir="$(shell $(APXS) -q exp_includedir)" CLEAN_TARGETS = *.loT include $(exp_installbuilddir)/special.mk @@ -23,6 +23,6 @@ all: local-shared-build all-recursive # additional defines, includes and libraries DEFS=-DFCGID_APXS_BUILD -INCLUDES=-I$(builddir) -I$(srcdir) -I$(fcgid_srcdir)/include +INCLUDES=-I$(builddir) -I$(srcdir) -I$(fcgid_srcdir)/include -I$(mpm_includedir) #LIBS=-Lmy/lib/dir -lmylib ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org