[arch-commits] Commit in apache/trunk (PKGBUILD pcre_info.patch)

[Pierre Schmitz]

    Date: Wednesday, February 8, 2012 @ 05:36:07
  Author: pierre
Revision: 149496

upgpkg: apache 2.2.22-3

Use propper pcre_info patch
See https://issues.apache.org/bugzilla/show_bug.cgi?id=52623

Modified:
  apache/trunk/PKGBUILD
  apache/trunk/pcre_info.patch

-----------------+
 PKGBUILD        |    6 +++---
 pcre_info.patch |   21 ++++++++++++++++-----
 2 files changed, 19 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-08 10:36:00 UTC (rev 149495)
+++ PKGBUILD	2012-02-08 10:36:07 UTC (rev 149496)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.2.22
-pkgrel=2
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -54,12 +54,12 @@
          '6382331e9700ed9e8cc78ea51887b537'
          'c7e300a287ef7e2e066ac7639536f87e'
          '3d659d41276ba3bfcb20c231eb254e0c'
-         'f74652f3169baaae595026116ef54599')
+         'fde5121e32b5aeef5a7eedb5a97009ff')
 
 build() {
 	cd "${srcdir}/httpd-${pkgver}"
 
-	#patch -p1 -i "${srcdir}/pcre_info.patch"
+	patch -p1 -i "${srcdir}/pcre_info.patch"
 	patch -Np0 -i "${srcdir}/apachectl-confd.patch"
 
 	# set default user

Modified: pcre_info.patch
===================================================================
--- pcre_info.patch	2012-02-08 10:36:00 UTC (rev 149495)
+++ pcre_info.patch	2012-02-08 10:36:07 UTC (rev 149496)
@@ -1,11 +1,22 @@
---- httpd-2.2.22/server/util_pcre.c	2005-11-11 01:20:05.000000000 +1000
-+++ httpd-2.2.22/server/util_pcre.c	2012-02-06 23:45:37.687946748 +1000
-@@ -137,7 +137,7 @@
+--- httpd-2.2.22/server/util_pcre.c	2005-11-10 16:20:05.000000000 +0100
++++ httpd-2.2.22/server/util_pcre.c	2012-02-08 11:23:56.273855663 +0100
+@@ -128,6 +128,7 @@
+ 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;
+@@ -136,8 +137,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);
-+preg->re_nsub = pcre_fullinfo((const pcre *)preg->re_pcre, NULL, NULL, NULL);
++pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
++               PCRE_INFO_CAPTURECOUNT, &nsub);
++preg->re_nsub = nsub;
  return 0;
  }