--- a/components/apache2/Makefile	Tue Apr 01 23:35:49 2014 -0700
+++ b/components/apache2/Makefile	Wed Apr 02 05:41:43 2014 -0700
@@ -18,20 +18,21 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		apache2
-COMPONENT_VERSION=	2.2.26
+COMPONENT_VERSION=	2.2.27
 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:9fcd0328d755887a80399200d83d487a4c72ff300482b0c9373751b7a6d4a1e8
+    sha256:7e58abdc6f30756aafe136d7efb10a79d6ff66f8b68308fd2399cb01ae77895d
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/httpd/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/apache
+TPNO=			16942
 
 CONFIGURE_DEFAULT_DIRS=no
 
@@ -39,6 +40,8 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 PATCH_LEVEL=0
 
 # Some patches need configure script re-creation.

--- a/components/apache2/apache-22.p5m	Tue Apr 01 23:35:49 2014 -0700
+++ b/components/apache2/apache-22.p5m	Wed Apr 02 05:41:43 2014 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file link hardlink path=usr/apache2/2.2/build/.* -> \
@@ -31,7 +31,7 @@
 set name=pkg.description \
     value="The Apache HTTP Server Version 2.2"
 set name=com.oracle.info.description value="the Apache Web Server V2.2"
-set name=com.oracle.info.tpno value=15876
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)

--- a/components/apache2/apache.license	Tue Apr 01 23:35:49 2014 -0700
+++ b/components/apache2/apache.license	Wed Apr 02 05:41:43 2014 -0700
@@ -1,5 +1,5 @@
 Apache HTTP Server
-Copyright 2013 The Apache Software Foundation.
+Copyright 2014 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

--- a/components/apache2/documentation.p5m	Tue Apr 01 23:35:49 2014 -0700
+++ b/components/apache2/documentation.p5m	Wed Apr 02 05:41:43 2014 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 <transform dir file link hardlink path=usr/apache2/2.2/manual(/.+){0,1}$ -> \
     default facet.doc.html true>
@@ -29,7 +29,7 @@
 set name=pkg.description \
     value="The Apache HTTP Server Version 2.2 (documentation)"
 set name=com.oracle.info.description value="the Apache Web Server V2.2 Documentation"
-set name=com.oracle.info.tpno value=15876
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -41,27 +41,9 @@
 
 license apache.license license="Apache v2.0"
 
-dir path=usr
-dir path=usr/apache2
-dir path=usr/apache2/2.2
-dir path=usr/apache2/2.2/manual
-dir path=usr/apache2/2.2/manual/developer
-dir path=usr/apache2/2.2/manual/faq
-dir path=usr/apache2/2.2/manual/howto
-dir path=usr/apache2/2.2/manual/images
-dir path=usr/apache2/2.2/manual/misc
-dir path=usr/apache2/2.2/manual/mod
-dir path=usr/apache2/2.2/manual/platform
-dir path=usr/apache2/2.2/manual/programs
-dir path=usr/apache2/2.2/manual/rewrite
-dir path=usr/apache2/2.2/manual/ssl
-dir path=usr/apache2/2.2/manual/style
-dir path=usr/apache2/2.2/manual/style/css
 dir path=usr/apache2/2.2/manual/style/lang
-dir path=usr/apache2/2.2/manual/style/latex
-dir path=usr/apache2/2.2/manual/style/xsl
 dir path=usr/apache2/2.2/manual/style/xsl/util
-dir path=usr/apache2/2.2/manual/vhosts
+
 file path=usr/apache2/2.2/manual/LICENSE
 file path=usr/apache2/2.2/manual/bind.html
 file path=usr/apache2/2.2/manual/bind.html.de
@@ -100,14 +82,14 @@
 file path=usr/apache2/2.2/manual/developer/debugging.html.en
 file path=usr/apache2/2.2/manual/developer/documenting.html
 file path=usr/apache2/2.2/manual/developer/documenting.html.en
-file path=usr/apache2/2.2/manual/developer/documenting.html.zh-cn
+file path=usr/apache2/2.2/manual/developer/documenting.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/developer/filters.html
 file path=usr/apache2/2.2/manual/developer/filters.html.en
 file path=usr/apache2/2.2/manual/developer/hooks.html
 file path=usr/apache2/2.2/manual/developer/hooks.html.en
 file path=usr/apache2/2.2/manual/developer/index.html
 file path=usr/apache2/2.2/manual/developer/index.html.en
-file path=usr/apache2/2.2/manual/developer/index.html.zh-cn
+file path=usr/apache2/2.2/manual/developer/index.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/developer/modules.html
 file path=usr/apache2/2.2/manual/developer/modules.html.en
 file path=usr/apache2/2.2/manual/developer/modules.html.ja.utf8
@@ -133,7 +115,7 @@
 file path=usr/apache2/2.2/manual/faq/index.html
 file path=usr/apache2/2.2/manual/faq/index.html.en
 file path=usr/apache2/2.2/manual/faq/index.html.tr.utf8
-file path=usr/apache2/2.2/manual/faq/index.html.zh-cn
+file path=usr/apache2/2.2/manual/faq/index.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/filter.html
 file path=usr/apache2/2.2/manual/filter.html.en
 file path=usr/apache2/2.2/manual/filter.html.es
@@ -157,7 +139,7 @@
 file path=usr/apache2/2.2/manual/handler.html.ko.euc-kr
 file path=usr/apache2/2.2/manual/handler.html.ru.koi8-r
 file path=usr/apache2/2.2/manual/handler.html.tr.utf8
-file path=usr/apache2/2.2/manual/handler.html.zh-cn
+file path=usr/apache2/2.2/manual/handler.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/howto/access.html
 file path=usr/apache2/2.2/manual/howto/access.html.en
 file path=usr/apache2/2.2/manual/howto/auth.html
@@ -180,7 +162,7 @@
 file path=usr/apache2/2.2/manual/howto/index.html.en
 file path=usr/apache2/2.2/manual/howto/index.html.ja.utf8
 file path=usr/apache2/2.2/manual/howto/index.html.ko.euc-kr
-file path=usr/apache2/2.2/manual/howto/index.html.zh-cn
+file path=usr/apache2/2.2/manual/howto/index.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/howto/public_html.html
 file path=usr/apache2/2.2/manual/howto/public_html.html.en
 file path=usr/apache2/2.2/manual/howto/public_html.html.ja.utf8
@@ -234,7 +216,7 @@
 file path=usr/apache2/2.2/manual/index.html.ko.euc-kr
 file path=usr/apache2/2.2/manual/index.html.pt-br
 file path=usr/apache2/2.2/manual/index.html.tr.utf8
-file path=usr/apache2/2.2/manual/index.html.zh-cn
+file path=usr/apache2/2.2/manual/index.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/install.html
 file path=usr/apache2/2.2/manual/install.html.de
 file path=usr/apache2/2.2/manual/install.html.en
@@ -264,7 +246,7 @@
 file path=usr/apache2/2.2/manual/misc/index.html.en
 file path=usr/apache2/2.2/manual/misc/index.html.ko.euc-kr
 file path=usr/apache2/2.2/manual/misc/index.html.tr.utf8
-file path=usr/apache2/2.2/manual/misc/index.html.zh-cn
+file path=usr/apache2/2.2/manual/misc/index.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/misc/password_encryptions.html
 file path=usr/apache2/2.2/manual/misc/password_encryptions.html.en
 file path=usr/apache2/2.2/manual/misc/perf-tuning.html
@@ -305,7 +287,7 @@
 file path=usr/apache2/2.2/manual/mod/directives.html.ko.euc-kr
 file path=usr/apache2/2.2/manual/mod/directives.html.ru.koi8-r
 file path=usr/apache2/2.2/manual/mod/directives.html.tr.utf8
-file path=usr/apache2/2.2/manual/mod/directives.html.zh-cn
+file path=usr/apache2/2.2/manual/mod/directives.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/mod/event.html
 file path=usr/apache2/2.2/manual/mod/event.html.en
 file path=usr/apache2/2.2/manual/mod/index.html
@@ -315,7 +297,7 @@
 file path=usr/apache2/2.2/manual/mod/index.html.ja.utf8
 file path=usr/apache2/2.2/manual/mod/index.html.ko.euc-kr
 file path=usr/apache2/2.2/manual/mod/index.html.tr.utf8
-file path=usr/apache2/2.2/manual/mod/index.html.zh-cn
+file path=usr/apache2/2.2/manual/mod/index.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/mod/mod_actions.html
 file path=usr/apache2/2.2/manual/mod/mod_actions.html.de
 file path=usr/apache2/2.2/manual/mod/mod_actions.html.en
@@ -623,7 +605,7 @@
 file path=usr/apache2/2.2/manual/mod/quickreference.html.ko.euc-kr
 file path=usr/apache2/2.2/manual/mod/quickreference.html.ru.koi8-r
 file path=usr/apache2/2.2/manual/mod/quickreference.html.tr.utf8
-file path=usr/apache2/2.2/manual/mod/quickreference.html.zh-cn
+file path=usr/apache2/2.2/manual/mod/quickreference.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/mod/worker.html
 file path=usr/apache2/2.2/manual/mod/worker.html.de
 file path=usr/apache2/2.2/manual/mod/worker.html.en
@@ -637,7 +619,7 @@
 file path=usr/apache2/2.2/manual/mpm.html.ja.utf8
 file path=usr/apache2/2.2/manual/mpm.html.ko.euc-kr
 file path=usr/apache2/2.2/manual/mpm.html.tr.utf8
-file path=usr/apache2/2.2/manual/mpm.html.zh-cn
+file path=usr/apache2/2.2/manual/mpm.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/new_features_2_0.html
 file path=usr/apache2/2.2/manual/new_features_2_0.html.de
 file path=usr/apache2/2.2/manual/new_features_2_0.html.en
@@ -660,7 +642,7 @@
 file path=usr/apache2/2.2/manual/platform/index.html
 file path=usr/apache2/2.2/manual/platform/index.html.en
 file path=usr/apache2/2.2/manual/platform/index.html.ko.euc-kr
-file path=usr/apache2/2.2/manual/platform/index.html.zh-cn
+file path=usr/apache2/2.2/manual/platform/index.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/platform/netware.html
 file path=usr/apache2/2.2/manual/platform/netware.html.en
 file path=usr/apache2/2.2/manual/platform/netware.html.ko.euc-kr
@@ -751,7 +733,7 @@
 file path=usr/apache2/2.2/manual/rewrite/index.html.en
 file path=usr/apache2/2.2/manual/rewrite/index.html.fr
 file path=usr/apache2/2.2/manual/rewrite/index.html.tr.utf8
-file path=usr/apache2/2.2/manual/rewrite/index.html.zh-cn
+file path=usr/apache2/2.2/manual/rewrite/index.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/rewrite/intro.html
 file path=usr/apache2/2.2/manual/rewrite/intro.html.en
 file path=usr/apache2/2.2/manual/rewrite/intro.html.fr
@@ -776,12 +758,12 @@
 file path=usr/apache2/2.2/manual/sitemap.html.ja.utf8
 file path=usr/apache2/2.2/manual/sitemap.html.ko.euc-kr
 file path=usr/apache2/2.2/manual/sitemap.html.tr.utf8
-file path=usr/apache2/2.2/manual/sitemap.html.zh-cn
+file path=usr/apache2/2.2/manual/sitemap.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/ssl/index.html
 file path=usr/apache2/2.2/manual/ssl/index.html.en
 file path=usr/apache2/2.2/manual/ssl/index.html.ja.utf8
 file path=usr/apache2/2.2/manual/ssl/index.html.tr.utf8
-file path=usr/apache2/2.2/manual/ssl/index.html.zh-cn
+file path=usr/apache2/2.2/manual/ssl/index.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/ssl/ssl_compat.html
 file path=usr/apache2/2.2/manual/ssl/ssl_compat.html.en
 file path=usr/apache2/2.2/manual/ssl/ssl_faq.html
@@ -855,7 +837,7 @@
 file path=usr/apache2/2.2/manual/vhosts/index.html.ko.euc-kr
 file path=usr/apache2/2.2/manual/vhosts/index.html.ru.koi8-r
 file path=usr/apache2/2.2/manual/vhosts/index.html.tr.utf8
-file path=usr/apache2/2.2/manual/vhosts/index.html.zh-cn
+file path=usr/apache2/2.2/manual/vhosts/index.html.zh-cn.utf8
 file path=usr/apache2/2.2/manual/vhosts/ip-based.html
 file path=usr/apache2/2.2/manual/vhosts/ip-based.html.en
 file path=usr/apache2/2.2/manual/vhosts/ip-based.html.fr