# HG changeset patch # User Petr Sumbera # Date 1396000109 25200 # Node ID 294646fdcae67f4b789bad2b4903e18d0aad899d # Parent a2310ec32635b1ebde9ff0920c0c2832f9458bf8 18459410 Upgrade Apache Web Server to version 2.2.27 18454251 problem in UTILITY/APACHE diff -r a2310ec32635 -r 294646fdcae6 components/apache2/Makefile --- a/components/apache2/Makefile Thu Mar 27 19:40:44 2014 -0700 +++ b/components/apache2/Makefile Fri Mar 28 02:48:29 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. diff -r a2310ec32635 -r 294646fdcae6 components/apache2/apache-22.p5m --- a/components/apache2/apache-22.p5m Thu Mar 27 19:40:44 2014 -0700 +++ b/components/apache2/apache-22.p5m Fri Mar 28 02:48:29 2014 -0700 @@ -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) diff -r a2310ec32635 -r 294646fdcae6 components/apache2/apache.license --- a/components/apache2/apache.license Thu Mar 27 19:40:44 2014 -0700 +++ b/components/apache2/apache.license Fri Mar 28 02:48:29 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/). diff -r a2310ec32635 -r 294646fdcae6 components/apache2/documentation.p5m --- a/components/apache2/documentation.p5m Thu Mar 27 19:40:44 2014 -0700 +++ b/components/apache2/documentation.p5m Fri Mar 28 02:48:29 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. # \ 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) @@ -85,14 +85,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 @@ -118,7 +118,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 @@ -142,7 +142,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 @@ -165,7 +165,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 @@ -219,7 +219,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 @@ -249,7 +249,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 @@ -290,7 +290,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 @@ -300,7 +300,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 @@ -608,7 +608,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 @@ -622,7 +622,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 @@ -645,7 +645,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 @@ -736,7 +736,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 @@ -761,12 +761,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 @@ -840,7 +840,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