summaryrefslogtreecommitdiff
path: root/extra/apache/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'extra/apache/PKGBUILD')
-rw-r--r--extra/apache/PKGBUILD17
1 files changed, 11 insertions, 6 deletions
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index 6f2ee060d..5f9ff1786 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 138021 2011-09-14 11:59:52Z pierre $
+# $Id: PKGBUILD 149398 2012-02-07 13:58:02Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=apache
-pkgver=2.2.21
-pkgrel=1
+pkgver=2.2.22
+pkgrel=2
pkgdesc='A high performance Unix-based HTTP server'
arch=('i686' 'x86_64')
options=('!libtool')
@@ -20,6 +20,7 @@ depends=('openssl' 'zlib' 'apr-util' 'pcre')
optdepends=('lynx: apachectl status')
_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01
source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
+ http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2.asc
${_itkurl}/02-rename-prefork-to-itk.patch
${_itkurl}/03-add-mpm-to-build-system.patch
${_itkurl}/04-correct-output-makefile-location.patch
@@ -34,8 +35,10 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
apache.conf.d
httpd.logrotate
httpd
- arch.layout)
-md5sums=('1696ae62cd879ab1d4dd9ff021a470f2'
+ arch.layout
+ pcre_info.patch)
+md5sums=('9fe3093194c8a57f085ff7c3fc43715f'
+ '41b3a6e4948679cab70b9caf490877c4'
'f1d9d41360908ceb2374da55ae99197a'
'cdfa04985a0efa850976aef01c2a0c40'
'0930d2d0612eb0a53a0d00aea7e8687f'
@@ -50,11 +53,13 @@ md5sums=('1696ae62cd879ab1d4dd9ff021a470f2'
'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