Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/www-servers
diff options
context:
space:
mode:
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tomcat/ChangeLog11
-rw-r--r--www-servers/tomcat/files/7/7.0.11-build-xml.patch136
-rw-r--r--www-servers/tomcat/files/7/7.0.12-build-xml.patch (renamed from www-servers/tomcat/files/7/7.0.10-build-xml.patch)0
-rw-r--r--www-servers/tomcat/files/7/7.0.8-build-xml.patch137
-rw-r--r--www-servers/tomcat/tomcat-7.0.12.ebuild (renamed from www-servers/tomcat/tomcat-7.0.11.ebuild)2
5 files changed, 11 insertions, 275 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 2a68204f77ff..9c5feb3ed934 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,15 @@
# 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.250 2011/04/05 17:36:16 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.251 2011/04/07 14:13:49 fordfrog Exp $
+
+*tomcat-7.0.12 (07 Apr 2011)
+
+ 07 Apr 2011; Miroslav Šulc <fordfrog@gentoo.org>
+ +files/7/7.0.12-build-xml.patch, -files/7/7.0.8-build-xml.patch,
+ -files/7/7.0.10-build-xml.patch, -files/7/7.0.11-build-xml.patch,
+ -tomcat-7.0.11.ebuild, +tomcat-7.0.12.ebuild:
+ Bumped to latest version. Removed older version as it contains security
+ issue. Also removed orphaned files.
05 Apr 2011; <elvanor@gentoo.org> files/6/tomcat.init.2:
Modified init script for bug #361235 / #191611. Removed the --startas
diff --git a/www-servers/tomcat/files/7/7.0.11-build-xml.patch b/www-servers/tomcat/files/7/7.0.11-build-xml.patch
deleted file mode 100644
index 72d67161fd66..000000000000
--- a/www-servers/tomcat/files/7/7.0.11-build-xml.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- 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" />
--
-+-->
- </target>
-
- <target name="examples-sources" description="Create examples sources"
-@@ -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}"
diff --git a/www-servers/tomcat/files/7/7.0.10-build-xml.patch b/www-servers/tomcat/files/7/7.0.12-build-xml.patch
index 72d67161fd66..72d67161fd66 100644
--- a/www-servers/tomcat/files/7/7.0.10-build-xml.patch
+++ b/www-servers/tomcat/files/7/7.0.12-build-xml.patch
diff --git a/www-servers/tomcat/files/7/7.0.8-build-xml.patch b/www-servers/tomcat/files/7/7.0.8-build-xml.patch
deleted file mode 100644
index d8211bff0dda..000000000000
--- a/www-servers/tomcat/files/7/7.0.8-build-xml.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Naur apache-tomcat-7.0.6-src_orig/build.xml apache-tomcat-7.0.5-src/build.xml
---- apache-tomcat-7.0.6-src_orig/build.xml 2010-12-06 17:20:48.777166339 -0500
-+++ apache-tomcat-7.0.6-src/build.xml 2010-12-06 17:58:10.529303918 -0500
-@@ -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}"
diff --git a/www-servers/tomcat/tomcat-7.0.11.ebuild b/www-servers/tomcat/tomcat-7.0.12.ebuild
index e60568d1a7f7..2e7e3c089921 100644
--- a/www-servers/tomcat/tomcat-7.0.11.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.12.ebuild
@@ -1,6 +1,6 @@
# 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.11.ebuild,v 1.1 2011/03/11 16:28:54 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.12.ebuild,v 1.1 2011/04/07 14:13:49 fordfrog Exp $
EAPI=2
JAVA_PKG_IUSE="doc examples source test"