From d93791cfa1ec26b44655df2c50bf6c265def3232 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Wed, 8 May 2019 09:56:48 +0200
Subject: [PATCH] - up to 7.0.94

---
 logging.patch          |  9 ++++++---
 tomcat-build.patch     | 22 ++++++++++++++++++++++
 tomcat-build.xml.patch |  6 +++---
 tomcat.spec            |  6 ++++--
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/logging.patch b/logging.patch
index 9042ffe..1f9668f 100644
--- a/logging.patch
+++ b/logging.patch
@@ -1,27 +1,30 @@
 --- apache-tomcat-7.0.41-src/conf/logging.properties~	2013-11-11 15:11:20.000000000 +0200
 +++ apache-tomcat-7.0.41-src/conf/logging.properties	2013-11-11 15:11:24.361648531 +0200
-@@ -25,18 +25,26 @@
- 1catalina.org.apache.juli.FileHandler.level = FINE
+@@ -26,21 +26,29 @@ handlers = 1catalina.org.apache.juli.Fil
  1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
  1catalina.org.apache.juli.FileHandler.prefix = catalina.
+ 1catalina.org.apache.juli.FileHandler.encoding = UTF-8
 +1catalina.org.apache.juli.FileHandler.rotatable = false
-+1catalina.org.apache.juli.FileHandler.suffix = log
++1catalina.org.apache.juli.FileHandlers.suffix = log
  
  2localhost.org.apache.juli.FileHandler.level = FINE
  2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
  2localhost.org.apache.juli.FileHandler.prefix = localhost.
+ 2localhost.org.apache.juli.FileHandler.encoding = UTF-8
 +2localhost.org.apache.juli.FileHandler.rotatable = false
 +2localhost.org.apache.juli.FileHandler.suffix = log
  
  3manager.org.apache.juli.FileHandler.level = FINE
  3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
  3manager.org.apache.juli.FileHandler.prefix = manager.
+ 3manager.org.apache.juli.FileHandler.encoding = UTF-8
 +3manager.org.apache.juli.FileHandler.rotatable = false
 +3manager.org.apache.juli.FileHandler.suffix = log
  
  4host-manager.org.apache.juli.FileHandler.level = FINE
  4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
  4host-manager.org.apache.juli.FileHandler.prefix = host-manager.
+ 4host-manager.org.apache.juli.FileHandler.encoding = UTF-8
 +4host-manager.org.apache.juli.FileHandler.rotatable = false
 +4host-manager.org.apache.juli.FileHandler.suffix = log
  
diff --git a/tomcat-build.patch b/tomcat-build.patch
index f0eea3b..0a1afce 100644
--- a/tomcat-build.patch
+++ b/tomcat-build.patch
@@ -42,3 +42,25 @@
        maxmemory="512m"
        failonerror="true"
        executable="${java.7.home}/bin/javadoc">
+--- apache-tomcat-7.0.94-src/build.xml~	2019-05-08 09:40:51.000000000 +0200
++++ apache-tomcat-7.0.94-src/build.xml	2019-05-08 09:42:01.675738032 +0200
+@@ -2559,7 +2559,7 @@ Apache Tomcat ${version} native binaries
+ 
+   <target name="download-deps"
+           description="Download the dependencies required to build and test"
+-          depends="download-compile, download-dist, download-test-compile, download-validate, download-cobertura, extras-commons-logging-prepare, extras-webservices-prepare" />
++          depends="download-compile, download-dist, download-test-compile, download-validate, download-cobertura, extras-webservices-prepare" />
+ 
+   <target name="download-validate"
+           description="Download components necessary to validate source"
+--- apache-tomcat-7.0.94-src/build.xml~	2019-05-08 09:42:27.000000000 +0200
++++ apache-tomcat-7.0.94-src/build.xml	2019-05-08 09:52:06.183789472 +0200
+@@ -1955,7 +1955,7 @@ Apache Tomcat ${version} native binaries
+       encoding="ISO-8859-1"
+       docencoding="ISO-8859-1"
+       charset="ISO-8859-1"
+-      additionalparam="-breakiterator -notimestamp"
++      additionalparam="-Xdoclint:none -breakiterator -notimestamp"
+       maxmemory="512m"
+       failonerror="true"
+       executable="${java.7.home}/bin/javadoc">
diff --git a/tomcat-build.xml.patch b/tomcat-build.xml.patch
index 52ed244..2f33c98 100644
--- a/tomcat-build.xml.patch
+++ b/tomcat-build.xml.patch
@@ -1,10 +1,10 @@
 --- apache-tomcat-7.0.63-src/build.xml~	2015-06-30 11:15:44.000000000 +0300
 +++ apache-tomcat-7.0.63-src/build.xml	2015-07-26 21:31:46.613106110 +0300
-@@ -632,7 +574,7 @@
-   <target name="compile" depends="compile-java6,check-java7,compile-java7" />
+@@ -655,7 +655,7 @@
+   <target name="compile" depends="compile-java6, check-java7, compile-java7" />
  
    <target name="compile-java6"
--          depends="build-prepare,download-compile,compile-prepare,validate">
+-          depends="build-prepare, download-compile, compile-prepare, validate">
 +          depends="build-prepare">
      <!-- Compile internal server components -->
      <javac srcdir="java" destdir="${tomcat.classes}"
diff --git a/tomcat.spec b/tomcat.spec
index ce0b503..4b3fc1d 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -15,12 +15,12 @@
 Summary:	Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP %{jspapiver} API
 Summary(pl.UTF-8):	Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
 Name:		tomcat
-Version:	7.0.91
+Version:	7.0.94
 Release:	1
 License:	Apache v2.0
 Group:		Networking/Daemons/Java
 Source0:	http://www.apache.org/dist/tomcat/tomcat-7/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
-# Source0-md5:	4e0b79a0a06a0dae07ca12e173f16920
+# Source0-md5:	ab9ce1e8190fbfed2b4843c2ca69106c
 Source1:	apache-%{name}.init
 Source2:	apache-%{name}.sysconfig
 Source3:	%{name}-build.properties
@@ -508,9 +508,11 @@ fi
 %{_tomcatdir}/lib/servlet-api.jar
 %{_tomcatdir}/lib/tomcat-jdbc.jar
 %{_tomcatdir}/lib/tomcat-coyote.jar
+%{_tomcatdir}/lib/tomcat-dbcp.jar
 %{_tomcatdir}/lib/tomcat-i18n-es.jar
 %{_tomcatdir}/lib/tomcat-i18n-fr.jar
 %{_tomcatdir}/lib/tomcat-i18n-ja.jar
+%{_tomcatdir}/lib/tomcat-i18n-ru.jar
 %{_tomcatdir}/lib/tomcat7-websocket.jar
 %{_tomcatdir}/lib/websocket-api.jar
 %{_tomcatdir}/lib/util.jar
-- 
2.43.0