Version bump to 7.0.57 with fix for bug #503090

* JDK/JRE 1.7 is required for +websockets.
* JDK 1.7 restriction for javadocs removed from build.xml
  This will open up CVE-2013-1571, but this is true for any other package in the tree build with USE="doc" and an old JDK.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 8a1f21ca68bb043ce2ff449d5ec5fa4fb8d807ae..3432e65d01166eac6b60f1d1c504a8d6674dc5a2 100644 (file)
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.336 2014/11/29 13:35:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.337 2014/12/14 11:51:54 ercpe Exp $
+
+*tomcat-7.0.57 (14 Dec 2014)
+
+  14 Dec 2014; Johann Schmitz <ercpe@gentoo.org>
+  +files/tomcat-7.0.57-build.xml.patch, +tomcat-7.0.57.ebuild:
+  Version bump to 7.0.57 with fix for bug #503090  * JDK/JRE 1.7 is required for
+  +websockets. * JDK 1.7 restriction for javadocs removed from build.xml   This
+  will open up CVE-2013-1571, but this is true for any other package in the tree
+  build with USE="doc" and an old JDK.
 
   29 Nov 2014; Agostino Sarubbo <ago@gentoo.org> tomcat-6.0.41.ebuild,
   tomcat-7.0.56.ebuild:

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 591490e198e391205122a3978723f938225813b4..488c39392cca1c7e4a313d7f1bb72a28c1a35840 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -8,6 +8,7 @@ AUX tomcat-7.0.42-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088
 AUX tomcat-7.0.47-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
 AUX tomcat-7.0.52-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
 AUX tomcat-7.0.56-build.xml.patch 3854 SHA256 51b845985859132b633371c6fd2e1e2ea5c787bf7206125546c4b8752464d39e SHA512 8da59a51e58db16b0062bcc6b24e6b0b43d13884abd7c68a37b15226ff4184fb872a8e43ac281c3c7bd379dd11a1343db3eff84175f9323808d1d0c8641242b4 WHIRLPOOL 6035466159f30b873117478a8859451d73c4424cb22e29991cec2af72fc918cf14adf2bb51d107a7a1b95ca1b770f7a3ba6290abdb036d1bdf1a9a4b8da75130
+AUX tomcat-7.0.57-build.xml.patch 7127 SHA256 ed30b302255203296a7e895924587f845ee5611e47f803d533e84927d9ac7765 SHA512 69826d3117abe07453f2c74922ab7ca066988bee2b86ae61ba6c57e8c22e751e4b627eddf89d83c58c5ca23a4cbd6e5851a214571def1f101a3a0110085f95b6 WHIRLPOOL 2a1032a989134c0e2f3c0a59bcc92d8e5d89ff134e52ed4e984cbd8eb09aa2f705f61ef0612a48859c5e334addc7a6935263d46c494c872bd129cbf4da1ff52f
 AUX tomcat-instance-manager-r1.bash 6451 SHA256 28990e664007e6eab91d1f90f58009457f683c4c9d37ef78f9065b4b6c87add2 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570 WHIRLPOOL 3be20ac95b1b2e80d62cecbd5e47d0b7c768e78ec38c5ec5661e4d563962196eb45fae82d54349a9202323f5a464ac922930b1b01e197ed6e83f03a3d38f79af
 AUX tomcat-instance-manager.bash 6403 SHA256 09ff73a51d6f11b83c78d6306322455091da302c8d6bd711a0fa4983d850dab4 SHA512 7b51b77447854dd4c6fd4a3bc16aa912edcb5e31d64a4c47f24102c3fc29c2a18f51d8b8f0e28723fba694451c8ab780dcac3d12dc553dc3f182c1d1372e7171 WHIRLPOOL ad845aedd608615df243722be6a4e3ad477890ee8e59b5d0061c4490d95058d7857346bf545c16d7756ecfa62a0b31f137d819095461cb6180cc75df1d81511d
 AUX tomcat.conf 1544 SHA256 6f74ff1ea148322d7595bb6bc10bd00a81851d1822046c01e7f42885b357a4cc SHA512 36ba5c4ccf9ac062acfaaecefd9aba1065fd5553df21cd9c2ffd2b320de472c3397d8499d3a2a96b51d8ef513aa86d5879a42287579da4152916802a988c7811 WHIRLPOOL f2ea708f87b21a004680f3f2865b98bfbeb4dbbee77ce19e7577a8d461df21d682136bda88591114c6b9c2e1dec42ed816ea4a981e6863ea1faaf3f0407dbce3
@@ -19,6 +20,7 @@ DIST apache-tomcat-7.0.42-src.tar.gz 4422120 SHA256 5dbc2194b894de0b620752f18f5d
 DIST apache-tomcat-7.0.47-src.tar.gz 4568824 SHA256 be7cad1c70b9db84e8b139a81312ecd80761f2e69edbd1d176d49e52f728bc99 SHA512 bb0d2c5ecc05b69655ebb6073e92ab379b588e18ea2d4e5883297ce528d6a6e7a400e3038d93f6d5e79be24687105e4fd3d6ab62b616da715f333dd9067dbaf8 WHIRLPOOL 126b2bae767c620ed0b4bd83ed71cea3f6ea81862258bce1273e7840682b771fca55393e6090300e9635d3839b9de9d48aa346bef8d06fb87b435f20e6b32495
 DIST apache-tomcat-7.0.52-src.tar.gz 4613085 SHA256 208781c82c8355f1796696f1022e47968d903a6e5f3e429f9fcf76c21d9d1024 SHA512 a83e16c575fee90585024121414171345645377f13b6a1af15a8fdfe307fb2aca020bae8c214b6bae8bd817ff1c6b3c37f01f38749bf87c06448a7519803b298 WHIRLPOOL 3492e99ef9f100ff1a7afa75d383668c4f69a2e4b4509b0cf7989026d9ace01d1758cd06dd23878b0716ef418901f0551521060d70f6de2d3d91be0695f81db3
 DIST apache-tomcat-7.0.56-src.tar.gz 4648164 SHA256 d51fd6b596fbcf418eddeff721f23b6109ec4d8085ba111580dbdeaa007c5b59 SHA512 f283ec2cd806ea1ac5372efc667e75687ea637185b1b74b396cf46379248da09c9a8bbdd1f4e37e84d91ed142f80a1185816fc5215e199df2ff25dded13cacff WHIRLPOOL cf63cd6e4888585f3dd9e4659f993f48e3a08f8c220414fe8f9dac9389a1456d49878b4a39674646fd6a9ad3df4259272005ccf40ead53ab51a196bee4150a93
+DIST apache-tomcat-7.0.57-src.tar.gz 4651308 SHA256 07962d20f2ce051c3e4fbdbd65a15d87d07553e7ee1542547a5ce0c201743c64 SHA512 fad8c296c2191c0168bf841b4b7c649b06900aa1b8b12d895fdaa1963f5a2b08fedb71f614cba1269b405892392daea0850c85360fb4fda2ea36311f8e8c563a WHIRLPOOL 9c938fdc419f989d9a2bc7618e9c68c0ee96b1dfaa94822d995818975c9217b7ff80c28b31cc6e9dea47d4097a2c61325e8075d4f313bc6415aa535361933741
 EBUILD tomcat-6.0.37.ebuild 3963 SHA256 934c69c50021c2a1b8b9c2aeffd8acb47c7b08ee79d358ac889a9c3954f2fb37 SHA512 0f19f8080a6c737379431590d5d8acbb67c202d4b535b64c87250b6fd54850bb8c2c745655c7845ff1b2216d36e16dcad7fbf7b638b1a7f5e9ca5f541c6c07f0 WHIRLPOOL d17092377652126e5e614b85253ee1627655a6ca52999e9045189f126c05c171301554b42d01d2da0d41083966c91b6b45077b487218c6793a1411b3c79b7418
 EBUILD tomcat-6.0.39.ebuild 3969 SHA256 1964b2a6c1c56e5cc0a00c8f307cf91494143c57b016980c8e2f60da96c9af80 SHA512 0c9df1c8bde93c76047e43769e4e0b20ea04e13c8d610df3f9a4c95b6db5d1ecc714ee08ca5ad6ac7814259a9faa258a38d300f6550dfff01d428fa91506cca2 WHIRLPOOL 5e8d38b79b3bd3e991b499cff5cef7c3cc0450be31de4591eece5a3b06d99be0097eadff58362e04c6467c024740535a2341168cfbb1a80e9fa6194e7f498e92
 EBUILD tomcat-6.0.41.ebuild 4100 SHA256 f6670ad36ebe0e33e355dbd48247498f0442375379dfd07699898dc017ec735c SHA512 a9cd92dbda03655749ecab0b18859c9b675da10cdca481c4cb5a817264a592fece1918488900f5737eb54e8a604ac6f1147818ded09cc7e9e95454e466ea0322 WHIRLPOOL 2238288feeeec4b2f24ade1606561d48461b5d0cb1d9996c03fcbf3e2a3474c0cfa0c54c876dd5e3a29e20d3015a370affad2df20bdd17d8949dbf7149fd5d61
@@ -26,22 +28,17 @@ EBUILD tomcat-7.0.42.ebuild 4036 SHA256 c717c7d67b0ba3931c848057980a10a7897db8d6
 EBUILD tomcat-7.0.47.ebuild 4047 SHA256 fd45a575e61eada7d36e7b6f4b93435d4684093efe1d8fe7e5871bcd300bc1c2 SHA512 0ac833f9e80b6fea175c4894df53ffeb1c2930e54dbfdb506e86e3b28ec36698d1d3d907fe11d97c71b70ceb36a4ccd236851519e1e0834bde9c3dffe95350f0 WHIRLPOOL 6d5184b23115b7d2d89621aa72eca2e411d5e8362179ef0fea8ac702acf986142ea5a0361d6f7fad6b8b51848fa5edd165a48726e08d487eea92a43062d21ccf
 EBUILD tomcat-7.0.52.ebuild 4047 SHA256 21a962b9afb1f8b3e0a0d5564de05a5b79d9b8de885493ffb2304fb84833f02d SHA512 326b2fb72ac1133c21e5d4267b6aaba3d5819df1c4f513c48f8009c1dee8d7c251c9d476feac08b743b80d664a6439868f5f98c9380b861781d6f5cbcf4d0173 WHIRLPOOL c5d8079a8e5b4c49b726313ec08fe003e9e38a18fe2502efe25d8f37410cdef4b0d9f56c67b7fda84c2751e1bbc0b24536bc36c800fb5b16a0c84c5b03c67761
 EBUILD tomcat-7.0.56.ebuild 4365 SHA256 97276b1e8550dc3d8b3605d57e744a76930c056dbcba21ee83742e8053cb7a52 SHA512 f3a968f5ed7c04e5752a0749467767689b5006ada49848aac02d9ac977ef2024d21a8ea5fcae2e1f609f5faab99b60c35ee084a01c961c668d031d0554650b78 WHIRLPOOL 81f7673fcf5c09cf3f705b748fcd7bc35d0d73672ec43af8e333b8e84fcdf8128eadf269e9835cc6e7da1e41478b4848572a6a6682c55026aba0dd457946f507
-MISC ChangeLog 79866 SHA256 3549254e00ef1fa3e30cb063ace75db702d9cb5224fde562b71fc3fddaaa66da SHA512 2ed068697b1e98277d40567cfd14dd7d3905ab82428b86703519be6a78eb7d9ff85316233d748e78390e0b67eaec23b63f695d8e6715bba9354c38d3eeeb93a9 WHIRLPOOL 44de374b4ba5bd55957eac05eb7fdc90f9fd6824a63dac73b61f6251d8800cebf11a2d568d3830720eb8de33a529eabbb736ce529b71c249394b7ff669394238
+EBUILD tomcat-7.0.57.ebuild 4349 SHA256 6fc213d477109c9438715922d2f86ad4b2e208ade3f5094cb308832377ce3a91 SHA512 9e37119cde5bce1fd15c8637e779ecbcd6aed21000eaabca2f1f67f6c17085379e33b364878e3e23c994ef8990edec20ff20c59f5a063a4fc8e38b7a7fed670d WHIRLPOOL cc6ebef82f783bd44e7ac5573b309ca65d67eb0df5675ddc454155603326f4d60c7503fa46c823c9213adb6653460750ab3f728a6eea97b04ead034476584440
+MISC ChangeLog 80292 SHA256 60e22303b6e8e7cb61ba48e054044372b56a23ee50b7bd641c1a8e066abab30e SHA512 18a08dcbe9deaedff76de4fbc3ff9698c91710e34f47f64719994d291207c1528fa583363b75244ef1a811cafba8c296c56abb801d623e6b4b5166d29face48c WHIRLPOOL d0871910475497056a276333b9b0d547361dbd95539a7c7d8af9865380d7031b9b6c22d4a232bc178ed6e40012ad4eff0445f504c9f5dd6d50c4bfe18073668b
 MISC metadata.xml 652 SHA256 ec9dcba0295a5c3eff6b20d7d8038e09c6438d2fc56e45b5cfc3c27206f4bfd8 SHA512 07bc791d1240d11cb34a117657187a9efe4ef4bcdfee76d99f9656caa6fde1c1ffb67b78fe5e552c2a44ddb7e595d4175ada50f0426f2b0d832f0162f6b0afac WHIRLPOOL e1cc5d3799a6b7f6249f5c1420248600b5fec9228dd803fd673b1a75e26900c6539222a1da07e83bb4560e17681ecdf9ff31fe5dcc4d0fb15a694e9402991d7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUecutAAoJELp701BxlEWfRl4P/jaU46E8ZwiCSr7J9SKf7PSX
-wPX+6whDeXEf0tWt8nzKGkqPwTVHHJUFGuHSLmZ/pT4kMaOJ4grVCu9UMDX0vK/L
-gKIf4huJGoPnL+h5xINanYAIsRVedafhjX4oH4B1SxtVaLFLfPZ+TEoOc/30J7PF
-z8Z8LiDHPyH7Mjw/K2iRZlpFD+OGZ6GXw0Jm6yRe5icrnSiBybCiQRAML/SxwS/j
-1ccyTiggDa6c/7O3ccmuQ6ErCA2zC38UtYNCGkO/QKpVv1C4TSecM20ntL0UepKM
-bbxR3kygF5RAnckt6FRlBvo5A1zp08MTCk1Y+/ETGjVMbDcs6+v7jMj+CjyqaYXK
-0JGxNcu0tl2NK4ey/HICTK8w3Zymbl7LVPkqo/c1MVvQQoCEPiJ0Y4OFkxMLmSd8
-1LEK2m8Vzzf3ae6EKe/OLZ9QU+ZNN3wI6Z/jH9XCQPPgdLr9PsrRchTdeZSjxCyg
-scvQiyxHmjDzTVfnJ9zr6v6Ep8/3uMqyLbW6Ctfj/mYXUbIZ3XuyIx4qeMIjpheR
-JR2caDbDfU2VAT2wnSbow5ZT0+EBVbgXYmeYedvvkU9opnCkBmOJrMIG2wi+6Tce
-1ct2rMNjGZ42JcRldlHVJdC3TTbEsxyjIFk4jYusv369yKm7uPcHJ8MYPfrV/+eu
-7jBfJnmr3Na8bbeFy+wE
-=G5o5
+iQEcBAEBCAAGBQJUjXnfAAoJEKCEBkJ3xQHtv8IH/iSNf6fIjTX2VcHA3zBSx6+w
+Q4VtxX750EY8pvPgio7/4DJVrpu+mlxXN3OkJvf6t1gPf2WtyuXeEDx5lcGO1HNR
+B46siSGZXPZXpj/7b6geBG9JbgszAMvZBj3sNaaXH45XyEUK2uqXfZhONRSBIFCb
+WAHECByNmdVkhfA5UaaaZ/GaZWJsVwsjvcKu/cblrJWrJX7nYHc6tISrosjvr/xn
+BsP3HODqfVWMorI0tfaXeC169vZ5pOu75bAv4CsR8DYer6WtWlvMOIjptT3H+APl
+vTffvZ0V7DoJzEvW/0ADDDTwKAt3YZux+4161TGxk5sbIYZ1Acom+iyIevMx4yk=
+=hQfj
 -----END PGP SIGNATURE-----

diff --git a/www-servers/tomcat/files/tomcat-7.0.57-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.57-build.xml.patch
new file mode 100644 (file)
index 0000000..6a78027
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.57-build.xml.patch
@@ -0,0 +1,179 @@
+diff --git a/apache-tomcat-7.0.57-src/build.xml b/apache-tomcat-7.0.57-src/build.xml
+index 60018a4..0283688 100644
+--- a/apache-tomcat-7.0.57-src/build.xml
++++ b/apache-tomcat-7.0.57-src/build.xml
+@@ -686,26 +686,32 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 3.0 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.2 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+       notice="${tomcat.manifests}/jsp-api.jar.notice"
+       license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+ 
+     <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+ 
+     <!-- Bootstrap JAR File -->
+     <jarIt jarfile="${bootstrap.jar}"
+@@ -951,12 +957,14 @@
+   <target name="deploy" depends="package,build-docs,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">
+@@ -1016,14 +1024,14 @@
+         <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" />
+-
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+       failonerror="false"/>
+-
++-->
+     <!-- 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}"
+@@ -1170,9 +1178,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
+@@ -1618,7 +1628,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}"/>
+@@ -1825,8 +1835,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ 
+   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+     description="Create the Tomcat javadoc" >
++<!--
+     <fail unless="java.7.home"
+           message="The java.7.home property must be set for javadoc build"/>
++-->
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -1840,8 +1852,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       docencoding="ISO-8859-1"
+       charset="ISO-8859-1"
+       additionalparam="-breakiterator -notimestamp"
+-      maxmemory="256m"
+-      executable="${java.7.home}/bin/javadoc">
++      maxmemory="256m">
+       <classpath>
+         <path refid="compile.classpath"/>
+         <path refid="tomcat.webservices.classpath"/>
+@@ -1860,8 +1871,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       docencoding="ISO-8859-1"
+       charset="ISO-8859-1"
+       additionalparam="-breakiterator -notimestamp"
+-      maxmemory="256m"
+-      executable="${java.7.home}/bin/javadoc">
++      maxmemory="256m">
+       <classpath>
+         <path refid="compile.classpath"/>
+         <path refid="tomcat.webservices.classpath"/>
+@@ -1880,8 +1890,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       docencoding="ISO-8859-1"
+       charset="ISO-8859-1"
+       additionalparam="-breakiterator -notimestamp"
+-      maxmemory="256m"
+-      executable="${java.7.home}/bin/javadoc">
++      maxmemory="256m">
+       <classpath>
+         <path refid="compile.classpath"/>
+         <path refid="tomcat.webservices.classpath"/>
+@@ -1900,8 +1909,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       docencoding="ISO-8859-1"
+       charset="ISO-8859-1"
+       additionalparam="-breakiterator -notimestamp"
+-      maxmemory="256m"
+-      executable="${java.7.home}/bin/javadoc">
++      maxmemory="256m">
+       <classpath>
+         <path refid="compile.classpath"/>
+         <path refid="tomcat.webservices.classpath"/>
+@@ -1919,8 +1927,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       docencoding="ISO-8859-1"
+       charset="ISO-8859-1"
+       additionalparam="-breakiterator -notimestamp"
+-      maxmemory="256m"
+-      executable="${java.7.home}/bin/javadoc">
++      maxmemory="256m">
+       <classpath>
+         <path refid="compile.classpath"/>
+         <path refid="tomcat.webservices.classpath"/>
+@@ -2605,7 +2612,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+   </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}"/>
+@@ -2662,7 +2669,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+   </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}"/>
+@@ -2690,7 +2697,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+   </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}"/>

diff --git a/www-servers/tomcat/tomcat-7.0.57.ebuild b/www-servers/tomcat/tomcat-7.0.57.ebuild
new file mode 100644 (file)
index 0000000..0e86403
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.57.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.57.ebuild,v 1.1 2014/12/14 11:51:54 ercpe Exp $
+
+EAPI=5
+
+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.0/JSP-2.2 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.4"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="
+       dev-java/eclipse-ecj:${ECJ_SLOT}
+       ~dev-java/tomcat-servlet-api-${PV}
+       extra-webapps? ( dev-java/jakarta-jstl:0 )"
+RDEPEND="${COMMON_DEP}
+       websockets? ( >=virtual/jre-1.7 )
+       !websockets? ( >=virtual/jre-1.6 )
+       !<dev-java/tomcat-native-1.1.24"
+DEPEND="${COMMON_DEP}
+       websockets? ( >=virtual/jdk-1.7 )
+       !websockets? ( >=virtual/jdk-1.6 )
+       >=dev-java/ant-core-1.8.1:0
+       test? (
+               dev-java/ant-junit:0
+               dev-java/junit:4
+       )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+       java-pkg-2_pkg_setup
+       enewgroup tomcat 265
+       enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+       find -type f -name '*.jar' -exec rm -frv {} + || 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_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revision of the instance-manager script
+IM_REV="-r1"
+
+src_compile() {
+       use websockets && EANT_EXTRA_ARGS="-Djava.7.home=${JAVA_HOME}"
+       EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+       java-pkg-2_src_compile
+}
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+
+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
+
+       # so we don't have to call java-config with --with-dependencies, which might
+       # bring in more jars then actually desired.
+       java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})"
+
+       dodoc RELEASE-NOTES RUNNING.txt
+       use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+       use source && java-pkg_dosrc java/*
+
+       ### Webapps ###
+
+       insinto "${dest}"/webapps
+       doins -r output/build/webapps/{host-manager,manager,ROOT}
+       use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+       ### Config ###
+
+       # replace the default pw with a random one, see #92281
+       local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+       sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+       insinto "${dest}"
+       doins -r output/build/conf
+
+       ### rc ###
+
+       cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} "${T}" || die
+       eprefixify "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash}
+       sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} || die
+
+       insinto "${dest}"/gentoo
+       doins "${T}"/tomcat.conf
+       exeinto "${dest}"/gentoo
+       doexe "${T}"/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 http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}