17825179 Upgrade Apache Web Server to version 2.2.26
authorPetr Sumbera <petr.sumbera@oracle.com>
Fri, 22 Nov 2013 00:45:43 -0800
changeset 1569 abcbdc25c2f3
parent 1568 b73d1dab3340
child 1570 7d7b05000b1d
17825179 Upgrade Apache Web Server to version 2.2.26
components/apache2/Makefile
components/apache2/apache-22.p5m
components/apache2/documentation.p5m
--- a/components/apache2/Makefile	Fri Nov 22 09:15:38 2013 +1100
+++ b/components/apache2/Makefile	Fri Nov 22 00:45:43 2013 -0800
@@ -23,13 +23,13 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		apache2
-COMPONENT_VERSION=	2.2.25
+COMPONENT_VERSION=	2.2.26
 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:b641b4512f280aaa568eab090ab52fdea86894f9ef22f384811a4572fc405bf3
+    sha256:9fcd0328d755887a80399200d83d487a4c72ff300482b0c9373751b7a6d4a1e8
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/httpd/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/apache
 
--- a/components/apache2/apache-22.p5m	Fri Nov 22 09:15:38 2013 +1100
+++ b/components/apache2/apache-22.p5m	Fri Nov 22 00:45:43 2013 -0800
@@ -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=9066
+set name=com.oracle.info.tpno value=15876
 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/documentation.p5m	Fri Nov 22 09:15:38 2013 +1100
+++ b/components/apache2/documentation.p5m	Fri Nov 22 00:45:43 2013 -0800
@@ -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=9066
+set name=com.oracle.info.tpno value=15876
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)