From: Miroslav Šulc Date: Sat, 24 Dec 2011 20:21:51 +0000 (+0000) Subject: www-servers/tomcat: tomcat 5.5 moved to java-overlay X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6cad1dd5132ed8e7e449713df85fd54e69ae9409;p=gentoo.git www-servers/tomcat: tomcat 5.5 moved to java-overlay Package-Manager: portage-2.1.10.43/cvs/Linux x86_64 --- diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index d214671006ba..1c8b90a33c66 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.274 2011/12/24 19:50:24 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.275 2011/12/24 20:21:51 fordfrog Exp $ + + 24 Dec 2011; Miroslav Å ulc + -files/5.5/26-main_tomcat_catalina_jasper_build_xml.patch, + -tomcat-5.5.27-r5.ebuild, -files/5.5/5.5.27-dynamic-JSSE13Factory.patch, + -files/5.5/build-jspc-classpath.patch, -files/5.5/catalina.policy, + -files/5.5/examples-cal.patch, + -files/5.5/jsr152_jsr154_examples_build_xml.patch, -files/5.5/tomcat.conf.2, + -files/5.5/tomcat.init.2, -tomcat-5.5.27-r4.ebuild, metadata.xml: + Tomcat 5.5 moved from main tree to java-overlay because it's heading towards + its EOL in 2012-09-30. Also the current version (5.5.27) is affected by + several security issues and it is unmaintained in our main tree. If you need + to use Tomcat 5.5, please use the ebuilds from java-overlay. *tomcat-7.0.23-r3 (24 Dec 2011) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index f88c746bae2c..c00593e4eed4 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,11 +1,3 @@ -AUX 5.5/26-main_tomcat_catalina_jasper_build_xml.patch 16573 RMD160 53f1deaa88a39459a584cf14c761cb411d68f2e6 SHA1 69b3ca39f9dbabe12c56865d47866c06dcb7c2e3 SHA256 99a2c1bb164d97407525305512a85e6139531d81a47aa2c25f5c2cfe50aee1f6 -AUX 5.5/5.5.27-dynamic-JSSE13Factory.patch 1853 RMD160 31d20202a3be06c156b0c13f0afb3b394b8ecf02 SHA1 d7e7640dd4f7b7b92b21ac51d1b508fe56691a81 SHA256 f7db0e692088ec25a4731a521c1da4a0075e747f68690235fde3ca93c6f2e19d -AUX 5.5/build-jspc-classpath.patch 1486 RMD160 454b41920a864e06b5b70e448fae724241eb008d SHA1 3671b1cd4d53fd248c19380c96760c051f7f7bff SHA256 865fd2a8721799b1628fe7b31f9bad00563d679236aba5656740feb310b6eb88 -AUX 5.5/catalina.policy 10897 RMD160 d6accc56803b132d0e82e163cc583464c38248ef SHA1 585f80e24cad7e5927f8c2c6ad03f668eb904cc1 SHA256 8188db94772eb00d44b28cb9b40e9ccf30803acf576c0af1be5844ebd35d763c -AUX 5.5/examples-cal.patch 577 RMD160 bab060b0c65b5a72ebaae6b39721c593d2847282 SHA1 0d00e4f166a7567e1c5158b5058fbd15f559410c SHA256 8dfef4e542a674fbd5daa061dc5a04e45c8ed9752e769afd92a2725264ad1bbe -AUX 5.5/jsr152_jsr154_examples_build_xml.patch 2478 RMD160 39a279b0f64bcf112fdaa26c51e3aaa2c7f7a089 SHA1 15857d3b5eaadd6c11bf271f7e7d4705aface448 SHA256 cdc63acd96a3d13d32c37fcbd975f85d38309a0df87a36bf8f49347dc34a181c -AUX 5.5/tomcat.conf.2 2927 RMD160 cc5faf4a3774e7498f2c6fe0d652f4ed2cf2a2fd SHA1 84bc4df821e08e3bab86329261f26e74de2a543e SHA256 109ad0c20f64b9ad9c60cca53a42fca7ba547ab27d8efdba1ef77732600af9dd -AUX 5.5/tomcat.init.2 3852 RMD160 de38c5ce7a0860d9e626f986d9787ef5044df6f7 SHA1 8d3ff55789278420e31a7fb3c7b9766097ce6e28 SHA256 f29db0936a677df99e81ad7e3a9a986c0f6419be25cd1ea9a4f525612d52b00c AUX 6/catalina.policy 6956 RMD160 957ad3b5dc4aeaa5acd289cdaada0a2e48974d52 SHA1 13b65455c8f52fff9d1b09ea67e93ec7a88f1a47 SHA256 9399efda3f6cfc238fb783fb338060e67aff15d0044b31c3d0265e1f9e5769e5 AUX 6/tomcat.conf 2895 RMD160 36ece62ddff5257c04f47d75b9c77bd4dc198652 SHA1 8fef42463b7bf186e2f1d1aeb083bdb370603265 SHA256 b04b085618be755ad9e1796fcbcbb8c2e192eefda3b240f1c06b0d9cc88f2ff0 AUX 6/tomcat.init.2 4034 RMD160 28a47d7e62ac5437eb2c9164f4595bd67b86f676 SHA1 c55f843f15db90e3e0af6069dfefc91daa4e0015 SHA256 55abf160871648ebeca531865b5918846cf298dadc9cdc5cc7ee060a8db487ad @@ -15,18 +7,15 @@ AUX 7/7.0.22-build-xml.patch 4744 RMD160 3d89056a8325ac7bf40f4b49822aff552e570d6 AUX 7/7.0.23-build-xml.patch 4897 RMD160 3b3b5755bd40e759985643f95f26e88069780f3c SHA1 8948dc0f168384670d6e69947de42069c30d78fd SHA256 e6f171cbdfa1af457dfe72be86a316e07a9bb9c22d3c98c094a0972ee4c38011 AUX 7/tomcat.conf 2895 RMD160 e0f3b7f72b925a5d681780e1dcdde46143daef48 SHA1 1b94de2c71c046045b5622756d976378678200a3 SHA256 834b38c1e17294ee73c6571a45fb35bc398f15da4ed189e4d359b8b39121bb8e AUX 7/tomcat.init 3505 RMD160 6fd99e04c94ca5cccd61d4dce4f35fa9f058488f SHA1 1e550da27a648a36eec9a4e3991e77992fdbd7c8 SHA256 9b2eaaadc9ccf25cf56212d3ca0574bba286fef7895c0a56327d5c3d5f98f5d5 -DIST apache-tomcat-5.5.27-src.tar.gz 7382057 RMD160 8114fa3be19fd28a5d2d0d7e7087f6d82e0f111f SHA1 c6217d78d2e64fa839a30372bd2724ba75030c14 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334 DIST apache-tomcat-6.0.32-src.tar.gz 3394648 RMD160 e6203645e6570564b25154018436d908c5b1a71a SHA1 ec94c511e54da2b02dd2ba45b9fd1703d5771a45 SHA256 aa2b72343f2d7f5090e8aabdbf6e0c4f65cd504a719ebb2e18268207ff2c426c DIST apache-tomcat-6.0.33-src.tar.gz 3389376 RMD160 24bd6c0e1bee7daa4cb59ec56552599330f0bb4c SHA1 437db0ba55c6e398fe3af73c4fa5eed3c4666842 SHA256 6dbd5d6eedcf3acd8bf7b6e32544a6e94ec595f7c921baa92f08adb5a5d91b64 DIST apache-tomcat-6.0.35-src.tar.gz 3403286 RMD160 d292b210fe62aafec4a074e3a626766585367a3e SHA1 1a47ad41d52a27757cfeddf7fa1627688ed4027a SHA256 6e5205834bd595250c8e0b640e2345ef643f23364ae0e099334b5132103be764 DIST apache-tomcat-7.0.22-src.tar.gz 4044650 RMD160 e49636d4555f92a4f56a46aee7fcdec3ede5b1f1 SHA1 588512b2149850b3e6de1ac20c79b54aea074eff SHA256 e907cc65ec38cf9e01995432cc7925c18d03cdbc0dd6baa8f82df2bae83c8486 DIST apache-tomcat-7.0.23-src.tar.gz 4103854 RMD160 ebe500ffcc7903c6f4d301533a2a16cb878d11ef SHA1 fe56adb0939825c4f7c0f69e57858b1fb93ae958 SHA256 b86523095b06d58b9553683f480250dec7216ce1914c92ea8ecca0799e6ad3b0 -EBUILD tomcat-5.5.27-r4.ebuild 10028 RMD160 39b0fde8bce7ca92a11d69992f1f8ba70404d70d SHA1 31953fe9665686f43d333608dfb73eff87717bae SHA256 bb074efd50f5164c4b07b97de1de0d77cc05c8548112de7f873fb1afe2b04b19 -EBUILD tomcat-5.5.27-r5.ebuild 10087 RMD160 f9f32edcf802c72499de5519e332aaf7b4b7efbf SHA1 7d494c9bd1ea4b6da8bf4913c8f28e7180d57535 SHA256 93e335594ff10e4bd9d9d2537f0ba5d701c909e181d0fe25d841b771743ec8fb EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b EBUILD tomcat-6.0.33.ebuild 6961 RMD160 17c4cc0cd1bf9b681f612bf131f34440e1a67bae SHA1 1dbe88bf2615d57add8e0deab2074d653a7423f0 SHA256 ae706bb3f875113fa03dc4e9770cd43b033db449f75bb3c76e7bd9b1405c2036 EBUILD tomcat-6.0.35.ebuild 6991 RMD160 c5bf0072768c23112e98f8d0f05d852446ce48f1 SHA1 079bc1830ee5dff2c8d37d24846e478f3a94c4ef SHA256 4292e84c08ba397bf26cbe3ae1df1c77058b52871b5e3578da5441d14161db1a EBUILD tomcat-7.0.22-r1.ebuild 7055 RMD160 73f24c33a3ddbedd60ddae890a2bf0db684b1d61 SHA1 cfeea5c3f16128b6344873ecea2683407c0c012c SHA256 8d540db3b047725613c34b886d18d42799abe82fa82daa4373a2dff20b6d670a EBUILD tomcat-7.0.23-r3.ebuild 7643 RMD160 e75ab8264d8a6b453133e4fc6bdd06d563966ef4 SHA1 e8fbbba6502bf1ca7fab91ce317563575874c3f6 SHA256 bfc37412b9c261a7de5269dccd8066b743affe55bff05b1adf0dcbc7a9fd8e76 -MISC ChangeLog 68383 RMD160 9f65645b99a27444e953335c212fa8618f306692 SHA1 9a58769573a1de325942df14410c6356348a1013 SHA256 3ee95f71c6193304a9c144ebee7ce60a1c5d059371731e2ac15a90efb22c496b -MISC metadata.xml 521 RMD160 72b6ce433f5c9a65deaa0c1830c070c3adbcf33a SHA1 2c4f4fd887a5df9e955c711d0fcd21a5cab90a2d SHA256 dbab559e58c59eddd5df1c3bb39d17b26fadb587ad5dab51fc6fa7af5e601e22 +MISC ChangeLog 69116 RMD160 c48fffa79c272bdee86fcf562b2eec5c13aa73f4 SHA1 9ac12b9b7780bb2524d6e9eb23813868164b4787 SHA256 192eb7dd5eade7547c0c938aa0aec9556c23c734d89e0368004f4f2469325014 +MISC metadata.xml 451 RMD160 965e7cb85fbf383be678e48d2ae0cdf7b4247c99 SHA1 9b3717d68fdd17b010345fb0a63ad9aa0126dc42 SHA256 b508f373350a4e92bc04ebafa528a5c50eac8bfbd67d2fab6a4fa82811d1f109 diff --git a/www-servers/tomcat/files/5.5/26-main_tomcat_catalina_jasper_build_xml.patch b/www-servers/tomcat/files/5.5/26-main_tomcat_catalina_jasper_build_xml.patch deleted file mode 100644 index 80f211d1c45e..000000000000 --- a/www-servers/tomcat/files/5.5/26-main_tomcat_catalina_jasper_build_xml.patch +++ /dev/null @@ -1,429 +0,0 @@ -diff -Naur apache-tomcat-5.5.26-src_orig/build/build.xml apache-tomcat-5.5.26-src/build/build.xml ---- apache-tomcat-5.5.26-src_orig/build/build.xml 2008-02-05 12:47:08.000000000 -0500 -+++ apache-tomcat-5.5.26-src/build/build.xml 2008-02-05 13:06:06.000000000 -0500 -@@ -161,6 +161,7 @@ - - - -+ -+ -+ - -+--> - - - -@@ -413,15 +415,14 @@ - - -+ -+ -+ - -- - -- - -- - - -- - - - -@@ -455,23 +456,6 @@ - addWebXmlMappings="true" - outputDir="${ROOT.base}/WEB-INF/src" /> - -- -- -- -- - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -+ -+ -+ -+ -+ -+ -+ - - - - - - -- - -- -- -- -- -- -+ excludes="**/*.smap"> -+ -+ -+ -+ -+ - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - -- -+ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ - - -@@ -676,7 +688,7 @@ - - - -- --> -+ - - - -@@ -694,6 +706,7 @@ - - - -+--> - - - -@@ -773,14 +786,7 @@ - - - -- -- -- ========== Building: webapps -- -- -- -- -+ - - - -@@ -798,6 +804,17 @@ - - - -+ -+ -+ -+ -+ ========== Building: webapps -+ -+ -+ -+ -+ - - - -@@ -869,14 +886,7 @@ - filtering="true" /> - - -- -- -- -- -- -- -- -+ - - -@@ -915,9 +925,19 @@ - todir="${tomcat.build}/conf/Catalina/localhost" /> - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -- - - - -@@ -1060,11 +1080,11 @@ - - - -- -+ - - - -@@ -1108,11 +1128,11 @@ - - - -- -+ - Target: Webapps precompilation ... - - -@@ -1213,11 +1233,11 @@ - - -- -+ - - - -@@ -1898,7 +1918,7 @@ - description="Download binary packages" > - - -- -+ - - - -@@ -1977,7 +1996,7 @@ - - - -- -+ --> - - - -diff -Naur apache-tomcat-5.5.26-src_orig/build.xml apache-tomcat-5.5.26-src/build.xml ---- apache-tomcat-5.5.26-src_orig/build.xml 2008-02-05 12:47:07.000000000 -0500 -+++ apache-tomcat-5.5.26-src/build.xml 2008-02-05 13:06:35.000000000 -0500 -@@ -81,13 +81,10 @@ - - -- -+ -- -- - - - -- -+--> - - - -diff -Naur apache-tomcat-5.5.26-src_orig/container/catalina/build.xml apache-tomcat-5.5.26-src/container/catalina/build.xml ---- apache-tomcat-5.5.26-src_orig/container/catalina/build.xml 2008-02-05 12:47:08.000000000 -0500 -+++ apache-tomcat-5.5.26-src/container/catalina/build.xml 2008-02-05 13:14:29.000000000 -0500 -@@ -77,6 +77,7 @@ - - - -+ - - - -@@ -108,6 +109,7 @@ - - - -+ - - - -@@ -565,9 +567,9 @@ - file="${commons-logging-api.jar}"/> - - -+--> - - - -diff -Naur apache-tomcat-5.5.26-src_orig/jasper/build.xml apache-tomcat-5.5.26-src/jasper/build.xml ---- apache-tomcat-5.5.26-src_orig/jasper/build.xml 2008-02-05 12:47:07.000000000 -0500 -+++ apache-tomcat-5.5.26-src/jasper/build.xml 2008-02-05 13:14:58.000000000 -0500 -@@ -47,6 +47,7 @@ - - - -+ - - - diff --git a/www-servers/tomcat/files/5.5/5.5.27-dynamic-JSSE13Factory.patch b/www-servers/tomcat/files/5.5/5.5.27-dynamic-JSSE13Factory.patch deleted file mode 100644 index 6dd5d7519ef2..000000000000 --- a/www-servers/tomcat/files/5.5/5.5.27-dynamic-JSSE13Factory.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java -=================================================================== ---- connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java (revision 696420) -+++ connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java (working copy) -@@ -49,27 +49,22 @@ - public JSSEImplementation() throws ClassNotFoundException { - // Check to see if JSSE is floating around somewhere - Class.forName(SSLSocketClass); -+ String className; - if( JdkCompat.isJava15() ) { -- try { -- Class factcl = Class.forName(JSSE15Factory); -- factory = (JSSEFactory)factcl.newInstance(); -- } catch(Exception ex) { -- if(logger.isDebugEnabled()) -- logger.debug("Error getting factory: " + JSSE15Factory, ex); -- } -+ className = JSSE15Factory; - } -- if(factory == null && JdkCompat.isJava14() ) { -- try { -- Class factcl = Class.forName(JSSE14Factory); -- factory = (JSSEFactory)factcl.newInstance(); -- } catch(Exception ex) { -- if(logger.isDebugEnabled()) { -- logger.debug("Error getting factory: " + JSSE14Factory, ex); -- } -- } -- } if(factory == null) { -- factory = new JSSE13Factory(); -+ else if( JdkCompat.isJava14() ) { -+ className = JSSE14Factory; -+ } else { -+ className = JSSE13Factory; - } -+ -+ try { -+ factory = (JSSEFactory) Class.forName(className).newInstance(); -+ } catch(Exception ex) { -+ if(logger.isDebugEnabled()) -+ logger.debug("Error getting factory: " + className, ex); -+ } - } - - diff --git a/www-servers/tomcat/files/5.5/build-jspc-classpath.patch b/www-servers/tomcat/files/5.5/build-jspc-classpath.patch deleted file mode 100644 index 3c34001428fd..000000000000 --- a/www-servers/tomcat/files/5.5/build-jspc-classpath.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: apache-tomcat-5.5.27-src/build/build.xml -=================================================================== ---- apache-tomcat-5.5.27-src.orig/build/build.xml -+++ apache-tomcat-5.5.27-src/build/build.xml -@@ -412,18 +412,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -444,6 +432,18 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/www-servers/tomcat/files/5.5/catalina.policy b/www-servers/tomcat/files/5.5/catalina.policy deleted file mode 100644 index 8392623ae4ab..000000000000 --- a/www-servers/tomcat/files/5.5/catalina.policy +++ /dev/null @@ -1,261 +0,0 @@ -// ============================================================================ -// catalina.corepolicy - Security Policy Permissions for Tomcat 5 -// -// This file contains a default set of security policies to be enforced (by the -// JVM) when Catalina is executed with the "-security" option. In addition -// to the permissions granted here, the following additional permissions are -// granted to the codebase specific to each web application: -// -// * Read access to the document root directory -// -// $Id: catalina.policy,v 1.1 2007/05/15 04:37:21 wltjr Exp $ -// ============================================================================ - - -// ========== SYSTEM CODE PERMISSIONS ========================================= - - -// These permissions apply to javac -grant codeBase "file:${java.home}/lib/-" { - permission java.security.AllPermission; -}; - -// These permissions apply to all shared system extensions -grant codeBase "file:${java.home}/jre/lib/ext/-" { - permission java.security.AllPermission; -}; - -// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre -grant codeBase "file:${java.home}/../lib/-" { - permission java.security.AllPermission; -}; - -// These permissions apply to all shared system extensions when -// ${java.home} points at $JAVA_HOME/jre -grant codeBase "file:${java.home}/lib/ext/-" { - permission java.security.AllPermission; -}; - - -// ========== CATALINA CODE PERMISSIONS ======================================= - - -// These permissions apply to the launcher code -grant codeBase "file:${catalina.home}/bin/commons-launcher.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the daemon code -grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the commons-logging API -grant codeBase "file:${catalina.home}/bin/commons-logging-api.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the server startup code -grant codeBase "file:${catalina.home}/bin/bootstrap.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to JULI -grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the servlet API classes -// and those that are shared across all class loaders -// located in the "common" directory -grant codeBase "file:${catalina.home}/common/-" { - permission java.security.AllPermission; -}; - -grant codeBase "file:${catalina.home}/-" { - permission java.security.AllPermission; -}; -// symlinks must be written separately (?) -grant codeBase "file:${catalina.home}/common/lib/ant-bootstrap.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/common/lib/ant.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/common/lib/ant-launcher.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/common/lib/commons-collections.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/common/lib/commons-dbcp.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/common/lib/commons-el.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/common/lib/commons-pool.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/common/lib/jasper-compiler.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/common/lib/jasper-runtime.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/common/lib/jsp-api.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/common/lib/naming-factory.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/common/lib/naming-resources.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/common/lib/servlet-api.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the container's core code, plus any additional -// libraries installed in the "server" directory -grant codeBase "file:${catalina.home}/server/-" { - permission java.security.AllPermission; -}; -// symlinks must be written separately (?) -grant codeBase "file:${catalina.home}/server/lib/catalina-ant.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/catalina-ant-jmx.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/catalina-cluster.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/catalina.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/catalina-optional.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/catalina-storeconfig.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/commons-beanutils.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/commons-digester.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/commons-modeler.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/servlets-default.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/servlets-invoker.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/servlets-webdav.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/tomcat-ajp.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/tomcat-apr.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/tomcat-coyote.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/tomcat-http.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/tomcat-jkstatus-ant.jar" { - permission java.security.AllPermission; -}; -grant codeBase "file:${catalina.home}/server/lib/tomcat-util.jar" { - permission java.security.AllPermission; -}; - -// ========== WEB APPLICATION PERMISSIONS ===================================== - - -// These permissions are granted by default to all web applications -// In addition, a web application will be given a read FilePermission -// and JndiPermission for all files and directories in its document root. -grant { - // Required for JNDI lookup of named JDBC DataSource's and - // javamail named MimePart DataSource used to send mail - permission java.util.PropertyPermission "java.home", "read"; - permission java.util.PropertyPermission "java.naming.*", "read"; - permission java.util.PropertyPermission "javax.sql.*", "read"; - - // OS Specific properties to allow read access - permission java.util.PropertyPermission "os.name", "read"; - permission java.util.PropertyPermission "os.version", "read"; - permission java.util.PropertyPermission "os.arch", "read"; - permission java.util.PropertyPermission "file.separator", "read"; - permission java.util.PropertyPermission "path.separator", "read"; - permission java.util.PropertyPermission "line.separator", "read"; - - // JVM properties to allow read access - permission java.util.PropertyPermission "java.version", "read"; - permission java.util.PropertyPermission "java.vendor", "read"; - permission java.util.PropertyPermission "java.vendor.url", "read"; - permission java.util.PropertyPermission "java.class.version", "read"; - permission java.util.PropertyPermission "java.specification.version", "read"; - permission java.util.PropertyPermission "java.specification.vendor", "read"; - permission java.util.PropertyPermission "java.specification.name", "read"; - - permission java.util.PropertyPermission "java.vm.specification.version", "read"; - permission java.util.PropertyPermission "java.vm.specification.vendor", "read"; - permission java.util.PropertyPermission "java.vm.specification.name", "read"; - permission java.util.PropertyPermission "java.vm.version", "read"; - permission java.util.PropertyPermission "java.vm.vendor", "read"; - permission java.util.PropertyPermission "java.vm.name", "read"; - - // Required for OpenJMX - permission java.lang.RuntimePermission "getAttribute"; - - // Allow read of JAXP compliant XML parser debug - permission java.util.PropertyPermission "jaxp.debug", "read"; - - // Precompiled JSPs need access to this package. - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime.*"; - -}; - - -// You can assign additional permissions to particular web applications by -// adding additional "grant" entries here, based on the code base for that -// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files. -// -// Different permissions can be granted to JSP pages, classes loaded from -// the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/ -// directory, or even to individual jar files in the /WEB-INF/lib/ directory. -// -// For instance, assume that the standard "examples" application -// included a JDBC driver that needed to establish a network connection to the -// corresponding database and used the scrape taglib to get the weather from -// the NOAA web server. You might create a "grant" entries like this: -// -// The permissions granted to the context root directory apply to JSP pages. -// grant codeBase "file:${catalina.home}/webapps/examples/-" { -// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; -// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; -// }; -// -// The permissions granted to the context WEB-INF/classes directory -// grant codeBase "file:${catalina.home}/webapps/examples/WEB-INF/classes/-" { -// }; -// -// The permission granted to your JDBC driver -// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar!/-" { -// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; -// }; -// The permission granted to the scrape taglib -// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/scrape.jar!/-" { -// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; -// }; - diff --git a/www-servers/tomcat/files/5.5/examples-cal.patch b/www-servers/tomcat/files/5.5/examples-cal.patch deleted file mode 100644 index 2ede06dc3ff0..000000000000 --- a/www-servers/tomcat/files/5.5/examples-cal.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- servletapi/jsr152/examples/cal/cal2.jsp 2008-08-28 20:14:05.000000000 -0700 -+++ servletapi/jsr152/examples/cal/cal2-new.jsp 2009-03-06 08:39:44.000000000 -0800 -@@ -35,7 +35,7 @@ -
-
-
--
-+
-

Description of the event

-
-
diff --git a/www-servers/tomcat/files/5.5/jsr152_jsr154_examples_build_xml.patch b/www-servers/tomcat/files/5.5/jsr152_jsr154_examples_build_xml.patch deleted file mode 100644 index 9f3a3a2f429d..000000000000 --- a/www-servers/tomcat/files/5.5/jsr152_jsr154_examples_build_xml.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -Naur apache-tomcat-5.5.25-src_orig/servletapi/jsr152/build.xml apache-tomcat-5.5.25-src/servletapi/jsr152/build.xml ---- apache-tomcat-5.5.25-src_orig/servletapi/jsr152/build.xml 2007-09-08 12:24:17.000000000 -0400 -+++ apache-tomcat-5.5.25-src/servletapi/jsr152/build.xml 2007-09-08 14:14:30.000000000 -0400 -@@ -37,6 +37,7 @@ - - - -+ - - - -@@ -244,7 +245,7 @@ - - -- -+ - - - -- -+--> - - - - - -+ - - - -@@ -142,7 +143,7 @@ - - -- -+ - - - - -- -+--> - - - =1.5 to run." - eerror "Please check your VM version, and restart Tomcat." - eend 1 - fi - - # Populate JAVA_HOME - JAVA_HOME=`java-config --jre-home` - - # Set some sane defaults - if [ -z "${CATALINA_TMPDIR}" ] ; then - CATALINA_TMPDIR="${CATALINA_BASE}"/temp - fi - JPDA_TRANSPORT=${JPDA_TRANSPORT:="dt_socket"} - JPDA_ADDRESS=${JPDA_ADDRESS:="8000"} - JPDA_OPTS=${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"} - - # Activate Logging - if [ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]; then - JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \ - -Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties" - fi - - # Populate the classpath - CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/server/lib:${JAVA_HOME}/lib/tools.jar" - if [ -n "${JSSE_HOME}" ]; then - CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar" - fi - CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/commons-logging-api.jar" - - OPTS_CP="${JAVA_OPTS} ${CATALINA_OPTS} \ - -Djava.endorsed.dirs=${CATALINA_HOME}/common/endorsed \ - -classpath ${CLASSPATH}" - - CATALINA_ARGS="-Dcatalina.base=${CATALINA_BASE} \ - -Dcatalina.home=${CATALINA_HOME} \ - -Djava.io.tmpdir=${CATALINA_TMPDIR} \ - org.apache.catalina.startup.Bootstrap " - - if [ ! -f "${CATALINA_BASE}logs/catalina.out" ]; then - touch "${CATALINA_BASE}logs/catalina.out" - chown tomcat:tomcat "${CATALINA_BASE}logs/catalina.out" - fi -} - -start_helper() { - local executor=${1} - shift - local arguments="--start --quiet \ - --chdir "${CATALINA_TMPDIR}" \ - --chuid ${CATALINA_USER}:${CATALINA_GROUP} \ - --make-pidfile --pidfile /var/run/tomcat-5.5.pid" - start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" \ - ${CATALINA_ARGS} ${TOMCAT_START} >> "${CATALINA_BASE}"/logs/catalina.out 2>&1 & - return $? -} - -depend() { - use dns logger net -} - -start() { - ebegin "Starting Tomcat" - init_env_vars - - if [ ! -e "${CATALINA_TMPDIR}" ]; then - eerror "CATALINA_TMPDIR does not exist. Unable to start tomcat." - eerror "Please see /etc/conf.d/tomcat-6 for more information." - eend 1 - fi - - # Figure out what arguments to pass start_helper based on TOMCAT_START - if [ "${TOMCAT_START}" = "debug" ] ; then - start_helper ${JAVA_HOME}/bin/jdb \ - -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share - elif [ "${TOMCAT_START}" = "-security debug" ] ; then - start_helper ${JAVA_HOME}/bin/jdb \ - -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \ - -Djava.security.manager \ - -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy - elif [ "${TOMCAT_START}" = "jpda start" ] ; then - start_helper ${JAVA_HOME}/bin/java ${JPDA_OPTS} - elif [ "${TOMCAT_START}" = "start" ] ; then - start_helper ${JAVA_HOME}/bin/java - elif [ "${TOMCAT_START}" = "-security start" ] ; then - start_helper ${JAVA_HOME}/bin/java \ - -Djava.security.manager \ - -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy - else - eerror "Invalid TOMCAT_START variable value, or one is not set" - eerror "Please see /etc/conf.d/tomcat-5.5 for more information" - eend 1 - fi - eend $? -} - -stop() { - ebegin "Stopping Tomcat" - init_env_vars - start-stop-daemon --stop --quiet \ - --pidfile /var/run/tomcat-5.5.pid \ - --exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} ${STD_OUT} stop - eend $? -} diff --git a/www-servers/tomcat/metadata.xml b/www-servers/tomcat/metadata.xml index a570037ceb4a..349379c953f8 100644 --- a/www-servers/tomcat/metadata.xml +++ b/www-servers/tomcat/metadata.xml @@ -8,7 +8,4 @@ The Java Servlet and JavaServer Pages specifications are developed by Sun under the Java Community Process. - - Enable Tomcat admin webapp - diff --git a/www-servers/tomcat/tomcat-5.5.27-r4.ebuild b/www-servers/tomcat/tomcat-5.5.27-r4.ebuild deleted file mode 100644 index fdd2dbf463f6..000000000000 --- a/www-servers/tomcat/tomcat-5.5.27-r4.ebuild +++ /dev/null @@ -1,310 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27-r4.ebuild,v 1.3 2011/11/03 00:46:33 vapier Exp $ - -EAPI="2" -JAVA_PKG_IUSE="doc source" -WANT_ANT_TASKS="ant-trax" - -inherit eutils java-pkg-2 java-ant-2 user - -DESCRIPTION="Tomcat Servlet-2.4/JSP-2.0 Container" - -MY_P="apache-${P}-src" -SLOT="5.5" -SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz" -HOMEPAGE="http://tomcat.apache.org/" -KEYWORDS="amd64 -ppc -ppc64 x86 ~x86-fbsd" -LICENSE="Apache-2.0" - -IUSE="admin examples test" - -RDEPEND="dev-java/eclipse-ecj:3.3 - dev-java/ant-eclipse-ecj:3.3 - dev-java/commons-beanutils:1.7 - >=dev-java/commons-collections-3.1 - >=dev-java/commons-daemon-1.0.1 - >=dev-java/commons-dbcp-1.2.1 - >=dev-java/commons-digester-1.7 - >=dev-java/commons-fileupload-1.1 - dev-java/commons-httpclient:0 - >=dev-java/commons-io-1.1 - >=dev-java/commons-el-1.0 - >=dev-java/commons-launcher-0.9 - >=dev-java/commons-logging-1.0.4 - >=dev-java/commons-modeler-2.0 - >=dev-java/commons-pool-1.2 - =dev-java/junit-3* - >=dev-java/log4j-1.2.9 - >=dev-java/saxpath-1.0 - >=dev-java/tomcat-servlet-api-${PV}-r1:2.4 - dev-java/ant-core - admin? ( dev-java/struts:1.2 ) - dev-java/sun-javamail - >=virtual/jre-1.5" -DEPEND=">=virtual/jdk-1.5 - ${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -TOMCAT_NAME="${PN}-${SLOT}" -WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps" - -pkg_setup() { - java-pkg-2_pkg_setup - # new user for tomcat - enewgroup tomcat - enewuser tomcat -1 -1 /dev/null tomcat - - java-pkg_filter-compiler ecj-3.1 ecj-3.2 -} - -java_prepare() { - epatch "${FILESDIR}/${SLOT}/26-main_tomcat_catalina_jasper_build_xml.patch" - # https://issues.apache.org/bugzilla/show_bug.cgi?id=45827 - epatch "${FILESDIR}/${SLOT}/5.5.27-dynamic-JSSE13Factory.patch" - epatch "${FILESDIR}/${SLOT}/examples-cal.patch" - - use examples && epatch "${FILESDIR}/${SLOT}/jsr152_jsr154_examples_build_xml.patch" - - sed -i -e 's:${struts.lib}:/usr/share/struts-1.2:' \ - "${S}/container/webapps/admin/build.xml" - - einfo "Removing 1.3 factories to so we don't need com.sun.*" - rm -v connectors/util/java/org/apache/tomcat/util/net/jsse/*13* || die - - # avoid packed jars :-) - mkdir -p "${S}"/build/build/common - cd "${S}"/build/build - - mkdir ./bin && cd ./bin - java-pkg_jar-from commons-logging commons-logging-api.jar - java-pkg_jar-from commons-daemon - - mkdir "${S}"/build/build/common/lib && cd "${S}"/build/build/common/lib - java-pkg_jar-from ant-core - java-pkg_jar-from commons-collections - java-pkg_jar-from commons-dbcp - java-pkg_jar-from commons-el - java-pkg_jar-from commons-pool - java-pkg_jar-from tomcat-servlet-api-2.4 - - mkdir -p "${S}"/build/build/server/lib && cd "${S}"/build/build/server/lib - java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar - java-pkg_jar-from commons-digester - java-pkg_jar-from commons-modeler - -} - -src_compile(){ - local antflags="-Dbase.path=${T}" - - antflags="${antflags} -Dservletapi.build.notrequired=true" - antflags="${antflags} -Djspapi.build.notrequired=true" - antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)" - antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjars commons-collections)" - antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjars commons-daemon)" - antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)" - antflags="${antflags} -Dcommons-dbcp.jar=$(java-pkg_getjars commons-dbcp)" - antflags="${antflags} -Dcommons-el.jar=$(java-pkg_getjars commons-el)" - antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)" - antflags="${antflags} -Dcommons-httpclient.jar=$(java-pkg_getjars commons-httpclient)" - antflags="${antflags} -Dcommons-io.jar=$(java-pkg_getjars commons-io-1)" - antflags="${antflags} -Dcommons-launcher.jar=$(java-pkg_getjars commons-launcher)" - antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" - antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)" - antflags="${antflags} -Dcommons-pool.jar=$(java-pkg_getjars commons-pool)" - antflags="${antflags} -Dcommons-modeler.jar=$(java-pkg_getjars commons-modeler)" - antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.3 ecj.jar)" - antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.4 jsp-api.jar)" - antflags="${antflags} -Djunit.jar=$(java-pkg_getjars junit)" - antflags="${antflags} -Dlog4j.jar=$(java-pkg_getjars log4j)" - antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail mail.jar)" - antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)" - antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.4 servlet-api.jar)" - if use admin; then - antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)" - antflags="${antflags} -Dstruts.home=/usr/share/struts" - else - antflags="${antflags} -Dadmin.build.notrequired=true" - antflags="${antflags} -Dadmin.precompile.notrequired=true" - fi - if ! use examples; then - antflags="${antflags} -Dexamples.build.notrequired=true" - antflags="${antflags} -Dexamples.precompile.notrequired=true" - fi - antflags="${antflags} -Djasper.home=${S}/jasper" - - eant ${antflags} -} - -src_install() { - cd "${S}"/build/build - - # init.d, conf.d - newinitd "${FILESDIR}"/${SLOT}/tomcat.init.2 ${TOMCAT_NAME} - newconfd "${FILESDIR}"/${SLOT}/tomcat.conf.2 ${TOMCAT_NAME} - - # create dir structure - diropts -m755 -o tomcat -g tomcat - dodir /usr/share/${TOMCAT_NAME} - keepdir /var/log/${TOMCAT_NAME}/ - keepdir /var/tmp/${TOMCAT_NAME}/ - keepdir /var/run/${TOMCAT_NAME}/ - - local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/ - dodir ${CATALINA_BASE} - keepdir ${CATALINA_BASE}/shared/lib - keepdir ${CATALINA_BASE}/shared/classes - - keepdir /usr/share/${TOMCAT_NAME}/common/lib - - dodir /etc/${TOMCAT_NAME} - fperms 750 /etc/${TOMCAT_NAME} - - diropts -m0755 - - # we don't need dos scripts - rm -f bin/*.bat - - # copy the manager and admin context's to the right position - mkdir -p conf/Catalina/localhost - if use admin; then - cp "${S}"/container/webapps/admin/admin.xml \ - conf/Catalina/localhost - fi - cp "${S}"/container/webapps/manager/manager.xml \ - conf/Catalina/localhost - - # make the jars available via java-pkg_getjar and jar-from, etc - base=$(pwd) - libdirs="common/lib server/lib" - for dir in ${libdirs} - do - cd "${dir}" - - for jar in *.jar; - do - # replace the file with a symlink - if [ ! -L ${jar} ]; then - java-pkg_dojar ${jar} - rm -f ${jar} - ln -s ${DESTTREE}/share/${TOMCAT_NAME}/lib/${jar} ${jar} - fi - done - - cd ${base} - done - - # replace a packed struts.jar - if use admin; then - cd server/webapps/admin/WEB-INF/lib - rm -f struts.jar - java-pkg_jar-from struts-1.2 struts.jar - cd ${base} - else - rm -fR server/webapps/admin - fi - - cd server/webapps/manager/WEB-INF/lib - java-pkg_jar-from commons-fileupload - java-pkg_jar-from commons-io-1 - cd ${base} - - # replace the default pw with a random one, see #92281 - local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) - sed -e s:SHUTDOWN:${randpw}: -i conf/{server,server-minimal}.xml - - # copy over the directories - chown -R tomcat:tomcat webapps/* conf/* - cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf" - cp -HR bin common server "${D}"/usr/share/${TOMCAT_NAME} || die "failed to copy" - - # replace catalina.policy with gentoo specific one bug #176701 - cp "${FILESDIR}"/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} || die "failed to replace catalina.policy" - - keepdir ${WEBAPPS_DIR} - set_webapps_perms "${D}"/${WEBAPPS_DIR} - - # Copy over webapps, some controlled by use flags - cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt - cp -pr webapps/ROOT "${D}"${CATALINA_BASE}/webapps - if use doc; then - cp -pr webapps/tomcat-docs "${D}"${CATALINA_BASE}/webapps - fi - if use examples; then - cp -pr webapps/{jsp-examples,servlets-examples,webdav} \ - "${D}"${CATALINA_BASE}/webapps - fi - - # symlink the directories to make CATALINA_BASE possible - dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf - dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs - dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp - dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work - - dodoc "${S}"/build/{RELEASE-NOTES,RUNNING.txt} - fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml -} - -pkg_postinst() { - #due to previous ebuild bloopers, make sure everything is correct - chown root:root /etc/init.d/${TOMCAT_NAME} - chown root:root /etc/conf.d/${TOMCAT_NAME} - - elog - elog " This ebuild implements a new filesystem layout for tomcat" - elog " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml" - elog " for more information!." - elog - ewarn "naming-factory-dbcp.jar is not built at this time. Please fetch" - ewarn "jar from upstream binary if you need it. Gentoo Bug # 144276" - elog - elog " Please file any bugs at http://bugs.gentoo.org/ or else it" - elog " may not get seen. Thank you." - elog -} - -#helpers -set_webapps_perms() { - chown tomcat:tomcat ${1} || die "Failed to change owner off ${1}." - chmod 750 ${1} || die "Failed to change permissions off ${1}." -} - -pkg_config() { - # Better suggestions are welcome - local currentdir=$(egethome tomcat) - - elog "The default home directory for Tomcat is /dev/null." - elog "You need to change it if your applications needs it to" - elog "be an actual directory. Current home directory:" - elog "${currentdir}" - elog "" - elog "Do you want to change it [yes/no]?" - - local answer - read answer - - if [[ "${answer}" == "yes" ]]; then - elog "" - elog "Suggestions:" - elog "${WEBAPPS_DIR}" - elog "" - elog "If you want to suggest a directory, file a bug to" - elog "http://bugs.gentoo.org" - elog "" - elog "Enter home directory:" - - local homedir - read homedir - - elog "" - elog "Setting home directory to: ${homedir}" - - /usr/sbin/usermod -d"${homedir}" tomcat - - elog "You can run emerge --config =${PF}" - elog "again to change to homedir" - elog "at any time." - fi -} diff --git a/www-servers/tomcat/tomcat-5.5.27-r5.ebuild b/www-servers/tomcat/tomcat-5.5.27-r5.ebuild deleted file mode 100644 index 2a3bbcc5f430..000000000000 --- a/www-servers/tomcat/tomcat-5.5.27-r5.ebuild +++ /dev/null @@ -1,311 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27-r5.ebuild,v 1.2 2011/11/03 00:46:33 vapier Exp $ - -EAPI="2" -JAVA_PKG_IUSE="doc source" -WANT_ANT_TASKS="ant-trax" - -inherit eutils java-pkg-2 java-ant-2 user - -DESCRIPTION="Tomcat Servlet-2.4/JSP-2.0 Container" - -MY_P="apache-${P}-src" -SLOT="5.5" -SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz" -HOMEPAGE="http://tomcat.apache.org/" -KEYWORDS="~amd64 -ppc -ppc64 ~x86 ~x86-fbsd" -LICENSE="Apache-2.0" - -IUSE="admin examples test" - -RDEPEND="dev-java/eclipse-ecj:3.3 - dev-java/ant-eclipse-ecj:3.3 - dev-java/commons-beanutils:1.7 - >=dev-java/commons-collections-3.1 - >=dev-java/commons-daemon-1.0.1 - >=dev-java/commons-dbcp-1.2.1 - >=dev-java/commons-digester-1.7 - >=dev-java/commons-fileupload-1.1 - dev-java/commons-httpclient:0 - >=dev-java/commons-io-1.1 - >=dev-java/commons-el-1.0 - >=dev-java/commons-launcher-0.9 - >=dev-java/commons-logging-1.0.4 - >=dev-java/commons-modeler-2.0 - >=dev-java/commons-pool-1.2 - =dev-java/junit-3* - >=dev-java/log4j-1.2.9 - >=dev-java/saxpath-1.0 - >=dev-java/tomcat-servlet-api-${PV}-r1:2.4 - dev-java/ant-core - admin? ( dev-java/struts:1.2 ) - dev-java/sun-javamail - >=virtual/jre-1.5" -DEPEND=">=virtual/jdk-1.5 - ${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -TOMCAT_NAME="${PN}-${SLOT}" -WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps" - -pkg_setup() { - java-pkg-2_pkg_setup - # new user for tomcat - enewgroup tomcat - enewuser tomcat -1 -1 /dev/null tomcat - - java-pkg_filter-compiler ecj-3.1 ecj-3.2 -} - -java_prepare() { - epatch "${FILESDIR}/${SLOT}/26-main_tomcat_catalina_jasper_build_xml.patch" - # https://issues.apache.org/bugzilla/show_bug.cgi?id=45827 - epatch "${FILESDIR}/${SLOT}/5.5.27-dynamic-JSSE13Factory.patch" - epatch "${FILESDIR}/${SLOT}/examples-cal.patch" - epatch "${FILESDIR}/${SLOT}/build-jspc-classpath.patch" - - use examples && epatch "${FILESDIR}/${SLOT}/jsr152_jsr154_examples_build_xml.patch" - - sed -i -e 's:${struts.lib}:/usr/share/struts-1.2:' \ - "${S}/container/webapps/admin/build.xml" - - einfo "Removing 1.3 factories to so we don't need com.sun.*" - rm -v connectors/util/java/org/apache/tomcat/util/net/jsse/*13* || die - - # avoid packed jars :-) - mkdir -p "${S}"/build/build/common - cd "${S}"/build/build - - mkdir ./bin && cd ./bin - java-pkg_jar-from commons-logging commons-logging-api.jar - java-pkg_jar-from commons-daemon - - mkdir "${S}"/build/build/common/lib && cd "${S}"/build/build/common/lib - java-pkg_jar-from ant-core - java-pkg_jar-from commons-collections - java-pkg_jar-from commons-dbcp - java-pkg_jar-from commons-el - java-pkg_jar-from commons-pool - java-pkg_jar-from tomcat-servlet-api-2.4 - - mkdir -p "${S}"/build/build/server/lib && cd "${S}"/build/build/server/lib - java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar - java-pkg_jar-from commons-digester - java-pkg_jar-from commons-modeler - -} - -src_compile(){ - local antflags="-Dbase.path=${T}" - - antflags="${antflags} -Dservletapi.build.notrequired=true" - antflags="${antflags} -Djspapi.build.notrequired=true" - antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)" - antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjars commons-collections)" - antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjars commons-daemon)" - antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)" - antflags="${antflags} -Dcommons-dbcp.jar=$(java-pkg_getjars commons-dbcp)" - antflags="${antflags} -Dcommons-el.jar=$(java-pkg_getjars commons-el)" - antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)" - antflags="${antflags} -Dcommons-httpclient.jar=$(java-pkg_getjars commons-httpclient)" - antflags="${antflags} -Dcommons-io.jar=$(java-pkg_getjars commons-io-1)" - antflags="${antflags} -Dcommons-launcher.jar=$(java-pkg_getjars commons-launcher)" - antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" - antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)" - antflags="${antflags} -Dcommons-pool.jar=$(java-pkg_getjars commons-pool)" - antflags="${antflags} -Dcommons-modeler.jar=$(java-pkg_getjars commons-modeler)" - antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.3 ecj.jar)" - antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.4 jsp-api.jar)" - antflags="${antflags} -Djunit.jar=$(java-pkg_getjars junit)" - antflags="${antflags} -Dlog4j.jar=$(java-pkg_getjars log4j)" - antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail mail.jar)" - antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)" - antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.4 servlet-api.jar)" - if use admin; then - antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)" - antflags="${antflags} -Dstruts.home=/usr/share/struts" - else - antflags="${antflags} -Dadmin.build.notrequired=true" - antflags="${antflags} -Dadmin.precompile.notrequired=true" - fi - if ! use examples; then - antflags="${antflags} -Dexamples.build.notrequired=true" - antflags="${antflags} -Dexamples.precompile.notrequired=true" - fi - antflags="${antflags} -Djasper.home=${S}/jasper" - - eant ${antflags} -} - -src_install() { - cd "${S}"/build/build - - # init.d, conf.d - newinitd "${FILESDIR}"/${SLOT}/tomcat.init.2 ${TOMCAT_NAME} - newconfd "${FILESDIR}"/${SLOT}/tomcat.conf.2 ${TOMCAT_NAME} - - # create dir structure - diropts -m755 -o tomcat -g tomcat - dodir /usr/share/${TOMCAT_NAME} - keepdir /var/log/${TOMCAT_NAME}/ - keepdir /var/tmp/${TOMCAT_NAME}/ - keepdir /var/run/${TOMCAT_NAME}/ - - local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/ - dodir ${CATALINA_BASE} - keepdir ${CATALINA_BASE}/shared/lib - keepdir ${CATALINA_BASE}/shared/classes - - keepdir /usr/share/${TOMCAT_NAME}/common/lib - - dodir /etc/${TOMCAT_NAME} - fperms 750 /etc/${TOMCAT_NAME} - - diropts -m0755 - - # we don't need dos scripts - rm -f bin/*.bat - - # copy the manager and admin context's to the right position - mkdir -p conf/Catalina/localhost - if use admin; then - cp "${S}"/container/webapps/admin/admin.xml \ - conf/Catalina/localhost - fi - cp "${S}"/container/webapps/manager/manager.xml \ - conf/Catalina/localhost - - # make the jars available via java-pkg_getjar and jar-from, etc - base=$(pwd) - libdirs="common/lib server/lib" - for dir in ${libdirs} - do - cd "${dir}" - - for jar in *.jar; - do - # replace the file with a symlink - if [ ! -L ${jar} ]; then - java-pkg_dojar ${jar} - rm -f ${jar} - ln -s ${DESTTREE}/share/${TOMCAT_NAME}/lib/${jar} ${jar} - fi - done - - cd ${base} - done - - # replace a packed struts.jar - if use admin; then - cd server/webapps/admin/WEB-INF/lib - rm -f struts.jar - java-pkg_jar-from struts-1.2 struts.jar - cd ${base} - else - rm -fR server/webapps/admin - fi - - cd server/webapps/manager/WEB-INF/lib - java-pkg_jar-from commons-fileupload - java-pkg_jar-from commons-io-1 - cd ${base} - - # replace the default pw with a random one, see #92281 - local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) - sed -e s:SHUTDOWN:${randpw}: -i conf/{server,server-minimal}.xml - - # copy over the directories - chown -R tomcat:tomcat webapps/* conf/* - cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf" - cp -HR bin common server "${D}"/usr/share/${TOMCAT_NAME} || die "failed to copy" - - # replace catalina.policy with gentoo specific one bug #176701 - cp "${FILESDIR}"/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} || die "failed to replace catalina.policy" - - keepdir ${WEBAPPS_DIR} - set_webapps_perms "${D}"/${WEBAPPS_DIR} - - # Copy over webapps, some controlled by use flags - cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt - cp -pr webapps/ROOT "${D}"${CATALINA_BASE}/webapps - if use doc; then - cp -pr webapps/tomcat-docs "${D}"${CATALINA_BASE}/webapps - fi - if use examples; then - cp -pr webapps/{jsp-examples,servlets-examples,webdav} \ - "${D}"${CATALINA_BASE}/webapps - fi - - # symlink the directories to make CATALINA_BASE possible - dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf - dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs - dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp - dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work - - dodoc "${S}"/build/{RELEASE-NOTES,RUNNING.txt} - fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml -} - -pkg_postinst() { - #due to previous ebuild bloopers, make sure everything is correct - chown root:root /etc/init.d/${TOMCAT_NAME} - chown root:root /etc/conf.d/${TOMCAT_NAME} - - elog - elog " This ebuild implements a new filesystem layout for tomcat" - elog " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml" - elog " for more information!." - elog - ewarn "naming-factory-dbcp.jar is not built at this time. Please fetch" - ewarn "jar from upstream binary if you need it. Gentoo Bug # 144276" - elog - elog " Please file any bugs at http://bugs.gentoo.org/ or else it" - elog " may not get seen. Thank you." - elog -} - -#helpers -set_webapps_perms() { - chown tomcat:tomcat ${1} || die "Failed to change owner off ${1}." - chmod 750 ${1} || die "Failed to change permissions off ${1}." -} - -pkg_config() { - # Better suggestions are welcome - local currentdir=$(egethome tomcat) - - elog "The default home directory for Tomcat is /dev/null." - elog "You need to change it if your applications needs it to" - elog "be an actual directory. Current home directory:" - elog "${currentdir}" - elog "" - elog "Do you want to change it [yes/no]?" - - local answer - read answer - - if [[ "${answer}" == "yes" ]]; then - elog "" - elog "Suggestions:" - elog "${WEBAPPS_DIR}" - elog "" - elog "If you want to suggest a directory, file a bug to" - elog "http://bugs.gentoo.org" - elog "" - elog "Enter home directory:" - - local homedir - read homedir - - elog "" - elog "Setting home directory to: ${homedir}" - - /usr/sbin/usermod -d"${homedir}" tomcat - - elog "You can run emerge --config =${PF}" - elog "again to change to homedir" - elog "at any time." - fi -}