From 13cd2e8dd257050a2cc0d5dbdc0fa968404cdfdd Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtakov@fedoraproject.org>
Date: Mon, 9 Nov 2009 20:31:26 +0000
Subject: [PATCH] Update to 6.0.20. Fixes CVE-2009-0033,CVE-2009-0580.

---
 .cvsignore                              | 1 +
 sources                                 | 2 +-
 tomcat6-6.0-bootstrap-MANIFEST.MF.patch | 2 +-
 tomcat6.spec                            | 9 ++++++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6565d01..0d3513f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 apache-tomcat-6.0.18-src.tar.gz
+apache-tomcat-6.0.20-src.tar.gz
diff --git a/sources b/sources
index a967ad7..2621202 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9bdbb1c1d79302c80057a70b18fe6721  apache-tomcat-6.0.18-src.tar.gz
+44f49e7e14028b6a53c3c346bd18c72f  apache-tomcat-6.0.20-src.tar.gz
diff --git a/tomcat6-6.0-bootstrap-MANIFEST.MF.patch b/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
index e0651b4..7b278dc 100644
--- a/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
+++ b/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
@@ -3,6 +3,6 @@
 @@ -1,5 +1,4 @@
  Manifest-Version: 1.0
  Main-Class: org.apache.catalina.startup.Bootstrap
--Class-Path: commons-daemon.jar commons-logging-api.jar tomcat-juli.jar tomcat-coyote.jar
+-Class-Path: commons-daemon.jar tomcat-juli.jar tomcat-coyote.jar
  Specification-Title: Catalina
  Specification-Version: 6.0
diff --git a/tomcat6.spec b/tomcat6.spec
index 61c8ca9..365d0f6 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -33,7 +33,7 @@
 %define jspspec 2.1
 %define major_version 6
 %define minor_version 0
-%define micro_version 18
+%define micro_version 20
 %define packdname apache-tomcat-%{version}-src
 %define servletspec 2.5
 %define tcuid 91
@@ -54,7 +54,7 @@
 Name: tomcat6
 Epoch: 0
 Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 10.2%{?dist}
+Release: 1%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group: Networking/Daemons
@@ -447,10 +447,13 @@ fi
 %{appdir}/sample
 
 %changelog
+* Mon Nov 9 2009 Alexander Kurtakov <akurtako@redhat.com> 0:6.0.20-1
+- Update to 6.0.20. Fixes CVE-2009-0033,CVE-2009-0580. 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:6.0.18-10.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Apr 1 2009 akurtakov <akurtakov@dhcp-lab-180.englab.brq.redhat.com> 0:6.0.18-9.2
+* Wed Apr 1 2009 Alexander Kurtakov <akurtako@redhat.com> 0:6.0.18-9.2
 - Add OSGi manifest for servlet-api.
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:6.0.18-9.1