rpms/mod_suphp/FC-5 mod_suphp.conf, 1.1, 1.2 mod_suphp.spec, 1.10, 1.11
Andreas Thienemann (ixs)
fedora-extras-commits at redhat.com
Fri Nov 10 00:58:00 UTC 2006
Author: ixs
Update of /cvs/extras/rpms/mod_suphp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7194/FC-5
Modified Files:
mod_suphp.conf mod_suphp.spec
Log Message:
* Fri Nov 10 2006 Andreas Thienemann <andreas at bawue.net> - 0.6.1-4
- Fix double free corruption. For real this time. :-/
Index: mod_suphp.conf
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/FC-5/mod_suphp.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_suphp.conf 6 Feb 2006 16:40:00 -0000 1.1
+++ mod_suphp.conf 10 Nov 2006 00:57:30 -0000 1.2
@@ -5,18 +5,14 @@
LoadModule suphp_module modules/mod_suphp.so
-# Define PHP Types
-AddType application/x-httpd-php .php
-
# To use suPHP to parse PHP-Files
-### Uncomment to activate mod_suphp
-#AddHandler x-httpd-php .php
# This option tells mod_suphp if a PHP-script requested on this server (or
# VirtualHost) should be run with the PHP-interpreter or returned to the
# browser "as it is".
-suPHP_Engine on
-suPHP_AddHandler x-httpd-php
+### Uncomment to activate mod_suphp
+#suPHP_Engine on
+#suPHP_AddHandler x-httpd-php
# This option tells mod_suphp which path to pass on to the PHP-interpreter
# (by setting the PHPRC environment variable).
Index: mod_suphp.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/FC-5/mod_suphp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_suphp.spec 6 Feb 2006 23:44:45 -0000 1.10
+++ mod_suphp.spec 10 Nov 2006 00:57:30 -0000 1.11
@@ -1,26 +1,31 @@
-# Depending on what version of Fedora we're on, use a different php binary
+# Depending on what version of Fedora we're on, use a different php binary, different apr
+# and also different handler.
%if 0%{?fedora}
%if "%{fedora}" >= "5"
%define php /usr/bin/php-cgi
+ %define handler php5-script
%define apr /usr/bin/apr-1-config
%endif
%if "%{fedora}" == "4"
%define php /usr/bin/php-cgi
+ %define handler x-httpd-php
%define apr /usr/bin/apr-config
%endif
%if "%{fedora}" <= "3"
%define php /usr/bin/php
+ %define handler x-httpd-php
%define apr /usr/bin/apr-config
%endif
%else
%define php /usr/bin/php
+ %define handler x-httpd-php
%define apr /usr/bin/apr-config
%endif
Summary: An apache2 module for executing PHP scripts with the permissions of their owners
Name: mod_suphp
Version: 0.6.1
-Release: 1%{?dist}
+Release: 4%{?dist}
License: GPL
Group: System Environment/Daemons
Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz
@@ -30,30 +35,47 @@
Patch0: mod_suphp-0.6.1-userdir.patch
Patch1: mod_suphp-0.6.1-AddHandler.patch
Patch2: mod_suphp-0.6.1-apr.patch
+Patch3: mod_suphp-0.6.1-chroot.patch
+Patch4: mod_suphp-0.6.1-DoubleFree.patch
URL: http://www.suphp.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: httpd >= 2.0, php
Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
+Requires(post): policycoreutils
+Requires(postun): policycoreutils
BuildRequires: httpd-devel >= 2.0, apr-devel
+
%description
suPHP is an apache module for executing PHP scripts with the permissions of
their owners. It consists of an Apache module (mod_suphp) and a setuid root
binary (suphp) that is called by the Apache module to change the uid of the
process executing the PHP interpreter.
+Please take a look at %{_docdir}/%{name}-%{version}/README.fedora for
+installation instructions.
+
%prep
%setup -q -n suphp-%{version}
%patch0 -p 1 -b .userdir
%patch1 -p 1 -b .AddHandler
+%patch3 -p 1 -b .chroot
+%patch4 -p 1 -b .double-free
# Patch source to conform to apr 1.x standards
%if "%{fedora}" >= "5"
%patch2 -p 0 -b .apr
%endif
+# fill placeholders
+sed -e 's|###PHP-BIN###|%{php}|g; s|###HANDLER###|%{handler}|g;' %{SOURCE1} > suphp.conf
+sed -e 's|###HANDLER###|%{handler}|g;' %{SOURCE2} > mod_suphp.conf
+sed -e 's|###HANDLER###|%{handler}|g;' %{SOURCE3} > README.fedora
+
+
%build
echo "Building mod_suphp with %{php} as PHP interpreter and %{apr} for the apr configuration script."
+echo "%{handler} is used as a AddHandler."
%configure \
--with-apr=%{apr} \
--with-apxs=/usr/sbin/apxs \
@@ -73,6 +95,7 @@
mv .libs/mod_suphp.so .
popd
+
%install
rm -rf %{buildroot}
@@ -80,27 +103,42 @@
%{__install} -m 755 -D src/apache2/mod_suphp.so %{buildroot}%{_libdir}/httpd/modules/mod_suphp.so
# Install the config files
-sed -e 's@###PHP-BIN###@%{php}@' %{SOURCE1} > suphp.conf
%{__install} -m 644 -D suphp.conf %{buildroot}%{_sysconfdir}/suphp.conf
-%{__install} -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_suphp.conf
+%{__install} -m 644 -D mod_suphp.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_suphp.conf
# Rename docs
cp doc/CONFIG CONFIG.suphp
cp doc/apache/CONFIG CONFIG.apache
-cp %{SOURCE3} README.fedora
+
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+
+%postun
+
%files
%defattr(-,root,root)
%doc README COPYING CONFIG.suphp CONFIG.apache README.fedora
-%attr (4755, root, root) %{_sbindir}/suphp
+%attr (4550, root, root) %{_sbindir}/suphp
%{_libdir}/httpd/modules/*.so
%config(noreplace) %{_sysconfdir}/suphp.conf
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_suphp.conf
+
%changelog
+* Fri Nov 10 2006 Andreas Thienemann <andreas at bawue.net> - 0.6.1-4
+- Fix double free corruption. For real this time. :-/
+
+* Fri Sep 08 2006 Andreas Thienemann <andreas at bawue.net> - 0.6.1-3
+- Finally fixed double free corruption #192415
+- Fixed up configuration creation
+
+* Wed May 24 2006 Andreas Thienemann <andreas at bawue.net> - 0.6.1-2
+- Corrected handler for mod_suphp.conf
+- Minor cleanups and fixes
+
* Mon Feb 06 2006 Andreas Thienemann <andreas at bawue.net> 0.6.1-1
- Updated to 0.6.1
More information about the fedora-extras-commits
mailing list