www-servers/tomcat: version bump in slot 9

Package-Manager: portage-2.3.0_rc1

4 files changed, 29 insertions, 121 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 3eb7012ce86e..d10393239f06 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,4 +4,4 @@ DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 fd29dc7ecd4796a693fdd7fc568e
 DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
 DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d WHIRLPOOL b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
 DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 420036fde5e1bfe0a3d27299e355ee153b7c547d17c7b52fe4b15a1315d9c4e9 SHA512 c56ba4339fc114cda9a784c7f37be99c82238bbe043f69a3bed2ec86a0bf60325af9105d74cfcffa144636fecc7f4730cee08eca3a22ed035dd5e3e483fa1742 WHIRLPOOL 38d2382eabe19be8b008eb8975ddf95e086b482eb58cb56f566cf4ec7c7628663260a550b611f4db57803e503ab6746aedaac279bff24868c5997eaee3514966
-DIST apache-tomcat-9.0.0.M6-src.tar.gz 5023823 SHA256 7217416b1c6470f3653d978bbfdb153693aef74929da21c5823117a168992b2a SHA512 712a93d71bef2f6dbdd35d32cbf200045bacc1a27426cb9f92e3a645a7f59f3611adebebdc24168de569cea2c64500ea893acfba05670947f53d72abec0988f1 WHIRLPOOL fb98d23ac462cef450d1ed8c88eb8be88a0aad32b24cf1b5c8437e51966bfb3d5222a3368ea54a2f19b0be38118b3148bf7549d2d59f1c8267aaa29246ef1d62
+DIST apache-tomcat-9.0.0.M8-src.tar.gz 5024499 SHA256 bef36f9ead80188a8859fc1fa9846e77e570c54c99c05388857dc6dd29f526f8 SHA512 b1778709bddf6b0d1263115a57c743fcb58286b58dda384b06079ddcab8188a63de48efd3f47b6314c92154dd01c7bd1c8858ac2ea82d20a3d90c80899edcf87 WHIRLPOOL 8083b108a49ac0e066104a5849fcc6ef6c1355c09d9854d50a4108df769384664d0b37aa0cc85f59361a080e73fb585de36916855e1fcef1a441c4225653aca6
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch
deleted file mode 100644
index fa38d5d27b39..000000000000
--- a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java	2016/05/04 11:07:55	1742251
-+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java	2016/05/17 07:18:38	1744194
-@@ -370,40 +370,42 @@
-         }
- 
-         Manifest manifest = jar.getManifest();
--        Attributes attributes = manifest.getMainAttributes();
--        String classPathAttribute = attributes.getValue("Class-Path");
--        if (classPathAttribute == null) {
--            return;
--        }
--        String[] classPathEntries = classPathAttribute.split(" ");
--        for (String classPathEntry : classPathEntries) {
--            classPathEntry = classPathEntry.trim();
--            if (classPathEntry.length() == 0) {
--                continue;
-+        if (manifest != null) {
-+            Attributes attributes = manifest.getMainAttributes();
-+            String classPathAttribute = attributes.getValue("Class-Path");
-+            if (classPathAttribute == null) {
-+                return;
-             }
--            URL jarURL = jar.getJarFileURL();
--            URI jarURI;
--            try {
--                jarURI = jarURL.toURI();
--            } catch (URISyntaxException e) {
--                if (log.isDebugEnabled()) {
--                    log.debug(sm.getString("jarScan.invalidUri", jarURL));
-+            String[] classPathEntries = classPathAttribute.split(" ");
-+            for (String classPathEntry : classPathEntries) {
-+                classPathEntry = classPathEntry.trim();
-+                if (classPathEntry.length() == 0) {
-+                    continue;
-+                }
-+                URL jarURL = jar.getJarFileURL();
-+                URI jarURI;
-+                try {
-+                    jarURI = jarURL.toURI();
-+                } catch (URISyntaxException e) {
-+                    if (log.isDebugEnabled()) {
-+                        log.debug(sm.getString("jarScan.invalidUri", jarURL));
-+                    }
-+                    continue;
-                 }
--                continue;
-+                /*
-+                 * Note: Resolving the relative URLs from the manifest has the
-+                 *       potential to introduce security concerns. However, since
-+                 *       only JARs provided by the container and NOT those provided
-+                 *       by web applications are processed, there should be no
-+                 *       issues.
-+                 *       If this feature is ever extended to include JARs provided
-+                 *       by web applications, checks should be added to ensure that
-+                 *       any relative URL does not step outside the web application.
-+                 */
-+                URI classPathEntryURI = jarURI.resolve(classPathEntry);
-+                URL classPathEntryURL = classPathEntryURI.toURL();
-+                classPathUrlsToProcess.add(classPathEntryURL);
-             }
--            /*
--             * Note: Resolving the relative URLs from the manifest has the
--             *       potential to introduce security concerns. However, since
--             *       only JARs provided by the container and NOT those provided
--             *       by web applications are processed, there should be no
--             *       issues.
--             *       If this feature is ever extended to include JARs provided
--             *       by web applications, checks should be added to ensure that
--             *       any relative URL does not step outside the web application.
--             */
--            URI classPathEntryURI = jarURI.resolve(classPathEntry);
--            URL classPathEntryURL = classPathEntryURI.toURL();
--            classPathUrlsToProcess.add(classPathEntryURL);
-         }
-     }
- 
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha8-build.xml.patch
index f5d49c72628d..3c4e5c2a9d45 100644
--- a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-9.0.0_alpha8-build.xml.patch
@@ -1,8 +1,8 @@
-diff --git a/apache-tomcat-9.0.0.M1-src/build.xml b/apache-tomcat-9.0.0.M1-src/build.xml
-index eab0c45..63ac495 100644
---- a/apache-tomcat-9.0.0.M1-src/build.xml
-+++ b/apache-tomcat-9.0.0.M1-src/build.xml
-@@ -711,24 +711,30 @@
+diff --git a/apache-tomcat-9.0.0.M8-src/build.xml b/apache-tomcat-9.0.0.M8-src/build.xml
+index dfec1f7..4dfc5d8 100644
+--- a/apache-tomcat-9.0.0.M8-src/build.xml
++++ b/apache-tomcat-9.0.0.M8-src/build.xml
+@@ -695,24 +695,30 @@
        manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
  
      <!-- Servlet 4.0 Implementation JAR File -->
@@ -33,7 +33,7 @@ index eab0c45..63ac495 100644
  
      <!-- WebSocket 1.1 API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
-@@ -1002,14 +1008,14 @@
+@@ -986,14 +992,14 @@
  
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
            description="Default. Builds a working Tomcat instance">
@@ -50,7 +50,7 @@ index eab0c45..63ac495 100644
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -1069,7 +1075,7 @@
+@@ -1053,7 +1059,7 @@
          <exclude name="${jdt.jar.filename}"/>
        </fileset>
      </delete>
@@ -59,7 +59,7 @@ index eab0c45..63ac495 100644
  
      <!-- Add sources for examples -->
      <antcall target="examples-sources" />
-@@ -1103,7 +1109,7 @@
+@@ -1087,7 +1093,7 @@
      </javac>
    </target>
  
@@ -68,7 +68,7 @@ index eab0c45..63ac495 100644
      <!-- build the jdbc-pool jar and source jar-->
      <echo message="Building Tomcat JDBC pool libraries"/>
      <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1118,7 +1124,7 @@
+@@ -1102,7 +1108,7 @@
      <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
    </target>
  
@@ -77,7 +77,7 @@ index eab0c45..63ac495 100644
      <!-- build the jdbc-pool source jar-->
      <echo message="Building Tomcat JDBC pool src JAR"/>
      <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1222,10 +1228,11 @@
+@@ -1206,10 +1212,11 @@
  
      <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
      <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
@@ -90,16 +90,7 @@ index eab0c45..63ac495 100644
      <!-- Note the meta-inf below will work as long as there is only one JAR
           that needs to add entries. If there is more than one a more complex
           solution will be required. -->
-@@ -1606,7 +1613,7 @@
- 
-   <target name="extras-commons-logging-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
-@@ -1745,7 +1752,7 @@
+@@ -1583,7 +1590,7 @@
  
    <target name="extras-webservices-prepare"
            depends="extras-prepare"
@@ -108,7 +99,7 @@ index eab0c45..63ac495 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1940,6 +1947,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1731,6 +1738,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
  
    <target name="javadoc" depends="dist-source,extras-webservices-prepare"
      description="Create the Tomcat javadoc" >
@@ -116,7 +107,7 @@ index eab0c45..63ac495 100644
      <javadoc packagenames="javax.servlet.*"
        excludepackagenames="javax.servlet.jsp.*"
        sourcepath="${tomcat.dist}/src/java"
-@@ -1998,6 +2006,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1795,6 +1803,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
      </javadoc>
@@ -124,14 +115,7 @@ index eab0c45..63ac495 100644
      <javadoc packagenames="javax.websocket.*"
        sourcepath="${tomcat.dist}/src/java"
        destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2028,15 +2037,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       docencoding="UTF-8"
-       charset="UTF-8"
-       additionalparam="-breakiterator -notimestamp"
--      maxmemory="256m" >
-+      maxmemory="512m" >
-       <classpath>
-         <path refid="compile.classpath"/>
+@@ -1835,9 +1844,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path refid="tomcat.webservices.classpath"/>
          <path location="${ant.core.lib}"/>
        </classpath>
@@ -143,7 +127,7 @@ index eab0c45..63ac495 100644
        <link href="../websocketapi"/>
        <link href="http://docs.oracle.com/javase/7/docs/api/"/>
        <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2775,7 +2786,7 @@ skip.installer property in build.properties" />
+@@ -2578,7 +2589,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-compile"
@@ -152,7 +136,7 @@ index eab0c45..63ac495 100644
  
      <antcall target="downloadfile-2">
        <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2809,7 +2820,7 @@ skip.installer property in build.properties" />
+@@ -2612,7 +2623,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-test-compile"
@@ -161,7 +145,7 @@ index eab0c45..63ac495 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2866,7 +2877,7 @@ skip.installer property in build.properties" />
+@@ -2669,7 +2680,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-dist"
@@ -170,7 +154,7 @@ index eab0c45..63ac495 100644
  
      <antcall target="downloadzip-2">
        <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-@@ -2892,18 +2903,18 @@ skip.installer property in build.properties" />
+@@ -2695,18 +2706,18 @@ skip.installer property in build.properties" />
  
    <!-- =============== Utility Targets to support downloads ================ -->
  
@@ -192,7 +176,7 @@ index eab0c45..63ac495 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2915,7 +2926,7 @@ skip.installer property in build.properties" />
+@@ -2718,7 +2729,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -201,7 +185,7 @@ index eab0c45..63ac495 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2934,7 +2945,7 @@ skip.installer property in build.properties" />
+@@ -2737,7 +2748,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -210,7 +194,7 @@ index eab0c45..63ac495 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2945,7 +2956,7 @@ skip.installer property in build.properties" />
+@@ -2748,7 +2759,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -219,7 +203,7 @@ index eab0c45..63ac495 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2963,7 +2974,7 @@ skip.installer property in build.properties" />
+@@ -2766,7 +2777,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -228,7 +212,7 @@ index eab0c45..63ac495 100644
      <!-- Download the file -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2973,7 +2984,7 @@ skip.installer property in build.properties" />
+@@ -2776,7 +2787,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -237,7 +221,7 @@ index eab0c45..63ac495 100644
      <!-- Download the file from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2996,7 +3007,7 @@ skip.installer property in build.properties" />
+@@ -2799,7 +2810,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -246,7 +230,7 @@ index eab0c45..63ac495 100644
      <condition property="trydownload.run">
        <and>
          <not>
-@@ -3007,7 +3018,7 @@ skip.installer property in build.properties" />
+@@ -2810,7 +2821,7 @@ skip.installer property in build.properties" />
      </condition>
    </target>
  
@@ -255,7 +239,7 @@ index eab0c45..63ac495 100644
      <!-- Downloads a file if not yet downloaded and the source URL is available -->
      <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
    </target>
-@@ -3018,7 +3029,7 @@ skip.installer property in build.properties" />
+@@ -2821,7 +2832,7 @@ skip.installer property in build.properties" />
  
    <target name="ide-eclipse"
            depends="download-compile, extras-webservices-prepare, download-test-compile"
diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha6-r1.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha8.ebuild
index 21e76fb21acf..76dbdc96dfdf 100644
--- a/www-servers/tomcat/tomcat-9.0.0_alpha6-r1.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.0_alpha8.ebuild
@@ -11,7 +11,7 @@ inherit eutils java-pkg-2 java-ant-2 prefix user
 MY_PV="${PV/_alpha/.M}"
 MY_P="apache-${PN}-${MY_PV}-src"
 
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3 Container"
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
 HOMEPAGE="http://tomcat.apache.org/"
 SRC_URI="mirror://apache/${PN}/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
 
@@ -52,7 +52,7 @@ java_prepare() {
 	# Remove bundled servlet-api
 	rm -rv java/javax/{el,servlet} || die
 
-	epatch "${FILESDIR}/${P}-build.xml.patch" "${FILESDIR}/${P}-processmanifest.patch"
+	epatch "${FILESDIR}/${P}-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\