# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1422966336 28800
# Node ID a71f444ba8497180cd9284192103edd2c9c7498c
# Parent  bf9abbe60d37fc59056838b40f9362cec06c8bc1
20462161 Upgrade Apache Web Server 2.4 to version 2.4.12
20462192 problem in UTILITY/APACHE

diff -r bf9abbe60d37 -r a71f444ba849 components/apache24/Makefile
--- a/components/apache24/Makefile	Thu Feb 05 21:04:08 2015 -0800
+++ b/components/apache24/Makefile	Tue Feb 03 04:25:36 2015 -0800
@@ -23,17 +23,17 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		apache2
-COMPONENT_VERSION=	2.4.10
+COMPONENT_VERSION=	2.4.12
 COMPONENT_PROJECT_URL=	http://httpd.apache.org/
 COMPONENT_SRC_NAME=	httpd
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:ab62f3283de03126fbd509866d8e4fdc9317235b6fca2734ae18827271f9c1fe
+    sha256:ee1e6901485feab7384371dbdd91c40fcb1b5e3f75583bb0d387b90d8c4176c8
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/httpd/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/apache
 
-TPNO=	18388
+TPNO=	21402
 	
 CONFIGURE_DEFAULT_DIRS=no
 
diff -r bf9abbe60d37 -r a71f444ba849 components/apache24/apache-24.p5m
--- a/components/apache24/apache-24.p5m	Thu Feb 05 21:04:08 2015 -0800
+++ b/components/apache24/apache-24.p5m	Tue Feb 03 04:25:36 2015 -0800
@@ -755,10 +755,10 @@
 file path=usr/apache2/2.4/manual/mod/mod_env.html.ja.utf8
 file path=usr/apache2/2.4/manual/mod/mod_env.html.ko.euc-kr
 file path=usr/apache2/2.4/manual/mod/mod_env.html.tr.utf8
-file path=usr/apache2/2.4/manual/mod/mod_example.html
-file path=usr/apache2/2.4/manual/mod/mod_example.html.en
-file path=usr/apache2/2.4/manual/mod/mod_example.html.fr
-file path=usr/apache2/2.4/manual/mod/mod_example.html.ko.euc-kr
+file path=usr/apache2/2.4/manual/mod/mod_example_hooks.html
+file path=usr/apache2/2.4/manual/mod/mod_example_hooks.html.en
+file path=usr/apache2/2.4/manual/mod/mod_example_hooks.html.fr
+file path=usr/apache2/2.4/manual/mod/mod_example_hooks.html.ko.euc-kr
 file path=usr/apache2/2.4/manual/mod/mod_expires.html
 file path=usr/apache2/2.4/manual/mod/mod_expires.html.en
 file path=usr/apache2/2.4/manual/mod/mod_expires.html.fr
diff -r bf9abbe60d37 -r a71f444ba849 components/apache24/apache.license
--- a/components/apache24/apache.license	Thu Feb 05 21:04:08 2015 -0800
+++ b/components/apache24/apache.license	Tue Feb 03 04:25:36 2015 -0800
@@ -1,5 +1,5 @@
 Apache HTTP Server
-Copyright 2014 The Apache Software Foundation.
+Copyright 2015 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff -r bf9abbe60d37 -r a71f444ba849 components/apache24/patches/ssl.conf.patch
--- a/components/apache24/patches/ssl.conf.patch	Thu Feb 05 21:04:08 2015 -0800
+++ b/components/apache24/patches/ssl.conf.patch	Tue Feb 03 04:25:36 2015 -0800
@@ -26,7 +26,7 @@
  #   SSL Cipher Suite:
  #   List the ciphers that the client is permitted to negotiate.
  #   See the mod_ssl documentation for a complete list.
-@@ -81,7 +85,7 @@
+@@ -103,7 +107,7 @@
  
  #   General setup for the virtual host
  DocumentRoot "@exp_htdocsdir@"