diff options
Diffstat (limited to 'www-servers/tomcat')
-rw-r--r-- | www-servers/tomcat/Manifest | 6 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch (renamed from www-servers/tomcat/files/tomcat-9.0.2_beta-build.xml.patch) | 81 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-9.0.4.ebuild (renamed from www-servers/tomcat/tomcat-9.0.2_beta.ebuild) | 7 |
3 files changed, 51 insertions, 43 deletions
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index d03b531f5805..b30464d012a8 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -3,7 +3,7 @@ AUX tomcat-8.0.47-build.xml.patch 10703 BLAKE2B 6a3621e4e46fa193390115815be73cf7 AUX tomcat-8.0.48-build.xml.patch 10703 BLAKE2B 6a3621e4e46fa193390115815be73cf7b42c4a241ce48b853c22f0837b66f2da71b66e1ce074a0d454f674f855f567216caaabfc64fb8b01f6b495652a5a3d82 SHA512 ffea8c47e066573571050130f1c6fd03e18af872f814d9bb23c1f0866ae8184039828500c1fd7d5c8186a47625baa3c9db3653608e31d19fc110129d32262001 AUX tomcat-8.5.23-build.xml.patch 10323 BLAKE2B 754121fe17ea72678af3fdfd0a59e5cf6a21c86e4765bafe8aee7f94e950e6eafba665782474f31de1b21e631e4d4473e970f89ea07a5d73b9057d7ee256d3b7 SHA512 1d322b74acb363310566d6f5c35f83326c6504a8a75721f24536db0d650104765d6402f454843c38f816eb8f290ccd0273b559116ea62df433bd59a38ec29b72 AUX tomcat-8.5.24-build.xml.patch 10323 BLAKE2B 754121fe17ea72678af3fdfd0a59e5cf6a21c86e4765bafe8aee7f94e950e6eafba665782474f31de1b21e631e4d4473e970f89ea07a5d73b9057d7ee256d3b7 SHA512 1d322b74acb363310566d6f5c35f83326c6504a8a75721f24536db0d650104765d6402f454843c38f816eb8f290ccd0273b559116ea62df433bd59a38ec29b72 -AUX tomcat-9.0.2_beta-build.xml.patch 10319 BLAKE2B 0b89d84c0cebef256009ac965bdd2c9608445de81ceb603d85a718f60f115977b35ab7ac3863a64615a796db4f20190d67b28f042a8eec01aece937ba157653d SHA512 cdfd3c04b1f4014d44be7d6af40bcc959120af78d4a1976ec17434da72fd514e4c4c18b9e21e1e67134db74c2465f51094cf5962da4807a6e8ac2086564fcbfb +AUX tomcat-9.0.4-build.xml.patch 10464 BLAKE2B e3a8ca895f310fe91f759f558927761a307425bd373695b00eda0d642f98fdf4f8b7d5abe7070fa02ba7eaef506c59ce6e56a47602bce657c05320ccf5766292 SHA512 d055cfa4d947873a0e5541f7679bc1f52fae5196ab00e8c46eb011cb6373dbefa3c29721d3fda0d5b18b7bc961ffc1305d2766fdf088e3db2ee5c6bf5dc1c9b1 AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab @@ -13,11 +13,11 @@ DIST apache-tomcat-8.0.47-src.tar.gz 4996505 BLAKE2B 8024ec5248fed57bf1841a320fc DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc -DIST apache-tomcat-9.0.2-src.tar.gz 5047832 BLAKE2B 7be9cb7569fc771fab849cfe0b3e8154482fd97c2b74f46ebf457084e7f40d8bc70dd9d96793b6b6b43bcb64537dfab4360ea2fe6d3c437788263871944c19cc SHA512 463c0e8daa656dcd8193b3cdbec89bffa762c90b15933755fa51bc2268c28e142544fe71da1d459befb42b70d14834313de30a7f49a082e5121cf3f553c35cbe +DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557 EBUILD tomcat-7.0.82.ebuild 4279 BLAKE2B 21c8b0b0d3823ed1535276a03ed63b2afd840648036a1175f52babf19e3801f85d6bfb0822ef8a30aad1e731428511c2816d77d0afdd7587777775c33072fd86 SHA512 3f366efa7559235ef48b8dc297cafa6af9854f7ea6e4bce0e03e1be956590f3fa34fdbeeb5fd8ac7bd4e7ed43a4bda381a3c2b7f2b3e5a0e1ae50523ce5d5def EBUILD tomcat-8.0.47.ebuild 4471 BLAKE2B b9e4bf2549bc087f2ede1c2d21f8a28734b65155539ff9686d4d21937a3877a38cf8a8e60310a708f9122d1e4cdd7dbc52c6a8e2ab4483fbf2ec79b62b61a541 SHA512 e97bc0a73e8a1384c30915d42e1cfcfa4431ae63dccf85b997c30333a464b3042ec5aee48678c2dbcb045d30532d7aa17ec00ecff14f0d8d7caeaeff9cd3f5b2 EBUILD tomcat-8.0.48.ebuild 4472 BLAKE2B 5b0b4c1df76282c0f266ac921275285423834f3c75e44b8e5779e74eb444af738e2dda68d8940f7fcfa9d10d6850d148b46dcf58b8ff2d25afcd51dca7b4c614 SHA512 6eb897fb6fd1692b778bb8c80ea2e879690aee6d12af0db1b1dbd3a8fbdb01443af9e404694a35613a3be68e53ecbe5b259cc06feeee94c10d8460495d36c620 EBUILD tomcat-8.5.23.ebuild 4519 BLAKE2B 89e25b96d1b794e910ce1c549bc20d1c788f8dfe034d961614c358ff08883177923a45e25f719f850196e7f6d9fedc144cd445f522e85cf78fd951d1040a1725 SHA512 c63e34cac14b2739588a81c5d7b667fe9431f43df0a14d3f596a24e9414a375fcf6466d066e35395532d01b681ba634b026c34691dd10d63590858b6bbeac5fa EBUILD tomcat-8.5.24.ebuild 4520 BLAKE2B 1d117a461e056afcd51d4311759a51f6a519e92fe059fbc6c7b497fb34afdf1c7702fa917b3531156c93eb27438a251a2a3766b910f44be410a01b910e63db97 SHA512 2c50bbd367df38f7214d3bb04606e5a5f10f68a2d305a939477f2686d26ff4b9596dd4703a9979179919ad9ee9f034db2dc7dff5d0fba0c0b75b00abe6c3c918 -EBUILD tomcat-9.0.2_beta.ebuild 4527 BLAKE2B 7fb7c2f07300e60206e4007cb94c498e22c72b993858fb1012adbf0ccfe25964059772d75e8afdf08e4a3a4ecd4a5a3d2fc1eb3c994be0e9f4bca17542af4f73 SHA512 26af1a935ed316f141d93f0b828e07b02040d62c32ae65ebba3076812741fb0639936ac33f0c90eebb917772b069b1deea991ddf303b8e2d51d2c72f3a8eee4d +EBUILD tomcat-9.0.4.ebuild 4500 BLAKE2B 0b9a6f855b524697ba5c99d96600eb479e140d03a6719b148c17870188c76f63cf71d829a3f277b16e8804aa839380692842354b2e8196d234102d54f80a433e SHA512 7c27fbeddc1a1e1ddeb1630a722473c6f8d29ef43f62c63490f643e2cad12288f0d6fbfcd71629fd18eb1b350dace1db2f3e61169cad34915e943060dd025cb7 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109 diff --git a/www-servers/tomcat/files/tomcat-9.0.2_beta-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch index 3f55c285e230..87f869dd4c0c 100644 --- a/www-servers/tomcat/files/tomcat-9.0.2_beta-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch @@ -1,8 +1,8 @@ -diff --git a/apache-tomcat-9.0.1-src/build.xml b/apache-tomcat-9.0.1-src/build.xml -index aa29b28..a9ac6bd 100644 ---- a/apache-tomcat-9.0.1-src/build.xml -+++ b/apache-tomcat-9.0.1-src/build.xml -@@ -715,24 +715,30 @@ +diff --git a/build.xml b/build.xml +index c1331c9..b664cc3 100644 +--- a/build.xml ++++ b/build.xml +@@ -719,24 +719,30 @@ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> <!-- Servlet 4.0 Implementation JAR File --> @@ -33,24 +33,19 @@ index aa29b28..a9ac6bd 100644 <!-- WebSocket 1.1 API JAR File --> <jarIt jarfile="${websocket-api.jar}" -@@ -1006,14 +1012,14 @@ +@@ -1012,9 +1018,9 @@ <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"> -@@ -1073,7 +1079,7 @@ +@@ -1074,7 +1080,7 @@ <exclude name="${jdt.jar.filename}"/> </fileset> </delete> @@ -59,7 +54,7 @@ index aa29b28..a9ac6bd 100644 <!-- Add sources for examples --> <antcall target="examples-sources" /> -@@ -1107,7 +1113,7 @@ +@@ -1108,7 +1114,7 @@ </javac> </target> @@ -68,7 +63,7 @@ index aa29b28..a9ac6bd 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}" -@@ -1122,7 +1128,7 @@ +@@ -1123,7 +1129,7 @@ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> </target> @@ -77,7 +72,7 @@ index aa29b28..a9ac6bd 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}" -@@ -1226,9 +1232,11 @@ +@@ -1227,9 +1233,11 @@ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> @@ -89,7 +84,7 @@ index aa29b28..a9ac6bd 100644 <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> <!-- Note the meta-inf below will work as long as there is only one JAR -@@ -1609,7 +1617,7 @@ +@@ -1612,7 +1620,7 @@ <target name="extras-webservices-prepare" depends="extras-prepare" @@ -98,7 +93,21 @@ index aa29b28..a9ac6bd 100644 <antcall target="downloadfile"> <param name="sourcefile" value="${jaxrpc-lib.loc}"/> -@@ -1757,6 +1765,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -1752,11 +1760,12 @@ + </copy> + + <!-- Source bundles for native components --> ++<!-- + <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" + file="${tomcat-native.tar.gz}" /> + <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" + file="${commons-daemon.native.src.tgz}" /> +- ++--> + <!-- platform README files --> + <echo append="false" file="${tomcat.dist}/bin/x64/README"> + Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -1766,6 +1775,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" > @@ -106,7 +115,7 @@ index aa29b28..a9ac6bd 100644 <javadoc packagenames="javax.servlet.*" excludepackagenames="javax.servlet.jsp.*" sourcepath="${tomcat.dist}/src/java" -@@ -1821,6 +1830,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -1830,6 +1840,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. <path location="${ant.core.lib}"/> </classpath> </javadoc> @@ -114,7 +123,7 @@ index aa29b28..a9ac6bd 100644 <javadoc packagenames="javax.websocket.*" sourcepath="${tomcat.dist}/src/java" destdir="${tomcat.dist}/webapps/docs/websocketapi" -@@ -1861,9 +1871,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -1870,9 +1881,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. <path refid="tomcat.webservices.classpath"/> <path location="${ant.core.lib}"/> </classpath> @@ -124,18 +133,18 @@ index aa29b28..a9ac6bd 100644 <link href="../elapi"/> +--> <link href="../websocketapi"/> - <link href="http://docs.oracle.com/javase/7/docs/api/"/> + <link href="http://docs.oracle.com/javase/8/docs/api/"/> <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> -@@ -2608,7 +2620,7 @@ skip.installer property in build.properties" /> +@@ -2617,7 +2630,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}"/> -@@ -2642,7 +2654,7 @@ skip.installer property in build.properties" /> + <!-- Download Commons Daemon --> + <antcall target="downloadgz-2"> +@@ -2637,7 +2650,7 @@ skip.installer property in build.properties" /> </target> <target name="download-test-compile" @@ -144,16 +153,16 @@ index aa29b28..a9ac6bd 100644 <antcall target="downloadfile"> <param name="sourcefile" value="${junit.loc}"/> -@@ -2699,7 +2711,7 @@ skip.installer property in build.properties" /> +@@ -2694,7 +2707,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}"/> -@@ -2725,18 +2737,18 @@ skip.installer property in build.properties" /> + <antcall target="downloadfile-2"> + <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> +@@ -2734,18 +2747,18 @@ skip.installer property in build.properties" /> <!-- =============== Utility Targets to support downloads ================ --> @@ -175,7 +184,7 @@ index aa29b28..a9ac6bd 100644 <!-- Download and extract the package --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -2748,7 +2760,7 @@ skip.installer property in build.properties" /> +@@ -2757,7 +2770,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}.tar.gz"/> </target> @@ -184,7 +193,7 @@ index aa29b28..a9ac6bd 100644 <!-- Download and extract the package from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -2767,7 +2779,7 @@ skip.installer property in build.properties" /> +@@ -2776,7 +2789,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}.tar.gz"/> </target> @@ -193,7 +202,7 @@ index aa29b28..a9ac6bd 100644 <!-- Download and extract the package --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -2778,7 +2790,7 @@ skip.installer property in build.properties" /> +@@ -2787,7 +2800,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}"/> </target> @@ -202,7 +211,7 @@ index aa29b28..a9ac6bd 100644 <!-- Download and extract the package from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -2796,7 +2808,7 @@ skip.installer property in build.properties" /> +@@ -2805,7 +2818,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}"/> </target> @@ -211,7 +220,7 @@ index aa29b28..a9ac6bd 100644 <!-- Download the file --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -2806,7 +2818,7 @@ skip.installer property in build.properties" /> +@@ -2815,7 +2828,7 @@ skip.installer property in build.properties" /> <move file="${temp.file}" tofile="${destfile}"/> </target> @@ -220,7 +229,7 @@ index aa29b28..a9ac6bd 100644 <!-- Download the file from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -2829,7 +2841,7 @@ skip.installer property in build.properties" /> +@@ -2838,7 +2851,7 @@ skip.installer property in build.properties" /> <move file="${temp.file}" tofile="${destfile}"/> </target> @@ -229,7 +238,7 @@ index aa29b28..a9ac6bd 100644 <condition property="trydownload.run"> <and> <not> -@@ -2840,7 +2852,7 @@ skip.installer property in build.properties" /> +@@ -2849,7 +2862,7 @@ skip.installer property in build.properties" /> </condition> </target> @@ -238,7 +247,7 @@ index aa29b28..a9ac6bd 100644 <!-- Downloads a file if not yet downloaded and the source URL is available --> <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> </target> -@@ -2851,7 +2863,7 @@ skip.installer property in build.properties" /> +@@ -2860,7 +2873,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.2_beta.ebuild b/www-servers/tomcat/tomcat-9.0.4.ebuild index 6151c2e699bb..bb86ba9675bc 100644 --- a/www-servers/tomcat/tomcat-9.0.2_beta.ebuild +++ b/www-servers/tomcat/tomcat-9.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,12 +7,11 @@ JAVA_PKG_IUSE="doc source test" inherit eutils java-pkg-2 java-ant-2 prefix user -MY_PV="${PV/_beta/}" -MY_P="apache-${PN}-${MY_PV}-src" +MY_P="apache-${PN}-${PV}-src" DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container" HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz" +SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="9" |