From a391ec830980c6436b52e019142428704be20a2a Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 12 Oct 2009 15:04:41 +0000 Subject: [PATCH] - Update to 2.3.4 - Upstream moved to apache.org - License changed to ASL 2.0 - Configuration directives have all been renamed - use fixconf.sed script to fix if necessary - Lots of documentation changes - Renumber sources - Don't defer to mod_fastcgi if both are present - Build SELinux policy module for EL-5; support in EL-5.3 is incomplete and will be fixed in EL-5.5 (#519369) - Drop aliases httpd_sys_content_r{a,o,w}_t -> httpd_fastcgi_content_r{a,o,w}_t from pre-2.5 SElinux policy module as these types aren't defined there - Drop gawk buildreq --- .cvsignore | 2 +- configuration.htm | 257 ------------------------ doc.htm | 210 ------------------- fastcgi.te | 8 +- fcgid.conf | 12 +- mod_fcgid-2.1-README.RPM | 13 +- mod_fcgid-2.1-README.SELinux | 3 +- mod_fcgid-2.3.4-fixconf-shellbang.patch | 8 + mod_fcgid.spec | 105 ++++++---- sources | 2 +- 10 files changed, 83 insertions(+), 537 deletions(-) delete mode 100644 configuration.htm delete mode 100644 doc.htm create mode 100644 mod_fcgid-2.3.4-fixconf-shellbang.patch diff --git a/.cvsignore b/.cvsignore index 64d7d91..3760558 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mod_fcgid.2.2.tar.gz +mod_fcgid-2.3.4.tar.bz2 diff --git a/configuration.htm b/configuration.htm deleted file mode 100644 index 774334c..0000000 --- a/configuration.htm +++ /dev/null @@ -1,257 +0,0 @@ - - - - - - - The mod_fcgid Home Page - - -

This is a for regular fastcgi. 

-

LoadModule fcgid_module modules/mod_fcgid.so

-

<Location /fcgid>
-    SetHandler fcgid-script
-    Options ExecCGI
-    allow from all
-</Location>

-

  -

-
-

This is for suEXEC. Please get more -information about suEXEC here. 

-

LoadModule fcgid_module modules/mod_fcgid.so

-

<Location /fcgid>
-    SetHandler fcgid-script
-    Options ExecCGI
-    allow from all
-</Location>

-

<VirtualHost 192.168.1.89>
-    ServerAdmin webmaster@host.foo.com
-    DocumentRoot /usr/local/apache2/htdocs/
-    ServerName host.foo.com
-    SuexecUserGroup pqf pqf
-</VirtualHost>

-

　 -

-
-

This is for fastcgi-mode PHP (UNIX)

-

LoadModule fcgid_module modules/mod_fcgid.so

-

<Directory /usr/local/apache2/htdocs/php>
-    SetHandler fcgid-script
-    FCGIWrapper /usr/local/bin/php .php -

-

   # You need mod_fcgid -version >= 2.1 to support arguments in FCGIWrapper, if you want
-   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php

-    Options ExecCGI
-

    allow from all
-</Directory>

-

This works too:

-

LoadModule fcgid_module modules/mod_fcgid.so 

-

AddHandler fcgid-script .php
-<Directory /usr/local/apache2/htdocs/php>
-    FCGIWrapper /usr/local/bin/php .php

-

    # You need mod_fcgid version >= 2.1 to -support arguments in FCGIWrapper, if you want
-   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php

-

    Options ExecCGI
-    allow from all
-</Directory>

-

# Please make sure:
-# php is configured with --enable-fastcgi option
-# check error_log(with debug level), if any thing goes wrong

-

-
-

This is for fastcgi-mode Ruby on Rails ( Thank Andre Nathan giving -me this demo configuration )
-
-LoadModule fcgid_module modules/mod_fcgid.so
-SocketPath /tmp/fcgidsock
-SharememPath /tmp/fcgidshm
-DefaultInitEnv RAILS_ENV production
-
-<Directory /home/sneakymustard/tumble/public>
-    Options ExecCGI FollowSymLinks
-    AllowOverride AuthConfig Indexes Limit
-    Order allow,deny
-    Allow from all
-
-    AddHandler fcgid-script .fcgi

-

    # You need -mod_fcgid version >= 2.1 to support arguments "xxx/dispatch.fcgi" in -FCGIWrapper
-    FCGIWrapper "/usr/bin/ruby -/home/sneakymustard/tumble/public/dispatch.fcgi" .fcgi
-
-    RewriteEngine On
-    RewriteRule ^$ index.html [QSA]
-    RewriteRule ^([^.]+)$ $1.html [QSA]
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
-</Directory>
-
-

- -

-
-

This is for suPHP  ( UNIX )

-

LoadModule fcgid_module modules/mod_fcgid.so
-
-<VirtualHost *:80>
-    ServerName test2.example.com
-    DocumentRoot -/usr/local/apache2/htdocs/test2.example.com/
-    SuexecUserGroup pqf pqf
-</VirtualHost>
-
-<Directory /usr/local/apache2/htdocs/test2.example.com/>
-    AddHandler fcgid-script .php
-    Options ExecCGI
-    allow from all
-    FCGIWrapper -/usr/local/apache2/htdocs/test2.example.com/php .php

-

-

    # You need mod_fcgid version >= 2.1 to -support arguments in FCGIWrapper, if you want
-   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php

-

</Directory>

-

# Please make sure:
-# php is configured with --enable-fastcgi option
-# copy php execution to /usr/local/apache2/htdocs/test2.example.com/ -directory
-# make sure all files in /usr/local/apache2/htdocs/test2.example.com/ -with right owner and group
-# check error_log(with debug level) and suexec_log, if any thing goes -wrong
-

-
-


-This is for fastcgi-mode PHP ( Windows ) -

-

LoadModule fcgid_module modules/mod_fcgid.so
-DefaultInitEnv PHPRC "c:/php/"
-DefaultInitEnv PATH -"c:/php;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;"
-DefaultInitEnv SystemRoot "C:/Windows"
-DefaultInitEnv SystemDrive "C:"
-DefaultInitEnv TEMP "C:/WINDOWS/TEMP"
-DefaultInitEnv TMP "C:/WINDOWS/TEMP"
-DefaultInitEnv windir "C:/WINDOWS"
-<Directory "C:/Apache2/htdocs/php/">
-    SetHandler fcgid-script
-    Options execCGI
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-    FCGIWrapper "c:/php/php.exe" .php

-

    # You need mod_fcgid version >= 2.1 to -support arguments in FCGIWrapper, if you want
-   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php
-</Directory>

-

This works too: -

-

LoadModule fcgid_module modules/mod_fcgid.so
-DefaultInitEnv PHPRC "c:/php/"
-DefaultInitEnv PATH -"c:/php;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;"
-DefaultInitEnv SystemRoot "C:/Windows"
-DefaultInitEnv SystemDrive "C:"
-DefaultInitEnv TEMP "C:/WINDOWS/TEMP"
-DefaultInitEnv TMP "C:/WINDOWS/TEMP"
-DefaultInitEnv windir "C:/WINDOWS"
-AddHandler fcgid-script .php
-<Directory "C:/Apache2/htdocs/php/">
-    FCGIWrapper "c:/php/php.exe" .php

-

    # You need mod_fcgid version >= 2.1 to -support arguments in FCGIWrapper, if you want
-   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php
-

-

     -Options ExecCGI
-    allow from all
-</Directory>
-

-
-

This is for Authenticator

-

LoadModule fcgid_module modules/mod_fcgid.so -

-

<Location /fcgid>
-SetHandler fcgid-script
-Options ExecCGI
-allow from all
-AuthType Basic
-AuthName ProtectedRealm
-FastCgiAuthenticator /some/path/authenticator
-require valid-user
-</Location>
-

-

Another configuration: FastCgiAuthenticatorAuthoritative -(default On)

-

Setting the FastCgiAuthenticatorAuthoritative -directive explicitly to Off allows authentication to be -passed on to lower level modules

-
-

This is for Authorizer

-

LoadModule fcgid_module modules/mod_fcgid.so -

-

<Location /fcgid>
-SetHandler fcgid-script
-Options ExecCGI
-allow from all
-AuthType Basic
-AuthName ProtectedRealm
-FastCgiAuthorizer /some/place/Authorizer
-</Location>

-

Another configuration: FastCgiAuthorizerAuthoritative -(default On)

-

Setting the FastCgiAuthorizerAuthoritative directive -explicitly to Off allows authorization to be passed on to -lower level modules

-
-

This is for AccessChecker

-

LoadModule fcgid_module modules/mod_fcgid.so -

-

<Location /fcgid>
-SetHandler fcgid-script
-Options ExecCGI
-allow from all
-FastCgiAccessChecker /some/place/access-checker
-</Location>
-

-

Another configuration: FastCgiAccessCheckerAuthoritative -(default On)

-

Setting the FastCgiAccessCheckerAuthoritative -directive explicitly to Off allows access checking to be -passed on to lower level modules

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

-

　

- - diff --git a/doc.htm b/doc.htm deleted file mode 100644 index 51b1c1a..0000000 --- a/doc.htm +++ /dev/null @@ -1,210 +0,0 @@ - - - - The mod_fcgid Home Page - - - - - - - - - - -
  - - - - - - -
Home
- Chinese Info
- Download (source)
- Documentations
- Feedback
- Support This Project
- 		-
    -
  • -

    Here are some examples of configuration

    -
    • -
-

Configuration -for Regular fastcgi -(non-PHP, non-Ruby, non-Python) 

-

Configuration -for suEXEC fastcgi

-

Configuration for PHP -(UNIX)
-

-

Configuration for Ruby on -Rails
-

-

Configuration for suPHP -(UNIX)

-

Configuration -for PHP (Windows)

-

Configuration -for Authenticator

-

Configuration -for Authorizer

-

Configuration -for AccessChecker

-

 

-
-
    -
  • -

    There are -some other configurations you can set

    -
    • -
-

IdleTimeout n (300 -seconds)

-

An idle fastcgi application will be terminated after -IdleTimeout -seconds.

-

IdleScanInterval n (120 seconds)

-

The scan interval for idle -fastcgi applications.

-

BusyTimeout n (300 seconds)

-

a fastcgi -application will be terminated if handing a single request longer than -busy -timeout.

-

BusyScanInterval n (120 seconds)

-

The scan interval for busy -timeout fastcgi applications.

-

ErrorScanInterval n (3 seconds)

-

The -scan interval for exit pending fastcgi applications. fastcgi -applications will -be terminated within this scanning.

-

ZombieScanInterval n (3 seconds)

-

The -scan interval for zombie process. 

-

ProcessLifeTime n (3600 seconds)

-

A -fastcgi application will be terminated if lifetime expired, even no -error is -detected.

-

SocketPath path (logs/fcgidsock)

-

The directory to put the -UNIX domain socket. (UNIX only)
-

-

SharememPath path -(logs/fcgid_shm)
-

-

The share memory file path. (UNIX only) (version >= 2.1 -only)
-

-

SpawnScoreUpLimit n (10)

-

The -spawn-speed control score up water limit. Score increases while a -process is spawned or terminated, and decreases -as time progresses; while the score is higher than SpawnScoreUpLimit, -the spawning will be -held for a while. The higher this number is, the higher speed of the -spawning -can be.

-

SpawnScore n (1)

-

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.

-

TerminationScore n (2)

-

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.

-

MaxProcessCount n (1000)

-

The max count of total fastcgi process -count.

-

DefaultMaxClassProcessCount n (100)

-

The maximum number of -fastcgi application instances allowed to run for any one fastcgi -application. 

-

DefaultMinClassProcessCount n -(3)

-

The minimum number of -fastcgi application instances for any one fastcgi application. 

-

DefaultInitEnv  -env_name env_value

-

The default environment variables before a fastcgi -application is spawned. You can set this configuration more -than once.
-

- - - - - - -
Note: If you get:
-
Can't create TCP/IP -socket (10106) error while running PHP script(on Win32 only), you will have to set -these(Please modify the values if -necessary):
- DefaultInitEnv PHPRC "c:/php/"
-DefaultInitEnv PATH -"c:/php;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;"
-DefaultInitEnv SystemRoot "C:/Windows"
-DefaultInitEnv SystemDrive "C:"
-DefaultInitEnv TEMP "C:/WINDOWS/TEMP"
-DefaultInitEnv TMP "C:/WINDOWS/TEMP"
-DefaultInitEnv windir "C:/WINDOWS"
-
-(Thank Steffen of apachelounge.com for this note)
-
-
-


-

-

IPCConnectTimeout n (3 seconds)

-

The connect timeout to a -fastcgi application. 

-

IPCCommTimeout n (20 seconds)

-

The communication -timeout to a fastcgi application. Please increase this value if your -CGI have a -slow initialization or slow respond.

-

OutputBufferSize n (64k bytes)

-

CGI -output cache buffer size.

-

PHP_Fix_Pathinfo_Enable n(n=0/1, default 0)

-

If -you are using PHP and set cgi.fix_pathinfo=1 in php.ini, set -PHP_Fix_Pathinfo_Enable 1.

-

MaxRequestsPerProcess n (-1)

-

(Added in -version 1.11, patch from Robert L Mathews)

-

Adds a MaxRequestsPerProcess parameter that allows mod_fcgid -to -exit after handling a certain number of requests, similar to the -existing ProcessLifeTime option. 

-

This solves a problem with PHP in FastCGI mode. By default, -PHP stops -accepting new FastCGI connections after handling 500 requests; -unfortunately, there is a potential race condition during the PHP -cleanup code in which -PHP can be shutting down but still have the socket open, so mod_fcgid -under heavy load can send request number 501 to PHP and have it -"accepted", but then -PHP appears to simply exit, causing errors.

-

If you are using PHP, you should -set it to 500. -1 mean fastcgi process will not exit no matter how many -requests -it has handled.
-

-
- - diff --git a/fastcgi.te b/fastcgi.te index 68f1c13..373d920 100644 --- a/fastcgi.te +++ b/fastcgi.te @@ -8,16 +8,13 @@ # Previous versions of this policy module used a separate domain, httpd_fastcgi_script_t, # which is now an alias for httpd_sys_script_t. -policy_module(fastcgi, 0.1.10) +policy_module(fastcgi, 0.1.11) require { type devpts_t; type httpd_t; type httpd_log_t; type httpd_sys_content_t; - type httpd_sys_content_ra_t; - type httpd_sys_content_ro_t; - type httpd_sys_content_rw_t; type httpd_sys_script_exec_t; type httpd_sys_script_ra_t; type httpd_sys_script_ro_t; @@ -29,9 +26,6 @@ require { # Type aliases for contexts used with older policy modules typealias httpd_sys_content_t alias httpd_fastcgi_content_t; -typealias httpd_sys_content_ra_t alias httpd_fastcgi_content_ra_t; -typealias httpd_sys_content_ro_t alias httpd_fastcgi_content_ro_t; -typealias httpd_sys_content_rw_t alias httpd_fastcgi_content_rw_t; typealias httpd_sys_script_exec_t alias httpd_fastcgi_script_exec_t; typealias httpd_sys_script_ra_t alias httpd_fastcgi_script_ra_t; typealias httpd_sys_script_ro_t alias httpd_fastcgi_script_ro_t; diff --git a/fcgid.conf b/fcgid.conf index bf04642..90f208e 100644 --- a/fcgid.conf +++ b/fcgid.conf @@ -1,16 +1,14 @@ # This is the Apache server configuration file for providing FastCGI support # through mod_fcgid # -# Documentation is available at http://fastcgi.coremail.cn/doc.htm +# Documentation is available at +# http://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html LoadModule fcgid_module modules/mod_fcgid.so # Use FastCGI to process .fcg .fcgi & .fpl scripts -# Don't do this if mod_fastcgi is present, as it will try to do the same thing - - AddHandler fcgid-script fcg fcgi fpl - +AddHandler fcgid-script fcg fcgi fpl # Sane place to put sockets and shared memory file -SocketPath /var/run/mod_fcgid -SharememPath /var/run/mod_fcgid/fcgid_shm +FcgidIPCDir /var/run/mod_fcgid +FcgidProcessTableFile /var/run/mod_fcgid/fcgid_shm diff --git a/mod_fcgid-2.1-README.RPM b/mod_fcgid-2.1-README.RPM index 18891e0..89165c5 100644 --- a/mod_fcgid-2.1-README.RPM +++ b/mod_fcgid-2.1-README.RPM @@ -3,15 +3,10 @@ Using the mod_fcgid RPM Package This mod_fcgid package includes a configuration file /etc/httpd/conf.d/fcgid.conf that ensures that the module is loaded and -added as the handler for .fcg, .fcgi, and .fpl applications (provided -mod_fastcgi in not already loaded, in which case you will need to decide which -module should handle which types of application). +added as the handler for .fcg, .fcgi, and .fpl applications. -So far the module package has only been tested in conjunction with the "moin" -wiki application. Further feedback regarding other applications is welcome. - -Setting up moin with mod_fcgid -============================== +Example: setting up moin with mod_fcgid +======================================= Setting up moin with mod_fcgid is very similar to setting it up as a regular CGI application. @@ -37,7 +32,7 @@ CGI application. /etc/httpd/conf.d/mywiki.conf # Wiki application data common to all wiki instances - Alias /moin_static182 "/usr/share/moin/htdocs/" + Alias /moin_static185 "/usr/share/moin/htdocs/" Options Indexes FollowSymLinks AllowOverride None diff --git a/mod_fcgid-2.1-README.SELinux b/mod_fcgid-2.1-README.SELinux index 1d4ff71..981cf59 100644 --- a/mod_fcgid-2.1-README.SELinux +++ b/mod_fcgid-2.1-README.SELinux @@ -4,8 +4,7 @@ Using mod_fcgid with SELinux in Fedora Core 5 / RHEL 5 onwards Versions of this package built for Fedora Core 5, 6, or 7 include an SELinux policy module to support FastCGI applications. Later Fedora releases and Red Hat Enterprise Linux 5.3 onwards include the policy in the main selinux-policy -package and do not require the separate module. This has only been tested so -far with moin, so feedback from other applications is welcome. +package and do not require the separate module. The module source (fastcgi.{fc,te}) is included for reference as documentation in the package. diff --git a/mod_fcgid-2.3.4-fixconf-shellbang.patch b/mod_fcgid-2.3.4-fixconf-shellbang.patch new file mode 100644 index 0000000..ea5fb50 --- /dev/null +++ b/mod_fcgid-2.3.4-fixconf-shellbang.patch @@ -0,0 +1,8 @@ +--- mod_fcgid-2.3.4/build/fixconf.sed 2009-10-07 04:16:08.000000000 +0100 ++++ mod_fcgid-2.3.4/build/fixconf.sed 2009-10-12 09:50:14.570448865 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/sed -f ++#!/bin/sed -f + # + # Licensed to the Apache Software Foundation (ASF) under one or more + # contributor license agreements. See the NOTICE file distributed with diff --git a/mod_fcgid.spec b/mod_fcgid.spec index 8f48e90..a2d7bdc 100644 --- a/mod_fcgid.spec +++ b/mod_fcgid.spec @@ -1,8 +1,8 @@ # Fedora 5, 6, and 7 versions includes SELinux policy module package # Fedora 8 and 9 versions include policy in errata selinux-policy releases # Fedora 10 onwards include policy in standard selinux-policy releases -# RHEL 5.3 onwards include policy in standard selinux-policy releases -%if 0%{?fedora} < 5 || 0%{?fedora} > 7 +# RHEL 5.5 onwards will include policy in standard selinux-policy releases +%if 0%{?fedora}%{?rhel} < 5 || 0%{?fedora} > 7 %global selinux_module 0 %global selinux_types %{nil} %global selinux_variants %{nil} @@ -15,31 +15,30 @@ %endif Name: mod_fcgid -Version: 2.2 -Release: 13%{?dist} -Summary: Apache2 module for high-performance server-side scripting +Version: 2.3.4 +Release: 1%{?dist} +Summary: FastCGI interface module for Apache 2 Group: System Environment/Daemons -License: GPL+ -URL: http://fastcgi.coremail.cn/ -Source0: http://downloads.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz +License: ASL 2.0 +URL: http://httpd.apache.org/mod_fcgid/ +Source0: http://www.apache.org/dist/httpd/mod_fcgid/mod_fcgid-%{version}.tar.bz2 Source1: fcgid.conf -Source2: fastcgi.te -Source3: fastcgi.fc -Source4: mod_fcgid-2.1-README.RPM -Source5: http://fastcgi.coremail.cn/doc.htm -Source6: http://fastcgi.coremail.cn/configuration.htm -Source7: mod_fcgid-2.1-README.SELinux -Source8: fastcgi-2.5.te -Patch0: mod_fcgid.2.1-docurls.patch +Source2: mod_fcgid-2.1-README.RPM +Source3: mod_fcgid-2.1-README.SELinux +Source10: fastcgi.te +Source11: fastcgi-2.5.te +Source12: fastcgi.fc +Patch0: mod_fcgid-2.3.4-fixconf-shellbang.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gawk, httpd-devel >= 2.0, pkgconfig +BuildRequires: httpd-devel >= 2.0, pkgconfig Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing) # Make sure that selinux-policy is sufficiently up-to-date if it's installed -%if "%{?rhel}" == "5" -Conflicts: selinux-policy < 2.4.6-203.el5 -# No provide here because selinux-policy >= 2.4.6-203.el5 does the providing -Obsoletes: mod_fcgid-selinux <= %{version}-%{release} -%endif +## FastCGI policy properly incorporated into EL 5.5 (not yet available) +#%if "%{?rhel}" == "5" +#Conflicts: selinux-policy < 2.4.6-257.el5 +## No provide here because selinux-policy >= 2.4.6-203.el5 does the providing +#Obsoletes: mod_fcgid-selinux <= %{version}-%{release} +#%endif %if "%{?fedora}" == "8" Conflicts: selinux-policy < 3.0.8-123.fc8 %endif @@ -79,26 +78,23 @@ SELinux policy module supporting FastCGI applications with mod_fcgid. %endif %prep -%setup -q -n mod_fcgid.%{version} +%setup -q %{__cp} -p %{SOURCE1} fcgid.conf +%{__cp} -p %{SOURCE2} README.RPM +%{__cp} -p %{SOURCE3} README.SELinux %if 0%{?selinux_policynum} < 20501 -%{__cp} -p %{SOURCE2} fastcgi.te +%{__cp} -p %{SOURCE10} fastcgi.te %else -%{__cp} -p %{SOURCE8} fastcgi.te +%{__cp} -p %{SOURCE11} fastcgi.te %endif -%{__cp} -p %{SOURCE3} fastcgi.fc -%{__cp} -p %{SOURCE4} README.RPM -%{__cp} -p %{SOURCE5} directives.htm -%{__cp} -p %{SOURCE6} configuration.htm -%{__cp} -p %{SOURCE7} README.SELinux +%{__cp} -p %{SOURCE12} fastcgi.fc + +# Fix shellbang in fixconf script for our location of sed %patch0 -p1 -%{__sed} -i -e 's/\r$//' directives.htm configuration.htm -/usr/bin/iconv -f gb2312 -t utf8 < configuration.htm > configuration.htm.utf8 -%{__mv} -f configuration.htm.utf8 configuration.htm %build -topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir)) -%{__make} top_dir=${topdir} +APXS=/usr/sbin/apxs ./configure.apxs +%{__make} %if %{selinux_module} for selinuxvariant in %{selinux_variants} do @@ -110,15 +106,13 @@ done %install %{__rm} -rf %{buildroot} -topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir)) -%{__make} \ - top_dir=${topdir} \ - DESTDIR=%{buildroot} \ - MKINSTALLDIRS="%{__mkdir_p}" \ - install +%{__make} DESTDIR=%{buildroot} MKINSTALLDIRS="%{__mkdir_p}" install %{__install} -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf %{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid +# Include the manual as %doc, don't need it elsewhere +%{__rm} -rf %{buildroot}%{_var}/www/manual + # Install SELinux policy modules %if %{selinux_module} for selinuxvariant in %{selinux_variants} @@ -161,8 +155,10 @@ exit 0 %files %defattr(-,root,root,-) -%doc ChangeLog AUTHOR COPYING configuration.htm directives.htm -%doc README.RPM +# mod_fcgid.html.en is explicitly encoded as ISO-8859-1 +%doc CHANGES-FCGID LICENSE-FCGID NOTICE-FCGID README-FCGID STATUS-FCGID +%doc docs/manual/mod/mod_fcgid.html.en modules/fcgid/ChangeLog +%doc build/fixconf.sed %{_libdir}/httpd/modules/mod_fcgid.so %config(noreplace) %{_sysconfdir}/httpd/conf.d/fcgid.conf %dir %attr(0755,apache,apache) %{_localstatedir}/run/mod_fcgid/ @@ -175,6 +171,29 @@ exit 0 %endif %changelog +* Mon Oct 12 2009 Paul Howarth 2.3.4-1 +- Update to 2.3.4 (configuration directives changed again) +- Add fixconf.sed script for config file directives update + +* Fri Sep 25 2009 Paul Howarth 2.3.1-2.20090925svn818270 +- Update to svn revision 818270 +- DESTDIR and header detection patches upstreamed +- Build SELinux policy module for EL-5; support in EL-5.3 is incomplete and + will be fixed in EL-5.5 (#519369) +- Drop aliases httpd_sys_content_r{a,o,w}_t -> httpd_fastcgi_content_r{a,o,w}_t + from pre-2.5 SElinux policy module as these types aren't defined there + +* Wed Sep 23 2009 Paul Howarth 2.3.1-1.20090923svn817978 +- Update to post-2.3.1 svn snapshot +- Upstream moved to apache.org +- License changed to ASL 2.0 +- Use FCGID-prefixed config file options (old ones deprecated) +- Lots of documentation changes +- Renumber sources +- Don't defer to mod_fastcgi if both are present +- Drop gawk buildreq +- Add patches fixing RPM build issues (DESTDIR support, header detection) + * Sat Jul 25 2009 Fedora Release Engineering - 2.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 3ca1705..f2d8db5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ce7d7b16e69643dbd549d43d85025983 mod_fcgid.2.2.tar.gz +de1af384672a4bf719038e79be029c09 mod_fcgid-2.3.4.tar.bz2