Notification time stamped 2018-07-31 21:01:13 UTC
From 69c429d6280780296d4ec2c01146c2ec5d703ea1 Mon Sep 17 00:00:00 2001
From: Coty Sutherland <csutherl(a)redhat.com>
Date: Jul 31 2018 21:01:08 +0000
Subject: Related: Update to 7.0.90 Fix patch files so that they apply correctly
---
diff --git a/tomcat-7.0.70-build.patch b/tomcat-7.0.70-build.patch
deleted file mode 100644
index 6c8d8cc..0000000
--- a/tomcat-7.0.70-build.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- build.xml.orig 2016-06-15 12:45:47.000000000 -0400
-+++ build.xml 2016-07-01 12:01:58.494022657 -0400
-@@ -213,7 +213,7 @@
- <path id="tomcat.webservices.classpath">
- <path refid="tomcat.classpath" />
- <fileset dir="${tomcat.extras}/webservices">
-- <include name="jaxrpc.jar"/>
-+ <!--<include name="jaxrpc.jar"/>-->
- <include name="wsdl4j.jar"/>
- </fileset>
- </path>
-@@ -1046,12 +1046,11 @@
- </copy>
-
- <!-- Delete all other versions of Eclipse JDT Compiler and copy the current one
-->
-- <local name="jdt.jar.filename" />
-- <basename property="jdt.jar.filename" file="${jdt.jar}"/>
-+ <basename property="deploy.jdt.jar.filename"
file="${jdt.jar}"/>
- <delete verbose="true">
- <fileset dir="${tomcat.build}/lib">
- <include name="ecj-*.jar"/>
-- <exclude name="${jdt.jar.filename}"/>
-+ <exclude name="${deploy.jdt.jar.filename}"/>
- </fileset>
- </delete>
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-@@ -1699,8 +1698,8 @@
- <param name="destdir" value="${wsdl4j-lib.home}"/>
- </antcall>
-
-- <copy file="${jaxrpc-lib.jar}"
-- tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
-+ <!--<copy file="${jaxrpc-lib.jar}"
-+ tofile="${tomcat.extras}/webservices/jaxrpc.jar" />-->
- <copy file="${wsdl4j-lib.jar}"
- tofile="${tomcat.extras}/webservices/wsdl4j.jar" />
- </target>
-@@ -2814,7 +2813,7 @@
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
- <tempfile property="temp.file" destdir="${base.path}"
prefix="download-"/>
-- <get src="${sourcefile}"
httpusecaches="${trydownload.httpusecaches}"
dest="${temp.file}.tar.gz" />
-+ <get src="${sourcefile}" dest="${temp.file}.tar.gz" />
- <gunzip src="${temp.file}.tar.gz"
dest="${temp.file}.tar"/>
- <untar src="${temp.file}.tar" dest="${base.path}"/>
- <delete file="${temp.file}.tar"/>
-@@ -2845,7 +2844,7 @@
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
- <tempfile property="temp.file" destdir="${base.path}"
prefix="download-" suffix=".zip"/>
-- <get src="${sourcefile}"
httpusecaches="${trydownload.httpusecaches}" dest="${temp.file}"/>
-+ <get src="${sourcefile}" dest="${temp.file}"/>
- <mkdir dir="${destdir}"/>
- <unzip src="${temp.file}" dest="${destdir}"/>
- <delete file="${temp.file}"/>
-@@ -2874,7 +2873,7 @@
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
- <tempfile property="temp.file" destdir="${base.path}"
prefix="download-" suffix=".tmp"/>
-- <get src="${sourcefile}"
httpusecaches="${trydownload.httpusecaches}" dest="${temp.file}"/>
-+ <get src="${sourcefile}" dest="${temp.file}"/>
- <mkdir dir="${destdir}"/>
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-@@ -2915,7 +2914,7 @@
-
- <target name="trydownload" if="trydownload.run"
depends="trydownload.check">
- <!-- Downloads a file if not yet downloaded and the source URL is available
-->
-- <get src="${sourcefile}"
httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
-+ <get src="${sourcefile}" dest="${destfile}" />
- </target>
-
- <!-- ============================ IDE Support ============================ -->
diff --git a/tomcat-7.0.84-CompilerOptionsV89.patch
b/tomcat-7.0.84-CompilerOptionsV89.patch
deleted file mode 100644
index aa379e0..0000000
--- a/tomcat-7.0.84-CompilerOptionsV89.patch
+++ /dev/null
@@ -1,117 +0,0 @@
---- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2018-02-01 10:13:12.975989687
-0500
-+++ java/org/apache/jasper/compiler/JDTCompiler.java 2018-02-01 10:15:47.913534769 -0500
-@@ -67,7 +67,6 @@ public class JDTCompiler extends org.apa
- /**
- * Compile the servlet from .java file to .class file
- */
-- @Override
- protected void generateClass(String[] smap)
- throws FileNotFoundException, JasperException, Exception {
-
-@@ -98,12 +97,10 @@ public class JDTCompiler extends org.apa
- this.sourceFile = sourceFile;
- }
-
-- @Override
- public char[] getFileName() {
- return sourceFile.toCharArray();
- }
-
-- @Override
- public char[] getContents() {
- char[] result = null;
- FileInputStream is = null;
-@@ -145,7 +142,6 @@ public class JDTCompiler extends org.apa
- return result;
- }
-
-- @Override
- public char[] getMainTypeName() {
- int dot = className.lastIndexOf('.');
- if (dot > 0) {
-@@ -154,7 +150,6 @@ public class JDTCompiler extends org.apa
- return className.toCharArray();
- }
-
-- @Override
- public char[][] getPackageName() {
- StringTokenizer izer =
- new StringTokenizer(className, ".");
-@@ -166,7 +161,6 @@ public class JDTCompiler extends org.apa
- return result;
- }
-
-- @Override
- public boolean ignoreOptionalProblems() {
- return false;
- }
-@@ -174,7 +168,6 @@ public class JDTCompiler extends org.apa
-
- final INameEnvironment env = new INameEnvironment() {
-
-- @Override
- public NameEnvironmentAnswer
- findType(char[][] compoundTypeName) {
- StringBuilder result = new StringBuilder();
-@@ -187,7 +180,6 @@ public class JDTCompiler extends org.apa
- return findType(result.toString());
- }
-
-- @Override
- public NameEnvironmentAnswer
- findType(char[] typeName,
- char[][] packageName) {
-@@ -269,7 +261,6 @@ public class JDTCompiler extends org.apa
- }
- }
-
-- @Override
- public boolean isPackage(char[][] parentPackageName,
- char[] packageName) {
- StringBuilder result = new StringBuilder();
-@@ -291,7 +282,6 @@ public class JDTCompiler extends org.apa
- return isPackage(result.toString());
- }
-
-- @Override
- public void cleanup() {
- }
-
-@@ -340,12 +330,6 @@ public class JDTCompiler extends org.apa
- } else if(opt.equals("1.7")) {
- settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_7);
-- } else if(opt.equals("1.8")) {
-- settings.put(CompilerOptions.OPTION_Source,
-- CompilerOptions.VERSION_1_8);
-- } else if(opt.equals("1.9")) {
-- settings.put(CompilerOptions.OPTION_Source,
-- "1.9"); // CompilerOptions.VERSION_1_9
- } else {
- log.warn("Unknown source VM " + opt + " ignored.");
- settings.put(CompilerOptions.OPTION_Source,
-@@ -387,16 +371,6 @@ public class JDTCompiler extends org.apa
- CompilerOptions.VERSION_1_7);
- settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_1_7);
-- } else if(opt.equals("1.8")) {
-- settings.put(CompilerOptions.OPTION_TargetPlatform,
-- CompilerOptions.VERSION_1_8);
-- settings.put(CompilerOptions.OPTION_Compliance,
-- CompilerOptions.VERSION_1_8);
-- } else if(opt.equals("1.9")) {
-- settings.put(CompilerOptions.OPTION_TargetPlatform,
-- "1.9"); // CompilerOptions.VERSION_1_9
-- settings.put(CompilerOptions.OPTION_Compliance,
-- "1.9"); // CompilerOptions.VERSION_1_9
- } else {
- log.warn("Unknown target VM " + opt + " ignored.");
- settings.put(CompilerOptions.OPTION_TargetPlatform,
-@@ -414,7 +388,6 @@ public class JDTCompiler extends org.apa
- new DefaultProblemFactory(Locale.getDefault());
-
- final ICompilerRequestor requestor = new ICompilerRequestor() {
-- @Override
- public void acceptResult(CompilationResult result) {
- try {
- if (result.hasProblems()) {
diff --git a/tomcat-7.0.90-RemoveCompilerOptions.patch
b/tomcat-7.0.90-RemoveCompilerOptions.patch
new file mode 100644
index 0000000..3de72aa
--- /dev/null
+++ b/tomcat-7.0.90-RemoveCompilerOptions.patch
@@ -0,0 +1,105 @@
+--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2018-07-02 13:12:33.000000000
-0400
++++ java/org/apache/jasper/compiler/JDTCompiler.java 2018-07-31 16:48:35.420679218 -0400
+@@ -95,7 +95,6 @@ public class JDTCompiler extends org.apa
+ /**
+ * Compile the servlet from .java file to .class file
+ */
+- @Override
+ protected void generateClass(String[] smap)
+ throws FileNotFoundException, JasperException, Exception {
+
+@@ -126,12 +125,10 @@ public class JDTCompiler extends org.apa
+ this.sourceFile = sourceFile;
+ }
+
+- @Override
+ public char[] getFileName() {
+ return sourceFile.toCharArray();
+ }
+
+- @Override
+ public char[] getContents() {
+ char[] result = null;
+ FileInputStream is = null;
+@@ -173,7 +170,6 @@ public class JDTCompiler extends org.apa
+ return result;
+ }
+
+- @Override
+ public char[] getMainTypeName() {
+ int dot = className.lastIndexOf('.');
+ if (dot > 0) {
+@@ -182,7 +178,6 @@ public class JDTCompiler extends org.apa
+ return className.toCharArray();
+ }
+
+- @Override
+ public char[][] getPackageName() {
+ StringTokenizer izer =
+ new StringTokenizer(className, ".");
+@@ -194,7 +189,6 @@ public class JDTCompiler extends org.apa
+ return result;
+ }
+
+- @Override
+ public boolean ignoreOptionalProblems() {
+ return false;
+ }
+@@ -202,7 +196,6 @@ public class JDTCompiler extends org.apa
+
+ final INameEnvironment env = new INameEnvironment() {
+
+- @Override
+ public NameEnvironmentAnswer
+ findType(char[][] compoundTypeName) {
+ StringBuilder result = new StringBuilder();
+@@ -215,7 +208,6 @@ public class JDTCompiler extends org.apa
+ return findType(result.toString());
+ }
+
+- @Override
+ public NameEnvironmentAnswer
+ findType(char[] typeName,
+ char[][] packageName) {
+@@ -297,7 +289,6 @@ public class JDTCompiler extends org.apa
+ }
+ }
+
+- @Override
+ public boolean isPackage(char[][] parentPackageName,
+ char[] packageName) {
+ StringBuilder result = new StringBuilder();
+@@ -319,7 +310,6 @@ public class JDTCompiler extends org.apa
+ return isPackage(result.toString());
+ }
+
+- @Override
+ public void cleanup() {
+ }
+
+@@ -368,17 +358,6 @@ public class JDTCompiler extends org.apa
+ } else if(opt.equals("1.7")) {
+ settings.put(CompilerOptions.OPTION_Source,
+ CompilerOptions.VERSION_1_7);
+- } else if(opt.equals("1.8")) {
+- settings.put(CompilerOptions.OPTION_Source,
+- CompilerOptions.VERSION_1_8);
+- // Support old format that was used in EA implementation as well
+- } else if(opt.equals("9") || opt.equals("1.9")) {
+- settings.put(CompilerOptions.OPTION_Source,
+- JDT_JAVA_9_VERSION);
+- } else if(opt.equals("10")) {
+- // Constant not available in latest ECJ version that runs on
+- // Java 7
+- settings.put(CompilerOptions.OPTION_Source, "10");
+ } else {
+ log.warn("Unknown source VM " + opt + " ignored.");
+ settings.put(CompilerOptions.OPTION_Source,
+@@ -452,7 +431,6 @@ public class JDTCompiler extends org.apa
+ new DefaultProblemFactory(Locale.getDefault());
+
+ final ICompilerRequestor requestor = new ICompilerRequestor() {
+- @Override
+ public void acceptResult(CompilationResult result) {
+ try {
+ if (result.hasProblems()) {
diff --git a/tomcat-7.0.90-build.patch b/tomcat-7.0.90-build.patch
new file mode 100644
index 0000000..63a974c
--- /dev/null
+++ b/tomcat-7.0.90-build.patch
@@ -0,0 +1,73 @@
+--- build.xml.orig 2018-07-31 16:53:30.644130082 -0400
++++ build.xml 2018-07-31 16:56:12.472419607 -0400
+@@ -216,7 +216,7 @@
+ <path id="tomcat.webservices.classpath">
+ <path refid="tomcat.classpath" />
+ <fileset dir="${tomcat.extras}/webservices">
+- <include name="jaxrpc.jar"/>
++ <!--<include name="jaxrpc.jar"/>-->
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </path>
+@@ -1056,12 +1056,11 @@
+ </copy>
+
+ <!-- Delete all other versions of Eclipse JDT Compiler and copy the current one
-->
+- <local name="jdt.jar.filename" />
+- <basename property="jdt.jar.filename" file="${jdt.jar}"/>
++ <basename property="deploy.jdt.jar.filename"
file="${jdt.jar}"/>
+ <delete verbose="true">
+ <fileset dir="${tomcat.build}/lib">
+ <include name="ecj-*.jar"/>
+- <exclude name="${jdt.jar.filename}"/>
++ <exclude name="${deploy.jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+ <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+@@ -1734,8 +1733,8 @@
+ <param name="checksum.value"
value="${wsdl4j-lib.checksum.value}"/>
+ </antcall>
+
+- <copy file="${jaxrpc-lib.jar}"
+- tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
++ <!--<copy file="${jaxrpc-lib.jar}"
++ tofile="${tomcat.extras}/webservices/jaxrpc.jar" />-->
+ <copy file="${wsdl4j-lib.jar}"
+ tofile="${tomcat.extras}/webservices/wsdl4j.jar" />
+ </target>
+@@ -2976,7 +2975,7 @@ Apache Tomcat ${version} native binaries
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+ <tempfile property="temp.file" destdir="${base.path}"
prefix="download-"/>
+- <get src="${sourcefile}"
httpusecaches="${trydownload.httpusecaches}"
dest="${temp.file}.tar.gz" />
++ <get src="${sourcefile}" dest="${temp.file}.tar.gz" />
+ <verifyChecksum
+ enabled="${checksum.enabled}"
+ algorithm="${checksum.algorithm}" value="${checksum.value}"
+@@ -3018,7 +3017,7 @@ Apache Tomcat ${version} native binaries
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+ <tempfile property="temp.file" destdir="${base.path}"
prefix="download-" suffix=".zip"/>
+- <get src="${sourcefile}"
httpusecaches="${trydownload.httpusecaches}" dest="${temp.file}"/>
++ <get src="${sourcefile}" dest="${temp.file}"/>
+ <verifyChecksum
+ enabled="${checksum.enabled}"
+ algorithm="${checksum.algorithm}" value="${checksum.value}"
+@@ -3058,7 +3057,7 @@ Apache Tomcat ${version} native binaries
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+ <tempfile property="temp.file" destdir="${base.path}"
prefix="download-" suffix=".tmp"/>
+- <get src="${sourcefile}"
httpusecaches="${trydownload.httpusecaches}" dest="${temp.file}"/>
++ <get src="${sourcefile}" dest="${temp.file}"/>
+ <verifyChecksum
+ enabled="${checksum.enabled}"
+ algorithm="${checksum.algorithm}" value="${checksum.value}"
+@@ -3109,7 +3108,7 @@ Apache Tomcat ${version} native binaries
+
+ <target name="trydownload" if="trydownload.run"
depends="trydownload.check">
+ <!-- Downloads a file if not yet downloaded and the source URL is available
-->
+- <get src="${sourcefile}"
httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
++ <get src="${sourcefile}" dest="${destfile}" />
+ </target>
+
+ <!-- ============================ IDE Support ============================ -->
diff --git a/tomcat.spec b/tomcat.spec
index 4cfe1f0..ed4f9ad 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -81,9 +81,9 @@ Source16: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper
Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
# Adding patch to remove java 1.8 compiler options due to outdated ecj version in el6
-Patch2: %{name}-7.0.84-CompilerOptionsV89.patch
+Patch2: %{name}-7.0.90-RemoveCompilerOptions.patch
# Adding patch to remove unsupport ant tasks/attributes
-Patch3: %{name}-7.0.70-build.patch
+Patch3: %{name}-7.0.90-build.patch
Patch4: %{name}-7.0-catalina-policy.patch
BuildArch: noarch
https://src.fedoraproject.org/rpms/tomcat/c/69c429d6280780296d4ec2c01146c...