- Update source URL to point to downloads.sf.net rather than dl.sf.net

- Upstream released new tarball without changing version number, though the
    only change was in arch/win32/fcgid_pm_win.c, which is not used to
    build the RPM package
- Clarify license as GPL (unspecified/any version)
- Unexpand tabs in spec
- Add buildreq of gawk
- Add buildreq of pkgconfig, a missing dependency of both apr-devel and
    apr-util-devel on FC5
This commit is contained in:
Paul Howarth 2007-08-23 09:32:38 +00:00
parent 1c54c519a0
commit 760e07ba25
2 changed files with 62 additions and 49 deletions

View File

@ -9,26 +9,26 @@
%define selinux_buildreqs checkpolicy, selinux-policy-devel, hardlink %define selinux_buildreqs checkpolicy, selinux-policy-devel, hardlink
%endif %endif
Name: mod_fcgid Name: mod_fcgid
Version: 2.1 Version: 2.1
Release: 3%{?dist} Release: 5%{?dist}
Summary: Apache2 module for high-performance server-side scripting Summary: Apache2 module for high-performance server-side scripting
Group: System Environment/Daemons Group: System Environment/Daemons
License: GPL License: GPL+
URL: http://fastcgi.coremail.cn/ URL: http://fastcgi.coremail.cn/
Source0: http://dl.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz Source0: http://downloads.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz
Source1: fcgid.conf Source1: fcgid.conf
Source2: fastcgi.te Source2: fastcgi.te
Source3: fastcgi.fc Source3: fastcgi.fc
Source4: mod_fcgid-2.1-README.RPM Source4: mod_fcgid-2.1-README.RPM
Source5: http://fastcgi.coremail.cn/doc.htm Source5: http://fastcgi.coremail.cn/doc.htm
Source6: http://fastcgi.coremail.cn/configuration.htm Source6: http://fastcgi.coremail.cn/configuration.htm
Source7: mod_fcgid-2.1-README.SELinux Source7: mod_fcgid-2.1-README.SELinux
Source8: fastcgi-2.5.te Source8: fastcgi-2.5.te
Patch0: mod_fcgid.2.1-docurls.patch Patch0: mod_fcgid.2.1-docurls.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: httpd-devel >= 2.0 BuildRequires: gawk, httpd-devel >= 2.0, pkgconfig
Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing) Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing)
%description %description
mod_fcgid is a binary-compatible alternative to the Apache module mod_fastcgi. mod_fcgid is a binary-compatible alternative to the Apache module mod_fastcgi.
@ -40,9 +40,9 @@ as possible.
%define selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp) %define selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp)
%define selinux_policynum %(echo %{selinux_policyver} | %{__awk} -F. '{ printf "%d%02d%02d", $1, $2, $3 }') %define selinux_policynum %(echo %{selinux_policyver} | %{__awk} -F. '{ printf "%d%02d%02d", $1, $2, $3 }')
%package selinux %package selinux
Summary: SELinux policy module supporting FastCGI applications with mod_fcgid Summary: SELinux policy module supporting FastCGI applications with mod_fcgid
Group: System Environment/Base Group: System Environment/Base
BuildRequires: %{selinux_buildreqs} BuildRequires: %{selinux_buildreqs}
# selinux-policy is required for directory ownership of %{_datadir}/selinux/* # selinux-policy is required for directory ownership of %{_datadir}/selinux/*
# Modules built against one version of a policy may not work with older policy # Modules built against one version of a policy may not work with older policy
# versions, as noted on fedora-selinux-list: # versions, as noted on fedora-selinux-list:
@ -50,10 +50,10 @@ BuildRequires: %{selinux_buildreqs}
# Hence the versioned dependency. The versioning will hopefully be replaced by # Hence the versioned dependency. The versioning will hopefully be replaced by
# an ABI version requirement or something similar in the future # an ABI version requirement or something similar in the future
%if "%{selinux_policyver}" != "" %if "%{selinux_policyver}" != ""
Requires: selinux-policy >= %{selinux_policyver} Requires: selinux-policy >= %{selinux_policyver}
%endif %endif
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires(post): /usr/sbin/semodule, /sbin/restorecon Requires(post): /usr/sbin/semodule, /sbin/restorecon
Requires(postun): /usr/sbin/semodule, /sbin/restorecon Requires(postun): /usr/sbin/semodule, /sbin/restorecon
%description selinux %description selinux
@ -82,9 +82,9 @@ topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
%if %{selinux_module} %if %{selinux_module}
for selinuxvariant in %{selinux_variants} for selinuxvariant in %{selinux_variants}
do do
%{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
%{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant} %{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant}
%{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
done done
%endif %endif
@ -92,10 +92,10 @@ done
%{__rm} -rf %{buildroot} %{__rm} -rf %{buildroot}
topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir)) topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
%{__make} \ %{__make} \
top_dir=${topdir} \ top_dir=${topdir} \
DESTDIR=%{buildroot} \ DESTDIR=%{buildroot} \
MKINSTALLDIRS="%{__mkdir_p}" \ MKINSTALLDIRS="%{__mkdir_p}" \
install install
%{__install} -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf %{__install} -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf
%{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid %{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid
@ -103,9 +103,9 @@ topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
%if %{selinux_module} %if %{selinux_module}
for selinuxvariant in %{selinux_variants} for selinuxvariant in %{selinux_variants}
do do
%{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} %{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
%{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \ %{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \
%{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp %{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp
done done
# Hardlink identical policy module packages together # Hardlink identical policy module packages together
/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
@ -119,8 +119,8 @@ done
# Install SELinux policy modules # Install SELinux policy modules
for selinuxvariant in %{selinux_variants} for selinuxvariant in %{selinux_variants}
do do
/usr/sbin/semodule -s ${selinuxvariant} -i \ /usr/sbin/semodule -s ${selinuxvariant} -i \
%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp &> /dev/null || : %{_datadir}/selinux/${selinuxvariant}/fastcgi.pp &> /dev/null || :
done done
# Fix up non-standard directory context # Fix up non-standard directory context
/sbin/restorecon %{_localstatedir}/run/mod_fcgid || : /sbin/restorecon %{_localstatedir}/run/mod_fcgid || :
@ -128,15 +128,15 @@ done
%postun selinux %postun selinux
# Clean up after package removal # Clean up after package removal
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
# Remove SELinux policy modules # Remove SELinux policy modules
for selinuxvariant in %{selinux_variants} for selinuxvariant in %{selinux_variants}; do
do /usr/sbin/semodule -s ${selinuxvariant} -r fastcgi &> /dev/null || :
/usr/sbin/semodule -s ${selinuxvariant} -r fastcgi &> /dev/null || : done
done # Clean up any remaining file contexts (shouldn't be any really)
# Clean up any remaining file contexts (shouldn't be any really) [ -d %{_localstatedir}/run/mod_fcgid ] && \
[ -d %{_localstatedir}/run/mod_fcgid ] && \ /sbin/restorecon -R %{_localstatedir}/run/mod_fcgid &> /dev/null || :
/sbin/restorecon -R %{_localstatedir}/run/mod_fcgid &> /dev/null || :
fi fi
exit 0
%endif %endif
%files %files
@ -155,6 +155,19 @@ fi
%endif %endif
%changelog %changelog
* Thu Aug 23 2007 Paul Howarth <paul@city-fan.org> 2.1-5
- Update source URL to point to downloads.sf.net rather than dl.sf.net
- Upstream released new tarball without changing version number, though the
only change was in arch/win32/fcgid_pm_win.c, which is not used to build the
RPM package
- Clarify license as GPL (unspecified/any version)
- Unexpand tabs in spec
- Add buildreq of gawk
* Fri Aug 3 2007 Paul Howarth <paul@city-fan.org> 2.1-4
- Add buildreq of pkgconfig, a missing dependency of both apr-devel and
apr-util-devel on FC5
* Fri Jun 15 2007 Paul Howarth <paul@city-fan.org> 2.1-3 * Fri Jun 15 2007 Paul Howarth <paul@city-fan.org> 2.1-3
- Major update of SELinux policy, supporting accessing data on NFS/CIFS shares - Major update of SELinux policy, supporting accessing data on NFS/CIFS shares
and a new boolean, httpd_fastcgi_can_sendmail, to allow connections to SMTP and a new boolean, httpd_fastcgi_can_sendmail, to allow connections to SMTP
@ -208,9 +221,9 @@ fi
* Tue Jul 4 2006 Paul Howarth <paul@city-fan.org> 1.09-10 * Tue Jul 4 2006 Paul Howarth <paul@city-fan.org> 1.09-10
- SELinux policy update: - SELinux policy update:
* allow httpd to read httpd_fastcgi_content_t without having the * allow httpd to read httpd_fastcgi_content_t without having the
httpd_builtin_scripting boolean set | httpd_builtin_scripting boolean set
* allow httpd_fastcgi_script_t to read /etc/resolv.conf without * allow httpd_fastcgi_script_t to read /etc/resolv.conf without
having the httpd_can_network_connect boolean set | having the httpd_can_network_connect boolean set
* Sun Jun 18 2006 Paul Howarth <paul@city-fan.org> 1.09-9 * Sun Jun 18 2006 Paul Howarth <paul@city-fan.org> 1.09-9
- Discard output of semodule in %%postun - Discard output of semodule in %%postun

View File

@ -1 +1 @@
68a6479e398a20577334f16a8b06c418 mod_fcgid.2.1.tar.gz 0bc036276e378463c80617ff57e853dc mod_fcgid.2.1.tar.gz