rpms/tomcat5/F-7 .cvsignore, 1.13, 1.14 sources, 1.11, 1.12 tomcat5.spec, 1.105, 1.106 tomcat5-5.5-cookieparsing.patch, 1.1, NONE tomcat5-5.5-webdav.patch, 1.1, NONE

[Devrim GÜNDÜZ (devrim)]

Author: devrim

Update of /cvs/extras/rpms/tomcat5/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30177

Modified Files:
	.cvsignore sources tomcat5.spec 
Removed Files:
	tomcat5-5.5-cookieparsing.patch tomcat5-5.5-webdav.patch 
Log Message:
- Update to new upstream version
  * CVE-2007-5342
- Removed patch20, now in upstream.
- Removed patch24.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/F-7/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	16 Nov 2007 16:43:01 -0000	1.13
+++ .cvsignore	8 Feb 2008 23:40:05 -0000	1.14
@@ -1 +1 @@
-apache-tomcat-5.5.25-src.tar.gz
+apache-tomcat-5.5.26-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	16 Nov 2007 16:43:01 -0000	1.11
+++ sources	8 Feb 2008 23:40:05 -0000	1.12
@@ -1 +1 @@
-2d6cc9a16aceeef4ec3610cd782d5c9d  apache-tomcat-5.5.25-src.tar.gz
+642b6526354cb18c5b5d77ebef8109ae  apache-tomcat-5.5.26-src.tar.gz


Index: tomcat5.spec
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/F-7/tomcat5.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- tomcat5.spec	10 Jan 2008 19:54:21 -0000	1.105
+++ tomcat5.spec	8 Feb 2008 23:40:05 -0000	1.106
@@ -68,8 +68,8 @@
 
 Name: tomcat5
 Epoch: 0
-Version: 5.5.25
-Release: 3jpp.1%{?dist}
+Version: 5.5.26
+Release: 1jpp.1%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -104,9 +104,7 @@
 # Seems to be only needed when building with ECJ for java 1.5 since
 # the default source type for ecj is still 1.4
 Patch19: %{name}-%{majversion}-connectors-util-build.patch
-Patch20: %{name}-%{majversion}-webdav.patch
 Patch21: %{name}-%{majversion}-acceptlangheader.patch
-Patch24: %{name}-%{majversion}-cookieparsing.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if ! %{gcj_support}
@@ -452,9 +450,7 @@
 %patch18 -b .p18
 %endif
 %patch19 -b .p19
-%patch20 -b .p20
 %patch21 -b .p21
-%patch24 -b .p24
 
 %if %{without_ecj}
     %{__rm} %{jname}/src/share/org/apache/jasper/compiler/JDTCompiler.java
@@ -593,8 +589,8 @@
 %if %{with_ecj}
 mkdir org.apache.jasper
 pushd org.apache.jasper
-unzip -qq ../apache-tomcat-5.5.25-src/build/build/common/lib/jasper-compiler.jar
-unzip -qq ../apache-tomcat-5.5.25-src/build/build/common/lib/jasper-runtime.jar \
+unzip -qq ../apache-tomcat-5.5.26-src/build/build/common/lib/jasper-compiler.jar
+unzip -qq ../apache-tomcat-5.5.26-src/build/build/common/lib/jasper-runtime.jar \
   -x META-INF/MANIFEST.MF org/apache/jasper/compiler/Localizer.class
 unzip -qq %{_javadir}/jdtcore.jar -x META-INF/MANIFEST.MF
 cp %{SOURCE6} META-INF/MANIFEST.MF
@@ -1303,8 +1299,10 @@
 %endif
 
 %changelog
-* Thu Jan 10 2008 Devrim GUNDUZ <devrim at commandprompt.com> 0:5.5.25-3jpp.1
-- Add new patch(24) for improving cookie parsing, per bz #428255
+* Fri Feb 8 2008 Devrim GUNDUZ <devrim at commandprompt.com> 0:5.5.26-1jpp.1
+- Update to new upstream version
+  * CVE-2007-5342
+- Removed patch20, now in upstream.
 
 * Sat Jan 5 2008 Devrim GUNDUZ <devrim at commandprompt.com> 0:5.5.25-2jpp.2
 - Fix for bz #153187


--- tomcat5-5.5-cookieparsing.patch DELETED ---


--- tomcat5-5.5-webdav.patch DELETED ---