Source Mage code commit list

[Remko van der Vossen <scm AT sourcemage.org>]

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

 http/apache22/HISTORY       |    3 +++
 http/apache22/PRE_BUILD     |    3 +++
 http/apache22/pcre830.patch |   20 ++++++++++++++++++++
 3 files changed, 26 insertions(+)

New commits:
commit 9d44198c10a1d6765e58874e94d8661f5a4f1bad
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

    apache22: fix compilation for pcre8.30

diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 647088d..e47d6db 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2012-05-27 Remko van der Vossen <wich AT sourcemage.org>
+       * PRE_BUILD, pcre830.patch: copied pcre8.30 compat fix from upstream
+
 2012-01-31 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.2.22; SECURITY_PATCH++ (CVE-2011-3368,
          CVE-2011-3607, CVE-2011-4317, CVE-2012-0021, CVE-2012-0031,
diff --git a/http/apache22/PRE_BUILD b/http/apache22/PRE_BUILD
new file mode 100755
index 0000000..daad8c2
--- /dev/null
+++ b/http/apache22/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p4 < $SPELL_DIRECTORY/pcre830.patch
diff --git a/http/apache22/pcre830.patch b/http/apache22/pcre830.patch
new file mode 100644
index 0000000..c4009fb
--- /dev/null
+++ b/http/apache22/pcre830.patch
@@ -0,0 +1,20 @@
+--- httpd/httpd/branches/2.2.x/server/util_pcre.c      2005/11/10 15:20:05   
  332309
++++ httpd/httpd/branches/2.2.x/server/util_pcre.c      2012/04/04 18:19:19   
  1309513
+@@ -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;
+@@ -137,7 +138,9 @@
+ 
+ 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 = (apr_size_t)nsub;
+ return 0;
+ }