- up to 7.0.70; add patch that fixes CVE-2016-5388

[packages/tomcat.git] / tomcat.spec

diff --git a/tomcat.spec b/tomcat.spec
index fd824c601788cd4fff01f552517f7b2f0d1863b1..40284e772c61b7210acf26dc81006cf9e64fdac4 100644 (file)
--- 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.69
+Version:       7.0.70
 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: c055311b06f3f314b7cf7932ab31bd4a
+# Source0-md5: 0f56c888df5002cce25fce91634a65c9
 Source1:       apache-%{name}.init
 Source2:       apache-%{name}.sysconfig
 Source3:       %{name}-build.properties
@@ -40,6 +40,8 @@ Patch3:               %{name}-catalina.policy-javadir.patch
 Patch4:                %{name}-userdir.patch
 Patch5:                logging.patch
 Patch6:                jcl.patch
+Patch7:                %{name}-build.patch
+Patch8:                tomcat-CVE-2016-5388.patch
 Patch100:      jcl-build.xml.patch
 URL:           http://tomcat.apache.org/
 BuildRequires: ant >= 1.5.3
@@ -269,6 +271,8 @@ javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext).
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 # Prepare java-commmons-logging sources
 install -d output/extras/logging