[arch-commits] Commit in apache/trunk (PKGBUILD prefork.c.patch)
Andrea Scarpino
andrea at archlinux.org
Tue Sep 1 17:28:57 UTC 2009
Date: Tuesday, September 1, 2009 @ 13:28:56
Author: andrea
Revision: 50815
upgpkg: apache 2.2.13-1
upstream release
Modified:
apache/trunk/PKGBUILD
Deleted:
apache/trunk/prefork.c.patch
-----------------+
PKGBUILD | 21 +++++++++------------
prefork.c.patch | 17 -----------------
2 files changed, 9 insertions(+), 29 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-09-01 16:27:10 UTC (rev 50814)
+++ PKGBUILD 2009-09-01 17:28:56 UTC (rev 50815)
@@ -1,9 +1,10 @@
# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
pkgname=apache
-pkgver=2.2.11
-pkgrel=3
+pkgver=2.2.13
+pkgrel=1
pkgdesc='A high performance Unix-based HTTP server'
arch=('i686' 'x86_64')
options=('!libtool')
@@ -13,22 +14,18 @@
etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf)
-depends=('openssl' 'zlib' 'apr-util' 'db' 'pcre')
+depends=('openssl' 'zlib' 'apr-util' 'pcre')
optdepends=('lynx: apachectl status')
source=("http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2"
- 'httpd.logrotate' 'httpd' 'arch.layout' 'prefork.c.patch')
-md5sums=('3e98bcb14a7122c274d62419566431bb'
+ 'httpd.logrotate' 'httpd' 'arch.layout')
+md5sums=('8d8d904e7342125825ec70f03c5745ef'
'f4d627c64024c1b7b95efb5ffbaa625e'
'bddd84dafa770d74df1dc1f96bd71823'
- '3d659d41276ba3bfcb20c231eb254e0c'
- '171df0cf9b6b8d68c7a0cb392b68d0ec')
+ '3d659d41276ba3bfcb20c231eb254e0c')
build() {
cd ${srcdir}/httpd-${pkgver}
- # see https://issues.apache.org/bugzilla/show_bug.cgi?id=46467
- patch -p0 -i $srcdir/prefork.c.patch
-
# set default user
sed -e 's#User daemon#User http#' \
-e 's#Group daemon#Group http#' \
@@ -56,7 +53,7 @@
--with-apr-util=/usr/bin/apu-1-config \
--with-pcre=/usr
- make
+ make || return 1
make DESTDIR=${pkgdir} install
install -D -m755 ${srcdir}/httpd ${pkgdir}/etc/rc.d/httpd
Deleted: prefork.c.patch
===================================================================
--- prefork.c.patch 2009-09-01 16:27:10 UTC (rev 50814)
+++ prefork.c.patch 2009-09-01 17:28:56 UTC (rev 50815)
@@ -1,17 +0,0 @@
---- server/mpm/prefork/prefork.c 2009/01/12 11:37:23 733697
-+++ server/mpm/prefork/prefork.c 2009/01/12 11:37:32 733698
-@@ -517,8 +517,12 @@
- (void) ap_update_child_status(sbh, SERVER_READY, (request_rec *) NULL);
-
- /* Set up the pollfd array */
-- /* ### check the status */
-- (void) apr_pollset_create(&pollset, num_listensocks, pchild, 0);
-+ status = apr_pollset_create(&pollset, num_listensocks, pchild, 0);
-+ if (status != APR_SUCCESS) {
-+ ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf,
-+ "Couldn't create pollset in child; check system or user limits");
-+ clean_child_exit(APEXIT_CHILDSICK); /* assume temporary resource issue */
-+ }
-
- for (lr = ap_listeners, i = num_listensocks; i--; lr = lr->next) {
- apr_pollfd_t pfd = { 0 };
More information about the arch-commits
mailing list