diff options
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/tomcat/Manifest | 1 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-8.0.41-build.xml.patch | 259 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-8.0.43-build.xml.patch | 259 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-8.0.39.ebuild | 6 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-8.0.41.ebuild | 6 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-8.0.43.ebuild | 157 |
6 files changed, 686 insertions, 2 deletions
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 59cf8dc44259..9c4b1f714069 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -4,6 +4,7 @@ DIST apache-tomcat-7.0.76-src.tar.gz 4662334 SHA256 67e8449ed9e5e33251e19c38f6db DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 7db04b3bf8898d9f9facee9c53ae7a2c78f13dfd4d14e931d78cee2d0813cc43 SHA512 19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428 WHIRLPOOL c17fe412d5c1db530287111624dbebfffe100639cd4bbc78be8e7e5b9be130ac23dd2978bbababd2981c1c91c00570f80e05b34e505af9a49646835334867bc6 DIST apache-tomcat-8.0.39-src.tar.gz 5019148 SHA256 566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 SHA512 0f58f2ef0dc047189672107b1f2586731e9455c3e665210d5634f5f5a16b0afd7ef5c35beaf02e22b874d4898ab62d33638785d9f18714893674bc691b0f9330 WHIRLPOOL 62baaba90f588c43ea503eb336d1b385b3a00b86686c1e232a836975f10d12241416b688279ffcd60dd42afb9d9660b6385e749c0c4d0877217f7494539f2752 DIST apache-tomcat-8.0.41-src.tar.gz 4950440 SHA256 2bbaf50e9c9ffe8d79369c0c16cad04ea256cccde85658d15a011c8f8d1c2b77 SHA512 6d2d104be33f203a5c45e6d0d8a8631542830462da932f1d11eadfb9927ba82e3fa5245321197e610f55ed34622b50743cb3af4699c7cedfb91b9dd2b35f338d WHIRLPOOL 758104c1e2f7aa57ffff07f8711b6c08c67674c4c9b8702f8da2d48839da1802f158aa158aef6386af27e6c95b430c6060436cafbd7accc48c7bced376c5cef8 +DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b WHIRLPOOL d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414 DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d DIST apache-tomcat-8.5.12-src.tar.gz 5009933 SHA256 af8b7ab3cc3ba17a667fd1fdd943ce5a459e8e887d30902030af7c42e3af2b07 SHA512 de8e928db261143629e415cb3532fbe762620d0500eca021d9a888671e9a609f82039b14db3d64371076be13e2ca6affc045f62bcd38c1608e968cb07d3e77d1 WHIRLPOOL eb927ed655ee49417203264b5cf45bd39629df2e29387a78d9db43f1c9e6376adad641d779a1243a109695aedcaa0a4a886c7edad523488ab02aef0cf94475a5 DIST apache-tomcat-8.5.13-src.tar.gz 5021333 SHA256 70db8d68f3a702e0997220a91d0c1ed59de4bbdc32d8482532412c1e31666a0b SHA512 4855e0b686dcdc10224e3bba804c7c944a8b2f48761dd0e4fca12a59cfc308fd5f26db6a02b3b7c39b595506c920fdf8f19eedb26a8acb7f1580f4e4b597fb5b WHIRLPOOL 6ad3150416e17396c81e6b638e035f55e695388fb2cdfd65a6803195894dee3391aac56243879faa850b2765d29f3ae13c74cefd66c349bd53bf14900e59dea6 diff --git a/www-servers/tomcat/files/tomcat-8.0.41-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.41-build.xml.patch new file mode 100644 index 000000000000..cefd59f55ae3 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-8.0.41-build.xml.patch @@ -0,0 +1,259 @@ +diff --git a/apache-tomcat-8.0.36-src/build.xml b/apache-tomcat-8.0.36-src/build.xml +index 1ba0dae..81a0a2c 100644 +--- a/apache-tomcat-8.0.36-src/build.xml ++++ b/apache-tomcat-8.0.36-src/build.xml +@@ -701,24 +701,29 @@ + manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> + + <!-- Servlet 3.1 Implementation JAR File --> ++<!-- + <jarIt jarfile="${servlet-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.servlet-api" + manifest="${tomcat.manifests}/servlet-api.jar.manifest" + notice="${tomcat.manifests}/servlet-api.jar.notice" + 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 --> ++<!-- + <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 --> + <jarIt jarfile="${websocket-api.jar}" +@@ -986,14 +991,14 @@ + + <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" + description="Default. Builds a working Tomcat instance"> +- ++<!-- + <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" + file="${tomcat-native.tar.gz}" /> + <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" + file="${commons-daemon.native.src.tgz}" /> + + <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> +- ++--> + <!-- Copy scripts --> + <copy todir="${tomcat.build}/bin"> + <fileset dir="bin"> +@@ -1053,7 +1058,7 @@ + <exclude name="${jdt.jar.filename}"/> + </fileset> + </delete> +- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> ++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> + + <!-- Add sources for examples --> + <antcall target="examples-sources" /> +@@ -1087,7 +1092,7 @@ + </javac> + </target> + +- <target name="build-tomcat-jdbc" depends="package"> ++ <target name="build-tomcat-jdbc" depends="package" unless="noget"> + <!-- 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}" +@@ -1102,7 +1107,7 @@ + <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> + </target> + +- <target name="build-tomcat-jdbc-src"> ++ <target name="build-tomcat-jdbc-src" unless="noget"> + <!-- 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}" +@@ -1206,10 +1211,11 @@ + + <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> + <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> ++<!-- + <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" + failonerror="false"/> + <copy file="${jdt.jar}" todir="${tomcat.embed}" /> +- ++--> + <!-- 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. --> +@@ -1594,7 +1600,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}"/> +@@ -1733,7 +1739,7 @@ + + <target name="extras-webservices-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"> + <param name="sourcefile" value="${jaxrpc-lib.loc}"/> +@@ -1928,6 +1934,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" > ++<!-- + <javadoc packagenames="javax.servlet.*" + excludepackagenames="javax.servlet.jsp.*" + sourcepath="${tomcat.dist}/src/java" +@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path location="${ant.core.lib}"/> + </classpath> + </javadoc> ++--> + <javadoc packagenames="javax.websocket.*" + sourcepath="${tomcat.dist}/src/java" + destdir="${tomcat.dist}/webapps/docs/websocketapi" +@@ -2027,9 +2035,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path refid="tomcat.webservices.classpath"/> + <path location="${ant.core.lib}"/> + </classpath> ++<!-- + <link href="../servletapi"/> + <link href="../jspapi"/> + <link href="../elapi"/> ++--> + <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/"/> +@@ -2757,7 +2767,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-compile" +- description="Download (and build) components necessary to compile" > ++ description="Download (and build) components necessary to compile" unless="noget"> + + <antcall target="downloadfile-2"> + <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> +@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-test-compile" +- description="Download additional components for the tests" > ++ description="Download additional components for the tests" unless="noget"> + + <antcall target="downloadfile"> + <param name="sourcefile" value="${junit.loc}"/> +@@ -2848,7 +2858,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-dist" +- description="Download additional components for a distribution" > ++ description="Download additional components for a distribution" unless="noget"> + + <antcall target="downloadzip-2"> + <param name="sourcefile.1" value="${tomcat-native.win.1}"/> +@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" /> + + <!-- =============== Utility Targets to support downloads ================ --> + +- <target name="setproxy" if="${proxy.use}"> ++ <target name="setproxy" if="${proxy.use}" unless="noget"> + <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" + proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> + <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> + </target> + +- <target name="testexist"> ++ <target name="testexist" unless="noget"> + <echo message="Testing for ${destfile}"/> + <available file="${destfile}" property="exist"/> + </target> + +- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> ++ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> + <!-- Download and extract the package --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}.tar.gz"/> + </target> + +- <target name="downloadgz-2" unless="exist" depends="testexist"> ++ <target name="downloadgz-2" unless="noget" depends="testexist"> + <!-- Download and extract the package from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}.tar.gz"/> + </target> + +- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> ++ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> + <!-- Download and extract the package --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}"/> + </target> + +- <target name="downloadzip-2" unless="exist" depends="testexist"> ++ <target name="downloadzip-2" unless="noget" depends="testexist"> + <!-- Download and extract the package from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}"/> + </target> + +- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> ++ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> + <!-- Download the file --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" /> + <move file="${temp.file}" tofile="${destfile}"/> + </target> + +- <target name="downloadfile-2" unless="exist" depends="testexist"> ++ <target name="downloadfile-2" unless="noget" depends="testexist"> + <!-- Download the file from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" /> + <move file="${temp.file}" tofile="${destfile}"/> + </target> + +- <target name="trydownload.check" depends="setproxy"> ++ <target name="trydownload.check" depends="setproxy" unless="noget"> + <condition property="trydownload.run"> + <and> + <not> +@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" /> + </condition> + </target> + +- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> ++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> + <!-- Downloads a file if not yet downloaded and the source URL is available --> + <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> + </target> +@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" /> + + <target name="ide-eclipse" + depends="download-compile, extras-webservices-prepare, download-test-compile" +- description="Prepares the source tree to be built in Eclipse"> ++ description="Prepares the source tree to be built in Eclipse" unless="noget"> + + <!-- Copy the sample project files into the root directory --> + <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> diff --git a/www-servers/tomcat/files/tomcat-8.0.43-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.43-build.xml.patch new file mode 100644 index 000000000000..cefd59f55ae3 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-8.0.43-build.xml.patch @@ -0,0 +1,259 @@ +diff --git a/apache-tomcat-8.0.36-src/build.xml b/apache-tomcat-8.0.36-src/build.xml +index 1ba0dae..81a0a2c 100644 +--- a/apache-tomcat-8.0.36-src/build.xml ++++ b/apache-tomcat-8.0.36-src/build.xml +@@ -701,24 +701,29 @@ + manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> + + <!-- Servlet 3.1 Implementation JAR File --> ++<!-- + <jarIt jarfile="${servlet-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.servlet-api" + manifest="${tomcat.manifests}/servlet-api.jar.manifest" + notice="${tomcat.manifests}/servlet-api.jar.notice" + 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 --> ++<!-- + <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 --> + <jarIt jarfile="${websocket-api.jar}" +@@ -986,14 +991,14 @@ + + <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" + description="Default. Builds a working Tomcat instance"> +- ++<!-- + <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" + file="${tomcat-native.tar.gz}" /> + <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" + file="${commons-daemon.native.src.tgz}" /> + + <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> +- ++--> + <!-- Copy scripts --> + <copy todir="${tomcat.build}/bin"> + <fileset dir="bin"> +@@ -1053,7 +1058,7 @@ + <exclude name="${jdt.jar.filename}"/> + </fileset> + </delete> +- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> ++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> + + <!-- Add sources for examples --> + <antcall target="examples-sources" /> +@@ -1087,7 +1092,7 @@ + </javac> + </target> + +- <target name="build-tomcat-jdbc" depends="package"> ++ <target name="build-tomcat-jdbc" depends="package" unless="noget"> + <!-- 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}" +@@ -1102,7 +1107,7 @@ + <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> + </target> + +- <target name="build-tomcat-jdbc-src"> ++ <target name="build-tomcat-jdbc-src" unless="noget"> + <!-- 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}" +@@ -1206,10 +1211,11 @@ + + <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> + <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> ++<!-- + <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" + failonerror="false"/> + <copy file="${jdt.jar}" todir="${tomcat.embed}" /> +- ++--> + <!-- 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. --> +@@ -1594,7 +1600,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}"/> +@@ -1733,7 +1739,7 @@ + + <target name="extras-webservices-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"> + <param name="sourcefile" value="${jaxrpc-lib.loc}"/> +@@ -1928,6 +1934,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" > ++<!-- + <javadoc packagenames="javax.servlet.*" + excludepackagenames="javax.servlet.jsp.*" + sourcepath="${tomcat.dist}/src/java" +@@ -1989,6 +1996,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path location="${ant.core.lib}"/> + </classpath> + </javadoc> ++--> + <javadoc packagenames="javax.websocket.*" + sourcepath="${tomcat.dist}/src/java" + destdir="${tomcat.dist}/webapps/docs/websocketapi" +@@ -2027,9 +2035,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path refid="tomcat.webservices.classpath"/> + <path location="${ant.core.lib}"/> + </classpath> ++<!-- + <link href="../servletapi"/> + <link href="../jspapi"/> + <link href="../elapi"/> ++--> + <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/"/> +@@ -2757,7 +2767,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-compile" +- description="Download (and build) components necessary to compile" > ++ description="Download (and build) components necessary to compile" unless="noget"> + + <antcall target="downloadfile-2"> + <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> +@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-test-compile" +- description="Download additional components for the tests" > ++ description="Download additional components for the tests" unless="noget"> + + <antcall target="downloadfile"> + <param name="sourcefile" value="${junit.loc}"/> +@@ -2848,7 +2858,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-dist" +- description="Download additional components for a distribution" > ++ description="Download additional components for a distribution" unless="noget"> + + <antcall target="downloadzip-2"> + <param name="sourcefile.1" value="${tomcat-native.win.1}"/> +@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" /> + + <!-- =============== Utility Targets to support downloads ================ --> + +- <target name="setproxy" if="${proxy.use}"> ++ <target name="setproxy" if="${proxy.use}" unless="noget"> + <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" + proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> + <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> + </target> + +- <target name="testexist"> ++ <target name="testexist" unless="noget"> + <echo message="Testing for ${destfile}"/> + <available file="${destfile}" property="exist"/> + </target> + +- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> ++ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> + <!-- Download and extract the package --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}.tar.gz"/> + </target> + +- <target name="downloadgz-2" unless="exist" depends="testexist"> ++ <target name="downloadgz-2" unless="noget" depends="testexist"> + <!-- Download and extract the package from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}.tar.gz"/> + </target> + +- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> ++ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> + <!-- Download and extract the package --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}"/> + </target> + +- <target name="downloadzip-2" unless="exist" depends="testexist"> ++ <target name="downloadzip-2" unless="noget" depends="testexist"> + <!-- Download and extract the package from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}"/> + </target> + +- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> ++ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> + <!-- Download the file --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" /> + <move file="${temp.file}" tofile="${destfile}"/> + </target> + +- <target name="downloadfile-2" unless="exist" depends="testexist"> ++ <target name="downloadfile-2" unless="noget" depends="testexist"> + <!-- Download the file from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" /> + <move file="${temp.file}" tofile="${destfile}"/> + </target> + +- <target name="trydownload.check" depends="setproxy"> ++ <target name="trydownload.check" depends="setproxy" unless="noget"> + <condition property="trydownload.run"> + <and> + <not> +@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" /> + </condition> + </target> + +- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> ++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> + <!-- Downloads a file if not yet downloaded and the source URL is available --> + <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> + </target> +@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" /> + + <target name="ide-eclipse" + depends="download-compile, extras-webservices-prepare, download-test-compile" +- description="Prepares the source tree to be built in Eclipse"> ++ description="Prepares the source tree to be built in Eclipse" unless="noget"> + + <!-- Copy the sample project files into the root directory --> + <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> diff --git a/www-servers/tomcat/tomcat-8.0.39.ebuild b/www-servers/tomcat/tomcat-8.0.39.ebuild index 81596bae336b..4fffdde7178c 100644 --- a/www-servers/tomcat/tomcat-8.0.39.ebuild +++ b/www-servers/tomcat/tomcat-8.0.39.ebuild @@ -44,7 +44,9 @@ pkg_setup() { enewuser tomcat 265 -1 /dev/null tomcat } -java_prepare() { +src_prepare() { + default + find -name '*.jar' -type f -delete -print || die # Remove bundled servlet-api @@ -56,6 +58,8 @@ java_prepare() { sed -i -e "/^# ----- Execute The Requested Command/ a\ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ bin/catalina.sh || die + + java-pkg-2_src_prepare } JAVA_ANT_REWRITE_CLASSPATH="true" diff --git a/www-servers/tomcat/tomcat-8.0.41.ebuild b/www-servers/tomcat/tomcat-8.0.41.ebuild index 9ef90f30cda4..9d2c9ff6392d 100644 --- a/www-servers/tomcat/tomcat-8.0.41.ebuild +++ b/www-servers/tomcat/tomcat-8.0.41.ebuild @@ -44,7 +44,9 @@ pkg_setup() { enewuser tomcat 265 -1 /dev/null tomcat } -java_prepare() { +src_prepare() { + default + find -name '*.jar' -type f -delete -print || die # Remove bundled servlet-api @@ -56,6 +58,8 @@ java_prepare() { sed -i -e "/^# ----- Execute The Requested Command/ a\ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ bin/catalina.sh || die + + java-pkg-2_src_prepare } JAVA_ANT_REWRITE_CLASSPATH="true" diff --git a/www-servers/tomcat/tomcat-8.0.43.ebuild b/www-servers/tomcat/tomcat-8.0.43.ebuild new file mode 100644 index 000000000000..9d2c9ff6392d --- /dev/null +++ b/www-servers/tomcat/tomcat-8.0.43.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +JAVA_PKG_IUSE="doc source test" + +inherit eutils java-pkg-2 java-ant-2 prefix user + +MY_P="apache-${P}-src" + +DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container" +HOMEPAGE="http://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="8" +KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="extra-webapps" + +RESTRICT="test" # can we run them on a production system? + +ECJ_SLOT="4.5" +SAPI_SLOT="3.1" + +COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/tomcat-servlet-api:${SAPI_SLOT}" +RDEPEND="${COMMON_DEP} + !<dev-java/tomcat-native-1.1.24 + >=virtual/jre-1.7" +DEPEND="${COMMON_DEP} + app-admin/pwgen + >=virtual/jdk-1.7 + test? ( + >=dev-java/ant-junit-1.9:0 + dev-java/easymock:3.2 + )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + java-pkg-2_pkg_setup + enewgroup tomcat 265 + enewuser tomcat 265 -1 /dev/null tomcat +} + +src_prepare() { + default + + find -name '*.jar' -type f -delete -print || die + + # Remove bundled servlet-api + rm -rv java/javax/{el,servlet} || die + + epatch "${FILESDIR}/${P}-build.xml.patch" + + # For use of catalina.sh in netbeans + sed -i -e "/^# ----- Execute The Requested Command/ a\ + CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ + bin/catalina.sh || die + + java-pkg-2_src_prepare +} + +JAVA_ANT_REWRITE_CLASSPATH="true" + +EANT_BUILD_TARGET="deploy" +EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" +EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" +EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" +EANT_NEEDS_TOOLS="true" +EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" + +# revisions of the scripts +IM_REV="-r2" +INIT_REV="-r1" + +src_compile() { + EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" + java-pkg-2_src_compile +} + +src_test() { + java-pkg-2_src_test +} + +src_install() { + local dest="/usr/share/${PN}-${SLOT}" + + java-pkg_jarinto "${dest}"/bin + java-pkg_dojar output/build/bin/*.jar + exeinto "${dest}"/bin + doexe output/build/bin/*.sh + + java-pkg_jarinto "${dest}"/lib + java-pkg_dojar output/build/lib/*.jar + + dodoc RELEASE-NOTES RUNNING.txt + use doc && java-pkg_dojavadoc output/dist/webapps/docs/api + use source && java-pkg_dosrc java/* + + ### Webapps ### + + # add missing docBase + local apps="host-manager manager" + for app in ${apps}; do + sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ + output/build/webapps/${app}/META-INF/context.xml || die + done + + insinto "${dest}"/webapps + doins -r output/build/webapps/{host-manager,manager,ROOT} + use extra-webapps && doins -r output/build/webapps/{docs,examples} + + ### Config ### + + # create "logs" directory in $CATALINA_BASE + # and set correct perms, see #458890 + dodir "${dest}"/logs + fperms 0750 "${dest}"/logs + + # replace the default pw with a random one, see #92281 + local randpw="$(pwgen -s -B 15 1)" + sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die + + # prepend gentoo.classpath to common.loader, see #453212 + sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die + + insinto "${dest}" + doins -r output/build/conf + + ### rc ### + + cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die + eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} + sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die + + insinto "${dest}"/gentoo + doins "${T}"/tomcat.conf + exeinto "${dest}"/gentoo + newexe "${T}"/tomcat${INIT_REV}.init tomcat.init + newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash +} + +pkg_postinst() { + elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" + elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." + elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" + + elog "To manage Tomcat instances, run:" + elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" + + ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" + ewarn "from upstream binary if you need it. Gentoo Bug # 144276" + +# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." +} |