25033828 Upgrade Apache Tomcat to version 6.0.47 s11u3-sru
authorPetr Sumbera <petr.sumbera@oracle.com>
Wed, 02 Nov 2016 06:19:13 -0700
branchs11u3-sru
changeset 7317 bd14d5a59818
parent 7311 e8cb2cdab518
child 7319 0753ecc76d4d
25033828 Upgrade Apache Tomcat to version 6.0.47 25027840 problem in UTILITY/TOMCAT
components/tomcat/Makefile
components/tomcat/Solaris/tomcat.1m
components/tomcat/patches/build.properties.patch
components/tomcat/patches/build.xml.patch
components/tomcat/patches/env.patch
components/tomcat/patches/tomcat_strict_servlet.patch
--- a/components/tomcat/Makefile	Tue Nov 15 13:28:46 2016 -0800
+++ b/components/tomcat/Makefile	Wed Nov 02 06:19:13 2016 -0700
@@ -26,13 +26,13 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tomcat
-COMPONENT_VERSION=	6.0.45
+COMPONENT_VERSION=	6.0.47
 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:d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e
+    sha256:ad836d9d35d3281538f4986800222522c6be237cdb610854c685a8ada62db5ab
 COMPONENT_ARCHIVE_URL=	http://www.apache.org/dist/tomcat/tomcat-6/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/tomcat
 
@@ -50,7 +50,7 @@
     sha256:5f86314f67dc57a0a9865265a48fd7831f16ab177c0c1349eea798c2c6297295
 COMPONENT_ARCHIVE_URL_3= http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/$(COMPONENT_ARCHIVE_3)
 
-TPNO=			26982
+TPNO=			32477
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ant.mk
@@ -64,7 +64,8 @@
 # Create configuration backup archive for custom user's deployments.
 COMPONENT_POST_BUILD_ACTION= \
 	(cd $(PROTO_DIR) ; $(RM) conf/CONF.tar.gz ; \
-	    gtar cfz conf/CONF.tar.gz conf/* )
+	    $(CHMOD) 600 conf/tomcat-users.xml ; \
+	    gtar cfz conf/CONF.tar.gz conf/* --owner=root --group=bin )
 
 COMPONENT_TEST_ARGS = $(COMPONENT_BUILD_ARGS) -Djunit.home=/usr/share/lib/java
 COMPONENT_TEST_TARGETS =  test
--- a/components/tomcat/Solaris/tomcat.1m	Tue Nov 15 13:28:46 2016 -0800
+++ b/components/tomcat/Solaris/tomcat.1m	Wed Nov 02 06:19:13 2016 -0700
@@ -1,6 +1,6 @@
 '\" te
 .\" Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
-.TH tomcat 1M "February 2016" "SunOS 5.11" "System Administration Commands"
+.TH tomcat 1M "November 2016" "SunOS 5.11" "System Administration Commands"
 .SH NAME
 tomcat \- Apache Tomcat Version 6 overview
 .SH DESCRIPTION
@@ -19,7 +19,7 @@
 .fi
 .in -2
 .sp
-Tomcat enabled via SMF is executed for better security with "webserv"
+Tomcat enabled via SMF is executed for better security with "webservd"
 user credentials and with added "net_privaddr" privilege so it can be
 configured to listen on privileged TCP ports (e.g. 80). With default
 configuration Tomcat listens on TCP port 8080.
--- a/components/tomcat/patches/build.properties.patch	Tue Nov 15 13:28:46 2016 -0800
+++ b/components/tomcat/patches/build.properties.patch	Wed Nov 02 06:19:13 2016 -0700
@@ -7,7 +7,7 @@
 
 --- build.properties.default
 +++ build.properties.default
[email protected]@ -67,6 +67,12 @@
[email protected]@ -65,6 +65,12 @@
  # repo.maven.apache.org is the same as repo2.maven.org
  base-maven.loc=http://repo.maven.apache.org/maven2
  
@@ -20,7 +20,7 @@
  # ----- Commons Logging, version 1.1 or later -----
  # If this version is updated, check the versions required for the deps
  # - avalon-framework
[email protected]@ -127,7 +133,7 @@
[email protected]@ -125,7 +131,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
@@ -29,7 +29,7 @@
  jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
  
  # ----- Tomcat native library -----
[email protected]@ -139,16 +145,16 @@
[email protected]@ -137,16 +143,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
  
--- a/components/tomcat/patches/build.xml.patch	Tue Nov 15 13:28:46 2016 -0800
+++ b/components/tomcat/patches/build.xml.patch	Wed Nov 02 06:19:13 2016 -0700
@@ -7,7 +7,7 @@
 
 --- build.xml
 +++ build.xml
[email protected]@ -515,13 +515,6 @@
[email protected]@ -514,13 +514,6 @@
  
    <target name="deploy" depends="build-only,build-docs,warn.dbcp">
  
@@ -21,7 +21,7 @@
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
[email protected]@ -956,42 +949,6 @@
[email protected]@ -955,42 +948,6 @@
            description="Download (and build as necessary) dependent components"
            depends="build-manifests">
  
@@ -64,7 +64,7 @@
      <!-- Build Tomcat DBCP bundle -->
      <antcall target="downloadgz-2">
        <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
[email protected]@ -1003,6 +960,11 @@
[email protected]@ -1002,6 +959,11 @@
        <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
        <param name="destfile" value="${commons-dbcp.home}/build.xml" />
      </antcall>
@@ -76,7 +76,7 @@
      <mkdir dir="${tomcat-dbcp.home}"/>
      <antcall target="build-tomcat-dbcp" />
  
[email protected]@ -1014,29 +976,9 @@
[email protected]@ -1013,29 +975,9 @@
        <param name="destdir" value="${jdt.home}"/>
      </antcall>
  
--- a/components/tomcat/patches/env.patch	Tue Nov 15 13:28:46 2016 -0800
+++ b/components/tomcat/patches/env.patch	Wed Nov 02 06:19:13 2016 -0700
@@ -6,15 +6,15 @@
 
 --- bin/catalina.sh
 +++ bin/catalina.sh
[email protected]@ -90,6 +90,7 @@
- CYGWIN*) cygwin=true;;
[email protected]@ -101,6 +101,7 @@
  OS400*) os400=true;;
  Darwin*) darwin=true;;
+ HP-UX*) hpux=true;;
 +SunOS*) solaris=true;;
  esac
  
  # resolve links - $0 may be a softlink
[email protected]@ -118,7 +119,13 @@
[email protected]@ -129,7 +130,13 @@
  # but allow them to be specified in setenv.sh, in rare case when it is needed.
  CLASSPATH=
  
@@ -29,7 +29,7 @@
    . "$CATALINA_BASE/bin/setenv.sh"
  elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then
    . "$CATALINA_HOME/bin/setenv.sh"
[email protected]@ -145,6 +152,11 @@
[email protected]@ -156,6 +163,11 @@
    export QIBM_MULTI_THREADED=Y
  fi
  
--- a/components/tomcat/patches/tomcat_strict_servlet.patch	Tue Nov 15 13:28:46 2016 -0800
+++ b/components/tomcat/patches/tomcat_strict_servlet.patch	Wed Nov 02 06:19:13 2016 -0700
@@ -6,7 +6,7 @@
 
 --- bin/catalina.sh
 +++ bin/catalina.sh
[email protected]@ -285,6 +285,7 @@
[email protected]@ -313,6 +313,7 @@
          -Dcatalina.base="$CATALINA_BASE" \
          -Dcatalina.home="$CATALINA_HOME" \
          -Djava.io.tmpdir="$CATALINA_TMPDIR" \
@@ -14,7 +14,7 @@
          org.apache.catalina.startup.Bootstrap "[email protected]" start
      else
        exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
[email protected]@ -293,6 +294,7 @@
[email protected]@ -321,6 +322,7 @@
          -Dcatalina.base="$CATALINA_BASE" \
          -Dcatalina.home="$CATALINA_HOME" \
          -Djava.io.tmpdir="$CATALINA_TMPDIR" \
@@ -22,7 +22,7 @@
          org.apache.catalina.startup.Bootstrap "[email protected]" start
      fi
    fi
[email protected]@ -312,6 +314,7 @@
[email protected]@ -340,6 +342,7 @@
        -Dcatalina.base="$CATALINA_BASE" \
        -Dcatalina.home="$CATALINA_HOME" \
        -Djava.io.tmpdir="$CATALINA_TMPDIR" \
@@ -30,7 +30,7 @@
        org.apache.catalina.startup.Bootstrap "[email protected]" start
    else
      exec "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
[email protected]@ -319,6 +322,7 @@
[email protected]@ -347,6 +350,7 @@
        -Dcatalina.base="$CATALINA_BASE" \
        -Dcatalina.home="$CATALINA_HOME" \
        -Djava.io.tmpdir="$CATALINA_TMPDIR" \
@@ -38,7 +38,7 @@
        org.apache.catalina.startup.Bootstrap "[email protected]" start
    fi
  
[email protected]@ -378,6 +382,7 @@
[email protected]@ -406,6 +410,7 @@
        -Dcatalina.base="$CATALINA_BASE" \
        -Dcatalina.home="$CATALINA_HOME" \
        -Djava.io.tmpdir="$CATALINA_TMPDIR" \
@@ -46,7 +46,7 @@
        org.apache.catalina.startup.Bootstrap "[email protected]" start \
        >> "$CATALINA_OUT" 2>&1 &
  
[email protected]@ -387,6 +392,7 @@
[email protected]@ -415,6 +420,7 @@
        -Dcatalina.base="$CATALINA_BASE" \
        -Dcatalina.home="$CATALINA_HOME" \
        -Djava.io.tmpdir="$CATALINA_TMPDIR" \
@@ -54,7 +54,7 @@
        org.apache.catalina.startup.Bootstrap "[email protected]" start \
        >> "$CATALINA_OUT" 2>&1 &
  
[email protected]@ -437,6 +443,7 @@
[email protected]@ -465,6 +471,7 @@
      -Dcatalina.base="$CATALINA_BASE" \
      -Dcatalina.home="$CATALINA_HOME" \
      -Djava.io.tmpdir="$CATALINA_TMPDIR" \