rpms/tomcat5/devel tomcat5-5.5-acceptlangheader.patch, 1.1, 1.2 tomcat5-5.5-connectors-util-build.patch, 1.1, 1.2 tomcat5-5.5-http11-build.patch, 1.4, 1.5 tomcat5-5.5-jk-build.patch, 1.3, 1.4 tomcat5-5.5-jspc-classpath.patch, 1.2, 1.3 tomcat5-5.5-jspc.sh.patch, 1.2, 1.3 tomcat5-5.5-skip-jsp-precompile.patch, 1.1, 1.2 tomcat5-5.5-util-build.patch, 1.2, 1.3 tomcat5.spec, 1.114, 1.115

Andrew Overholt (overholt) fedora-extras-commits at redhat.com
Mon Jul 14 16:27:14 UTC 2008 

Author: overholt

Update of /cvs/pkgs/rpms/tomcat5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20959

Modified Files:
	tomcat5-5.5-acceptlangheader.patch 
	tomcat5-5.5-connectors-util-build.patch 
	tomcat5-5.5-http11-build.patch tomcat5-5.5-jk-build.patch 
	tomcat5-5.5-jspc-classpath.patch tomcat5-5.5-jspc.sh.patch 
	tomcat5-5.5-skip-jsp-precompile.patch 
	tomcat5-5.5-util-build.patch tomcat5.spec 
Log Message:
- Update patches to apply with 0 fuzz.

tomcat5-5.5-acceptlangheader.patch:

Index: tomcat5-5.5-acceptlangheader.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-acceptlangheader.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-acceptlangheader.patch	16 Nov 2007 02:57:27 -0000	1.1
+++ tomcat5-5.5-acceptlangheader.patch	14 Jul 2008 16:26:18 -0000	1.2
@@ -1,6 +1,6 @@
---- container/catalina/src/share/org/apache/catalina/connector/Request.java.old	2007-11-15 16:40:42.000000000 -0800
-+++ container/catalina/src/share/org/apache/catalina/connector/Request.java	2007-11-15 16:46:19.000000000 -0800
-@@ -2488,6 +2488,9 @@
+--- container/catalina/src/share/org/apache/catalina/connector/Request.java.old	2008-07-14 12:13:28.000000000 -0400
++++ container/catalina/src/share/org/apache/catalina/connector/Request.java	2008-07-14 12:14:39.000000000 -0400
+@@ -2508,6 +2508,9 @@
              String variant = null;
              int dash = entry.indexOf('-');
              if (dash < 0) {
@@ -10,16 +10,18 @@
                  language = entry;
                  country = "";
                  variant = "";
-@@ -2501,6 +2504,12 @@
+@@ -2521,7 +2524,13 @@
                      country = cTemp;
                  } else {
                      variant = "";
-+		}
+-                }
++       		}
 +		if (!language.matches(localeRegex)) {
 +		    continue;
 +		}
 +		if (!country.matches(localeRegex)) {
 +		    continue;
-                 }
++		}
              }
              if (!isAlpha(language) || !isAlpha(country) || !isAlpha(variant)) {
+                 continue;

tomcat5-5.5-connectors-util-build.patch:

Index: tomcat5-5.5-connectors-util-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-connectors-util-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-connectors-util-build.patch	14 Mar 2007 21:36:42 -0000	1.1
+++ tomcat5-5.5-connectors-util-build.patch	14 Jul 2008 16:26:18 -0000	1.2
@@ -1,6 +1,6 @@
---- ./connectors/util/build.xml.sav	2007-03-14 15:13:18.000000000 -0400
-+++ ./connectors/util/build.xml	2007-03-14 17:25:27.000000000 -0400
-@@ -44,7 +44,9 @@
+--- connectors/util/build.xml.sav	2008-07-14 12:20:27.000000000 -0400
++++ connectors/util/build.xml	2008-07-14 12:21:22.000000000 -0400
+@@ -61,7 +61,9 @@
          <available property="commons-logging.present" file="${commons-logging.jar}"/>
          <available property="modeler.present" file="${commons-modeler.jar}"/>
  	<available property="jdk1.4.present" classname="java.lang.CharSequence" />
@@ -10,7 +10,7 @@
      </target>
  
      <target name="build-prepare" depends="detect">
-@@ -72,6 +74,7 @@
+@@ -89,6 +91,7 @@
  	       debug="${compile.debug}"
  	       optimize="off"
  	       verbose="off"

tomcat5-5.5-http11-build.patch:

Index: tomcat5-5.5-http11-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-http11-build.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tomcat5-5.5-http11-build.patch	17 Nov 2007 00:35:30 -0000	1.4
+++ tomcat5-5.5-http11-build.patch	14 Jul 2008 16:26:18 -0000	1.5
@@ -1,6 +1,6 @@
---- connectors/http11/build.xml.orig	2007-02-26 10:27:04.000000000 -0500
-+++ connectors/http11/build.xml		2007-02-26 10:28:11.000000000 -0500
-@@ -31,7 +31,7 @@
+--- connectors/http11/build.xml.orig	2008-07-14 11:45:53.000000000 -0400
++++ connectors/http11/build.xml	2008-07-14 11:51:44.000000000 -0400
+@@ -48,7 +48,7 @@
  
    <!-- The locations of necessary jar files -->
    <property name="tomcat-util.jar"  value="${util.home}/build/lib/tomcat-util.jar"/>
@@ -9,7 +9,7 @@
    <property name="tomcat-coyote.jar" value="${coyote.home}/build/lib/tomcat-coyote.jar"/>
    <property name="tomcat33-coyote.jar" 
            value="${coyote.home}/build/lib/tomcat33-coyote.jar"/>
-@@ -169,7 +169,10 @@
+@@ -186,7 +186,10 @@
         deprecation="${compile.deprecation}"
            optimize="${compile.optimize}">
        <exclude name="org\apache\coyote\http11\*Apr*" unless="jdk.1.4.present" />

tomcat5-5.5-jk-build.patch:

Index: tomcat5-5.5-jk-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-jk-build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomcat5-5.5-jk-build.patch	16 May 2007 10:57:12 -0000	1.3
+++ tomcat5-5.5-jk-build.patch	14 Jul 2008 16:26:18 -0000	1.4
@@ -1,6 +1,6 @@
---- connectors/jk/build.xml.p14	2006-03-05 02:25:22.000000000 +0100
-+++ connectors/jk/build.xml	2006-03-23 19:25:51.000000000 +0100
-@@ -28,7 +28,7 @@
+--- connectors/jk/build.xml.p14	2008-07-14 11:55:14.000000000 -0400
++++ connectors/jk/build.xml	2008-07-14 11:58:29.000000000 -0400
+@@ -45,7 +45,7 @@
      <property name="tomcat-jkshm.jar" value="${jk.build}/lib/jkshm.jar" />
      <property name="tomcat-jk2.jar" value="${jk.build}/lib/tomcat-jk2.jar" />
      <property name="tomcat-jni.jar" value="${jk.build}/lib/tomcat-jni.jar" />
@@ -9,7 +9,7 @@
  
      <!-- default locations, overrident by properties -->
      <property name="base.path" location="/usr/share/java"/>
-@@ -211,6 +211,7 @@
+@@ -230,6 +230,7 @@
              <exclude name="org/apache/jk/ant/**" />
  	    <classpath>
  	       <pathelement location="${tomcat-apr.jar}" />
@@ -17,7 +17,7 @@
  	       <path refid="xml-apis.classpath"/>
  	       <path refid="build-main.classpath"/>
  	    </classpath>
-@@ -252,6 +252,7 @@
+@@ -269,6 +270,7 @@
              <include name="org/apache/coyote/ajp/**"/>
              <include name="org/apache/jk/config/**"/>
  	    <classpath>

tomcat5-5.5-jspc-classpath.patch:

Index: tomcat5-5.5-jspc-classpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-jspc-classpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat5-5.5-jspc-classpath.patch	7 Jul 2006 17:16:45 -0000	1.2
+++ tomcat5-5.5-jspc-classpath.patch	14 Jul 2008 16:26:18 -0000	1.3
@@ -1,6 +1,6 @@
---- build/build.xml.sav	2006-02-21 13:48:51.743828000 -0500
-+++ build/build.xml	2006-02-21 13:48:56.499065000 -0500
-@@ -416,6 +416,7 @@
+--- build/build.xml.sav	2008-07-14 11:59:37.000000000 -0400
++++ build/build.xml	2008-07-14 11:59:57.000000000 -0400
+@@ -433,6 +433,7 @@
  
      <path id="jspc.classpath">
        <pathelement location="${java.home}/../lib/tools.jar"/>

tomcat5-5.5-jspc.sh.patch:

Index: tomcat5-5.5-jspc.sh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-jspc.sh.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat5-5.5-jspc.sh.patch	5 Jul 2006 22:50:50 -0000	1.2
+++ tomcat5-5.5-jspc.sh.patch	14 Jul 2008 16:26:18 -0000	1.3
@@ -1,6 +1,6 @@
---- jasper/src/bin/jspc.sh.sav	2006-03-23 17:33:40.000000000 +0100
-+++ jasper/src/bin/jspc.sh	2006-03-23 17:35:26.000000000 +0100
-@@ -5,32 +5,9 @@
+--- jasper/src/bin/jspc.sh.sav	2008-07-14 11:30:15.000000000 -0400
++++ jasper/src/bin/jspc.sh	2008-07-14 11:31:25.000000000 -0400
+@@ -21,32 +21,9 @@
  # $Id$
  # -----------------------------------------------------------------------------
  

tomcat5-5.5-skip-jsp-precompile.patch:

Index: tomcat5-5.5-skip-jsp-precompile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-skip-jsp-precompile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-skip-jsp-precompile.patch	13 Jul 2006 20:10:14 -0000	1.1
+++ tomcat5-5.5-skip-jsp-precompile.patch	14 Jul 2008 16:26:18 -0000	1.2
@@ -1,22 +1,18 @@
-*** build/build.xml.orig	2006-07-13 12:05:51.000000000 -0400
---- build/build.xml	2006-07-13 12:06:17.000000000 -0400
-***************
-*** 429,434 ****
---- 429,435 ----
-        <classpath refid="jspc.classpath"/>
-      </taskdef>
-  
-+ <!--
-      <jasper2
-               compile="false"
-               validateXml="false"
-***************
-*** 453,458 ****
---- 454,460 ----
-               webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
-               addWebXmlMappings="true"
-               outputDir="${admin.base}/WEB-INF/src/admin" />
-+ -->
-  
-      <javac destdir="${ROOT.base}/WEB-INF/classes"
-             optimize="off"
+--- build/build.xml.orig	2008-07-14 12:04:11.000000000 -0400
++++ build/build.xml	2008-07-14 12:04:34.000000000 -0400
+@@ -456,6 +456,7 @@
+       <classpath refid="jspc.classpath"/>
+     </taskdef>
+ 
++<!--
+     <jasper2
+              compile="false"
+              validateXml="false"
+@@ -480,6 +481,7 @@
+              webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
+              addWebXmlMappings="true"
+              outputDir="${admin.base}/WEB-INF/src/admin" />
++-->
+ 
+     <javac destdir="${ROOT.base}/WEB-INF/classes"
+            optimize="off"

tomcat5-5.5-util-build.patch:

Index: tomcat5-5.5-util-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-util-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat5-5.5-util-build.patch	5 Jul 2006 22:50:50 -0000	1.2
+++ tomcat5-5.5-util-build.patch	14 Jul 2008 16:26:18 -0000	1.3
@@ -1,6 +1,6 @@
---- connectors/util/build.xml.sav	2006-03-23 19:16:02.000000000 +0100
-+++ connectors/util/build.xml	2006-03-23 19:17:46.000000000 +0100
-@@ -23,7 +23,7 @@
+--- connectors/util/build.xml.sav	2008-07-14 12:19:19.000000000 -0400
++++ connectors/util/build.xml	2008-07-14 12:19:55.000000000 -0400
+@@ -40,7 +40,7 @@
      <property name="tomcat-util.lib" value="${tomcat-util.build}/lib" />
      <property name="tomcat-util.jar" value="${tomcat-util.lib}/tomcat-util.jar" />
      <property name="tomcat-loader.jar" value="${tomcat-util.lib}/tomcat-loader.jar" />
@@ -9,7 +9,7 @@
  
      <path id="compile.classpath">
          <pathelement location="${jmx.jar}" />
-@@ -73,7 +73,10 @@
+@@ -90,7 +90,10 @@
  	       optimize="off"
  	       verbose="off"
  	       excludes="**/CVS/**">


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- tomcat5.spec	14 Jul 2008 14:37:38 -0000	1.114
+++ tomcat5.spec	14 Jul 2008 16:26:18 -0000	1.115
@@ -1308,6 +1308,7 @@
 %changelog
 * Mon Jul 14 2008 Andrew Overholt <overholt at redhat.com> 0:5.5.26-1.5
 - Bump OSGi version numbers to match Eclipse SDK 3.4.
+- Update patches to apply with 0 fuzz.
 
 * Thu Jul 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:5.5.26-1.4
 - drop repotag

More information about the scm-commits mailing list