aboutsummaryrefslogtreecommitdiffstats
path: root/main/apache2
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-03-12 20:16:23 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-03-12 20:48:02 +0000
commitbb9bbcea206a3a0cb154396b6c61f1f71527aa5c (patch)
treeb2e4887e848003025e6bc65373d9989bd99b07bb /main/apache2
parent2d43d0722559ba3012bd5419919fc7f05aadf8cb (diff)
downloadaports-bb9bbcea206a3a0cb154396b6c61f1f71527aa5c.tar.bz2
aports-bb9bbcea206a3a0cb154396b6c61f1f71527aa5c.tar.xz
main/apache2: rebuild against pcre-8.30
Diffstat (limited to 'main/apache2')
-rw-r--r--main/apache2/APKBUILD4
-rw-r--r--main/apache2/httpd-2.2.22-pcre830.patch24
2 files changed, 27 insertions, 1 deletions
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 4241daa1c6..bfbeeae35c 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apache2
pkgver=2.2.22
-pkgrel=0
+pkgrel=1
pkgdesc="A high performance Unix-based HTTP server"
url="http://httpd.apache.org/"
arch="all"
@@ -26,6 +26,7 @@ source="http://archive.apache.org/dist/httpd/httpd-$pkgver.tar.bz2
http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01/09-capabilities.patch
http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01/10-nice.patch
http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01/11-fix-htaccess-reads-for-persistent-connections.patch
+ httpd-2.2.22-pcre830.patch
apache2.confd
apache2.logrotate
apache2.initd
@@ -246,6 +247,7 @@ d33e39350e987721d50e6fb8e164ab6b 07-base-functionality.patch
1b28e3363e1b0d05b738a21e7ddd264f 09-capabilities.patch
d9667fcd2ffecc63e446edd4d6666731 10-nice.patch
1e5b222edcfbf99a3edc56fcb2074fbe 11-fix-htaccess-reads-for-persistent-connections.patch
+088271c7e514cfb01e9c5f55d851331c httpd-2.2.22-pcre830.patch
e322b5211e49511cac6e40c86af1b1da apache2.confd
75fe4138b98fcffd01b8c8c077b944f3 apache2.logrotate
7105fc70298b24bfca6dba517f7486d7 apache2.initd
diff --git a/main/apache2/httpd-2.2.22-pcre830.patch b/main/apache2/httpd-2.2.22-pcre830.patch
new file mode 100644
index 0000000000..6942a80d66
--- /dev/null
+++ b/main/apache2/httpd-2.2.22-pcre830.patch
@@ -0,0 +1,24 @@
+
+http://svn.apache.org/viewvc?view=revision&revision=r1243176
+
+--- httpd-2.2.22/server/util_pcre.c.pcre830
++++ httpd-2.2.22/server/util_pcre.c
+@@ -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;
+ }
+