[httpd-itk] Fix PCRE compilation problem

Pavel Alexeev hubbitus at fedoraproject.org
Wed Mar 7 15:22:03 UTC 2012


commit cd51ac561a5999b0cbfb7ce7c871dbf16fba2119
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Wed Mar 7 19:18:50 2012 +0400

    Fix PCRE compilation problem

 .gitignore     |    1 +
 httpd-itk.spec |    7 ++++++-
 sources        |    1 +
 3 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dcd98d1..9230032 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /httpd-2.2.22.tar.bz2
+/httpd-2.2.22-pcre830.patch
diff --git a/httpd-itk.spec b/httpd-itk.spec
index 1271f05..7c5a4e7 100644
--- a/httpd-itk.spec
+++ b/httpd-itk.spec
@@ -5,7 +5,7 @@
 Summary:		MPM Itk for Apache HTTP Server
 Name:		httpd-itk
 Version:		2.2.22
-Release:		3%{?dist}
+Release:		4%{?dist}
 URL:			http://mpm-itk.sesse.net/
 License:		ASL 2.0
 Group:		System Environment/Daemons
@@ -34,6 +34,7 @@ Patch223:		httpd-2.0.45-export.patch
 Patch224:		httpd-2.2.11-corelimit.patch
 Patch225:		httpd-2.2.11-selinux.patch
 Patch226:		httpd-2.2.9-suenable.patch
+Patch227:		httpd-2.2.22-pcre830.patch
 
 
 BuildRequires:	autoconf, perl, pkgconfig
@@ -73,6 +74,7 @@ allow safely use non-thread-aware code software (like many PHP extensions f.e.)
 %patch224 -p1 -b .corelimit
 %patch225 -p1 -b .selinux
 %patch226 -p1 -b .suenable
+%patch227 -p1 -b .pcre830
 
 # Safety check: prevent build if defined MMN does not equal upstream MMN.
 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
@@ -132,6 +134,9 @@ rm -rf %{buildroot}
 %{_sbindir}/httpd.itk
 
 %changelog
+* Wed Mar 7 2012 Pavel Alexeev <Pahan at Hubbitus.info> - 2.2.22-4
+- Port pcre patch from httpd.
+
 * Thu Mar 1 2012 Pavel Alexeev <Pahan at Hubbitus.info> - 2.2.22-3
 - Add source1 - README.Fedora.
 
diff --git a/sources b/sources
index c130096..d241604 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 9fe3093194c8a57f085ff7c3fc43715f  httpd-2.2.22.tar.bz2
+088271c7e514cfb01e9c5f55d851331c  httpd-2.2.22-pcre830.patch


More information about the scm-commits mailing list