# 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.264 2011/10/19 20:46:13 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.265 2011/10/22 18:53:30 fordfrog Exp $
+
+ 22 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org> -files/6/build-xml.patch,
+ -files/6/examples-cal.patch, -files/6/tomcat.init,
+ -files/7/7.0.21-build-xml.patch, -tomcat-6.0.26.ebuild,
+ -files/7/build-xml.patch, -tomcat-6.0.26-r2.ebuild,
+ -files/7/examples-cal.patch, -tomcat-6.0.28-r1.ebuild,
+ -tomcat-6.0.29-r1.ebuild, -tomcat-6.0.32-r2.ebuild, -tomcat-7.0.21-r1.ebuild:
+ Removed obsolete files
*tomcat-7.0.22-r1 (19 Oct 2011)
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/build-xml.patch 2786 RMD160 7d05d8c4ddcadf882f918e54c8c51c9c54782944 SHA1 944111d0faacf74c7daabcd3aa07cd68daf4a317 SHA256 ef0d6b59aa09e44c789157200dc472331d46ca30434dfec020edeabf40ca9f30
AUX 6/catalina.policy 6956 RMD160 957ad3b5dc4aeaa5acd289cdaada0a2e48974d52 SHA1 13b65455c8f52fff9d1b09ea67e93ec7a88f1a47 SHA256 9399efda3f6cfc238fb783fb338060e67aff15d0044b31c3d0265e1f9e5769e5
-AUX 6/examples-cal.patch 565 RMD160 85294480f354eb19340bdc7357690ae55ef5a89f SHA1 e9550e02500f2d9da6f4f7b3c7ca79c1934318ea SHA256 caf76c88d3b67d29a7aadca1485accd01270d986e7bc77281a9b30f0b1582b55
AUX 6/tomcat.conf 2895 RMD160 36ece62ddff5257c04f47d75b9c77bd4dc198652 SHA1 8fef42463b7bf186e2f1d1aeb083bdb370603265 SHA256 b04b085618be755ad9e1796fcbcbb8c2e192eefda3b240f1c06b0d9cc88f2ff0
-AUX 6/tomcat.init 3529 RMD160 45aabac31804faff713ca3648f4a675e5ea7ea89 SHA1 f2b499fda69d83aecda72742f88ed8bf64f5cfb3 SHA256 744daa31e36e548f76f2997c3e3430b961163bfe0d2ba2ef6d81f5c2ddb0470c
AUX 6/tomcat.init.2 4034 RMD160 28a47d7e62ac5437eb2c9164f4595bd67b86f676 SHA1 c55f843f15db90e3e0af6069dfefc91daa4e0015 SHA256 55abf160871648ebeca531865b5918846cf298dadc9cdc5cc7ee060a8db487ad
AUX 6/tomcat.init.3 4050 RMD160 d7fe0c83c7e5aeb30f2946c259c9f2bb3fe98aa8 SHA1 1519b957d5c467d604e5422f7876a08d79874ca5 SHA256 726fbfd0961df4a6fb70df17f72144a3f19c1080bd6f1f6abdadd849d5dd343c
-AUX 7/7.0.21-build-xml.patch 4744 RMD160 3d89056a8325ac7bf40f4b49822aff552e570d64 SHA1 87b6d986778e8c085500896feac1d7d0b56e3a9c SHA256 8764f2b11ca68712a8122b3c5995d85a4a3c56b855855ced1dce4ffd7b7bb1c1
AUX 7/7.0.22-build-xml.patch 4744 RMD160 3d89056a8325ac7bf40f4b49822aff552e570d64 SHA1 87b6d986778e8c085500896feac1d7d0b56e3a9c SHA256 8764f2b11ca68712a8122b3c5995d85a4a3c56b855855ced1dce4ffd7b7bb1c1
-AUX 7/build-xml.patch 5561 RMD160 672659e5273a9d6ef450fd29cc171fae56c99c9a SHA1 08714c12a72b1db8490460b10f74d32fc951dacb SHA256 f85ec37d37cc2bceca7877da3271570701a352e087e101e6b3146bdd16f31490
-AUX 7/examples-cal.patch 565 RMD160 85294480f354eb19340bdc7357690ae55ef5a89f SHA1 e9550e02500f2d9da6f4f7b3c7ca79c1934318ea SHA256 caf76c88d3b67d29a7aadca1485accd01270d986e7bc77281a9b30f0b1582b55
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.26-src.tar.gz 3472211 RMD160 84f8ad4d894204a8930fa57633c3aed43bf66cd2 SHA1 afe0aa87d004a89f4ad314314b17bd4e7222250b SHA256 376a02d4fa56c4bbdc981965e62db74aa6c63fe0f056d9c82b4558013a74a88c
-DIST apache-tomcat-6.0.28-src.tar.gz 3325872 RMD160 4a699324f332b8c32fa79615f14681a0fa9924b1 SHA1 0df5e58518607ff738bbf440d829747df6acb9ce SHA256 0d6354d45de39e3593ae8f8e6e1361caaa55835e73838f003000e53c6c7ff73a
-DIST apache-tomcat-6.0.29-src.tar.gz 3330475 RMD160 eb789c63aaf629ec897b4280924e086c969169f6 SHA1 255e080706578be0b0f15c67989718ab94e52837 SHA256 9746483edb46b112a81b57376701c7c23c5c657675c2c7efa3187447c07b9d28
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-7.0.21-src.tar.gz 4040831 RMD160 0648477adec2034c7678c9ca3b41f3b2e3070d6e SHA1 3c71f7a2c1e161e32a86f86daead62620c5b8100 SHA256 7381142eaebfa43f5e77098487ee857f4dc1885c0bed197812eb43adbfb04d2c
DIST apache-tomcat-7.0.22-src.tar.gz 4044650 RMD160 e49636d4555f92a4f56a46aee7fcdec3ede5b1f1 SHA1 588512b2149850b3e6de1ac20c79b54aea074eff SHA256 e907cc65ec38cf9e01995432cc7925c18d03cdbc0dd6baa8f82df2bae83c8486
EBUILD tomcat-5.5.27-r4.ebuild 10058 RMD160 a235794b1e53760c35289566dcaff2446437f53d SHA1 a49fb2db00fbcab78ab8672cdb11a8b0404df671 SHA256 18b69fb66c088a621db636243823701504af0a1dcc16df378e018f1958ecfa01
EBUILD tomcat-5.5.27-r5.ebuild 10119 RMD160 ef3c4d2d31ca81fdc357afdb11c13704ed14a5a1 SHA1 daf3d57e12f9bd8f25465e74be7f3bef945a8db2 SHA256 2dcbf313716d4e208f3c70abc759a9c43cb066705793d1ad94304363b270906f
-EBUILD tomcat-6.0.26-r2.ebuild 6913 RMD160 bdf0aba8f686216106286f7210823387699e1960 SHA1 75ea1850ed3d9f2ab7a2194cefa022e0652e286a SHA256 33fe5868df3c1eb86983fc9c220629947b2ec0538f7467aaafa14ed1571a14a2
-EBUILD tomcat-6.0.26.ebuild 6861 RMD160 38045bfd3921e366823b00061ee327fb17d21bbf SHA1 272759bcbf4744ec404e6c941c2aeac3852c58e8 SHA256 1d8198ae22485ffb11a87690f969f272c6446c3a83b4137bc14b7f1f8a62cba2
-EBUILD tomcat-6.0.28-r1.ebuild 6948 RMD160 dcc281587e6a2bd0dd81808e1fa5d1a4c5a3a7f7 SHA1 57ef17a33196a95e7581cdc6fcba3ba38679da57 SHA256 7af5502722afe40b4e54e4306598b9c86197ef0304022791ac96dbcfc3dbec9e
-EBUILD tomcat-6.0.29-r1.ebuild 6948 RMD160 d340dad22a80e36a03bdc0614fee97ce9e296fe2 SHA1 4885f884254f2475a6ca004e82dcfeed9462de7b SHA256 a6f9cba93f8f07fd184b62ac7aa2830b7d420050c08e13a060db54c77c730e7f
EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b
-EBUILD tomcat-6.0.32-r2.ebuild 6968 RMD160 756ffd21d60906c47031e0bc202d3fc77b21c868 SHA1 a9339169846af791be4a92c5cda053324eaa923a SHA256 ad9c4ce33cb4d998b3447a106f8a9df76dde19ef28b6dd94163362d0aaff3343
EBUILD tomcat-6.0.33.ebuild 6965 RMD160 a3221a02424e3960eec38de7db6f89b406501ec3 SHA1 d7b0e9bb92f4aa232594a63c6245f91c291f15a0 SHA256 c361b1795c611f6d97152a24ccf27ccdfc41e008f7ecf9ea87379b559d44aa50
-EBUILD tomcat-7.0.21-r1.ebuild 7150 RMD160 ee721d42438a969cd2fb158e539d3e6a0c0e8f6d SHA1 459260462dfe3d0cf3b3411d421b428790d42027 SHA256 111de68f76a3deddf5d97663c5f5f1e80093b4a79b695b7cbdec93d58f4d0e67
EBUILD tomcat-7.0.22-r1.ebuild 7061 RMD160 bee674c76e8b18d6f7151b8c97ca7ce518cbec5c SHA1 667080b1585a16af1153d09c65b338a803bd7f4b SHA256 4896d355fcfbd5053584d83b01d6cd94ab965daa61113a26110c44f7eb09ccde
-MISC ChangeLog 66055 RMD160 ca88c3aa1eac397dce5ee20b12df1c88cea885bf SHA1 cb4d2c1ae818dd09974cee6432df81fdd3a93118 SHA256 1d813c844223e54a6bdd5d0e810c521545f77482b066759197aef65cf4ae51f9
+MISC ChangeLog 66461 RMD160 d64d5b2cea301d60a9244ab171b6b5489aa21aeb SHA1 0eb008da10807e6ce935545de1e5514bbf3266b6 SHA256 1d45fe5429a76ef45bd8b492e46665a792be6aeec3c1f81a369302b9b754015a
MISC metadata.xml 521 RMD160 72b6ce433f5c9a65deaa0c1830c070c3adbcf33a SHA1 2c4f4fd887a5df9e955c711d0fcd21a5cab90a2d SHA256 dbab559e58c59eddd5df1c3bb39d17b26fadb587ad5dab51fc6fa7af5e601e22
+++ /dev/null
---- build.xml 2007-05-15 11:29:45.000000000 -0400
-+++ portage/www-servers/tomcat-6.0.13/work/apache-tomcat-6.0.13-src/build.xml 2007-05-15 11:41:46.000000000 -0400
-@@ -96,6 +96,7 @@
- <classpath refid="tomcat.classpath" />
- <exclude name="org/apache/tomcat/util/net/puretls/**" />
- <exclude name="org/apache/naming/factory/webservices/**" />
-+ <exclude name="javax/servlet/**" />
- </javac>
- <tstamp>
- <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
-@@ -135,27 +136,27 @@
- </fileset>
- </jar>
-
-- <!-- Servlet 2.5 Implementation JAR File -->
-+ <!-- Servlet 2.5 Implementation JAR File
- <jar jarfile="${servlet-api.jar}">
- <fileset dir="${tomcat.classes}">
- <include name="javax/servlet/*" />
- <include name="javax/servlet/http/*" />
- <include name="javax/servlet/resources/*" />
-- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-+ -->
-
-- <!-- JSP 2.1 Implementation JAR File -->
-+ <!-- JSP 2.1 Implementation JAR File
- <jar jarfile="${jsp-api.jar}">
- <fileset dir="${tomcat.classes}">
- <include name="javax/servlet/jsp/**" />
-- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-+ -->
-
- <!-- JSP 2.1 EL Implementation JAR File -->
- <jar jarfile="${el-api.jar}">
-@@ -302,7 +303,7 @@
-
- </target>
-
-- <target name="build-docs">
-+ <target name="build-docs" unless="nobuild.docs">
-
- <copy todir="${tomcat.build}/webapps">
- <fileset dir="webapps">
-@@ -453,11 +454,16 @@
-
- <target name="deploy" depends="build-only,build-docs">
-
-+<!--
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
-+-->
-
- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
-+
-+<!--
- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" />
-+-->
-
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
-@@ -494,7 +500,7 @@
- destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
- debug="${compile.debug}" deprecation="${compile.deprecation}"
- optimize="${compile.optimize}"
-- classpath="${tomcat.classes}"
-+ classpath="${tomcat.classes}:${jsp-api.jar}"
- excludes="**/CVS/**,**/.svn/**">
- </javac>
-
-@@ -506,8 +512,10 @@
- excludes="**/CVS/**,**/.svn/**">
- </javac>
-
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" />
- <copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
-+-->
-
- </target>
-
+++ /dev/null
---- webapps/examples/jsp/cal/cal2.jsp 2008-07-21 17:01:28.000000000 -0700
-+++ webapps/examples/jsp/cal/cal2-new.jsp 2009-03-06 08:22:39.000000000 -0800
-@@ -35,7 +35,7 @@
- <FORM METHOD=POST ACTION=cal1.jsp>
- <BR>
- <BR> <INPUT NAME="date" TYPE=HIDDEN VALUE="current">
--<BR> <INPUT NAME="time" TYPE=HIDDEN VALUE=<%= util.HTMLFilter.filter(time) %>
-+<BR> <INPUT NAME="time" TYPE=HIDDEN VALUE="<%= util.HTMLFilter.filter(time) %>">
- <BR> <h2> Description of the event <INPUT NAME="description" TYPE=TEXT SIZE=20> </h2>
- <BR> <INPUT TYPE=SUBMIT VALUE="submit">
- </FORM>
+++ /dev/null
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.10 2008/12/20 18:12:23 serkan Exp $
-
-init_env_vars() {
- # 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}/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/tomcat-juli.jar"
-
- OPTS_CP="${JAVA_OPTS} ${CATALINA_OPTS} -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-6.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-6 for more information"
- eend 1
- fi
- eend $?
-}
-
-stop() {
- ebegin "Stopping Tomcat"
- init_env_vars
- start-stop-daemon --stop --quiet \
- --pidfile /var/run/tomcat-6.pid \
- --exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} stop ${STD_OUT}
- eend $?
-}
+++ /dev/null
---- build.xml.orig 2011-03-05 14:11:01.000000000 +0100
-+++ build.xml 2011-03-08 17:39:53.752257789 +0100
-@@ -147,6 +147,7 @@
-
- <!-- Classpaths -->
- <path id="compile.classpath">
-+ <pathelement location="${ant.jar}"/>
- <pathelement location="${jdt.jar}"/>
- </path>
-
-@@ -291,6 +292,7 @@
- <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
- <exclude name="org/apache/catalina/tribes/**" />
- <exclude name="org/apache/naming/factory/webservices/**" />
-+ <exclude name="javax/servlet/**" />
- </patternset>
-
- <patternset id="files.catalina-tribes">
-@@ -420,7 +422,7 @@
-
- </target>
-
-- <target name="validate" depends="download-validate" if="${execute.validate}">
-+ <target name="validate" if="${execute.validate}">
- <!-- Required so we can cache checkstyle results -->
- <mkdir dir="${tomcat.output}/res/checkstyle"/>
-
-@@ -464,7 +466,7 @@
- </checkstyle>
- </target>
-
-- <target name="compile" depends="build-prepare,download-compile,validate">
-+ <target name="compile" depends="build-prepare,validate">
-
- <!-- Compile internal server components -->
- <javac srcdir="java" destdir="${tomcat.classes}"
-@@ -525,7 +527,7 @@
- filesId="files.annotations-api"
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
-- <!-- Servlet 3.0 Implementation JAR File -->
-+<!-- Servlet 3.0 Implementation JAR File
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -533,7 +535,7 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-
-- <!-- JSP 2.2 Implementation JAR File -->
-+ JSP 2.2 Implementation JAR File
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
-@@ -541,12 +543,12 @@
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-
-- <!-- JSP 2.2 EL Implementation JAR File -->
-+ 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}"
- filesDir="${tomcat.classes}"
-@@ -637,7 +639,7 @@
-
- </target>
-
-- <target name="build-docs" description="Builds all documentation from XML sources">
-+ <target name="build-docs" unless="nobuild.docs" description="Builds all documentation from XML sources">
-
- <copy todir="${tomcat.build}/webapps">
- <fileset dir="webapps">
-@@ -745,14 +747,14 @@
-
- <target name="deploy" depends="package,build-docs"
- 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">
-@@ -809,7 +811,7 @@
- source="${compile.source}"
- target="${compile.target}"
- optimize="${compile.optimize}"
-- classpath="${tomcat.classes}"
-+ classpath="${tomcat.classes}:${jsp-api.jar}"
- excludes="**/CVS/**,**/.svn/**"
- encoding="ISO-8859-1"
- includeantruntime="false">
-@@ -821,7 +823,7 @@
- source="${compile.source}"
- target="${compile.target}"
- optimize="${compile.optimize}"
-- classpath="$tomcat.lcasses}"
-+ classpath="${tomcat.classes}:${jsp-api.jar}"
- excludes="**/CVS/**,**/.svn/**"
- encoding="ISO-8859-1"
- includeantruntime="false">
-@@ -829,11 +831,11 @@
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
--
-+-->
- <!-- 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}" inheritall="false" target="build">
-@@ -1008,7 +1010,7 @@
-
- </target>
-
-- <target name="test-compile" depends="compile,download-test-compile" >
-+ <target name="test-compile" depends="compile" >
- <mkdir dir="${test.classes}"/>
- <!-- Compile -->
- <javac srcdir="test" destdir="${test.classes}"
+++ /dev/null
-diff -Naur apache-tomcat-7.0.5-src_orig/build.xml apache-tomcat-7.0.5-src/build.xml
---- apache-tomcat-7.0.5-src_orig/build.xml 2010-12-06 17:20:48.777166339 -0500
-+++ apache-tomcat-7.0.5-src/build.xml 2010-12-06 17:58:10.529303918 -0500
-@@ -38,9 +38,9 @@
- <!-- Version numbers -->
- <property name="version.major" value="7" />
- <property name="version.minor" value="0" />
-- <property name="version.build" value="0" />
-+ <property name="version.build" value="5" />
- <property name="version.patch" value="0" />
-- <property name="version.suffix" value="-dev" />
-+ <property name="version.suffix" value="-gentoo" />
-
- <property name="version" value="${version.major}.${version.minor}.${version.build}${version.suffix}" />
- <property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
-@@ -149,6 +149,7 @@
-
- <!-- Classpaths -->
- <path id="compile.classpath">
-+ <pathelement location="${ant.jar}"/>
- <pathelement location="${jdt.jar}"/>
- </path>
-
-@@ -291,6 +292,7 @@
- <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
- <exclude name="org/apache/catalina/tribes/**" />
- <exclude name="org/apache/naming/factory/webservices/**" />
-+ <exclude name="javax/servlet/**" />
- </patternset>
-
- <patternset id="files.catalina-tribes">
-@@ -420,7 +422,7 @@
-
- </target>
-
-- <target name="validate" depends="download-validate" if="${execute.validate}">
-+ <target name="validate" if="${execute.validate}">
- <taskdef resource="checkstyletask.properties"
- classpath="${checkstyle.jar}" />
- <checkstyle config="checkstyle.xml">
-@@ -437,7 +439,7 @@
- </checkstyle>
- </target>
-
-- <target name="compile" depends="build-prepare,download-compile,validate">
-+ <target name="compile" depends="build-prepare,validate">
-
- <!-- Compile internal server components -->
- <javac srcdir="java" destdir="${tomcat.classes}"
-@@ -498,7 +500,7 @@
- filesId="files.annotations-api"
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
-- <!-- Servlet 3.0 Implementation JAR File -->
-+<!-- Servlet 3.0 Implementation JAR File
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -506,7 +508,7 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
-
-- <!-- JSP 2.2 Implementation JAR File -->
-+ JSP 2.2 Implementation JAR File
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
-@@ -514,12 +516,12 @@
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
-
-- <!-- JSP 2.2 EL Implementation JAR File -->
-+ 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}"
- filesDir="${tomcat.classes}"
-@@ -610,7 +612,7 @@
-
- </target>
-
-- <target name="build-docs" description="Builds all documentation from XML sources">
-+ <target name="build-docs" unless="nobuild.docs" description="Builds all documentation from XML sources">
-
- <copy todir="${tomcat.build}/webapps">
- <fileset dir="webapps">
-@@ -718,14 +720,14 @@
-
- <target name="deploy" depends="package,build-docs"
- 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">
-@@ -782,7 +784,7 @@
- source="${compile.source}"
- target="${compile.target}"
- optimize="${compile.optimize}"
-- classpath="${tomcat.classes}"
-+ classpath="${tomcat.classes}:${jsp-api.jar}"
- excludes="**/CVS/**,**/.svn/**"
- encoding="ISO-8859-1"
- includeantruntime="false">
-@@ -794,7 +796,7 @@
- source="${compile.source}"
- target="${compile.target}"
- optimize="${compile.optimize}"
-- classpath="$tomcat.lcasses}"
-+ classpath="${tomcat.classes}:${jsp-api.jar}"
- excludes="**/CVS/**,**/.svn/**"
- encoding="ISO-8859-1"
- includeantruntime="false">
-@@ -802,11 +804,11 @@
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
--
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
--
-+-->
- </target>
-
- <target name="examples-sources" description="Create examples sources"
-@@ -946,7 +948,7 @@
- description="Creates the experimental embedded release"
- depends="embed,embed-sources,embed-extras" />
-
-- <target name="test-compile" depends="compile,download-test-compile" >
-+ <target name="test-compile" depends="compile" >
- <mkdir dir="${test.classes}"/>
- <!-- Compile -->
- <javac srcdir="test" destdir="${test.classes}"
+++ /dev/null
---- webapps/examples/jsp/cal/cal2.jsp 2008-07-21 17:01:28.000000000 -0700
-+++ webapps/examples/jsp/cal/cal2-new.jsp 2009-03-06 08:22:39.000000000 -0800
-@@ -35,7 +35,7 @@
- <FORM METHOD=POST ACTION=cal1.jsp>
- <BR>
- <BR> <INPUT NAME="date" TYPE=HIDDEN VALUE="current">
--<BR> <INPUT NAME="time" TYPE=HIDDEN VALUE=<%= util.HTMLFilter.filter(time) %>
-+<BR> <INPUT NAME="time" TYPE=HIDDEN VALUE="<%= util.HTMLFilter.filter(time) %>">
- <BR> <h2> Description of the event <INPUT NAME="description" TYPE=TEXT SIZE=20> </h2>
- <BR> <INPUT TYPE=SUBMIT VALUE="submit">
- </FORM>
+++ /dev/null
-# 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-6.0.26-r2.ebuild,v 1.1 2011/01/18 18:02:20 fordfrog Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-
-MY_P="apache-${P}-src"
-SLOT="6"
-SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-java/eclipse-ecj:3.3
- dev-java/ant-eclipse-ecj:3.3
- >=dev-java/commons-dbcp-1.2.1
- >=dev-java/commons-logging-1.1
- >=dev-java/commons-pool-1.2
- ~dev-java/tomcat-servlet-api-${PV}
- examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND=">=virtual/jre-1.5
- >=dev-java/commons-daemon-1.0.1
- dev-java/ant-core
- ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
- ${COMMON_DEPEND}
- test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
-# Find out why so
-JAVA_ANT_CELEMENT_REWRITER="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_NEEDS_TOOLS="true"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-2.5,eclipse-ecj-3.3"
-
-EANT_BUILD_TARGET="build-only build-jasper-jdt"
-EANT_DOC_TARGET="build-docs"
-
-EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV} -Dversion.number=${PV}
--Dcompile.debug=false -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
--Dant.jar=ant.jar"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- rm -v webapps/examples/WEB-INF/lib/*.jar || die
-
- # bug # 178980 and #312293
- if use amd64; then
- java-pkg_force-compiler ecj-3.3
- fi
-
- if ! use doc; then
- EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
- fi
-
- EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.3 ecj.jar)"
- java-pkg_jarfrom --build-only ant-core ant.jar
-}
-
-src_install() {
- cd "${S}/bin"
- rm -f *.bat
- chmod 755 *.sh
-
- # register jars per bug #171496
- cd "${S}/output/build/lib/"
- for jar in *.jar; do
- java-pkg_dojar ${jar}
- done
-
- local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
- # init.d, conf.d
- newinitd "${FILESDIR}"/${SLOT}/tomcat.init.2 ${TOMCAT_NAME}
- newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
- # create dir structure
- dodir /usr/share/${TOMCAT_NAME}
-
- diropts -m750 -o tomcat -g tomcat
- dodir /etc/${TOMCAT_NAME}
- keepdir ${WEBAPPS_DIR}
-
- diropts -m755 -o tomcat -g tomcat
- dodir ${CATALINA_BASE}
-
- diropts -m775 -o tomcat -g tomcat
- dodir /etc/${TOMCAT_NAME}/Catalina/localhost
- keepdir /var/log/${TOMCAT_NAME}/
- keepdir /var/run/${TOMCAT_NAME}/
- keepdir /var/tmp/${TOMCAT_NAME}/
-
- cd "${S}"
- # fix context's so webapps will be deployed
- sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager" a:' "${S}"/webapps/host-manager/META-INF/context.xml
- sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager" a:' "${S}"/webapps/manager/META-INF/context.xml
-
- # 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.xml
-
- # copy over the directories
- chown -R tomcat:tomcat webapps/* conf/*
- cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
- cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
- || die "failed to copy"
- # webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
- cd "${S}"/webapps || die
- ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
-
- dodir /usr/share/${TOMCAT_NAME}/webapps
- cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- if use doc; then
- cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- fi
- if use examples; then
- cd "${S}"/webapps/examples/WEB-INF/lib
- java-pkg_jar-from jakarta-jstl jstl.jar
- java-pkg_jar-from jakarta-jstl standard.jar
- cd "${S}"/webapps
- cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- fi
-
- # replace catalina.policy with gentoo specific one bug #176701
-# cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-# || die "failed to replace catalina.policy"
-
- cp "${T}"/tomcat6-deps/jdt/jasper-jdt.jar "${D}"/usr/share/${TOMCAT_NAME}/lib \
- || die "failed to copy"
-
- cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
- java-pkg_jar-from tomcat-servlet-api-2.5
-
- # 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}"/{RELEASE-NOTES,RUNNING.txt}
- fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-
- #install *.sh scripts bug #278059
- exeinto /usr/share/${TOMCAT_NAME}/bin
- doexe "${S}"/bin/*.sh
-}
-
-pkg_postinst() {
- ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
- # temp fix for bug #176097
- chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
- ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
- # bug #180519
- if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
- elog "The latest webapp has NOT been installed into"
- elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
- elog "and we do not want to overwrite any files you have put there."
- elog
- elog "Installing latest webapp into"
- elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
- elog
- elog "Manager Symbolic Links NOT created."
-
- else
- einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
- cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
- "${ROOT}""${WEBAPPS_DIR}"
- # link the manager's context to the right position
- dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
- dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
- fi
-
- elog
- elog " This ebuild implements a FHS compliant layout for tomcat"
- elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
- elog " for more information."
- elog
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
- elog
-
- ewarn "The manager webapps have known exploits, please refer to"
- ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-
- if use examples ; then
- ewarn
- ewarn "The examples webapp has a known exploit, please refer to"
- ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
- ewarn
- fi
-
- elog
- elog " Please report any bugs to http://bugs.gentoo.org/"
- elog
-}
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.6 2010/04/10 21:17:30 caster Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-
-MY_P="apache-${P}-src"
-SLOT="6"
-SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-java/eclipse-ecj:3.3
- dev-java/ant-eclipse-ecj:3.3
- >=dev-java/commons-dbcp-1.2.1
- >=dev-java/commons-logging-1.1
- >=dev-java/commons-pool-1.2
- ~dev-java/tomcat-servlet-api-${PV}
- examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND=">=virtual/jre-1.5
- >=dev-java/commons-daemon-1.0.1
- dev-java/ant-core
- ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
- ${COMMON_DEPEND}
- test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
-# Find out why so
-JAVA_ANT_CELEMENT_REWRITER="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_NEEDS_TOOLS="true"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-2.5,eclipse-ecj-3.3"
-
-EANT_BUILD_TARGET="build-only build-jasper-jdt"
-EANT_DOC_TARGET="build-docs"
-
-EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV} -Dversion.number=${PV}
--Dcompile.debug=false -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
--Dant.jar=ant.jar"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- rm -v webapps/examples/WEB-INF/lib/*.jar || die
-
- # bug # 178980 and #312293
- if use amd64; then
- java-pkg_force-compiler ecj-3.3
- fi
-
- if ! use doc; then
- EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
- fi
-
- EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.3 ecj.jar)"
- java-pkg_jarfrom --build-only ant-core ant.jar
-}
-
-src_install() {
- cd "${S}/bin"
- rm -f *.bat
- chmod 755 *.sh
-
- # register jars per bug #171496
- cd "${S}/output/build/lib/"
- for jar in *.jar; do
- java-pkg_dojar ${jar}
- done
-
- local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
- # init.d, conf.d
- newinitd "${FILESDIR}"/${SLOT}/tomcat.init ${TOMCAT_NAME}
- newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
- # create dir structure
- dodir /usr/share/${TOMCAT_NAME}
-
- diropts -m750 -o tomcat -g tomcat
- dodir /etc/${TOMCAT_NAME}
- keepdir ${WEBAPPS_DIR}
-
- diropts -m755 -o tomcat -g tomcat
- dodir ${CATALINA_BASE}
-
- diropts -m775 -o tomcat -g tomcat
- dodir /etc/${TOMCAT_NAME}/Catalina/localhost
- keepdir /var/log/${TOMCAT_NAME}/
- keepdir /var/run/${TOMCAT_NAME}/
- keepdir /var/tmp/${TOMCAT_NAME}/
-
- cd "${S}"
- # fix context's so webapps will be deployed
- sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager" a:' "${S}"/webapps/host-manager/META-INF/context.xml
- sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager" a:' "${S}"/webapps/manager/META-INF/context.xml
-
- # 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.xml
-
- # copy over the directories
- chown -R tomcat:tomcat webapps/* conf/*
- cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
- cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
- || die "failed to copy"
- # webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
- cd "${S}"/webapps || die
- ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
-
- cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- if use doc; then
- cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- fi
- if use examples; then
- cd "${S}"/webapps/examples/WEB-INF/lib
- java-pkg_jar-from jakarta-jstl jstl.jar
- java-pkg_jar-from jakarta-jstl standard.jar
- cd "${S}"/webapps
- cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- fi
-
- # replace catalina.policy with gentoo specific one bug #176701
-# cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-# || die "failed to replace catalina.policy"
-
- cp "${T}"/tomcat6-deps/jdt/jasper-jdt.jar "${D}"/usr/share/${TOMCAT_NAME}/lib \
- || die "failed to copy"
-
- cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
- java-pkg_jar-from tomcat-servlet-api-2.5
-
- # 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}"/{RELEASE-NOTES,RUNNING.txt}
- fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-
- #install *.sh scripts bug #278059
- exeinto /usr/share/${TOMCAT_NAME}/bin
- doexe "${S}"/bin/*.sh
-}
-
-pkg_postinst() {
- ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
- # temp fix for bug #176097
- chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
- ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
- # bug #180519
- if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
- elog "The latest webapp has NOT been installed into"
- elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
- elog "and we do not want to overwrite any files you have put there."
- elog
- elog "Installing latest webapp into"
- elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
- elog
- elog "Manager Symbolic Links NOT created."
-
- else
- einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
- cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
- "${ROOT}""${WEBAPPS_DIR}"
- # link the manager's context to the right position
- dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
- dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
- fi
-
- elog
- elog " This ebuild implements a FHS compliant layout for tomcat"
- elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
- elog " for more information."
- elog
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
- elog
-
- ewarn "The manager webapps have known exploits, please refer to"
- ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-
- if use examples ; then
- ewarn
- ewarn "The examples webapp has a known exploit, please refer to"
- ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
- ewarn
- fi
-
- elog
- elog " Please report any bugs to http://bugs.gentoo.org/"
- elog
-}
+++ /dev/null
-# 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-6.0.28-r1.ebuild,v 1.1 2011/01/18 18:02:20 fordfrog Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-
-MY_P="apache-${P}-src"
-SLOT="6"
-SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-java/eclipse-ecj:3.3
- dev-java/ant-eclipse-ecj:3.3
- >=dev-java/commons-dbcp-1.2.1
- >=dev-java/commons-logging-1.1
- >=dev-java/commons-pool-1.2
- ~dev-java/tomcat-servlet-api-${PV}
- examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND="
- !<dev-java/tomcat-native-1.1.20
- >=virtual/jre-1.5
- >=dev-java/commons-daemon-1.0.1
- dev-java/ant-core
- ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
- ${COMMON_DEPEND}
- test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
-# Find out why so
-JAVA_ANT_CELEMENT_REWRITER="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_NEEDS_TOOLS="true"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-2.5,eclipse-ecj-3.3"
-
-EANT_BUILD_TARGET="build-only build-jasper-jdt"
-EANT_DOC_TARGET="build-docs"
-
-EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV} -Dversion.number=${PV}
--Dcompile.debug=false -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
--Dant.jar=ant.jar"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- rm -v webapps/examples/WEB-INF/lib/*.jar || die
-
- # bug # 178980 and #312293
- if use amd64; then
- java-pkg_force-compiler ecj-3.3
- fi
-
- if ! use doc; then
- EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
- fi
-
- EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.3 ecj.jar)"
- java-pkg_jarfrom --build-only ant-core ant.jar
-}
-
-src_install() {
- cd "${S}/bin"
- rm -f *.bat
- chmod 755 *.sh
-
- # register jars per bug #171496
- cd "${S}/output/build/lib/"
- for jar in *.jar; do
- java-pkg_dojar ${jar}
- done
-
- local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
- # init.d, conf.d
- newinitd "${FILESDIR}"/${SLOT}/tomcat.init.2 ${TOMCAT_NAME}
- newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
- # create dir structure
- dodir /usr/share/${TOMCAT_NAME}
-
- diropts -m750 -o tomcat -g tomcat
- dodir /etc/${TOMCAT_NAME}
- keepdir ${WEBAPPS_DIR}
-
- diropts -m755 -o tomcat -g tomcat
- dodir ${CATALINA_BASE}
-
- diropts -m775 -o tomcat -g tomcat
- dodir /etc/${TOMCAT_NAME}/Catalina/localhost
- keepdir /var/log/${TOMCAT_NAME}/
- keepdir /var/run/${TOMCAT_NAME}/
- keepdir /var/tmp/${TOMCAT_NAME}/
-
- cd "${S}"
- # fix context's so webapps will be deployed
- sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager" a:' "${S}"/webapps/host-manager/META-INF/context.xml
- sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager" a:' "${S}"/webapps/manager/META-INF/context.xml
-
- # 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.xml
-
- # copy over the directories
- chown -R tomcat:tomcat webapps/* conf/*
- cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
- cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
- || die "failed to copy"
- # webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
- cd "${S}"/webapps || die
- ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
-
- dodir /usr/share/${TOMCAT_NAME}/webapps
- cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- if use doc; then
- cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- fi
- if use examples; then
- cd "${S}"/webapps/examples/WEB-INF/lib
- java-pkg_jar-from jakarta-jstl jstl.jar
- java-pkg_jar-from jakarta-jstl standard.jar
- cd "${S}"/webapps
- cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- fi
-
- # replace catalina.policy with gentoo specific one bug #176701
-# cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-# || die "failed to replace catalina.policy"
-
- cp "${T}"/tomcat6-deps/jdt/jasper-jdt.jar "${D}"/usr/share/${TOMCAT_NAME}/lib \
- || die "failed to copy"
-
- cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
- java-pkg_jar-from tomcat-servlet-api-2.5
-
- # 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}"/{RELEASE-NOTES,RUNNING.txt}
- fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-
- #install *.sh scripts bug #278059
- exeinto /usr/share/${TOMCAT_NAME}/bin
- doexe "${S}"/bin/*.sh
-}
-
-pkg_postinst() {
- ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
- # temp fix for bug #176097
- chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
- ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
- # bug #180519
- if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
- elog "The latest webapp has NOT been installed into"
- elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
- elog "and we do not want to overwrite any files you have put there."
- elog
- elog "Installing latest webapp into"
- elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
- elog
- elog "Manager Symbolic Links NOT created."
-
- else
- einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
- cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
- "${ROOT}""${WEBAPPS_DIR}"
- # link the manager's context to the right position
- dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
- dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
- fi
-
- elog
- elog " This ebuild implements a FHS compliant layout for tomcat"
- elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
- elog " for more information."
- elog
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
- elog
-
- ewarn "The manager webapps have known exploits, please refer to"
- ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-
- if use examples ; then
- ewarn
- ewarn "The examples webapp has a known exploit, please refer to"
- ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
- ewarn
- fi
-
- elog
- elog " Please report any bugs to http://bugs.gentoo.org/"
- elog
-}
+++ /dev/null
-# 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-6.0.29-r1.ebuild,v 1.1 2011/01/18 18:02:20 fordfrog Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-
-MY_P="apache-${P}-src"
-SLOT="6"
-SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-java/eclipse-ecj:3.3
- dev-java/ant-eclipse-ecj:3.3
- >=dev-java/commons-dbcp-1.2.1
- >=dev-java/commons-logging-1.1
- >=dev-java/commons-pool-1.2
- ~dev-java/tomcat-servlet-api-${PV}
- examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND="
- !<dev-java/tomcat-native-1.1.20
- >=virtual/jre-1.5
- >=dev-java/commons-daemon-1.0.1
- dev-java/ant-core
- ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
- ${COMMON_DEPEND}
- test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
-# Find out why so
-JAVA_ANT_CELEMENT_REWRITER="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_NEEDS_TOOLS="true"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-2.5,eclipse-ecj-3.3"
-
-EANT_BUILD_TARGET="build-only build-jasper-jdt"
-EANT_DOC_TARGET="build-docs"
-
-EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV} -Dversion.number=${PV}
--Dcompile.debug=false -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
--Dant.jar=ant.jar"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- rm -v webapps/examples/WEB-INF/lib/*.jar || die
-
- # bug # 178980 and #312293
- if use amd64; then
- java-pkg_force-compiler ecj-3.3
- fi
-
- if ! use doc; then
- EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
- fi
-
- EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.3 ecj.jar)"
- java-pkg_jarfrom --build-only ant-core ant.jar
-}
-
-src_install() {
- cd "${S}/bin"
- rm -f *.bat
- chmod 755 *.sh
-
- # register jars per bug #171496
- cd "${S}/output/build/lib/"
- for jar in *.jar; do
- java-pkg_dojar ${jar}
- done
-
- local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
- # init.d, conf.d
- newinitd "${FILESDIR}"/${SLOT}/tomcat.init.2 ${TOMCAT_NAME}
- newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
- # create dir structure
- dodir /usr/share/${TOMCAT_NAME}
-
- diropts -m750 -o tomcat -g tomcat
- dodir /etc/${TOMCAT_NAME}
- keepdir ${WEBAPPS_DIR}
-
- diropts -m755 -o tomcat -g tomcat
- dodir ${CATALINA_BASE}
-
- diropts -m775 -o tomcat -g tomcat
- dodir /etc/${TOMCAT_NAME}/Catalina/localhost
- keepdir /var/log/${TOMCAT_NAME}/
- keepdir /var/run/${TOMCAT_NAME}/
- keepdir /var/tmp/${TOMCAT_NAME}/
-
- cd "${S}"
- # fix context's so webapps will be deployed
- sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager" a:' "${S}"/webapps/host-manager/META-INF/context.xml
- sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager" a:' "${S}"/webapps/manager/META-INF/context.xml
-
- # 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.xml
-
- # copy over the directories
- chown -R tomcat:tomcat webapps/* conf/*
- cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
- cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
- || die "failed to copy"
- # webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
- cd "${S}"/webapps || die
- ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
-
- dodir /usr/share/${TOMCAT_NAME}/webapps
- cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- if use doc; then
- cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- fi
- if use examples; then
- cd "${S}"/webapps/examples/WEB-INF/lib
- java-pkg_jar-from jakarta-jstl jstl.jar
- java-pkg_jar-from jakarta-jstl standard.jar
- cd "${S}"/webapps
- cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- fi
-
- # replace catalina.policy with gentoo specific one bug #176701
-# cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-# || die "failed to replace catalina.policy"
-
- cp "${T}"/tomcat6-deps/jdt/jasper-jdt.jar "${D}"/usr/share/${TOMCAT_NAME}/lib \
- || die "failed to copy"
-
- cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
- java-pkg_jar-from tomcat-servlet-api-2.5
-
- # 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}"/{RELEASE-NOTES,RUNNING.txt}
- fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-
- #install *.sh scripts bug #278059
- exeinto /usr/share/${TOMCAT_NAME}/bin
- doexe "${S}"/bin/*.sh
-}
-
-pkg_postinst() {
- ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
- # temp fix for bug #176097
- chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
- ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
- # bug #180519
- if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
- elog "The latest webapp has NOT been installed into"
- elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
- elog "and we do not want to overwrite any files you have put there."
- elog
- elog "Installing latest webapp into"
- elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
- elog
- elog "Manager Symbolic Links NOT created."
-
- else
- einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
- cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
- "${ROOT}""${WEBAPPS_DIR}"
- # link the manager's context to the right position
- dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
- dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
- fi
-
- elog
- elog " This ebuild implements a FHS compliant layout for tomcat"
- elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
- elog " for more information."
- elog
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
- elog
-
- ewarn "The manager webapps have known exploits, please refer to"
- ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-
- if use examples ; then
- ewarn
- ewarn "The examples webapp has a known exploit, please refer to"
- ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
- ewarn
- fi
-
- elog
- elog " Please report any bugs to http://bugs.gentoo.org/"
- elog
-}
+++ /dev/null
-# 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-6.0.32-r2.ebuild,v 1.1 2011/02/14 23:09:40 fordfrog Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-
-MY_P="apache-${P}-src"
-SLOT="6"
-SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-java/eclipse-ecj:3.3
- dev-java/ant-eclipse-ecj:3.3
- >=dev-java/commons-dbcp-1.2.1
- >=dev-java/commons-logging-1.1
- >=dev-java/commons-pool-1.2
- ~dev-java/tomcat-servlet-api-${PV}
- examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND="
- !<dev-java/tomcat-native-1.1.20
- >=virtual/jre-1.5
- >=dev-java/commons-daemon-1.0.1
- dev-java/ant-core
- ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
- ${COMMON_DEPEND}
- test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
-# Find out why so
-JAVA_ANT_CELEMENT_REWRITER="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_NEEDS_TOOLS="true"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-2.5,eclipse-ecj-3.3"
-
-EANT_BUILD_TARGET="build-only"
-EANT_DOC_TARGET="build-docs"
-
-EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV} -Dversion.number=${PV}
--Dcompile.debug=false -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
--Dant.jar=ant.jar"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- rm -v webapps/examples/WEB-INF/lib/*.jar || die
-
- # bug # 178980 and #312293
- if use amd64; then
- java-pkg_force-compiler ecj-3.3
- fi
-
- if ! use doc; then
- EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
- fi
-
- EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.3 ecj.jar)"
- java-pkg_jarfrom --build-only ant-core ant.jar
-}
-
-src_install() {
- cd "${S}/bin"
- rm -f *.bat
- chmod 755 *.sh
-
- # register jars per bug #171496
- cd "${S}/output/build/lib/"
- for jar in *.jar; do
- java-pkg_dojar ${jar}
- done
-
- local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
- # init.d, conf.d
- newinitd "${FILESDIR}"/${SLOT}/tomcat.init.3 ${TOMCAT_NAME}
- newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
- # create dir structure
- dodir /usr/share/${TOMCAT_NAME}
-
- diropts -m750 -o tomcat -g tomcat
- dodir /etc/${TOMCAT_NAME}
- keepdir ${WEBAPPS_DIR}
-
- diropts -m755 -o tomcat -g tomcat
- dodir ${CATALINA_BASE}
-
- diropts -m775 -o tomcat -g tomcat
- dodir /etc/${TOMCAT_NAME}/Catalina/localhost
- keepdir /var/log/${TOMCAT_NAME}/
- keepdir /var/run/${TOMCAT_NAME}/
- keepdir /var/tmp/${TOMCAT_NAME}/
-
- cd "${S}"
- # fix context's so webapps will be deployed
- sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager" a:' "${S}"/webapps/host-manager/META-INF/context.xml
- sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager" a:' "${S}"/webapps/manager/META-INF/context.xml
-
- # 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.xml
-
- # copy over the directories
- chown -R tomcat:tomcat webapps/* conf/*
- cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
- cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
- || die "failed to copy"
- # webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
- cd "${S}"/webapps || die
- ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
-
- dodir /usr/share/${TOMCAT_NAME}/webapps
- cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- if use doc; then
- cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- fi
- if use examples; then
- cd "${S}"/webapps/examples/WEB-INF/lib
- java-pkg_jar-from jakarta-jstl jstl.jar
- java-pkg_jar-from jakarta-jstl standard.jar
- cd "${S}"/webapps
- cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- fi
-
- # replace catalina.policy with gentoo specific one bug #176701
-# cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-# || die "failed to replace catalina.policy"
-
-# cp "${T}"/tomcat6-deps/jdt/jasper-jdt.jar "${D}"/usr/share/${TOMCAT_NAME}/lib \
-# || die "failed to copy"
-
- cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
- java-pkg_jar-from tomcat-servlet-api-2.5
- java-pkg_jar-from eclipse-ecj-3.3
-
- # 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}"/{RELEASE-NOTES,RUNNING.txt}
- fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-
- #install *.sh scripts bug #278059
- exeinto /usr/share/${TOMCAT_NAME}/bin
- doexe "${S}"/bin/*.sh
-}
-
-pkg_postinst() {
- ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
- # temp fix for bug #176097
- chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
- ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
- # bug #180519
- if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
- elog "The latest webapp has NOT been installed into"
- elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
- elog "and we do not want to overwrite any files you have put there."
- elog
- elog "Installing latest webapp into"
- elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
- elog
- elog "Manager Symbolic Links NOT created."
-
- else
- einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
- cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
- "${ROOT}""${WEBAPPS_DIR}"
- # link the manager's context to the right position
- dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
- dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
- fi
-
- elog
- elog " This ebuild implements a FHS compliant layout for tomcat"
- elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
- elog " for more information."
- elog
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
- elog
-
- ewarn "The manager webapps have known exploits, please refer to"
- ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-
- if use examples ; then
- ewarn
- ewarn "The examples webapp has a known exploit, please refer to"
- ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
- ewarn
- fi
-
- elog
- elog " Please report any bugs to http://bugs.gentoo.org/"
- elog
-}
+++ /dev/null
-# 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-7.0.21-r1.ebuild,v 1.1 2011/10/18 22:27:52 fordfrog Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-
-MY_P="apache-${P}-src"
-SLOT="7"
-SRC_URI="mirror://apache/${PN}/${PN}-${SLOT}/v${PV}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE=""
-
-# eclipse ecj version/slot (upstream uses version 3.7 which we do not have packaged yet)
-ECJV="3.6"
-
-# servlet-api slot
-SAPIS="3.0"
-
-COMMON_DEPEND="dev-java/eclipse-ecj:${ECJV}
- dev-java/ant-eclipse-ecj:${ECJV}
- >=dev-java/commons-dbcp-1.4
- >=dev-java/commons-logging-1.1
- >=dev-java/commons-pool-1.5.5
- ~dev-java/tomcat-servlet-api-${PV}
- examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND="
- !<dev-java/tomcat-native-1.1.20
- >=virtual/jre-1.6
- >=dev-java/commons-daemon-1.0.3
- dev-java/ant-core
- ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
- ${COMMON_DEPEND}
- test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
-# Find out why so
-JAVA_ANT_CELEMENT_REWRITER="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_NEEDS_TOOLS="true"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPIS},eclipse-ecj-${ECJV}"
-
-EANT_BUILD_TARGET="package"
-EANT_DOC_TARGET="build-docs"
-
-EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV}-gentoo -Dversion.number=${PV}
--Dcompile.debug=false -Del-api.jar=el-api.jar -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
--Dant.jar=ant.jar"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- epatch "${FILESDIR}/${SLOT}/${PV}-build-xml.patch"
-
- rm -v webapps/examples/WEB-INF/lib/*.jar \
- test/webapp-3.0-fragments/WEB-INF/lib/*.jar || die
-
- # bug # 178980 and #312293
- use amd64 && java-pkg_force-compiler eclipse-ecj-${ECJV}
-
- if ! use doc; then
- EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
- fi
-
- EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-${ECJV} ecj.jar)"
- java-pkg_jarfrom --build-only ant-core ant.jar
-}
-
-src_install() {
- cd "${S}/bin"
- rm -f *.bat
- chmod 755 *.sh
-
- # register jars per bug #171496
- cd "${S}/output/build/lib/"
- for jar in *.jar; do
- java-pkg_dojar ${jar}
- done
-
- local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
- # init.d, conf.d
- newinitd "${FILESDIR}"/${SLOT}/tomcat.init ${TOMCAT_NAME}
- newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
- # create dir structure
- dodir /usr/share/${TOMCAT_NAME}
-
- diropts -m750 -o tomcat -g tomcat
- dodir /etc/${TOMCAT_NAME}
- keepdir ${WEBAPPS_DIR}
-
- diropts -m755 -o tomcat -g tomcat
- dodir ${CATALINA_BASE}
-
- diropts -m775 -o tomcat -g tomcat
- dodir /etc/${TOMCAT_NAME}/Catalina/localhost
- keepdir /var/log/${TOMCAT_NAME}/
- keepdir /var/run/${TOMCAT_NAME}/
- keepdir /var/tmp/${TOMCAT_NAME}/
-
- cd "${S}"
- # fix context's so webapps will be deployed
- sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager" a:' "${S}"/webapps/host-manager/META-INF/context.xml
- sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager" a:' "${S}"/webapps/manager/META-INF/context.xml
-
- # 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.xml
-
- # copy over the directories
- chown -R tomcat:tomcat webapps/* conf/*
- cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
- cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
- || die "failed to copy"
- # webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
- cd "${S}"/webapps || die
- ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
-
- dodir /usr/share/${TOMCAT_NAME}/webapps
- cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- if use doc; then
- cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- fi
- if use examples; then
- cd "${S}"/webapps/examples/WEB-INF/lib
- java-pkg_jar-from jakarta-jstl jstl.jar
- java-pkg_jar-from jakarta-jstl standard.jar
- cd "${S}"/webapps
- cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- fi
-
- # replace catalina.policy with gentoo specific one bug #176701
-# cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-# || die "failed to replace catalina.policy"
-
- cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
- java-pkg_jar-from eclipse-ecj-${ECJV}
- java-pkg_jar-from tomcat-servlet-api-${SAPIS}
-
- # 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}"/{RELEASE-NOTES,RUNNING.txt}
- fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-
- #install *.sh scripts bug #278059
- exeinto /usr/share/${TOMCAT_NAME}/bin
- doexe "${S}"/bin/*.sh
-}
-
-pkg_postinst() {
- ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
- # temp fix for bug #176097
- chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
- ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
- # bug #180519
- if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
- elog "The latest webapp has NOT been installed into"
- elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
- elog "and we do not want to overwrite any files you have put there."
- elog
- elog "Installing latest webapp into"
- elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
- elog
- elog "Manager Symbolic Links NOT created."
-
- else
- einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
- cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
- "${ROOT}""${WEBAPPS_DIR}"
- # link the manager's context to the right position
- dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
- dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
- fi
-
- elog
- elog " This ebuild implements a FHS compliant layout for tomcat"
- elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
- elog " for more information."
- elog
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
- elog
-
- ewarn "The manager webapps have known exploits, please refer to"
- ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-
- if use examples ; then
- ewarn
- ewarn "The examples webapp has a known exploit, please refer to"
- ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
- ewarn
- fi
-
- elog
- elog " Please report any bugs to http://bugs.gentoo.org/"
- elog
-}
projects / gentoo.git / commitdiff