Attachment 575323 Details for Bug 810133 – proposed patch

[patch] proposed patch

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

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kaluža

Created: 2012-04-05 08:58:49 UTC

Size: 3.68 KB

patch

obsolete

>From 23173e73779f971e3e27ade3e15a99cb71d3b22f Mon Sep 17 00:00:00 2001
>From: Jan Kaluza <hanzz.k@gmail.com>
>Date: Thu, 5 Apr 2012 09:48:28 +0200
>Subject: [PATCH] Fix compilation with httpd-2.4
>
>---
> perl-CGI-SpeedyCGI.spec |   18 ++++++++++++++----
> speedycgi.module.conf   |    1 +
> 2 files changed, 15 insertions(+), 4 deletions(-)
> create mode 100644 speedycgi.module.conf
>
>diff --git a/perl-CGI-SpeedyCGI.spec b/perl-CGI-SpeedyCGI.spec
>index 9e9ae3f..10b1852 100644
>--- a/perl-CGI-SpeedyCGI.spec
>+++ b/perl-CGI-SpeedyCGI.spec
>@@ -1,14 +1,17 @@
> %define pkgname CGI-SpeedyCGI
>+%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
>+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
> 
> Summary:        Speed up perl scripts by running them persistently
> Name:           perl-CGI-SpeedyCGI
> Version:        2.22
>-Release:        12%{?dist}
>+Release:        13%{?dist}
> License:        GPLv3+
> Group:          Development/Libraries
> URL:            http://search.cpan.org/dist/%{pkgname}/
> Source0:	http://www.cpan.org/modules/by-authors/id/H/HO/HORROCKS/%{pkgname}-%{version}.tar.gz
> Source1:	speedycgi.conf
>+Source2:	speedycgi.module.conf
> Patch0:		perl-CGI-SpeedyCGI-2.22-documentation.patch
> Patch1:		perl-CGI-SpeedyCGI-2.22-empty_param.patch
> Patch2:		perl-CGI-SpeedyCGI-2.22-strerror.patch
>@@ -33,7 +36,7 @@ Summary:	SpeedyCGI module for the Apache HTTP Server
> Group:		System Environment/Daemons
> BuildRequires:	httpd-devel
> Requires:	%{name}%{?_isa} = %{version}-%{release}, httpd >= 2.0.40
>-Requires:	httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
>+Requires:	httpd-mmn = %{_httpd_mmn}
> 
> %description -n mod_speedycgi
> The SpeedyCGI module for the Apache HTTP Server. It can be used to run
>@@ -50,9 +53,9 @@ perl scripts for web application persistently to make them more quickly.
> %patch6 -p1 -b .c99_inline
> 
> %build
>-sed -i 's@apxs -@%{_sbindir}/apxs -@g' Makefile.PL src/SpeedyMake.pl \
>+sed -i 's@apxs -@%{_httpd_apxs} -@g' Makefile.PL src/SpeedyMake.pl \
>   mod_speedycgi/t/ModTest.pm mod_speedycgi/t/mod_perl.t
>-sed -i 's@APXS=apxs@APXS=%{_sbindir}/apxs@g' mod_speedycgi/Makefile.tmpl
>+sed -i 's@APXS=apxs@APXS=%{_httpd_apxs}@g' mod_speedycgi/Makefile.tmpl
> 
> echo yes | perl Makefile.PL INSTALLDIRS=vendor
> make OPTIMIZE="$RPM_OPT_FLAGS" # doesn't understand %{?_smp_mflags}
>@@ -66,8 +69,10 @@ find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
> chmod -R u+w $RPM_BUILD_ROOT/*
> 
> mkdir -p $RPM_BUILD_ROOT{%{_libdir}/httpd/modules,%{_sysconfdir}/httpd/conf.d}
>+mkdir -p $RPM_BUILD_ROOT{%{_libdir}/httpd/modules,%{_sysconfdir}/httpd/conf.modules.d}
> install -m 755 mod_speedycgi2/mod_speedycgi.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules/
> install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
>+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/02-speedycgi.conf
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
>@@ -82,8 +87,13 @@ rm -rf $RPM_BUILD_ROOT
> %defattr(-,root,root)
> %{_libdir}/httpd/modules/mod_speedycgi.so
> %config(noreplace) %{_sysconfdir}/httpd/conf.d/speedycgi.conf
>+%config(noreplace) %{_sysconfdir}/httpd/conf.d/speedycgi.conf
>+%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/02-speedycgi.conf
> 
> %changelog
>+* Thu Apr 05 2012 Jan Kaluza <jkaluza@redhat.com> - 2.22-13
>+- Fix compilation with httpd-2.4
>+
> * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.22-12
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>diff --git a/speedycgi.module.conf b/speedycgi.module.conf
>new file mode 100644
>index 0000000..a9e610c
>--- /dev/null
>+++ b/speedycgi.module.conf
>@@ -0,0 +1 @@
>+LoadModule speedycgi_module modules/mod_speedycgi.so
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 810133: 575323