rpms/mod_fcgid/F-12 mod_fcgid-2.3.4-fixconf-shellbang.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 fastcgi.te, 1.7, 1.8 fcgid.conf, 1.4, 1.5 mod_fcgid-2.1-README.RPM, 1.2, 1.3 mod_fcgid-2.1-README.SELinux, 1.5, 1.6 mod_fcgid.spec, 1.21, 1.22 sources, 1.6, 1.7 configuration.htm, 1.3, NONE doc.htm, 1.3, NONE mod_fcgid.2.1-docurls.patch, 1.1, NONE
Paul Howarth
pghmcfc at fedoraproject.org
Tue Oct 13 13:10:46 UTC 2009
Author: pghmcfc
Update of /cvs/pkgs/rpms/mod_fcgid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29272
Modified Files:
.cvsignore fastcgi.te fcgid.conf mod_fcgid-2.1-README.RPM
mod_fcgid-2.1-README.SELinux mod_fcgid.spec sources
Added Files:
mod_fcgid-2.3.4-fixconf-shellbang.patch
Removed Files:
configuration.htm doc.htm mod_fcgid.2.1-docurls.patch
Log Message:
- 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
mod_fcgid-2.3.4-fixconf-shellbang.patch:
fixconf.sed | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mod_fcgid-2.3.4-fixconf-shellbang.patch ---
--- 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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 15 Sep 2007 16:01:29 -0000 1.5
+++ .cvsignore 13 Oct 2009 13:10:45 -0000 1.6
@@ -1 +1 @@
-mod_fcgid.2.2.tar.gz
+mod_fcgid-2.3.4.tar.bz2
Index: fastcgi.te
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/fastcgi.te,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fastcgi.te 24 Oct 2008 14:30:59 -0000 1.7
+++ fastcgi.te 13 Oct 2009 13:10:45 -0000 1.8
@@ -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;
Index: fcgid.conf
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/fcgid.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- fcgid.conf 26 May 2009 15:52:47 -0000 1.4
+++ fcgid.conf 13 Oct 2009 13:10:45 -0000 1.5
@@ -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
-<IfModule !mod_fastcgi.c>
- AddHandler fcgid-script fcg fcgi fpl
-</IfModule>
+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
Index: mod_fcgid-2.1-README.RPM
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/mod_fcgid-2.1-README.RPM,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mod_fcgid-2.1-README.RPM 26 Feb 2009 12:50:40 -0000 1.2
+++ mod_fcgid-2.1-README.RPM 13 Oct 2009 13:10:45 -0000 1.3
@@ -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/"
<Directory "/usr/share/moin/htdocs/">
Options Indexes FollowSymLinks
AllowOverride None
Index: mod_fcgid-2.1-README.SELinux
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/mod_fcgid-2.1-README.SELinux,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mod_fcgid-2.1-README.SELinux 7 Apr 2009 09:32:25 -0000 1.5
+++ mod_fcgid-2.1-README.SELinux 13 Oct 2009 13:10:45 -0000 1.6
@@ -4,8 +4,7 @@ Using mod_fcgid with SELinux in Fedora C
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.
Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/mod_fcgid.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- mod_fcgid.spec 25 Jul 2009 14:45:26 -0000 1.21
+++ mod_fcgid.spec 13 Oct 2009 13:10:45 -0000 1.22
@@ -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
%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 <paul at city-fan.org> 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 <paul at city-fan.org> 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 <paul at city-fan.org> 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 <rel-eng at lists.fedoraproject.org> - 2.2-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 15 Sep 2007 16:01:29 -0000 1.6
+++ sources 13 Oct 2009 13:10:45 -0000 1.7
@@ -1 +1 @@
-ce7d7b16e69643dbd549d43d85025983 mod_fcgid.2.2.tar.gz
+de1af384672a4bf719038e79be029c09 mod_fcgid-2.3.4.tar.bz2
--- configuration.htm DELETED ---
--- doc.htm DELETED ---
--- mod_fcgid.2.1-docurls.patch DELETED ---
More information about the scm-commits
mailing list