diff --git a/fcgid.conf b/fcgid.conf index e9d886e..bf04642 100644 --- a/fcgid.conf +++ b/fcgid.conf @@ -12,5 +12,5 @@ LoadModule fcgid_module modules/mod_fcgid.so # Sane place to put sockets and shared memory file -SocketPath run/mod_fcgid -SharememPath run/mod_fcgid/fcgid_shm +SocketPath /var/run/mod_fcgid +SharememPath /var/run/mod_fcgid/fcgid_shm diff --git a/mod_fcgid.spec b/mod_fcgid.spec index a2ff842..bb80049 100644 --- a/mod_fcgid.spec +++ b/mod_fcgid.spec @@ -14,12 +14,9 @@ %global selinux_buildreqs checkpolicy, selinux-policy-devel, hardlink %endif -# /etc/httpd/run is a symlink to /var/run prior to Fedora 11, to /var/run/httpd thereafter -%global rundir %(/usr/bin/readlink /etc/httpd/run | %{__sed} -e 's|^\.\./\.\.||') - Name: mod_fcgid Version: 2.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Apache2 module for high-performance server-side scripting Group: System Environment/Daemons License: GPL+ @@ -120,7 +117,7 @@ topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir)) MKINSTALLDIRS="%{__mkdir_p}" \ install %{__install} -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf -%{__install} -d -m 755 %{buildroot}%{rundir}/mod_fcgid +%{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid # Install SELinux policy modules %if %{selinux_module} @@ -168,7 +165,7 @@ exit 0 %doc README.RPM %{_libdir}/httpd/modules/mod_fcgid.so %config(noreplace) %{_sysconfdir}/httpd/conf.d/fcgid.conf -%dir %attr(0755,apache,apache) %{rundir}/mod_fcgid/ +%dir %attr(0755,apache,apache) %{_localstatedir}/run/mod_fcgid/ %if %{selinux_module} %files selinux @@ -178,6 +175,11 @@ exit 0 %endif %changelog +* Tue May 26 2009 Paul Howarth 2.2-12 +- Don't use /etc/httpd/run as basis of "run" directory as its DAC permissions + are not permissive enough in F-11 onwards; instead, revert to + /var/run/mod_fcgid and tweak default config accordingly (#502273) + * Sun May 17 2009 Paul Howarth 2.2-11 - Follow link /etc/httpd/run and make our "run" directory a subdir of wherever that leads (#501123)