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

[Pierre Schmitz]

    Date: Monday, February 6, 2012 @ 09:00:13
  Author: pierre
Revision: 149225

upgpkg: apache 2.2.22-1

pcre 8.30 rebuild

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

-----------------+
 PKGBUILD        |    7 +++++--
 pcre_info.patch |   11 +++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-06 13:52:26 UTC (rev 149224)
+++ PKGBUILD	2012-02-06 14:00:13 UTC (rev 149225)
@@ -35,7 +35,8 @@
         apache.conf.d
         httpd.logrotate
         httpd
-        arch.layout)
+        arch.layout
+        pcre_info.patch)
 md5sums=('9fe3093194c8a57f085ff7c3fc43715f'
          '41b3a6e4948679cab70b9caf490877c4'
          'f1d9d41360908ceb2374da55ae99197a'
@@ -52,11 +53,13 @@
          '08b3c875f6260644f2f52b4056d656b0'
          '6382331e9700ed9e8cc78ea51887b537'
          'c7e300a287ef7e2e066ac7639536f87e'
-         '3d659d41276ba3bfcb20c231eb254e0c')
+         '3d659d41276ba3bfcb20c231eb254e0c'
+         'f74652f3169baaae595026116ef54599')
 
 build() {
 	cd "${srcdir}/httpd-${pkgver}"
 
+	patch -p1 -i "${srcdir}/pcre_info.patch"
 	patch -Np0 -i "${srcdir}/apachectl-confd.patch"
 
 	# set default user

Added: pcre_info.patch
===================================================================
--- pcre_info.patch	                        (rev 0)
+++ pcre_info.patch	2012-02-06 14:00:13 UTC (rev 149225)
@@ -0,0 +1,11 @@
+--- 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 @@
+ 
+ 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);
+ return 0;
+ }
+