diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-13 01:08:38 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-13 01:08:38 -0300 |
| commit | 6b1c32bde545b9e47ab1fe83fdfb722ca6218393 (patch) | |
| tree | ac8f75aa35fc81be9eaffe905ab498e7713b2f84 /extra/apache | |
| parent | 2c721caa534df76621bf07705ed0ea80efe44f8b (diff) | |
| parent | 0020cc650ff973f269f23332e82fc097254d0adc (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ccze/PKGBUILD
community/remind/PKGBUILD
core/iw/PKGBUILD
core/less/PKGBUILD
extra/davfs2/PKGBUILD
extra/ettercap/PKGBUILD
extra/gtk-xfce-engine/PKGBUILD
extra/imagemagick/PKGBUILD
extra/kismet/PKGBUILD
extra/libmp3splt/PKGBUILD
extra/php/PKGBUILD
extra/xfce4-verve-plugin/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/wine/PKGBUILD
staging/xorg-server/PKGBUILD
Diffstat (limited to 'extra/apache')
| -rw-r--r-- | extra/apache/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/apache/pcre_info.patch | 21 |
2 files changed, 20 insertions, 9 deletions
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index 113a15c07..5b41fe9ff 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149398 2012-02-07 13:58:02Z jgc $ +# $Id: PKGBUILD 149928 2012-02-11 23:28:51Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache pkgver=2.2.22 -pkgrel=2 +pkgrel=3 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64' 'mips64el') options=('!libtool') @@ -54,12 +54,12 @@ md5sums=('9fe3093194c8a57f085ff7c3fc43715f' '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 diff --git a/extra/apache/pcre_info.patch b/extra/apache/pcre_info.patch index f1774db63..906a3159e 100644 --- a/extra/apache/pcre_info.patch +++ b/extra/apache/pcre_info.patch @@ -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 (preg->re_pcre == NULL) return AP_REG_INVARG; + 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; } |