Attachment 575277 Details for Bug 809717 – proposed patch

[patch] proposed patch

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

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kaluža

Created: 2012-04-05 05:35:13 UTC

Size: 3.61 KB

patch

obsolete

>From 3dfa640fad9e1c2345c02de8e00ce83c6c480787 Mon Sep 17 00:00:00 2001
>From: Jan Kaluza <hanzz.k@gmail.com>
>Date: Thu, 5 Apr 2012 06:26:11 +0200
>Subject: [PATCH] Fix compilation with httpd-2.4
>
>---
> mod_line_edit.conf        |    2 --
> mod_line_edit.module.conf |    1 +
> mod_line_edit.spec        |   18 +++++++++++++++---
> 3 files changed, 16 insertions(+), 5 deletions(-)
> create mode 100644 mod_line_edit.module.conf
>
>diff --git a/mod_line_edit.conf b/mod_line_edit.conf
>index cf0725e..5fdd64b 100644
>--- a/mod_line_edit.conf
>+++ b/mod_line_edit.conf
>@@ -1,5 +1,3 @@
>-LoadModule line_edit_module    modules/mod_line_edit.so
>-
> <IfModule mod_line_edit.c>
> 
>     # LELineEnd
>diff --git a/mod_line_edit.module.conf b/mod_line_edit.module.conf
>new file mode 100644
>index 0000000..558467e
>--- /dev/null
>+++ b/mod_line_edit.module.conf
>@@ -0,0 +1 @@
>+LoadModule line_edit_module    modules/mod_line_edit.so
>diff --git a/mod_line_edit.spec b/mod_line_edit.spec
>index 6101165..6dead97 100644
>--- a/mod_line_edit.spec
>+++ b/mod_line_edit.spec
>@@ -1,19 +1,24 @@
> #Module-Specific definitions
> %define mod_name mod_line_edit
> %define mod_conf %{mod_name}.conf
>+%define mod_module_conf %{mod_name}.module.conf
> %define mod_so %{mod_name}.so
> 
>+%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
>+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
>+
> Summary:	A general-purpose filter for text documents
> Name:		%{mod_name}
> Version:	1.0.0
>-Release:	8%{?dist}
>+Release:	9%{?dist}
> Group:		System Environment/Daemons
> License:	GPLv2+
> URL:		http://apache.webthing.com/mod_line_edit/
> Source0:	http://apache.webthing.com/mod_line_edit/mod_line_edit.c
> Source1:	%{mod_conf}
> Source2:	http://apache.webthing.com/mod_line_edit/index.html
>-Requires:	httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
>+Source3:	%{mod_module_conf}
>+Requires:	httpd-mmn = %{_httpd_mmn}
> BuildRequires:	httpd-devel
> BuildRequires:	file
> BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
>@@ -42,6 +47,7 @@ Apache 2.0 and 2.2, and all operating systems and MPMs.
> cp %{SOURCE0} %{mod_name}.c
> cp %{SOURCE1} %{mod_conf}
> cp %{SOURCE2} README.html
>+cp %{SOURCE3} %{mod_module_conf}
> 
> # strip away annoying ^M
> find . -type f|xargs file|grep 'CRLF'|cut -d: -f1|xargs perl -p -i -e 's/\r//'
>@@ -50,16 +56,18 @@ find . -type f|xargs file|grep 'text'|cut -d: -f1|xargs perl -p -i -e 's/\r//'
> head -19 %{mod_name}.c > LICENSE
> 
> %build
>-%{_sbindir}/apxs -c %{mod_name}.c
>+%{_httpd_apxs} -c %{mod_name}.c
> 
> %install
> rm -rf %{buildroot}
> 
> install -d %{buildroot}%{_libdir}/httpd/modules/
> install -d %{buildroot}%{_sysconfdir}/httpd/conf.d
>+install -d %{buildroot}%{_sysconfdir}/httpd/conf.modules.d
> 
> install -m0755 .libs/*.so %{buildroot}%{_libdir}/httpd/modules/
> install -m0644 %{mod_conf} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{mod_conf}
>+install -m0644 %{mod_module_conf} %{buildroot}%{_sysconfdir}/httpd/conf.modules.d/02-%{mod_conf}
> 
> %clean
> rm -rf %{buildroot}
>@@ -68,9 +76,13 @@ rm -rf %{buildroot}
> %defattr(-,root,root)
> %doc LICENSE README.html
> %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{mod_conf}
>+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/02-%{mod_conf}
> %attr(0755,root,root) %{_libdir}/httpd/modules/%{mod_so}
> 
> %changelog
>+* Wed Apr 04 2012 Jan Kaluza <jkaluza@redhat.com> - 1.0.0-9
>+- Fixed compilation with httpd-2.4
>+
> * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-8
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 809717: 575053 | 575276 | 575277