# HG changeset patch # User Petr Sumbera # Date 1396870484 25200 # Node ID 6c3d483b5807a5cfcc85aec1b1cc545be2bc7abb # Parent 60a045d209ef5e341ce4fb4196fa60b4d099ae4f 18466561 Upgrade Apache Tomcat to version 6.0.39 18466635 problem in UTILITY/TOMCAT diff -r 60a045d209ef -r 6c3d483b5807 components/tomcat/Makefile --- a/components/tomcat/Makefile Mon Mar 31 06:47:28 2014 -0700 +++ b/components/tomcat/Makefile Mon Apr 07 04:34:44 2014 -0700 @@ -20,19 +20,19 @@ # # -# 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= tomcat -COMPONENT_VERSION= 6.0.37 +COMPONENT_VERSION= 6.0.39 COMPONENT_PROJECT_URL= http://tomcat.apache.org/ COMPONENT_SRC_NAME= apache-tomcat COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:665d72f375a9bf9ec5b8f9300c0af620948ff14d35b4c57c4297030ff6c1f281 + sha256:f31eba79138f5ac8223ff706fb2637205837ea44ba27c39bfb18ce9aada0f7ec COMPONENT_ARCHIVE_URL= http://www.apache.org/dist/tomcat/tomcat-6/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/tomcat @@ -45,10 +45,10 @@ COMPONENT_ARCHIVE_HASH_2= \ sha256:e9f414555c41e9584da1f6953af28208ece5cd4664ef2fea297e6a6aadc4377e COMPONENT_ARCHIVE_URL_2= http://archive.apache.org/dist/commons/pool/source/$(COMPONENT_ARCHIVE_2) -COMPONENT_ARCHIVE_3= ecj-4.2.2.jar +COMPONENT_ARCHIVE_3= ecj-4.3.1.jar COMPONENT_ARCHIVE_HASH_3= \ - sha256:4c74df88610d673b2c74bf5b48b6284bae42f9b880f0ad89a8ada69fe84a0d70 -COMPONENT_ARCHIVE_URL_3= http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.2-201302041200/$(COMPONENT_ARCHIVE_3) + sha256:5f86314f67dc57a0a9865265a48fd7831f16ab177c0c1349eea798c2c6297295 +COMPONENT_ARCHIVE_URL_3= http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/$(COMPONENT_ARCHIVE_3) include ../../make-rules/prep.mk include ../../make-rules/ant.mk @@ -62,6 +62,8 @@ (cd $(PROTO_DIR) ; $(RM) conf/CONF.tar.gz ; \ gtar cfz conf/CONF.tar.gz conf/* ) +ASLR_MODE = $(ASLR_NOT_APPLICABLE) + build: $(BUILD_32) install: build diff -r 60a045d209ef -r 6c3d483b5807 components/tomcat/patches/build.properties.patch --- a/components/tomcat/patches/build.properties.patch Mon Mar 31 06:47:28 2014 -0700 +++ b/components/tomcat/patches/build.properties.patch Mon Apr 07 04:34:44 2014 -0700 @@ -1,8 +1,8 @@ ---- apache-tomcat-6.0.37-src/build.properties.default Mon Apr 29 02:36:52 2013 -+++ apache-tomcat-6.0.37-src/build.properties.default Wed Jun 12 01:31:42 2013 -@@ -54,6 +54,12 @@ - base-sf.loc=http://downloads.sourceforge.net - base-maven.loc=http://repo2.maven.org/maven2 +--- apache-tomcat-6.0.39-src/build.properties.default 2014-01-27 14:44:16.000000000 -0800 ++++ apache-tomcat-6.0.39-src/build.properties.default 2014-03-26 07:10:57.760032171 -0700 +@@ -52,6 +52,12 @@ + # repo.maven.apache.org is the same as repo2.maven.org + base-maven.loc=http://repo.maven.apache.org/maven2 +# In Userland we really don't want Tomcat to download its build +# dependencies itself but instead we will do it ourself in advance. @@ -13,7 +13,7 @@ # ----- Commons Logging, version 1.1 or later ----- # If this version is updated, check the versions required for the deps # - avalon-framework -@@ -114,7 +120,7 @@ +@@ -112,7 +118,7 @@ jdt.jar=${jdt.home}/ecj-${jdt.version}.jar # The download will be moved to the archive area eventually. We are taking care of that in advance. # Note older JARs were called ecj.jar. Newer JARs are called ecj-${jdt.version}.jar @@ -22,7 +22,7 @@ jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar # ----- Tomcat native library ----- -@@ -126,16 +132,16 @@ +@@ -124,16 +130,16 @@ tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip diff -r 60a045d209ef -r 6c3d483b5807 components/tomcat/tomcat-examples.p5m --- a/components/tomcat/tomcat-examples.p5m Mon Mar 31 06:47:28 2014 -0700 +++ b/components/tomcat/tomcat-examples.p5m Mon Apr 07 04:34:44 2014 -0700 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # \ @@ -35,7 +35,7 @@ set name=pkg.summary \ value="Tomcat Servlet/JSP Container - example applications" set name=com.oracle.info.description value="the Tomcat example applications" -set name=com.oracle.info.tpno value=9075 +set name=com.oracle.info.tpno value=17010 set name=info.classification \ value="org.opensolaris.category.2008:Web Services/Application and Web Servers" set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) @@ -43,68 +43,6 @@ set name=org.opensolaris.arc-caseid \ value=PSARC/2008/711 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -dir path=var -dir path=var/tomcat6 -dir path=var/tomcat6/webapps group=webservd owner=webservd -dir path=var/tomcat6/webapps/ROOT -dir path=var/tomcat6/webapps/ROOT.example -dir path=var/tomcat6/webapps/ROOT.example/WEB-INF -dir path=var/tomcat6/webapps/examples -dir path=var/tomcat6/webapps/examples/WEB-INF -dir path=var/tomcat6/webapps/examples/WEB-INF/classes -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/cal -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/chat -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/checkbox -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/colors -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/dates -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/error -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/examples -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/filters -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2 -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/num -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/sessions -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/util -dir path=var/tomcat6/webapps/examples/WEB-INF/classes/validators -dir path=var/tomcat6/webapps/examples/WEB-INF/jsp -dir path=var/tomcat6/webapps/examples/WEB-INF/jsp/applet -dir path=var/tomcat6/webapps/examples/WEB-INF/jsp2 -dir path=var/tomcat6/webapps/examples/WEB-INF/lib -dir path=var/tomcat6/webapps/examples/WEB-INF/tags -dir path=var/tomcat6/webapps/examples/jsp -dir path=var/tomcat6/webapps/examples/jsp/cal -dir path=var/tomcat6/webapps/examples/jsp/chat -dir path=var/tomcat6/webapps/examples/jsp/checkbox -dir path=var/tomcat6/webapps/examples/jsp/colors -dir path=var/tomcat6/webapps/examples/jsp/dates -dir path=var/tomcat6/webapps/examples/jsp/error -dir path=var/tomcat6/webapps/examples/jsp/forward -dir path=var/tomcat6/webapps/examples/jsp/images -dir path=var/tomcat6/webapps/examples/jsp/include -dir path=var/tomcat6/webapps/examples/jsp/jsp2 -dir path=var/tomcat6/webapps/examples/jsp/jsp2/el -dir path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute -dir path=var/tomcat6/webapps/examples/jsp/jsp2/jspx -dir path=var/tomcat6/webapps/examples/jsp/jsp2/misc -dir path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag -dir path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles -dir path=var/tomcat6/webapps/examples/jsp/jsptoserv -dir path=var/tomcat6/webapps/examples/jsp/num -dir path=var/tomcat6/webapps/examples/jsp/plugin -dir path=var/tomcat6/webapps/examples/jsp/plugin/applet -dir path=var/tomcat6/webapps/examples/jsp/security -dir path=var/tomcat6/webapps/examples/jsp/security/protected -dir path=var/tomcat6/webapps/examples/jsp/sessions -dir path=var/tomcat6/webapps/examples/jsp/simpletag -dir path=var/tomcat6/webapps/examples/jsp/snp -dir path=var/tomcat6/webapps/examples/jsp/tagplugin -dir path=var/tomcat6/webapps/examples/jsp/xml -dir path=var/tomcat6/webapps/examples/servlets -dir path=var/tomcat6/webapps/examples/servlets/images file path=var/tomcat6/webapps/ROOT.example/RELEASE-NOTES.txt file path=var/tomcat6/webapps/ROOT.example/WEB-INF/web.xml file path=var/tomcat6/webapps/ROOT.example/asf-logo-wide.gif @@ -471,3 +409,5 @@ link path=var/tomcat6/webapps/docs target=../../../usr/tomcat6/docs license tomcat.license license="Apache v2.0" + +depend type=require fmri=__TBD pkg.debug.depend.file=usr/tomcat6/bin/bootstrap.jar diff -r 60a045d209ef -r 6c3d483b5807 components/tomcat/tomcat.license --- a/components/tomcat/tomcat.license Mon Mar 31 06:47:28 2014 -0700 +++ b/components/tomcat/tomcat.license Mon Apr 07 04:34:44 2014 -0700 @@ -1,7 +1,7 @@ Apache Tomcat -Copyright 1999-2013 The Apache Software Foundation +Copyright 1999-2014 The Apache Software Foundation -This product includes software developed by +This product includes software developed at The Apache Software Foundation (http://www.apache.org/). The Windows Installer is built with the Nullsoft diff -r 60a045d209ef -r 6c3d483b5807 components/tomcat/tomcat.p5m --- a/components/tomcat/tomcat.p5m Mon Mar 31 06:47:28 2014 -0700 +++ b/components/tomcat/tomcat.p5m Mon Apr 07 04:34:44 2014 -0700 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # \ @@ -33,14 +33,14 @@ set action.hash Solaris/index.jsp > default mangler.man.stability uncommitted> - \ + \ default facet.doc.html true> set name=pkg.fmri \ value=pkg:/web/java-servlet/tomcat@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="Tomcat Servlet/JSP Container" set name=com.oracle.info.description value="the Tomcat Servlet/JSP Container" -set name=com.oracle.info.tpno value=9075 +set name=com.oracle.info.tpno value=17010 set name=info.classification \ value="org.opensolaris.category.2008:Web Services/Application and Web Servers" set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) @@ -48,54 +48,10 @@ set name=org.opensolaris.arc-caseid \ value=PSARC/2008/711 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -dir path=etc -dir path=lib -dir path=lib/svc -dir path=lib/svc/manifest -dir path=lib/svc/manifest/network -dir path=lib/svc/method -dir path=usr -dir path=usr/share -dir path=usr/share/man -dir path=usr/share/man/man1m -dir path=usr/tomcat6 -dir path=usr/tomcat6/bin -dir path=usr/tomcat6/docs -dir path=usr/tomcat6/docs/WEB-INF -dir path=usr/tomcat6/docs/api -dir path=usr/tomcat6/docs/appdev -dir path=usr/tomcat6/docs/appdev/sample -dir path=usr/tomcat6/docs/appdev/sample/docs -dir path=usr/tomcat6/docs/appdev/sample/src -dir path=usr/tomcat6/docs/appdev/sample/src/mypackage -dir path=usr/tomcat6/docs/appdev/sample/web -dir path=usr/tomcat6/docs/appdev/sample/web/WEB-INF -dir path=usr/tomcat6/docs/appdev/sample/web/images -dir path=usr/tomcat6/docs/architecture -dir path=usr/tomcat6/docs/architecture/requestProcess -dir path=usr/tomcat6/docs/architecture/startup -dir path=usr/tomcat6/docs/config -dir path=usr/tomcat6/docs/funcspecs -dir path=usr/tomcat6/docs/images -dir path=usr/tomcat6/docs/tribes -dir path=usr/tomcat6/lib -dir path=var -dir path=var/tomcat6 dir path=var/tomcat6/conf group=webservd owner=webservd dir path=var/tomcat6/logs group=webservd owner=webservd mode=0700 dir path=var/tomcat6/temp group=webservd owner=webservd dir path=var/tomcat6/webapps group=webservd owner=webservd -dir path=var/tomcat6/webapps/ROOT -dir path=var/tomcat6/webapps/host-manager -dir path=var/tomcat6/webapps/host-manager/META-INF -dir path=var/tomcat6/webapps/host-manager/WEB-INF -dir path=var/tomcat6/webapps/host-manager/WEB-INF/jsp -dir path=var/tomcat6/webapps/host-manager/images -dir path=var/tomcat6/webapps/manager -dir path=var/tomcat6/webapps/manager/META-INF -dir path=var/tomcat6/webapps/manager/WEB-INF -dir path=var/tomcat6/webapps/manager/WEB-INF/jsp -dir path=var/tomcat6/webapps/manager/images dir path=var/tomcat6/work group=webservd owner=webservd file Solaris/http-tomcat6.xml path=lib/svc/manifest/network/http-tomcat6.xml file Solaris/http-tomcat6 path=lib/svc/method/http-tomcat6 @@ -234,7 +190,7 @@ file path=usr/tomcat6/lib/catalina-ha.jar file path=usr/tomcat6/lib/catalina-tribes.jar file path=usr/tomcat6/lib/catalina.jar -file path=usr/tomcat6/lib/ecj-4.2.2.jar +file path=usr/tomcat6/lib/ecj-4.3.1.jar file path=usr/tomcat6/lib/el-api.jar file path=usr/tomcat6/lib/jasper-el.jar file path=usr/tomcat6/lib/jasper.jar