Fix for /var/run on tmpfs (#656625)

- Add /etc/tmpfiles.d/mod_fcgid.conf for builds on Fedora 15 onwards to
  support running with /var/run on tmpfs (#656625)
This commit is contained in:
Paul Howarth 2010-12-01 14:47:59 +00:00
parent b969a41714
commit ddc537476b
2 changed files with 21 additions and 1 deletions

1
mod_fcgid-tmpfs.conf Normal file
View File

@ -0,0 +1 @@
d /var/run/mod_fcgid - apache apache

View File

@ -16,7 +16,7 @@
Name: mod_fcgid Name: mod_fcgid
Version: 2.3.6 Version: 2.3.6
Release: 1%{?dist} Release: 2%{?dist}
Summary: FastCGI interface module for Apache 2 Summary: FastCGI interface module for Apache 2
Group: System Environment/Daemons Group: System Environment/Daemons
License: ASL 2.0 License: ASL 2.0
@ -25,6 +25,7 @@ Source0: http://www.apache.org/dist/httpd/mod_fcgid/mod_fcgid-%{version}.tar.bz2
Source1: fcgid.conf Source1: fcgid.conf
Source2: mod_fcgid-2.1-README.RPM Source2: mod_fcgid-2.1-README.RPM
Source3: mod_fcgid-2.1-README.SELinux Source3: mod_fcgid-2.1-README.SELinux
Source4: mod_fcgid-tmpfs.conf
Source10: fastcgi.te Source10: fastcgi.te
Source11: fastcgi-2.5.te Source11: fastcgi-2.5.te
Source12: fastcgi.fc Source12: fastcgi.fc
@ -34,6 +35,10 @@ BuildRequires: 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)
# sed required for fixconf script # sed required for fixconf script
Requires: /bin/sed Requires: /bin/sed
# systemd-units needed for ownership of /etc/tmpfiles.d directory
%if 0%{?fedora} > 14
Requires: systemd-units
%endif
# Make sure that selinux-policy is sufficiently up-to-date if it's installed # Make sure that selinux-policy is sufficiently up-to-date if it's installed
# FastCGI policy properly incorporated into EL 5.5 # FastCGI policy properly incorporated into EL 5.5
%if "%{?rhel}" == "5" %if "%{?rhel}" == "5"
@ -115,6 +120,13 @@ done
# Include the manual as %%doc, don't need it elsewhere # Include the manual as %%doc, don't need it elsewhere
%{__rm} -rf %{buildroot}%{_var}/www/manual %{__rm} -rf %{buildroot}%{_var}/www/manual
# Make sure /var/run/mod_fcgid exists at boot time for systems
# with /var/run on tmpfs (#656625)
%if 0%{?fedora} > 14
%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/tmpfiles.d
%{__install} -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/tmpfiles.d/mod_fcgid.conf
%endif
# Install SELinux policy modules # Install SELinux policy modules
%if %{selinux_module} %if %{selinux_module}
for selinuxvariant in %{selinux_variants} for selinuxvariant in %{selinux_variants}
@ -163,6 +175,9 @@ exit 0
%doc build/fixconf.sed %doc build/fixconf.sed
%{_libdir}/httpd/modules/mod_fcgid.so %{_libdir}/httpd/modules/mod_fcgid.so
%config(noreplace) %{_sysconfdir}/httpd/conf.d/fcgid.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/fcgid.conf
%if 0%{?fedora} > 14
%{_sysconfdir}/tmpfiles.d/mod_fcgid.conf
%endif
%dir %attr(0755,apache,apache) %{_localstatedir}/run/mod_fcgid/ %dir %attr(0755,apache,apache) %{_localstatedir}/run/mod_fcgid/
%if %{selinux_module} %if %{selinux_module}
@ -173,6 +188,10 @@ exit 0
%endif %endif
%changelog %changelog
* Wed Dec 1 2010 Paul Howarth <paul@city-fan.org> 2.3.6-2
- Add /etc/tmpfiles.d/mod_fcgid.conf for builds on Fedora 15 onwards to
support running with /var/run on tmpfs (#656625)
* Thu Nov 4 2010 Paul Howarth <paul@city-fan.org> 2.3.6-1 * Thu Nov 4 2010 Paul Howarth <paul@city-fan.org> 2.3.6-1
- Update to 2.3.6 (see CHANGES-FCGID for full details) - Update to 2.3.6 (see CHANGES-FCGID for full details)
- Fix possible stack buffer overwrite (CVE-2010-3872) - Fix possible stack buffer overwrite (CVE-2010-3872)