OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Dec-2007 16:33:56
Branch: HEAD Handle: 2007121615335500
Modified files:
openpkg-src/apache-fastcgi
apache-fastcgi.conf apache-fastcgi.spec
Log:
add mod_fcgid alternative
Summary:
Revision Changes Path
1.4 +2 -0 openpkg-src/apache-fastcgi/apache-fastcgi.conf
1.4 +35 -12 openpkg-src/apache-fastcgi/apache-fastcgi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache-fastcgi/apache-fastcgi.conf
============================================================================
$ cvs diff -u -r1.3 -r1.4 apache-fastcgi.conf
--- openpkg-src/apache-fastcgi/apache-fastcgi.conf 22 Jun 2007 21:34:04
-0000 1.3
+++ openpkg-src/apache-fastcgi/apache-fastcgi.conf 16 Dec 2007 15:33:55
-0000 1.4
@@ -4,7 +4,9 @@
# load DSO
LoadModule fastcgi_module @l_prefix@/libexec/apache/mod_fastcgi.so
+LoadModule fcgid_module @l_prefix@/libexec/apache/mod_fcgid.so
# activate FastCGI handler by file extension
AddHandler fastcgi-script .fcgi
+AddHandler fcgid-script .fcgid
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache-fastcgi/apache-fastcgi.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 apache-fastcgi.spec
--- openpkg-src/apache-fastcgi/apache-fastcgi.spec 13 Nov 2007 15:48:11
-0000 1.3
+++ openpkg-src/apache-fastcgi/apache-fastcgi.spec 16 Dec 2007 15:33:55
-0000 1.4
@@ -22,6 +22,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_mod_fastcgi 2.4.6
+%define V_mod_fcgid 2.2
+
# package information
Name: apache-fastcgi
Summary: Apache Extension: FastCGI Support
@@ -32,12 +36,13 @@
Class: EVAL
Group: Web
License: Open Source
-Version: 2.4.6
-Release: 20071113
+Version: %{V_mod_fastcgi}
+Release: 20071216
# list of sources
-Source0: http://www.fastcgi.com/dist/mod_fastcgi-%{version}.tar.gz
-Source1: apache-fastcgi.conf
+Source0: http://www.fastcgi.com/dist/mod_fastcgi-%{V_mod_fastcgi}.tar.gz
+Source1:
http://switch.dl.sourceforge.net/mod-fcgid/mod_fcgid.%{V_mod_fcgid}.tar.gz
+Source2: apache-fastcgi.conf
# build information
Prefix: %{l_prefix}
@@ -51,20 +56,32 @@
This is the FastCGI extension module for the Apache HTTP webserver.
%track
- prog apache-fastcgi = {
- version = %{version}
+ prog apache-fastcgi:mod_fastcgi = {
+ version = %{V_mod_fastcgi}
url = http://www.fastcgi.com/dist/
regex = mod_fastcgi-(__VER__)\.tar\.gz
}
+ prog apache-fastcgi:mod_fcgid = {
+ version = %{V_mod_fcgid}
+ url = http://fastcgi.coremail.cn/download.htm
+ regex = mod_fcgid\.(__VER__)\.tar.gz
+ }
%prep
- %setup -q -n mod_fastcgi-%{version}
+ %setup -q -c
+ %setup -q -T -D -a 1
%build
# build module
- cp Makefile.AP2 Makefile
- %{l_make} %{l_mflags} \
- top_dir=%{l_prefix}/share/apache
+ ( cd mod_fastcgi-%{V_mod_fastcgi}
+ cp Makefile.AP2 Makefile
+ %{l_make} %{l_mflags} \
+ top_dir=%{l_prefix}/share/apache
+ ) || exit $?
+ ( cd mod_fcgid.%{V_mod_fcgid}
+ %{l_make} %{l_mflags} \
+ top_dir=%{l_prefix}/share/apache
+ ) || exit $?
%install
# install module
@@ -72,8 +89,14 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d \
$RPM_BUILD_ROOT%{l_prefix}/libexec/apache
- %{l_shtool} install -c -m 755 \
- .libs/mod_fastcgi.so $RPM_BUILD_ROOT%{l_prefix}/libexec/apache/
+ ( cd mod_fastcgi-%{V_mod_fastcgi}
+ %{l_shtool} install -c -m 755 \
+ .libs/mod_fastcgi.so $RPM_BUILD_ROOT%{l_prefix}/libexec/apache/
+ ) || exit $?
+ ( cd mod_fcgid.%{V_mod_fcgid}
+ %{l_shtool} install -c -m 755 \
+ .libs/mod_fcgid.so $RPM_BUILD_ROOT%{l_prefix}/libexec/apache/
+ ) || exit $?
%{l_shtool} install -c -m 755 \
%{SOURCE apache-fastcgi.conf}
$RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d/
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
