# HG changeset patch # User Petr Sumbera # Date 1396679376 25200 # Node ID a6207faa3c859e79a42764dc75ed72f1a7bbc4d6 # Parent 3b2dcbbac014614690883a52c84053471d94532a 18466561 Upgrade Apache Tomcat to version 6.0.39 18466635 problem in UTILITY/TOMCAT diff -r 3b2dcbbac014 -r a6207faa3c85 components/tomcat/Makefile --- a/components/tomcat/Makefile Fri Apr 04 20:06:21 2014 -0700 +++ b/components/tomcat/Makefile Fri Apr 04 23:29:36 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 diff -r 3b2dcbbac014 -r a6207faa3c85 components/tomcat/patches/build.properties.patch --- a/components/tomcat/patches/build.properties.patch Fri Apr 04 20:06:21 2014 -0700 +++ b/components/tomcat/patches/build.properties.patch Fri Apr 04 23:29:36 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 3b2dcbbac014 -r a6207faa3c85 components/tomcat/tomcat-examples.p5m --- a/components/tomcat/tomcat-examples.p5m Fri Apr 04 20:06:21 2014 -0700 +++ b/components/tomcat/tomcat-examples.p5m Fri Apr 04 23:29:36 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) diff -r 3b2dcbbac014 -r a6207faa3c85 components/tomcat/tomcat.license --- a/components/tomcat/tomcat.license Fri Apr 04 20:06:21 2014 -0700 +++ b/components/tomcat/tomcat.license Fri Apr 04 23:29:36 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 3b2dcbbac014 -r a6207faa3c85 components/tomcat/tomcat.p5m --- a/components/tomcat/tomcat.p5m Fri Apr 04 20:06:21 2014 -0700 +++ b/components/tomcat/tomcat.p5m Fri Apr 04 23:29:36 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. # \ @@ -40,7 +40,7 @@ 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) @@ -190,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