diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /www-servers/tomcat/files | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'www-servers/tomcat/files')
-rw-r--r-- | www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch (renamed from www-servers/tomcat/files/tomcat-8.5.47-build.xml.patch) | 91 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch (renamed from www-servers/tomcat/files/tomcat-9.0.27-build.xml.patch) | 88 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch | 13 |
3 files changed, 109 insertions, 83 deletions
diff --git a/www-servers/tomcat/files/tomcat-8.5.47-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch index ffbd07016110..c01699945e0c 100644 --- a/www-servers/tomcat/files/tomcat-8.5.47-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch @@ -1,8 +1,8 @@ diff --git a/build.xml b/build.xml -index c274aab..ed1c3e5 100644 +index 348487c..d0b8b81 100644 --- a/build.xml +++ b/build.xml -@@ -739,24 +739,29 @@ +@@ -762,25 +762,28 @@ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> <!-- Servlet 3.1 Implementation JAR File --> @@ -15,26 +15,27 @@ index c274aab..ed1c3e5 100644 license="${tomcat.manifests}/servlet-api.jar.license" /> - +--> - <!-- JSP 2.3 Implementation JAR File --> -+<!-- - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" - manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> -+--> - - <!-- EL 3.0 Implementation JAR File --> + <!-- EL Implementation JAR File --> +<!-- <jarIt jarfile="${el-api.jar}" filesDir="${tomcat.classes}" filesId="files.el-api" manifest="${tomcat.manifests}/el-api.jar.manifest" /> +- +--> - - <!-- WebSocket 1.1 API JAR File --> + <!-- JSP Implementation JAR File --> ++<!-- + <jarIt jarfile="${jsp-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.jsp-api" + manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> +- ++--> + <!-- WebSocket API JAR File --> <jarIt jarfile="${websocket-api.jar}" -@@ -848,9 +853,9 @@ - filesId="files.jasper-el" /> + filesDir="${tomcat.classes}" +@@ -872,9 +875,9 @@ + meta-inf="${tomcat.manifests}/jasper.jar" /> <!-- Re-packaged Apache Commons DBCP 2--> - <jarIt jarfile="${tomcat-dbcp.jar}" @@ -45,7 +46,7 @@ index c274aab..ed1c3e5 100644 <!-- i18n JARs --> <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar" -@@ -1072,9 +1077,9 @@ +@@ -1096,9 +1099,9 @@ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" description="Default. Builds a working Tomcat instance"> @@ -57,7 +58,7 @@ index c274aab..ed1c3e5 100644 <!-- Copy scripts --> <copy todir="${tomcat.build}/bin"> <fileset dir="bin"> -@@ -1134,7 +1139,7 @@ +@@ -1158,7 +1161,7 @@ <exclude name="${jdt.jar.filename}"/> </fileset> </delete> @@ -66,7 +67,7 @@ index c274aab..ed1c3e5 100644 <!-- Add sources for examples --> <antcall target="examples-sources" /> -@@ -1177,7 +1182,7 @@ +@@ -1201,7 +1204,7 @@ </target> @@ -75,7 +76,7 @@ index c274aab..ed1c3e5 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}" -@@ -1192,7 +1197,7 @@ +@@ -1216,7 +1219,7 @@ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> </target> @@ -84,7 +85,7 @@ index c274aab..ed1c3e5 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}" -@@ -1295,9 +1300,11 @@ +@@ -1319,9 +1322,11 @@ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> @@ -96,7 +97,7 @@ index c274aab..ed1c3e5 100644 <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> <!-- Note the meta-inf below will work as long as there is only one JAR -@@ -1681,7 +1688,7 @@ +@@ -1710,7 +1715,7 @@ <target name="extras-webservices-prepare" depends="extras-prepare" @@ -105,15 +106,15 @@ index c274aab..ed1c3e5 100644 <antcall target="downloadfile"> <param name="sourcefile" value="${jaxrpc-lib.loc}"/> -@@ -1845,6 +1852,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" > +@@ -1895,6 +1900,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path location="${ant.core.lib}"/> + </classpath> + </javadoc> +<!-- - <javadoc packagenames="javax.annotation.*" + <javadoc packagenames="javax.servlet.*" + excludepackagenames="javax.servlet.jsp.*" sourcepath="${tomcat.dist}/src/java" - destdir="${tomcat.dist}/webapps/docs/annotationapi" -@@ -1933,6 +1941,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -1962,6 +1968,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. <path location="${ant.core.lib}"/> </classpath> </javadoc> @@ -121,7 +122,7 @@ index c274aab..ed1c3e5 100644 <javadoc packagenames="javax.websocket.*" sourcepath="${tomcat.dist}/src/java" destdir="${tomcat.dist}/webapps/docs/websocketapi" -@@ -1996,9 +2005,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -2025,13 +2032,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. <path location="${ant.core.lib}"/> </classpath> <link href="../annotationapi"/> @@ -132,8 +133,14 @@ index c274aab..ed1c3e5 100644 +--> <link href="../websocketapi"/> <link href="../jaspicapi"/> ++<!-- <link href="https://docs.oracle.com/javase/7/docs/api/"/> -@@ -2728,7 +2739,7 @@ skip.installer property in build.properties" /> + <link href="https://docs.oracle.com/javaee/7/api/"/> ++--> + <packageset dir="${tomcat.dist}/src/java/"> + <include name="org/**"/> + <exclude name="org/apache/el/parser/**"/> +@@ -2759,7 +2770,7 @@ skip.installer property in build.properties" /> </target> <target name="download-compile" @@ -142,7 +149,7 @@ index c274aab..ed1c3e5 100644 <!-- Download Commons Daemon --> <antcall target="downloadgz-2"> -@@ -2764,7 +2775,7 @@ skip.installer property in build.properties" /> +@@ -2795,7 +2806,7 @@ skip.installer property in build.properties" /> </target> <target name="download-test-compile" @@ -151,7 +158,7 @@ index c274aab..ed1c3e5 100644 <antcall target="downloadfile"> <param name="sourcefile" value="${junit.loc}"/> -@@ -2842,7 +2853,7 @@ skip.installer property in build.properties" /> +@@ -2873,7 +2884,7 @@ skip.installer property in build.properties" /> </target> <target name="download-dist" @@ -160,7 +167,7 @@ index c274aab..ed1c3e5 100644 <antcall target="downloadfile-2"> <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2897,13 +2908,13 @@ skip.installer property in build.properties" /> +@@ -2928,13 +2939,13 @@ skip.installer property in build.properties" /> <!-- =============== Utility Targets to support downloads ================ --> @@ -176,7 +183,7 @@ index c274aab..ed1c3e5 100644 <echo message="Testing for ${destfile}"/> <available file="${destfile}" property="exist"/> </target> -@@ -3025,7 +3036,7 @@ skip.installer property in build.properties" /> +@@ -3056,7 +3067,7 @@ skip.installer property in build.properties" /> </sequential> </macrodef> @@ -185,7 +192,7 @@ index c274aab..ed1c3e5 100644 <!-- Download and extract the package --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3042,7 +3053,7 @@ skip.installer property in build.properties" /> +@@ -3073,7 +3084,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}.tar.gz"/> </target> @@ -194,7 +201,7 @@ index c274aab..ed1c3e5 100644 <!-- Download and extract the package from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3067,7 +3078,7 @@ skip.installer property in build.properties" /> +@@ -3098,7 +3109,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}.tar.gz"/> </target> @@ -203,7 +210,7 @@ index c274aab..ed1c3e5 100644 <!-- Download and extract the package --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3083,7 +3094,7 @@ skip.installer property in build.properties" /> +@@ -3114,7 +3125,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}"/> </target> @@ -212,7 +219,7 @@ index c274aab..ed1c3e5 100644 <!-- Download and extract the package from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3107,7 +3118,7 @@ skip.installer property in build.properties" /> +@@ -3138,7 +3149,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}"/> </target> @@ -221,7 +228,7 @@ index c274aab..ed1c3e5 100644 <!-- Download the file --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3122,7 +3133,7 @@ skip.installer property in build.properties" /> +@@ -3153,7 +3164,7 @@ skip.installer property in build.properties" /> <move file="${temp.file}" tofile="${destfile}"/> </target> @@ -230,7 +237,7 @@ index c274aab..ed1c3e5 100644 <!-- Download the file from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3150,7 +3161,7 @@ skip.installer property in build.properties" /> +@@ -3181,7 +3192,7 @@ skip.installer property in build.properties" /> <move file="${temp.file}" tofile="${destfile}"/> </target> @@ -239,7 +246,7 @@ index c274aab..ed1c3e5 100644 <condition property="trydownload.run"> <and> <not> -@@ -3161,7 +3172,7 @@ skip.installer property in build.properties" /> +@@ -3192,7 +3203,7 @@ skip.installer property in build.properties" /> </condition> </target> @@ -248,7 +255,7 @@ index c274aab..ed1c3e5 100644 <!-- Downloads a file if not yet downloaded and the source URL is available --> <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> </target> -@@ -3172,7 +3183,7 @@ skip.installer property in build.properties" /> +@@ -3203,7 +3214,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/files/tomcat-9.0.27-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch index 05c8ffa1f990..ea902b4b922f 100644 --- a/www-servers/tomcat/files/tomcat-9.0.27-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch @@ -1,8 +1,8 @@ diff --git a/build.xml b/build.xml -index 020531c..a71f6ee 100644 +index 8e02cb5..9007e8b 100644 --- a/build.xml +++ b/build.xml -@@ -754,6 +754,7 @@ +@@ -760,6 +760,7 @@ addOSGi="true" /> <!-- Servlet 4.0 Implementation JAR File --> @@ -10,34 +10,34 @@ index 020531c..a71f6ee 100644 <jarIt jarfile="${servlet-api.jar}" filesDir="${tomcat.classes}" filesId="files.servlet-api" -@@ -761,21 +762,23 @@ +@@ -767,21 +768,23 @@ notice="${tomcat.manifests}/servlet-api.jar.notice" license="${tomcat.manifests}/servlet-api.jar.license" addOSGi="true" /> - +--> - <!-- JSP 2.3 Implementation JAR File --> + <!-- EL Implementation JAR File --> +<!-- - <jarIt jarfile="${jsp-api.jar}" + <jarIt jarfile="${el-api.jar}" filesDir="${tomcat.classes}" - filesId="files.jsp-api" - manifest="${tomcat.manifests}/jsp-api.jar.manifest" + filesId="files.el-api" + manifest="${tomcat.manifests}/el-api.jar.manifest" addOSGi="true" /> - +--> - <!-- EL 3.0 Implementation JAR File --> + <!-- JSP Implementation JAR File --> +<!-- - <jarIt jarfile="${el-api.jar}" + <jarIt jarfile="${jsp-api.jar}" filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" + filesId="files.jsp-api" + manifest="${tomcat.manifests}/jsp-api.jar.manifest" addOSGi="true" /> - +--> - <!-- WebSocket 1.1 API JAR File --> + <!-- WebSocket API JAR File --> <jarIt jarfile="${websocket-api.jar}" filesDir="${tomcat.classes}" -@@ -881,10 +884,10 @@ +@@ -894,10 +897,10 @@ addOSGi="true" /> <!-- Re-packaged Apache Commons DBCP 2--> @@ -50,7 +50,7 @@ index 020531c..a71f6ee 100644 <!-- i18n JARs --> <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar" -@@ -1126,9 +1129,9 @@ +@@ -1139,9 +1142,9 @@ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" description="Default. Builds a working Tomcat instance"> @@ -62,7 +62,7 @@ index 020531c..a71f6ee 100644 <!-- Copy scripts --> <copy todir="${tomcat.build}/bin"> <fileset dir="bin"> -@@ -1188,7 +1191,7 @@ +@@ -1201,7 +1204,7 @@ <exclude name="${jdt.jar.filename}"/> </fileset> </delete> @@ -71,7 +71,7 @@ index 020531c..a71f6ee 100644 <!-- Add sources for examples --> <antcall target="examples-sources" /> -@@ -1231,7 +1234,7 @@ +@@ -1244,7 +1247,7 @@ </target> @@ -80,7 +80,7 @@ index 020531c..a71f6ee 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}" -@@ -1246,7 +1249,7 @@ +@@ -1259,7 +1262,7 @@ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> </target> @@ -89,7 +89,7 @@ index 020531c..a71f6ee 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}" -@@ -1349,9 +1352,11 @@ +@@ -1362,9 +1365,11 @@ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> @@ -101,7 +101,7 @@ index 020531c..a71f6ee 100644 <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> <!-- Note the meta-inf below will work as long as there is only one JAR -@@ -1830,11 +1835,12 @@ +@@ -1863,11 +1868,12 @@ </copy> <!-- Source bundles for native components --> @@ -115,15 +115,15 @@ index 020531c..a71f6ee 100644 <!-- platform README files --> <echo append="false" file="${tomcat.dist}/bin/x64/README"> Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. -@@ -1844,6 +1850,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - - <target name="javadoc" depends="dist-source" - description="Create the Tomcat javadoc" > +@@ -1898,6 +1904,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path location="${ant.core.lib}"/> + </classpath> + </javadoc> +<!-- - <javadoc packagenames="javax.annotation.*" + <javadoc packagenames="javax.servlet.*" + excludepackagenames="javax.servlet.jsp.*" sourcepath="${tomcat.dist}/src/java" - destdir="${tomcat.dist}/webapps/docs/annotationapi" -@@ -1929,6 +1936,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -1962,6 +1969,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. <path location="${ant.core.lib}"/> </classpath> </javadoc> @@ -131,7 +131,7 @@ index 020531c..a71f6ee 100644 <javadoc packagenames="javax.websocket.*" sourcepath="${tomcat.dist}/src/java" destdir="${tomcat.dist}/webapps/docs/websocketapi" -@@ -1990,9 +1998,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -2023,13 +2031,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. <path location="${ant.core.lib}"/> </classpath> <link href="../annotationapi"/> @@ -142,8 +142,14 @@ index 020531c..a71f6ee 100644 +--> <link href="../websocketapi"/> <link href="../jaspicapi"/> ++<!-- <link href="https://docs.oracle.com/javase/8/docs/api/"/> -@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" /> + <link href="https://javaee.github.io/javaee-spec/javadocs/"/> ++--> + <packageset dir="${tomcat.dist}/src/java/"> + <include name="org/**"/> + <exclude name="org/apache/el/parser/**"/> +@@ -2756,7 +2768,7 @@ skip.installer property in build.properties" /> </target> <target name="download-compile" @@ -152,7 +158,7 @@ index 020531c..a71f6ee 100644 <!-- Download Commons Daemon --> <antcall target="downloadgz-2"> -@@ -2769,7 +2779,7 @@ skip.installer property in build.properties" /> +@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" /> </target> <target name="download-test-compile" @@ -161,7 +167,7 @@ index 020531c..a71f6ee 100644 <antcall target="downloadfile"> <param name="sourcefile" value="${junit.loc}"/> -@@ -2847,7 +2857,7 @@ skip.installer property in build.properties" /> +@@ -2889,7 +2901,7 @@ skip.installer property in build.properties" /> </target> <target name="download-dist" @@ -170,7 +176,7 @@ index 020531c..a71f6ee 100644 <antcall target="downloadfile-2"> <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2902,13 +2912,13 @@ skip.installer property in build.properties" /> +@@ -2944,13 +2956,13 @@ skip.installer property in build.properties" /> <!-- =============== Utility Targets to support downloads ================ --> @@ -186,7 +192,7 @@ index 020531c..a71f6ee 100644 <echo message="Testing for ${destfile}"/> <available file="${destfile}" property="exist"/> </target> -@@ -3030,7 +3040,7 @@ skip.installer property in build.properties" /> +@@ -3072,7 +3084,7 @@ skip.installer property in build.properties" /> </sequential> </macrodef> @@ -195,7 +201,7 @@ index 020531c..a71f6ee 100644 <!-- Download and extract the package --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3047,7 +3057,7 @@ skip.installer property in build.properties" /> +@@ -3089,7 +3101,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}.tar.gz"/> </target> @@ -204,7 +210,7 @@ index 020531c..a71f6ee 100644 <!-- Download and extract the package from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3072,7 +3082,7 @@ skip.installer property in build.properties" /> +@@ -3114,7 +3126,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}.tar.gz"/> </target> @@ -213,7 +219,7 @@ index 020531c..a71f6ee 100644 <!-- Download and extract the package --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3088,7 +3098,7 @@ skip.installer property in build.properties" /> +@@ -3130,7 +3142,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}"/> </target> @@ -222,7 +228,7 @@ index 020531c..a71f6ee 100644 <!-- Download and extract the package from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3112,7 +3122,7 @@ skip.installer property in build.properties" /> +@@ -3154,7 +3166,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}"/> </target> @@ -231,7 +237,7 @@ index 020531c..a71f6ee 100644 <!-- Download the file --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3127,7 +3137,7 @@ skip.installer property in build.properties" /> +@@ -3169,7 +3181,7 @@ skip.installer property in build.properties" /> <move file="${temp.file}" tofile="${destfile}"/> </target> @@ -240,7 +246,7 @@ index 020531c..a71f6ee 100644 <!-- Download the file from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3155,7 +3165,7 @@ skip.installer property in build.properties" /> +@@ -3197,7 +3209,7 @@ skip.installer property in build.properties" /> <move file="${temp.file}" tofile="${destfile}"/> </target> @@ -249,7 +255,7 @@ index 020531c..a71f6ee 100644 <condition property="trydownload.run"> <and> <not> -@@ -3166,7 +3176,7 @@ skip.installer property in build.properties" /> +@@ -3208,7 +3220,7 @@ skip.installer property in build.properties" /> </condition> </target> @@ -258,7 +264,7 @@ index 020531c..a71f6ee 100644 <!-- Downloads a file if not yet downloaded and the source URL is available --> <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> </target> -@@ -3177,7 +3187,7 @@ skip.installer property in build.properties" /> +@@ -3219,7 +3231,7 @@ skip.installer property in build.properties" /> <target name="ide-eclipse" depends="download-compile, download-test-compile" @@ -267,7 +273,7 @@ index 020531c..a71f6ee 100644 <!-- Copy the sample project files into the root directory --> <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> -@@ -3195,7 +3205,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho +@@ -3237,7 +3249,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho <target name="ide-intellij" depends="download-compile, download-test-compile" diff --git a/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch b/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch new file mode 100644 index 000000000000..7aa1e883f133 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch @@ -0,0 +1,13 @@ +diff --git a/build.xml b/build.xml +index 9ba357b..352e141 100644 +--- a/build.xml ++++ b/build.xml +@@ -2716,7 +2716,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho + <bndfiles > + <pathelement location="${tomcat.bnd}/${filename}.tmp.bnd" ></pathelement> + </bndfiles> +- <classpath path="${gentoo.classpath}" ></classpath></bnd> ++ </bnd> + <delete file="${jarfile}" ></delete> + <move file="${jarfile}.tmp" tofile="${jarfile}" ></move> + </target> |