[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
===
--- PKGBUILD2012-02-08 10:36:00 UTC (rev 149495)
+++ PKGBUILD2012-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.c2005-11-11 01:20:05.0 +1000
-+++ httpd-2.2.22/server/util_pcre.c2012-02-06 23:45:37.687946748 +1000
-@@ -137,7 +137,7 @@
+--- httpd-2.2.22/server/util_pcre.c2005-11-10 16:20:05.0 +0100
 httpd-2.2.22/server/util_pcre.c2012-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;
  }
  

[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
===
--- PKGBUILD2012-02-06 13:52:26 UTC (rev 149224)
+++ PKGBUILD2012-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.c2005-11-11 01:20:05.0 +1000
 httpd-2.2.22/server/util_pcre.c2012-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;
+ }
+