From 7a5b508efbcc2243c09bd0b060136f78409d3ab7 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 15 Oct 2015 11:21:23 +0200
Subject: main/apache2: security upgrade to 2.4.16
 (CVE-2015-3183,CVE-2015-3185)

ref #4722
fixes #4726
---
 main/apache2/APKBUILD | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index ca325a4d08..f0e974dded 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apache2
-pkgver=2.4.10
+pkgver=2.4.16
 pkgrel=0
 pkgdesc="A high performance Unix-based HTTP server"
 url="http://httpd.apache.org/"
@@ -11,7 +11,7 @@ install="$pkgname.pre-upgrade"
 pkgusers="apache"
 pkggroups="apache"
 makedepends="openssl-dev zlib-dev apr-util-dev apr-dev pcre-dev sed lua-dev
-	autoconf automake"
+	libxml2-dev autoconf automake"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-ssl
 	$pkgname-ldap $pkgname-webdav
 	$pkgname-proxy-html:proxy_html
@@ -73,6 +73,7 @@ build() {
 		--enable-proxy-connect \
 		--enable-proxy-http \
 		--enable-proxy-ftp \
+		--enable-proxy-html \
 		--enable-deflate \
 		--enable-dbd \
 		--enable-exception-hook \
@@ -217,7 +218,7 @@ _lua() {
 }
 
 
-md5sums="44543dff14a4ebc1e9e2d86780507156  httpd-2.4.10.tar.bz2
+md5sums="2b19cd338fd526dd5a63c57b1e9bfee2  httpd-2.4.16.tar.bz2
 e322b5211e49511cac6e40c86af1b1da  apache2.confd
 75fe4138b98fcffd01b8c8c077b944f3  apache2.logrotate
 cda94e6ec9e6f0322db0f32de2b3d68d  apache2.initd
@@ -228,7 +229,7 @@ fe26a0a70f572eb256a3c6c183a62223  proxy-html.conf
 96eddccfca1ec0349f844e2460cf655b  proxy.conf
 449a4aea60473ac4a16f025fca4463e3  lua.conf
 c66ff5f70260d5266e6803a59b39bd7f  alpine.layout"
-sha256sums="176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a  httpd-2.4.10.tar.bz2
+sha256sums="ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743  httpd-2.4.16.tar.bz2
 8b0ce62fc4e7cea3801744969d0b2390e28e4d11dd533816eb91e9d7af225500  apache2.confd
 dabf43e11c941125c771d2f4f5dadd1038906420716b747dfc8f5a946a0bdad5  apache2.logrotate
 312a35bddc4f6e78d2f951be02e46ac48a13a19038cbc480cb6b498120c65636  apache2.initd
@@ -239,7 +240,7 @@ dabf43e11c941125c771d2f4f5dadd1038906420716b747dfc8f5a946a0bdad5  apache2.logrot
 00c42b7806eaa73e732be9d9e92c3e841b20c6d91a9920be47f19db8aee3513e  proxy.conf
 edf701795137566c7cf4b9c0c95ecd5f8c58269f5600217a0a4d289d2bf15384  lua.conf
 cf0033a245d1d7752539613b6c92beaea9c0a755e7a877c8d41a2d4fd0f3eb22  alpine.layout"
-sha512sums="e251f5b330da17a8920c589b9e0326d6dd45db28923167718db27b0af2edf769607e9ae6fbb859afbf0c345937fd59053423a2d74bd18ff2272a0f6a19a6496f  httpd-2.4.10.tar.bz2
+sha512sums="039750ff962c08a7261896acc8272e59874d066f7d52721aaf967ddb737fc5716acc47e1effaf7c4d156ba61bc393e0738f64f8e89cc277ba2651e0f61d56628  httpd-2.4.16.tar.bz2
 e0a0b87889eff01e8a1ee21853d26c0307ceb87428727e60819d29644d8e54e9bfc08c197924567bed26befc904f8384af19516aea849f3cd6859d76b175b742  apache2.confd
 566a8c469ef148dfbb9449e91d6fb93baf85d06a31a52c283a7e402aef7bfa8b46c34ebed91c76b3e5a2cc606660145e8fc63fa41bdb22574c7efc4fc4d993e5  apache2.logrotate
 64480330f8a73c0b9c5a59a6a22c41869dd2593c97b3a4715f4e97670a4cbf8414986fa504f278042a081faad519d35294c1d9267a561bbffaa1739a491377f8  apache2.initd
-- 
cgit v1.2.3