diff --git a/apache2.changes b/apache2.changes index 5896993..6ffdee6 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 11 09:21:15 UTC 2012 - coolo@suse.com + +- compile with pcre 8.30 - patch taken from apache bugzilla + ------------------------------------------------------------------- Sat Jan 21 13:54:01 CET 2012 - draht@suse.de diff --git a/apache2.spec b/apache2.spec index 7281410..5b3b98e 100644 --- a/apache2.spec +++ b/apache2.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: apache2 BuildRequires: automake BuildRequires: db-devel @@ -145,6 +143,8 @@ Patch102: httpd-keepalivetimeout-millisecs.patch Patch104: httpd-mod_deflate_head.patch Patch105: ssl-mode-release-buffers.patch Patch106: httpd-2.2.x-CVE-2011-3368-server_protocl_c.diff +# PATCH-FIX-UPSTREAM https://issues.apache.org/bugzilla/show_bug.cgi?id=52623 +Patch107: httpd-new_pcre.patch Url: http://httpd.apache.org/ Icon: Apache.xpm Summary: The Apache Web Server Version 2.2 @@ -361,6 +361,9 @@ to administrators of web servers in general. %patch104 %patch105 %patch106 +%if 0%{?suse_version} >= 1220 +%patch107 +%endif # cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE diff --git a/httpd-new_pcre.patch b/httpd-new_pcre.patch new file mode 100644 index 0000000..dd558af --- /dev/null +++ b/httpd-new_pcre.patch @@ -0,0 +1,23 @@ +Index: server/util_pcre.c +=================================================================== +--- server/util_pcre.c.orig 2012-02-11 10:07:31.000000000 +0100 ++++ server/util_pcre.c 2012-02-11 10:08:23.062838133 +0100 +@@ -128,6 +128,7 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t *p + const char *errorptr; + int erroffset; + int options = 0; ++int nsub; + + if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS; + if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE; +@@ -137,7 +138,9 @@ preg->re_erroffset = erroffset; + + if (preg->re_pcre == NULL) return AP_REG_INVARG; + +-preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL); ++pcre_fullinfo((const pcre *)preg->re_pcre, NULL, ++ PCRE_INFO_CAPTURECOUNT, &nsub); ++preg->re_nsub = nsub; + return 0; + } +