From 4e88fd96fd41ee3f721806eb94c23e5eddb491a5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 18 Feb 2014 09:31:48 +0100
Subject: [PATCH] apache: update to 2.4.7.

---
 srcpkgs/apache-mpm-event/template  | 14 ++------------
 srcpkgs/apache-mpm-worker/template | 11 ++---------
 srcpkgs/apache/template            |  6 +++---
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/srcpkgs/apache-mpm-event/template b/srcpkgs/apache-mpm-event/template
index f17a42510f..66ae5cbe0a 100644
--- a/srcpkgs/apache-mpm-event/template
+++ b/srcpkgs/apache-mpm-event/template
@@ -6,27 +6,17 @@
 # Unset unused stuff.
 unset conf_files system_accounts systemd_services
 unset post_install pre_configure depends
-unset -f apache_package apache-devel_package
+unset -f apache-devel_package
 
 # Override some vars.
 pkgname=apache-mpm-event
 configure_args+=" --enable-modules= --prefix=/usr --with-mpm=event"
-version=2.4.6
+version=2.4.7
 revision=1
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://httpd.apache.org/"
 license="Apache-2.0"
 short_desc="Apache HTTP Server - event driven model"
-long_desc="
- Each Apache Multi-Processing Module provides a different flavor of web
- server binary, compiled with a different processing model.
-
- The event MPM is designed to allow more requests to be served simultaneously
- by passing off some processing work to supporting threads, freeing up the
- main threads to work on new requests. It is especially suitable for sites
- that see extensive KeepAlive traffic.
-
- This MPM is experimental and less tested than the worker and prefork MPMs."
 
 # dlopen(3) run-time dependencies.
 depends="apache>=$version"
diff --git a/srcpkgs/apache-mpm-worker/template b/srcpkgs/apache-mpm-worker/template
index f23bfa135c..03eea59606 100644
--- a/srcpkgs/apache-mpm-worker/template
+++ b/srcpkgs/apache-mpm-worker/template
@@ -6,24 +6,17 @@
 # Unset unused stuff.
 unset conf_files system_accounts systemd_services
 unset post_install pre_configure depends
-unset -f apache_package apache-devel_package
+unset -f apache-devel_package
 
 # Override some vars.
 pkgname=apache-mpm-worker
 configure_args+=" --enable-modules= --prefix=/usr --with-mpm=worker"
-version=2.4.6
+version=2.4.7
 revision=1
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://httpd.apache.org/"
 license="Apache-2.0"
 short_desc="Apache HTTP Server - high speed threaded mode"
-long_desc="
- Each Apache Multi-Processing Module provides a different flavor of web
- server binary, compiled with a different processing model.
-
- The worker MPM provides the default threaded implementation. It is
- recommended especially for high-traffic sites because it is faster and has
- a smaller memory footprint than the traditional prefork MPM."
 
 # dlopen(3) run-time dependencies.
 depends="apache>=$version"
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index e0fb523de5..6397fae47a 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
-version=2.4.6
-revision=2
+version=2.4.7
+revision=1
 wrksrc=httpd-${version}
 build_style=gnu-configure
 configure_args="--prefix= --enable-pie --enable-modules=all
@@ -46,7 +46,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://httpd.apache.org/"
 license="Apache-2.0"
 distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2"
-checksum=dc9f3625ebc08bea55eeb0d16e71fba656f252e6cd0aa244ee7806dc3b022fea
+checksum=64368d8301836815ae237f2b62d909711c896c1bd34573771e0ee5ad808ce71b
 
 pre_configure() {
         # set default user