rpms/mod_fcgid/F-11 fcgid.conf,1.3,1.4 mod_fcgid.spec,1.19,1.20
Paul Howarth
pghmcfc at fedoraproject.org
Tue May 26 16:01:25 UTC 2009
Author: pghmcfc
Update of /cvs/pkgs/rpms/mod_fcgid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23943
Modified Files:
fcgid.conf mod_fcgid.spec
Log Message:
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)
Index: fcgid.conf
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-11/fcgid.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fcgid.conf 14 Jan 2008 11:46:12 -0000 1.3
+++ fcgid.conf 26 May 2009 16:00:55 -0000 1.4
@@ -12,5 +12,5 @@ LoadModule fcgid_module modules/mod_fcgi
</IfModule>
# 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
Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-11/mod_fcgid.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mod_fcgid.spec 17 May 2009 08:40:04 -0000 1.19
+++ mod_fcgid.spec 26 May 2009 16:00:55 -0000 1.20
@@ -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/ap
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 <paul at city-fan.org> 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 <paul at city-fan.org> 2.2-11
- Follow link /etc/httpd/run and make our "run" directory a subdir of wherever
that leads (#501123)
More information about the scm-commits
mailing list