diff --git a/add_parent_logger_getter.patch b/add_parent_logger_getter.patch
deleted file mode 100644
index 40b9268..0000000
--- a/add_parent_logger_getter.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java.sav 2012-01-17 13:55:44.000000000 +0400
-+++ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java 2012-01-22 00:44:22.299789107 +0400
-@@ -19,9 +19,11 @@ package org.apache.tomcat.jdbc.pool;
- import java.io.PrintWriter;
- import java.sql.Connection;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.util.Iterator;
- import java.util.Properties;
- import java.util.concurrent.Future;
-+import java.util.logging.Logger;
-
- import javax.sql.XAConnection;
-
-@@ -534,6 +536,14 @@ public class DataSourceProxy implements
- }
-
- /**
-+ * no-op
-+ * {@link javax.sql.DataSource#getParentLogger}
-+ */
-+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /**
- * no-op
- * {@link javax.sql.DataSource#getLogWriter}
- */
diff --git a/sources b/sources
index b76a2e2..08fad59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1693d330f195366a6cd852bf3ce3eb95 apache-tomcat-7.0.33-src.tar.gz
+f26a57bbb9713c1a101e37243eaa2175 apache-tomcat-7.0.65-src.tar.gz
diff --git a/tomcat-7.0.57-CompilerOptionsV8.patch b/tomcat-7.0.57-CompilerOptionsV8.patch
new file mode 100644
index 0000000..baf9fce
--- /dev/null
+++ b/tomcat-7.0.57-CompilerOptionsV8.patch
@@ -0,0 +1,109 @@
+--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2014-11-18 14:29:02.146042000 -0500
++++ java/org/apache/jasper/compiler/JDTCompiler.java 2014-11-18 14:31:41.851597000 -0500
+@@ -67,7 +67,6 @@
+ /**
+ * Compile the servlet from .java file to .class file
+ */
+- @Override
+ protected void generateClass(String[] smap)
+ throws FileNotFoundException, JasperException, Exception {
+
+@@ -98,12 +97,10 @@
+ this.sourceFile = sourceFile;
+ }
+
+- @Override
+ public char[] getFileName() {
+ return sourceFile.toCharArray();
+ }
+
+- @Override
+ public char[] getContents() {
+ char[] result = null;
+ FileInputStream is = null;
+@@ -145,7 +142,6 @@
+ return result;
+ }
+
+- @Override
+ public char[] getMainTypeName() {
+ int dot = className.lastIndexOf('.');
+ if (dot > 0) {
+@@ -154,7 +150,6 @@
+ return className.toCharArray();
+ }
+
+- @Override
+ public char[][] getPackageName() {
+ StringTokenizer izer =
+ new StringTokenizer(className, ".");
+@@ -166,7 +161,6 @@
+ return result;
+ }
+
+- @Override
+ public boolean ignoreOptionalProblems() {
+ return false;
+ }
+@@ -174,7 +168,6 @@
+
+ final INameEnvironment env = new INameEnvironment() {
+
+- @Override
+ public NameEnvironmentAnswer
+ findType(char[][] compoundTypeName) {
+ String result = "";
+@@ -187,7 +180,6 @@
+ return findType(result);
+ }
+
+- @Override
+ public NameEnvironmentAnswer
+ findType(char[] typeName,
+ char[][] packageName) {
+@@ -269,7 +261,6 @@
+ }
+ }
+
+- @Override
+ public boolean isPackage(char[][] parentPackageName,
+ char[] packageName) {
+ String result = "";
+@@ -293,7 +284,6 @@
+ return isPackage(result);
+ }
+
+- @Override
+ public void cleanup() {
+ }
+
+@@ -342,9 +332,6 @@
+ } 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 {
+ log.warn("Unknown source VM " + opt + " ignored.");
+ settings.put(CompilerOptions.OPTION_Source,
+@@ -386,11 +373,6 @@
+ 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 {
+ log.warn("Unknown target VM " + opt + " ignored.");
+ settings.put(CompilerOptions.OPTION_TargetPlatform,
+@@ -408,7 +390,6 @@
+ 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.65-build.patch b/tomcat-7.0.65-build.patch
new file mode 100644
index 0000000..5e98385
--- /dev/null
+++ b/tomcat-7.0.65-build.patch
@@ -0,0 +1,53 @@
+--- build.xml 2015-12-11 07:27:23.026996172 -0500
++++ build.xml 2015-12-11 07:29:46.762002209 -0500
+@@ -1042,12 +1042,11 @@
+
+
+
+-
+-
++
+
+
+
+-
++
+
+
+
+@@ -2826,7 +2825,7 @@ Apache Tomcat ${version} native binaries
+
+
+
+-
++
+
+
+
+@@ -2857,7 +2856,7 @@ Apache Tomcat ${version} native binaries
+
+
+
+-
++
+
+
+
+@@ -2886,7 +2885,7 @@ Apache Tomcat ${version} native binaries
+
+
+
+-
++
+
+
+
+@@ -2927,7 +2926,7 @@ Apache Tomcat ${version} native binaries
+
+
+
+-
++
+
+
+
diff --git a/tomcat.spec b/tomcat.spec
index 67431be..167c04d 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -31,7 +31,7 @@
%global jspspec 2.2
%global major_version 7
%global minor_version 0
-%global micro_version 33
+%global micro_version 65
%global packdname apache-tomcat-%{version}-src
%global servletspec 3.0
%global elspec 2.2
@@ -53,13 +53,13 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 4%{?dist}
+Release: 1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
License: ASL 2.0
URL: http://tomcat.apache.org/
-Source0: http://archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz
+Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz
Source1: %{name}-%{major_version}.%{minor_version}.conf
Source2: %{name}-%{major_version}.%{minor_version}.init
Source3: %{name}-%{major_version}.%{minor_version}.sysconfig
@@ -79,11 +79,13 @@ 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.57-CompilerOptionsV8.patch
+# Adding patch to remove unsupport ant tasks/attributes
+Patch3: %{name}-7.0.65-build.patch
BuildArch: noarch
-ExcludeArch: ppc64
-
BuildRequires: ant
BuildRequires: ant-nodeps
BuildRequires: ant-trax
@@ -94,7 +96,7 @@ BuildRequires: jakarta-commons-daemon
BuildRequires: jakarta-commons-dbcp
BuildRequires: jakarta-commons-pool
BuildRequires: jakarta-taglibs-standard
-BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: java7-devel >= 1:1.7.0
BuildRequires: jpackage-utils >= 0:1.7.0
BuildRequires: junit
BuildRequires: log4j
@@ -164,6 +166,7 @@ Summary: Apache Tomcat JSP API implementation classes
Provides: jsp = %{jspspec}
Provides: jsp22
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
+Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
Requires(post): chkconfig
Requires(postun): chkconfig
@@ -226,11 +229,14 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
%patch0 -p0
%patch1 -p0
+%patch2 -p0
+%patch3 -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
%build
-export OPT_JAR_LIST="ant/ant-trax xalan-j2-serializer"
+export OPT_JAR_LIST="ant/ant-trax ant/ant-nodeps xalan-j2-serializer"
# we don't care about the tarballs and we're going to replace
# tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar
# so just create a dummy file for later removal
@@ -257,6 +263,7 @@ export OPT_JAR_LIST="ant/ant-trax xalan-j2-serializer"
-Dno.build.dbcp=true \
-Dversion="%{version}" \
-Dversion.build="%{micro_version}" \
+ -Djava.7.home=%{java_home} \
deploy dist-prepare dist-source javadoc
# remove some jars that we'll replace with symlinks later
@@ -526,8 +533,9 @@ fi
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%attr(0755,root,tomcat) %dir %{basedir}
%attr(0755,root,tomcat) %dir %{confdir}
+%defattr(0664,tomcat,root,0770)
+%attr(0770,tomcat,root) %dir %{logdir}
%defattr(0664,root,tomcat,0770)
-%attr(0770,root,tomcat) %dir %{logdir}
%attr(0660,tomcat,tomcat) %{logdir}/catalina.out
%attr(0644,tomcat,tomcat) %{_localstatedir}/run/%{name}.pid
%attr(0770,root,tomcat) %dir %{cachedir}
@@ -622,6 +630,9 @@ fi
%{_sbindir}/%{name}-jsvc
%changelog
+* Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1
+- Updated to 7.0.65
+
* Tue Apr 29 2014 Vlad Slepukhin 0:7.0.33-4
- Fixed bug not allowing Tomcat to start properly connected with access privleges to the logging directory
- Removed residual systemd configuration from the wrapper