Attachment 575273 Details for Bug 809750 – proposed patch

[patch] proposed patch

0001-Fix-compilation-with-httpd-2.4.patch (text/plain), 4.05 KB, created by Jan Kaluža on 2012-04-05 05:23:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kaluža

Created: 2012-04-05 05:23:39 UTC

Size: 4.05 KB

patch

obsolete

>From 70df136defb7eda02f42d1942ca7b399f35fa10b Mon Sep 17 00:00:00 2001
>From: Jan Kaluza <hanzz.k@gmail.com>
>Date: Thu, 5 Apr 2012 06:13:00 +0200
>Subject: [PATCH] Fix compilation with httpd-2.4
>
>---
> mod_suphp.conf        |    3 ---
> mod_suphp.module.conf |    5 +++++
> mod_suphp.spec        |   18 ++++++++++++++----
> 3 files changed, 19 insertions(+), 7 deletions(-)
> create mode 100644 mod_suphp.module.conf
>
>diff --git a/mod_suphp.conf b/mod_suphp.conf
>index 4681fff..05bd971 100644
>--- a/mod_suphp.conf
>+++ b/mod_suphp.conf
>@@ -2,9 +2,6 @@
> # It contains the configuration directives to instruct the server how to
> # serve php pages while switching to the user context before rendering.
> 
>-LoadModule suphp_module modules/mod_suphp.so
>-
>-
> ### Uncomment to activate mod_suphp
> #suPHP_AddHandler ###HANDLER###
> 
>diff --git a/mod_suphp.module.conf b/mod_suphp.module.conf
>new file mode 100644
>index 0000000..2b87216
>--- /dev/null
>+++ b/mod_suphp.module.conf
>@@ -0,0 +1,5 @@
>+# This is the Apache server configuration file providing suPHP support..
>+# It contains the configuration directives to instruct the server how to
>+# serve php pages while switching to the user context before rendering.
>+
>+LoadModule suphp_module modules/mod_suphp.so
>diff --git a/mod_suphp.spec b/mod_suphp.spec
>index 94c1211..90aa329 100644
>--- a/mod_suphp.spec
>+++ b/mod_suphp.spec
>@@ -22,23 +22,27 @@
>    %define apr /usr/bin/apr-config
> %endif
> 
>+%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
>+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
>+
> Summary: An apache2 module for executing PHP scripts with the permissions of their owners
> Name: mod_suphp
> Version: 0.6.3
>-Release: 8%{?dist}
>+Release: 9%{?dist}
> License: GPLv2+
> Group: System Environment/Daemons
> Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz
> Source1: suphp.conf
> Source2: mod_suphp.conf
> Source3: README.fedora
>+Source4: mod_suphp.module.conf
> Patch0: mod_suphp-0.6.3-userdir.patch
> Patch1: mod_suphp-0.6.1-AddHandler.patch
> Patch3: mod_suphp-0.6.1-chroot.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: httpd-mmn = %{_httpd_mmn}
> BuildRequires: httpd-devel >= 2.0, apr-devel
> 
> 
>@@ -62,6 +66,7 @@ installation instructions.
> 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
>+cp -a %{SOURCE4} mod_suphp.module.conf
> 
> 
> %build
>@@ -69,7 +74,7 @@ echo "Building mod_suphp with %{php} as PHP interpreter and %{apr} for the apr c
> echo "%{handler} is used as a AddHandler."
> %configure \
> 	--with-apr=%{apr} \
>-	--with-apxs=/usr/sbin/apxs \
>+	--with-apxs=%{_httpd_apxs} \
> 	--with-apache-user=apache \
> 	--with-min-uid=500 \
> 	--with-min-gid=500 \
>@@ -82,7 +87,7 @@ make %{?_smp_mflags} suphp
> popd
> 
> pushd src/apache2
>-%{_sbindir}/apxs -c mod_suphp.c
>+%{_httpd_apxs} -c mod_suphp.c
> mv .libs/mod_suphp.so .
> popd
> 
>@@ -96,6 +101,7 @@ rm -rf %{buildroot}
> # Install the config files
> %{__install} -m 644 -D suphp.conf %{buildroot}%{_sysconfdir}/suphp.conf
> %{__install} -m 644 -D mod_suphp.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_suphp.conf
>+%{__install} -m 644 -D mod_suphp.module.conf %{buildroot}%{_sysconfdir}/httpd/conf.modules.d/02-mod_suphp.conf
> 
> # Rename docs
> cp doc/CONFIG CONFIG.suphp
>@@ -112,9 +118,13 @@ rm -rf $RPM_BUILD_ROOT
> %{_libdir}/httpd/modules/*.so
> %config(noreplace) %{_sysconfdir}/suphp.conf
> %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_suphp.conf
>+%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/02-mod_suphp.conf
> 
> 
> %changelog
>+* Thu Apr 05 2012 Jan Kaluza <jkaluza@redhat.com> - 0.6.3-9
>+- Fix compilation issues with httpd-2.4
>+
> * Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.3-8
> - Rebuilt for c++ ABI breakage
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 809750: 575273