[tomcat: 35/66] Resolves rhbz 604686
by Ivan Afonichev
commit ae16f6ac6e4d3af8d09e8e99599b511e0e805cd1
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Wed Dec 1 09:47:50 2010 -0700
Resolves rhbz 604686
tomcat6.spec | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 20497b4..fa2fbbf 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -55,7 +55,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -439,11 +439,18 @@ done
%clean
%{__rm} -rf $RPM_BUILD_ROOT
+
%pre
# add the tomcat user and group
%{_sbindir}/groupadd -g %{tcuid} -r tomcat 2>/dev/null || :
%{_sbindir}/useradd -c "Apache Tomcat" -u %{tcuid} -g tomcat \
-s /bin/sh -r -d %{homedir} tomcat 2>/dev/null || :
+# Save the conf, app, and lib dirs
+# due to rbgz 640686. Copy them to the _tmppath so we don't pollute
+# the tomcat file structure
+[ -d %{appdir} ] && %{__cp} -rp %{appdir} %{_tmppath}/%{name}-webapps.bak || :
+[ -d %{confdir} ] && %{__cp} -rp %{confdir} %{_tmppath}/%{name}-confdir.bak || :
+[ -d %{libdir} ] && %{__cp} -rp %{libdir} %{_tmppath}/%{name}-libdir.bak || :
%post
# install but don't activate
@@ -473,6 +480,22 @@ done
#%{_bindir}/build-jar-repository -p %{appdir}/examples/WEB-INF/lib \
# taglibs-core.jar taglibs-standard.jar 2>&1
+# move the temporary backups to the correct tomcat directory
+# due to rhbz 640686
+%posttrans
+if [ -d %{_tmppath}/%{name}-webapps.bak ]; then
+ %{__cp} -rp %{_tmppath}/%{name}-webapps.bak/* %{appdir}
+ %{__rm} -rf %{_tmppath}/%{name}-webapps.bak
+fi
+if [ -d %{_tmppath}/%{name}-libdir.bak ]; then
+ %{__cp} -rp %{_tmppath}/%{name}-libdir.bak/* %{libdir}
+ %{__rm} -rf %{_tmppath}/%{name}-libdir.bak
+fi
+if [ -d %{_tmppath}/%{name}-confdir.bak ]; then
+ %{__cp} -rp %{_tmppath}/%{name}-confdir.bak/* %{confdir}
+ %{__rm} -rf %{_tmppath}/%{name}-confdir.bak
+fi
+
%preun
# clean tempdir and workdir on removal or upgrade
%{__rm} -rf %{workdir} %{tempdir}
@@ -608,6 +631,12 @@ fi
%{appdir}/sample
%changelog
+* Mon Nov 29 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-14
+- Resolving rhbz 640686: save appdir, confdir, and libdir during
+- pre and copy them back during posttrans. The directories are
+- copied to /var/tmp. They are copied back during posttrans and
+- removed from /var/tmp.
+
* Tue Nov 9 2010 Chris Spike <chris.spike(a)arcor.de> 0:6.0.26-13
- Added javax.servlet:servlet-api depmap entry to servlet-2.5-api subpackage
12 years, 11 months
[tomcat: 34/66] Added javax.servlet:servlet-api depmap entry to servlet-2.5-api subpackage
by Ivan Afonichev
commit efc584784e505043d8264a63098d3a55723fd5bc
Author: spike <spike(a)fedoraproject.org>
Date: Tue Nov 9 16:37:01 2010 +0100
Added javax.servlet:servlet-api depmap entry to servlet-2.5-api subpackage
tomcat6.spec | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 00f979d..20497b4 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -55,7 +55,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -395,6 +395,11 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
%{__ln_s} %{bindir}/tomcat-juli* .
popd
+# Generate a depmap fragment javax.servlet:servlet-api pointing to
+# tomcat6-servlet-2.5-api for backwards compatibility
+%add_to_maven_depmap javax.servlet servlet-api %{servletspec} JPP %{name}-servlet-%{servletspec}-api
+mv %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/%{name}-servlet-api
+
# Install the maven metadata
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir}
pushd %{packdname}/output/dist/src/res/maven
@@ -456,6 +461,7 @@ done
%post servlet-%{servletspec}-api
%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500
+%update_maven_depmap
%post el-%{elspec}-api
%{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \
@@ -499,6 +505,7 @@ fi
if [ "$1" = "0" ]; then
%{_sbindir}/update-alternatives --remove servlet \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
+ %update_maven_depmap
fi
%postun el-%{elspec}-api
@@ -548,7 +555,7 @@ fi
%{homedir}/work
%{homedir}/logs
%{homedir}/conf
-%{_mavendepmapfragdir}/*
+%{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/*.pom
# Exclude the POMs that are in sub-packages
%exclude %{_mavenpomdir}/*api*
@@ -584,6 +591,7 @@ fi
%files servlet-%{servletspec}-api
%defattr(0644,root,root,0755)
%{_javadir}/%{name}-servlet-%{servletspec}*.jar
+%{_mavendepmapfragdir}/%{name}-servlet-api
%{_mavenpomdir}/JPP-%{name}-servlet-api.pom
%files el-%{elspec}-api
@@ -600,6 +608,9 @@ fi
%{appdir}/sample
%changelog
+* Tue Nov 9 2010 Chris Spike <chris.spike(a)arcor.de> 0:6.0.26-13
+- Added javax.servlet:servlet-api depmap entry to servlet-2.5-api subpackage
+
* Thu Oct 14 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-12
- Resolves rhbz#640686 - Upgrade of tomcat6 wipes out directories
- WARNING - Back up all files that need to be preserved before
12 years, 11 months
[tomcat: 33/66] Update Release this time
by Ivan Afonichev
commit 1bb32f30d880ff7f9f3fc12c47c04058e200fac9
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Thu Oct 14 14:13:53 2010 -0600
Update Release this time
tomcat6.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 92b8a67..00f979d 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -55,7 +55,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
12 years, 11 months
[tomcat: 32/66] - Resolves rhbz#640686 - Upgrade of tomcat6 wipes out directories WARNING - Back up all files that n
by Ivan Afonichev
commit e7dc4cc4dac9414424e8e5794c9ee3e096759097
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Thu Oct 14 14:11:37 2010 -0600
- Resolves rhbz#640686 - Upgrade of tomcat6 wipes out directories
WARNING - Back up all files that need to be preserved before
package update or uninstall - WARNING
- Resolves: rhbz#638914 - update versions of commons-collections,
commons-dbcp, and commons-pool
tomcat6.spec | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 06c1f98..92b8a67 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -82,10 +82,12 @@ BuildRequires: ant-nodeps
BuildRequires: ecj
BuildRequires: findutils
BuildRequires: jakarta-commons-collections
-BuildRequires: jakarta-commons-collections-tomcat5
+#BuildRequires: jakarta-commons-collections-tomcat5
BuildRequires: jakarta-commons-daemon
-BuildRequires: jakarta-commons-dbcp-tomcat5
-BuildRequires: jakarta-commons-pool-tomcat5
+#BuildRequires: jakarta-commons-dbcp-tomcat5
+#BuildRequires: jakarta-commons-pool-tomcat5
+BuildRequires: jakarta-commons-dbcp
+BuildRequires: jakarta-commons-pool
BuildRequires: jakarta-taglibs-standard
BuildRequires: java-1.6.0-devel
BuildRequires: jpackage-utils >= 0:1.7.0
@@ -167,9 +169,9 @@ Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
Requires: ecj
-Requires: jakarta-commons-collections-tomcat5
-Requires: jakarta-commons-dbcp-tomcat5
-Requires: jakarta-commons-pool-tomcat5
+Requires: jakarta-commons-collections
+Requires: jakarta-commons-dbcp
+Requires: jakarta-commons-pool
Requires(preun): coreutils
%description lib
@@ -231,12 +233,12 @@ pushd %{packdname}
# who needs a build.properties file anyway
%{ant} -Dbase.path="." \
-Dbuild.compiler="modern" \
- -Dcommons-collections.jar="$(build-classpath commons-collections)" \
+ -Dcommons-collections.jar="$(build-classpath jakarata-commons-collections)" \
-Dcommons-daemon.jar="$(build-classpath commons-daemon)" \
-Dcommons-daemon.jsvc.tar.gz="HACK" \
-Djasper-jdt.jar="$(build-classpath ecj)" \
-Djdt.jar="$(build-classpath ecj)" \
- -Dtomcat-dbcp.jar="HACK" \
+ -Dtomcat-dbcp.jar="$(build-classpath commons-dbcp)" \
-Dtomcat-native.tar.gz="HACK" \
-Dversion="%{version}" \
-Dversion.build="%{micro_version}"
@@ -249,8 +251,7 @@ pushd %{packdname}
output/build/lib/ecj.jar
# remove the cruft we created
%{__rm} output/build/bin/HACK \
- output/build/bin/tomcat-native.tar.gz \
- output/build/lib/HACK
+ output/build/bin/tomcat-native.tar.gz
popd
pushd %{packdname}/output/dist/src/webapps/docs/appdev/sample/src
%{__mkdir_p} ../web/WEB-INF/classes
@@ -338,8 +339,8 @@ pushd ${RPM_BUILD_ROOT}%{_javadir}
popd
pushd %{packdname}/output/build
- %{_bindir}/build-jar-repository lib commons-collections-tomcat5 \
- commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1
+ %{_bindir}/build-jar-repository lib commons-collections \
+ commons-dbcp commons-pool ecj 2>&1
# need to use -p here with b-j-r otherwise the examples webapp fails to
# load with a java.io.IOException
%{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \
@@ -357,11 +358,11 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
%{__ln_s} ../%{name}-jsp-%{jspspec}-api-%{version}.jar .
%{__ln_s} ../%{name}-servlet-%{servletspec}-api-%{version}.jar .
%{__ln_s} ../%{name}-el-%{elspec}-api-%{version}.jar
- %{__cp} -p $(build-classpath commons-collections-tomcat5) .
+ %{__cp} -p $(build-classpath commons-collections) .
%{__cp} -p $(build-classpath log4j) .
%{__ln_s} log4j log4j-%{version}.jar
- %{__ln_s} $(build-classpath commons-dbcp-tomcat5) .
- %{__ln_s} $(build-classpath commons-pool-tomcat5) .
+# %{__ln_s} $(build-classpath commons-dbcp) .
+# %{__ln_s} $(build-classpath commons-pool) .
%{__ln_s} $(build-classpath ecj) jasper-jdt.jar
popd
pushd ${RPM_BUILD_ROOT}%{bindir}
@@ -484,9 +485,9 @@ fi
%postun
%update_maven_depmap
-%{__rm} -rf %{appdir}
-%{__rm} -rf %{confdir}
-%{__rm} -rf %{libdir}
+#%{__rm} -rf %{appdir}
+#%{__rm} -rf %{confdir}
+#%{__rm} -rf %{libdir}
%postun jsp-%{jspspec}-api
if [ "$1" = "0" ]; then
@@ -599,7 +600,14 @@ fi
%{appdir}/sample
%changelog
-* Thu Oct 07 2010 David Knox <dknox(a)redhat.com> 0L6.0.26-11
+* Thu Oct 14 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-12
+- Resolves rhbz#640686 - Upgrade of tomcat6 wipes out directories
+- WARNING - Back up all files that need to be preserved before
+- package update or uninstall - WARNING
+- Resolves: rhbz#638914 - update versions of commons-collections,
+- commons-dbcp, and commons-pool
+
+* Thu Oct 07 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-11
- resolves rhbz#640837 - tomcat user requires login shell
* Mon Oct 04 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-10
12 years, 11 months
[tomcat: 31/66] resolves: rhbz#640837
by Ivan Afonichev
commit 5fa3921fdca7da13ee4307e5d66e08e48309fd6b
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Thu Oct 7 12:25:50 2010 -0600
resolves: rhbz#640837
tomcat6-6.0.init | 4 ++--
tomcat6.spec | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init
index e4e9517..4123f1c 100644
--- a/tomcat6-6.0.init
+++ b/tomcat6-6.0.init
@@ -38,9 +38,9 @@ fi
# For SELinux we need to use 'runuser' not 'su'
if [ -x "/sbin/runuser" ]; then
- SU="/sbin/runuser"
+ SU="/sbin/runuser -s /bin/sh"
else
- SU="/bin/su"
+ SU="/bin/su -s /bin/sh"
fi
# Get the tomcat config (use this for environment specific settings)
diff --git a/tomcat6.spec b/tomcat6.spec
index 2b79798..06c1f98 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -55,7 +55,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -599,6 +599,9 @@ fi
%{appdir}/sample
%changelog
+* Thu Oct 07 2010 David Knox <dknox(a)redhat.com> 0L6.0.26-11
+- resolves rhbz#640837 - tomcat user requires login shell
+
* Mon Oct 04 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-10
- ant-nodeps is breaking the build. Put ant-nodeps on the
- OPT_JAR_LIST
12 years, 11 months
[tomcat: 30/66] adding cve-2010-2227.patch and resolving rhbz#575341
by Ivan Afonichev
commit 1bb926e7cc43b48aafd7309cbd64eaa25f372d13
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Tue Oct 5 09:34:55 2010 -0600
adding cve-2010-2227.patch and resolving rhbz#575341
tomcat6-6.0-CVE-2010-2227.patch | 138 +++++++++++++++++++++++++++++++++++++++
tomcat6.spec | 14 +++-
2 files changed, 148 insertions(+), 4 deletions(-)
---
diff --git a/tomcat6-6.0-CVE-2010-2227.patch b/tomcat6-6.0-CVE-2010-2227.patch
new file mode 100644
index 0000000..4f00c89
--- /dev/null
+++ b/tomcat6-6.0-CVE-2010-2227.patch
@@ -0,0 +1,138 @@
+--- java/org/apache/coyote/http11/Http11AprProcessor.java.orig 2010-07-12 11:52:05.981133000 -0400
++++ java/org/apache/coyote/http11/Http11AprProcessor.java 2010-07-12 11:59:39.205913000 -0400
+@@ -78,6 +78,12 @@
+ protected static StringManager sm =
+ StringManager.getManager(Constants.Package);
+
++ /**
++ * Tracks how many internal filters are in the filter library so they
++ * are skipped whe looking for pluggable filters
++ */
++ private int pluggableFilterIndex = Integer.MAX_VALUE;
++
+
+ // ----------------------------------------------------------- Constructors
+
+@@ -1736,6 +1742,8 @@
+ //inputBuffer.addFilter(new GzipInputFilter());
+ outputBuffer.addFilter(new GzipOutputFilter());
+
++ pluggableFilterIndex = inputBuffer.filterLibrary.length;
++
+ }
+
+
+@@ -1754,7 +1762,7 @@
+ (inputFilters[Constants.CHUNKED_FILTER]);
+ contentDelimitation = true;
+ } else {
+- for (int i = 2; i < inputFilters.length; i++) {
++ for (int i = pluggableFilterIndex; i < inputFilters.length; i++) {
+ if (inputFilters[i].getEncodingName()
+ .toString().equals(encodingName)) {
+ inputBuffer.addActiveFilter(inputFilters[i]);
+--- java/org/apache/coyote/http11/Http11NioProcessor.java.orig 2010-07-12 12:00:05.720580000 -0400
++++ java/org/apache/coyote/http11/Http11NioProcessor.java 2010-07-12 12:19:36.465303000 -0400
+@@ -81,6 +81,12 @@
+ */
+ protected SSLSupport sslSupport;
+
++ /**
++ * Tracks how many internal filters are in the filter library so they
++ * are skipped whe looking for pluggable filters
++ */
++ private int pluggableFilterIndex = Integer.MAX_VALUE;
++
+ // ----------------------------------------------------------- Constructors
+
+
+@@ -1763,6 +1769,8 @@
+ //inputBuffer.addFilter(new GzipInputFilter());
+ outputBuffer.addFilter(new GzipOutputFilter());
+
++ pluggableFilterIndex = inputBuffer.filterLibrary.length;
++
+ }
+
+
+@@ -1781,7 +1789,7 @@
+ (inputFilters[Constants.CHUNKED_FILTER]);
+ contentDelimitation = true;
+ } else {
+- for (int i = 2; i < inputFilters.length; i++) {
++ for (int i = pluggableFilterIndex; i < inputFilters.length; i++) {
+ if (inputFilters[i].getEncodingName()
+ .toString().equals(encodingName)) {
+ inputBuffer.addActiveFilter(inputFilters[i]);
+--- java/org/apache/coyote/http11/Http11Processor.java.orig 2010-07-12 12:20:42.784634000 -0400
++++ java/org/apache/coyote/http11/Http11Processor.java 2010-07-12 12:23:14.996732000 -0400
+@@ -76,6 +76,11 @@
+ protected static boolean isSecurityEnabled =
+ org.apache.coyote.Constants.IS_SECURITY_ENABLED;
+
++ /**
++ * Tracks how many internal filters are in the filter library so they
++ * are skipped whe looking for pluggable filters
++ */
++ private int pluggableFilterIndex = Integer.MAX_VALUE;
+ // ------------------------------------------------------------ Constructor
+
+
+@@ -1642,6 +1647,7 @@
+ //inputBuffer.addFilter(new GzipInputFilter());
+ outputBuffer.addFilter(new GzipOutputFilter());
+
++ pluggableFilterIndex = inputBuffer.filterLibrary.length;
+ }
+
+
+@@ -1660,7 +1666,7 @@
+ (inputFilters[Constants.CHUNKED_FILTER]);
+ contentDelimitation = true;
+ } else {
+- for (int i = 2; i < inputFilters.length; i++) {
++ for (int i = pluggableFilterIndex; i < inputFilters.length; i++) {
+ if (inputFilters[i].getEncodingName()
+ .toString().equals(encodingName)) {
+ inputBuffer.addActiveFilter(inputFilters[i]);
+--- java/org/apache/coyote/http11/filters/BufferedInputFilter.java.orig 2010-01-19 08:43:40.000000000 -0500
++++ java/org/apache/coyote/http11/filters/BufferedInputFilter.java 2010-07-12 13:00:50.374586000 -0400
+@@ -102,10 +102,14 @@
+ }
+
+ public void recycle() {
+- if (buffered.getBuffer().length > 65536) {
+- buffered = null;
+- } else {
+- buffered.recycle();
++ if (buffered != null)
++ {
++ if (buffered.getBuffer().length > 65536)
++ {
++ buffered = null;
++ } else {
++ buffered.recycle();
++ }
+ }
+ tempRead.recycle();
+ hasRead = false;
+
+--- webapps/docs/changelog.xml.orig 2010-07-12 16:08:24.000000000 -0600
++++ webapps/docs/changelog.xml 2010-07-12 16:12:43.000000000 -0600
+@@ -40,6 +40,16 @@
+ Correct TCK failures with security manager caused by the original fix
+ for <bug>47774</bug>. (markt)
+ </fix>
++ <fix>
++ Arange filter logic (jgclere)
++ Several flaws in the handling of the 'Transfer-Encoding' header
++ were found that prevented the recycling of a buffer. A remote
++ attacker could trigger this flaw which would cause subsequent
++ requests to fail and/or information to leak between requests.
++ This flaw is mitigated if Tomcat is behind a reverse proxy
++ (such as Apache httpd 2.2) as the proxy should reject the
++ invalid transfer encoding header.
++ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Other">
diff --git a/tomcat6.spec b/tomcat6.spec
index bab33f6..2b79798 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -55,7 +55,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -74,10 +74,11 @@ Source9: jsp-api-OSGi-MANIFEST.MF
Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties
Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
+Patch2: %{name}-%{major_version}.%{minor_version}-CVE-2010-2227.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
BuildRequires: ant
-BuildRequires: ant-trax
+BuildRequires: ant-nodeps
BuildRequires: ecj
BuildRequires: findutils
BuildRequires: jakarta-commons-collections
@@ -214,13 +215,14 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
pushd %{packdname}
%patch0 -p0
%patch1 -p0
+%patch2 -p0
%{__ln_s} $(build-classpath jakarta-taglibs-core) webapps/examples/WEB-INF/lib/jstl.jar
%{__ln_s} $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar
popd
%build
export CLASSPATH=
-export OPT_JAR_LIST="ant/ant-trax"
+export OPT_JAR_LIST="ant/ant-nodeps"
pushd %{packdname}
# we don't care about the tarballs and we're going to replace
# tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar
@@ -597,7 +599,11 @@ fi
%{appdir}/sample
%changelog
-* Fri Jul 02 2010 David Knox <dknox(a)rehat.com> 0:6.0.26-9
+* Mon Oct 04 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-10
+- ant-nodeps is breaking the build. Put ant-nodeps on the
+- OPT_JAR_LIST
+
+* Fri Oct 01 2010 David Knox <dknox(a)rehat.com> 0:6.0.26-9
- Resolves rhbz#575341 - Additionally created instances of Tomcat
- are broken
12 years, 11 months
[tomcat: 29/66] Change the release this time.
by Ivan Afonichev
commit 0d7ab63ad4478086850184086b62ad521de71f9d
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Wed Sep 29 15:27:41 2010 -0600
Change the release this time.
tomcat6.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index f3a0241..bab33f6 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -55,7 +55,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
12 years, 11 months
[tomcat: 28/66] Changelog entry for rhbz#575341
by Ivan Afonichev
commit fdab6896a4105dada0259928f8fbd747aa8e2e24
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Wed Sep 29 14:50:41 2010 -0600
Changelog entry for rhbz#575341
tomcat6.spec | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 6b7559a..f3a0241 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -597,6 +597,10 @@ fi
%{appdir}/sample
%changelog
+* Fri Jul 02 2010 David Knox <dknox(a)rehat.com> 0:6.0.26-9
+- Resolves rhbz#575341 - Additionally created instances of Tomcat
+- are broken
+
* Fri Jul 02 2010 David Knox <dknox(a)rehat.com> 0:6.0.26-8
- LSB initscript compliance
12 years, 11 months
[tomcat: 27/66] Resolves rhbz575341
by Ivan Afonichev
commit e4a58621528a50e8e2ae5d6feb865a1a09146487
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Wed Sep 29 14:31:33 2010 -0600
Resolves rhbz575341
tomcat6-6.0.wrapper | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/tomcat6-6.0.wrapper b/tomcat6-6.0.wrapper
index 979f0a7..0e95331 100644
--- a/tomcat6-6.0.wrapper
+++ b/tomcat6-6.0.wrapper
@@ -8,13 +8,13 @@ else
fi
# Get the tomcat config (use this for environment specific settings)
-if [ -z "${TOMCAT_CFG}" ]; then
- TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
-fi
+#if [ -z "${TOMCAT_CFG}" ]; then
+# TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
+#fi
-if [ -r "$TOMCAT_CFG" ]; then
- . $TOMCAT_CFG
-fi
+#if [ -r "$TOMCAT_CFG" ]; then
+# . $TOMCAT_CFG
+#fi
set_javacmd
12 years, 11 months
[tomcat: 26/66] dist-git conversion
by Ivan Afonichev
commit 429e8523eb83f206c43d5fb0dc3e643c899c6f46
Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
Date: Thu Jul 29 14:19:54 2010 +0000
dist-git conversion
.cvsignore => .gitignore | 0
Makefile | 21 ---------------------
2 files changed, 0 insertions(+), 21 deletions(-)
---
diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
12 years, 11 months