[tomcat: 55/66] update release this time
by Ivan Afonichev
commit 52d719825ce517d2c99671564cd614ba39937ec5
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Wed Mar 2 15:08:30 2011 -0700
update release this time
tomcat6.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 6e691c4..cb5605b 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -53,7 +53,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -566,6 +566,9 @@ fi
%{appdir}/sample
%changelog
+* Wed Mar 02 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-4
+- Resolves rhbz 681677
+
* Mon Feb 28 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-3
- Resolves rhbz 640134 - setting JAVA_HOME
12 years, 11 months
[tomcat: 54/66] resolves rhbz 681677
by Ivan Afonichev
commit fc407ac391854bc34168da3e4cdadb3e02a96f69
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Wed Mar 2 15:05:43 2011 -0700
resolves rhbz 681677
tomcat6-6.0.init | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init
index ae5d80d..dd12ef6 100644
--- a/tomcat6-6.0.init
+++ b/tomcat6-6.0.init
@@ -58,7 +58,7 @@ fi
CONNECTOR_PORT="${CONNECTOR_PORT:-8080}"
# Path to the tomcat launch script
-TOMCAT_SCRIPT="/usr/sbin/${NAME}"
+TOMCAT_SCRIPT="/usr/sbin/tomcat6
# Tomcat program name
TOMCAT_PROG="${NAME}"
12 years, 11 months
[tomcat: 53/66] cleaning up spec and correcting nvr. resolving rhbz 640134
by Ivan Afonichev
commit 6dbb0bd4ab1364a09d542db61d864d1f7245b336
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Mon Feb 28 17:15:20 2011 -0700
cleaning up spec and correcting nvr. resolving rhbz 640134
tomcat6.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index f90861d..6e691c4 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -53,7 +53,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -566,7 +566,7 @@ fi
%{appdir}/sample
%changelog
-* Mon Feb 28 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-2
+* Mon Feb 28 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-3
- Resolves rhbz 640134 - setting JAVA_HOME
* Mon Feb 28 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-1
12 years, 11 months
[tomcat: 52/66] resolves rhbz 640134
by Ivan Afonichev
commit 4aa2b84fe7b9caad8ed72c50539aafe25191b6ed
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Mon Feb 28 16:58:35 2011 -0700
resolves rhbz 640134
tomcat6-6.0.conf | 2 +-
tomcat6.spec | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/tomcat6-6.0.conf b/tomcat6-6.0.conf
index 668f81a..f2fe56e 100644
--- a/tomcat6-6.0.conf
+++ b/tomcat6-6.0.conf
@@ -9,7 +9,7 @@
#
# Where your java installation lives
-JAVA_HOME="/usr/lib/jvm/java-1.6.0"
+JAVA_HOME="/usr/lib/jvm/jre"
# Where your tomcat installation lives
CATALINA_BASE="@@@TCHOME@@@"
diff --git a/tomcat6.spec b/tomcat6.spec
index 575bc7e..f90861d 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -566,6 +566,9 @@ fi
%{appdir}/sample
%changelog
+* Mon Feb 28 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-2
+- Resolves rhbz 640134 - setting JAVA_HOME
+
* Mon Feb 28 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-1
- Rebase on 6.0.32 with several bug fixes and security fixes
- changed apache-commons to jakarta-commons to fix missing
12 years, 11 months
[tomcat: 51/66] merged auto message with current build
by Ivan Afonichev
commit eea1f30f107f83f4298743d4fc7502bcdb9170c6
Merge: 3cb34c7 b6cdbc0
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Mon Feb 28 15:53:47 2011 -0700
merged auto message with current build
tomcat6.spec | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc tomcat6.spec
index 18cceb0,960b4a7..575bc7e
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@@ -272,8 -269,6 +272,7 @@@ zip -u output/build/lib/jsp-api.jar MET
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir}
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir}
+/bin/touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out
- chmod 775 ${RPM_BUILD__ROOT}%{logdir}/catalina.out
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir}
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir}
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir}
@@@ -567,10 -561,8 +566,14 @@@ f
%{appdir}/sample
%changelog
- * Mon Feb 7 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-1
++* Mon Feb 28 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-1
+- Rebase on 6.0.32 with several bug fixes and security fixes
+- changed apache-commons to jakarta-commons to fix missing
- - dependencies during install.
++- dependencies during install. Adjusted permissions on logs and
++- conf dirs so init worked. Reversed order of reading conf files
++
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:6.0.30-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Feb 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.30-1
- Update to 6.0.30.
12 years, 11 months
[tomcat: 50/66] Rebased on tomcat 6.0.32. Corrected order of config files in tomcat6-init. Adjusted permissions on l
by Ivan Afonichev
commit 3cb34c719a6e6042afb64eb8f76a391c8c67cb48
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Mon Feb 28 15:48:39 2011 -0700
Rebased on tomcat 6.0.32. Corrected order of config files in tomcat6-init. Adjusted permissions on logs and confdir to get it to work.
.gitignore | 1 +
sources | 1 +
tomcat6-6.0.init | 17 +++++++++--------
tomcat6.spec | 49 ++++++++++++++++++++++++++++++-------------------
4 files changed, 41 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aeb3228..5ff9c77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ apache-tomcat-6.0.24-src.tar.gz
apache-tomcat-6.0.26-src.tar.gz
apache-tomcat-6.0.29-src.tar.gz
apache-tomcat-6.0.30-src.tar.gz
+/apache-tomcat-6.0.32-src.tar.gz
diff --git a/sources b/sources
index 3290f93..f1dcb10 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
7b811c9092bcb7779bd8df772744ac15 apache-tomcat-6.0.30-src.tar.gz
+19a1eaa9c9938b520d3c360d8cf4af22 apache-tomcat-6.0.32-src.tar.gz
diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init
index 43f53a4..ae5d80d 100644
--- a/tomcat6-6.0.init
+++ b/tomcat6-6.0.init
@@ -43,22 +43,22 @@ else
SU="/bin/su -s /bin/sh"
fi
-# Get instance specific config file
-if [ -r "/etc/sysconfig/${NAME}" ]; then
- . /etc/sysconfig/${NAME}
-fi
-
# Get the tomcat config (use this for environment specific settings)
-TOMCAT_CFG="${CATALINA_HOME}/conf/tomcat6.conf"
+TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
if [ -r "$TOMCAT_CFG" ]; then
. $TOMCAT_CFG
fi
+# Get instance specific config file
+if [ -r "/etc/sysconfig/${NAME}" ]; then
+ . /etc/sysconfig/${NAME}
+fi
+
# Define which connector port to use
CONNECTOR_PORT="${CONNECTOR_PORT:-8080}"
# Path to the tomcat launch script
-TOMCAT_SCRIPT="/usr/sbin/tomcat6"
+TOMCAT_SCRIPT="/usr/sbin/${NAME}"
# Tomcat program name
TOMCAT_PROG="${NAME}"
@@ -67,7 +67,8 @@ TOMCAT_PROG="${NAME}"
TOMCAT_USER="${TOMCAT_USER:-tomcat}"
# Define the tomcat log file
-TOMCAT_LOG="${TOMCAT_LOG:-${CATALINA_HOME}/logs/catalina.out}"
+TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat6/catalina.out}"
+
RETVAL="0"
diff --git a/tomcat6.spec b/tomcat6.spec
index 74d7245..18cceb0 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -31,7 +31,7 @@
%global jspspec 2.1
%global major_version 6
%global minor_version 0
-%global micro_version 30
+%global micro_version 32
%global packdname apache-tomcat-%{version}-src
%global servletspec 2.5
%global elspec 2.1
@@ -72,7 +72,8 @@ 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}-rhbz-674601.patch
+# In 6.0.32 source
+#Patch2: %{name}-%{major_version}.%{minor_version}-rhbz-674601.patch
BuildArch: noarch
BuildRequires: ant
@@ -80,17 +81,19 @@ BuildRequires: ant-nodeps
BuildRequires: ecj
BuildRequires: findutils
BuildRequires: jakarta-commons-collections
-BuildRequires: apache-commons-daemon
-BuildRequires: apache-commons-dbcp
-BuildRequires: apache-commons-pool
+BuildRequires: jakarta-commons-daemon
+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
BuildRequires: junit
BuildRequires: log4j
-Requires: apache-commons-daemon
-Requires: apache-commons-logging
-Requires: apache-commons-collections
+Requires: jakarta-commons-daemon
+Requires: jakarta-commons-logging
+Requires: jakarta-commons-collections
+Requires: jakarta-commons-dbcp
+Requires: jakarta-commons-pool
Requires: java-1.6.0
Requires: procps
Requires: %{name}-lib = %{epoch}:%{version}-%{release}
@@ -159,9 +162,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: apache-commons-collections
-Requires: apache-commons-dbcp
-Requires: apache-commons-pool
+Requires: jakarta-commons-collections
+Requires: jakarta-commons-dbcp
+Requires: jakarta-commons-pool
Requires(preun): coreutils
%description lib
@@ -207,7 +210,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
%patch0 -p0
%patch1 -p0
-%patch2 -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
@@ -269,6 +272,8 @@ zip -u output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir}
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir}
+/bin/touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out
+chmod 775 ${RPM_BUILD__ROOT}%{logdir}/catalina.out
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir}
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir}
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir}
@@ -476,7 +481,7 @@ if [ "$1" = "0" ]; then
fi
%files
-%defattr(-,root,tomcat,-)
+%defattr(-,root,tomcat,0775)
%doc {LICENSE,NOTICE,RELEASE*}
%attr(0755,root,root) %{_bindir}/%{name}-digest
%attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper
@@ -486,22 +491,23 @@ fi
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%attr(0765,root,tomcat) %dir %{basedir}
-%attr(0765,root,tomcat) %dir %{appdir}
-%attr(0765,root,tomcat) %dir %{confdir}
-%attr(0765,root,tomcat) %dir %{confdir}/Catalina
-%attr(0765,root,tomcat) %dir %{confdir}/Catalina/localhost
+%attr(0775,tomcat,root) %dir %{appdir}
+%attr(0775,tomcat,root) %dir %{confdir}
+%attr(0775,tomcat,root) %dir %{confdir}/Catalina
+%attr(0775,tomcat,root) %dir %{confdir}/Catalina/localhost
%config(noreplace) %{confdir}/%{name}.conf
%config(noreplace) %{confdir}/*.policy
%config(noreplace) %{confdir}/*.properties
%config(noreplace) %{confdir}/context.xml
%config(noreplace) %{confdir}/server.xml
%config(noreplace) %{confdir}/log4j.properties
-%attr(0664,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
+%attr(0664,tomcat,root) %config(noreplace) %{confdir}/tomcat-users.xml
%config(noreplace) %{confdir}/web.xml
%attr(0765,tomcat,root) %dir %{cachedir}
%attr(0765,tomcat,root) %dir %{tempdir}
%attr(0765,tomcat,root) %dir %{workdir}
-%attr(0765,root,tomcat) %dir %{logdir}
+%attr(0775,tomcat,root) %dir %{logdir}
+%attr(0664,tomcat,tomcat) %{logdir}/catalina.out
%dir %{homedir}
%{bindir}/bootstrap.jar
%{bindir}/catalina-tasks.xml
@@ -561,6 +567,11 @@ fi
%{appdir}/sample
%changelog
+* Mon Feb 7 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-1
+- Rebase on 6.0.32 with several bug fixes and security fixes
+- changed apache-commons to jakarta-commons to fix missing
+- dependencies during install.
+
* Thu Feb 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.30-1
- Update to 6.0.30.
- Drop jdt-core.pom which is gone upstream now.
12 years, 11 months
[tomcat: 49/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
by Ivan Afonichev
commit b6cdbc0ffa6fbd7e741f710740ffba427db3e346
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 9 13:55:51 2011 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
tomcat6.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 74d7245..960b4a7 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -53,7 +53,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -561,6 +561,9 @@ fi
%{appdir}/sample
%changelog
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:6.0.30-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Thu Feb 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.30-1
- Update to 6.0.30.
- Drop jdt-core.pom which is gone upstream now.
12 years, 11 months
[tomcat: 48/66] Update to 6.0.30.
by Ivan Afonichev
commit 477b5e91d18ad52eb845b5c3426e1e8faaec8b3e
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Feb 3 09:43:54 2011 +0200
Update to 6.0.30.
Drop jdt-core.pom which is gone upstream now.
.gitignore | 1 +
sources | 2 +-
tomcat6.spec | 10 +++++++---
3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6590968..aeb3228 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ apache-tomcat-6.0.20-src.tar.gz
apache-tomcat-6.0.24-src.tar.gz
apache-tomcat-6.0.26-src.tar.gz
apache-tomcat-6.0.29-src.tar.gz
+apache-tomcat-6.0.30-src.tar.gz
diff --git a/sources b/sources
index 8f99d1e..3290f93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-260de5ae62f415b9c085c5aeed4ef24c apache-tomcat-6.0.29-src.tar.gz
+7b811c9092bcb7779bd8df772744ac15 apache-tomcat-6.0.30-src.tar.gz
diff --git a/tomcat6.spec b/tomcat6.spec
index 1e2c8a6..74d7245 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -31,7 +31,7 @@
%global jspspec 2.1
%global major_version 6
%global minor_version 0
-%global micro_version 29
+%global micro_version 30
%global packdname apache-tomcat-%{version}-src
%global servletspec 2.5
%global elspec 2.1
@@ -53,7 +53,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -376,7 +376,7 @@ done
# we won't install dbcp, juli-adapters and juli-extras pom files
for pom in annotations-api.pom catalina.pom jasper-el.pom jasper.pom \
- catalina-ha.pom el-api.pom jasper-jdt.pom; do
+ catalina-ha.pom el-api.pom; do
%{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$pom
base=`basename $pom .pom`
%add_to_maven_depmap org.apache.tomcat $base %{version} JPP/%{name} $base
@@ -561,6 +561,10 @@ fi
%{appdir}/sample
%changelog
+* Thu Feb 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.30-1
+- Update to 6.0.30.
+- Drop jdt-core.pom which is gone upstream now.
+
* Wed Feb 2 2011 David Knox <dknox(a)redhat.com> 0:6.0.29-3
- Resolves rhbz# 674601 - JDK Double.parseDouble DoS
12 years, 11 months
[tomcat: 47/66] Adding the patch
by Ivan Afonichev
commit a1884b94375af74c5ba92ce4393d60c66cc9deda
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Wed Feb 2 16:34:58 2011 -0700
Adding the patch
tomcat6-6.0-rhbz-674601.patch | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/tomcat6-6.0-rhbz-674601.patch b/tomcat6-6.0-rhbz-674601.patch
new file mode 100644
index 0000000..64b927f
--- /dev/null
+++ b/tomcat6-6.0-rhbz-674601.patch
@@ -0,0 +1,18 @@
+--- ./java/org/apache/catalina/connector/Request.java.orig 2011-02-02 15:50:25.623469439 -0700
++++ ./java/org/apache/catalina/connector/Request.java 2011-02-02 15:51:58.832219055 -0700
+@@ -2717,8 +2717,14 @@
+ int semi = entry.indexOf(";q=");
+ if (semi >= 0) {
+ try {
+- quality = Double.parseDouble(entry.substring(semi + 3));
++ String strQuality = entry.substring(semi + 3);
++ if (strQuality.length() <= 5) {
++ quality = Double.parseDouble(strQuality);
++ } else {
++ quality = 0.0;
++ }
+ } catch (NumberFormatException e) {
++
+ quality = 0.0;
+ }
+ entry = entry.substring(0, semi);
12 years, 11 months
[tomcat: 46/66] Resolves rhbz 674601 JDK Double.parseDouble DoS
by Ivan Afonichev
commit 0e9407e9b063b8f4fc7e8339201f31ca04f03af0
Author: david knox <dknox(a)78-97-42-72.skybeam.com>
Date: Wed Feb 2 16:09:02 2011 -0700
Resolves rhbz 674601 JDK Double.parseDouble DoS
tomcat6.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index d7de59a..1e2c8a6 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -53,7 +53,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -72,7 +72,7 @@ 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}-rhbz-674601.patch
BuildArch: noarch
BuildRequires: ant
@@ -207,6 +207,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
%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
@@ -560,6 +561,9 @@ fi
%{appdir}/sample
%changelog
+* Wed Feb 2 2011 David Knox <dknox(a)redhat.com> 0:6.0.29-3
+- Resolves rhbz# 674601 - JDK Double.parseDouble DoS
+
* Mon Jan 17 2011 David Knox <dknox(a)redhat.com> 0:6.0.29-2
- Resolves: rhbz# 669969 - tomcat-jdbc missing
- Resolves problem with multiple instances of tomcat services. References to
12 years, 11 months