diff --git a/tomcat/tomcat.patch b/tomcat/tomcat.patch index 07d3a1a5c9..074c212fdc 100644 --- a/tomcat/tomcat.patch +++ b/tomcat/tomcat.patch @@ -1,6 +1,6 @@ Index: conf/server.xml ---- conf/server.xml.orig 2016-03-17 15:48:52.000000000 +0100 -+++ conf/server.xml 2016-03-24 20:12:32.863012059 +0100 +--- conf/server.xml.orig 2020-02-05 20:36:14.000000000 +0100 ++++ conf/server.xml 2020-02-11 20:08:55.758698000 +0100 @@ -19,7 +19,7 @@ define subcomponents such as "Valves" at this level. Documentation at /docs/config/server.html @@ -26,34 +26,39 @@ Index: conf/server.xml connectionTimeout="20000" redirectPort="8443" /> --> -@@ -81,7 +81,7 @@ - using the JSSE engine, the JSSE configuration attributes must be used. +@@ -85,7 +85,7 @@ + the SSLImplementation selected. JSSE style configuration is used below. --> -- -+ - +- @@ -63,8 +68,8 @@ Index: conf/server.xml pattern="%h %l %u %t "%r" %s %b" /> Index: conf/tomcat-users.xml ---- conf/tomcat-users.xml.orig 2016-03-24 20:11:18.072603000 +0100 -+++ conf/tomcat-users.xml 2016-03-24 20:13:15.832969414 +0100 +--- conf/tomcat-users.xml.orig 2020-02-05 20:36:14.000000000 +0100 ++++ conf/tomcat-users.xml 2020-02-11 20:07:06.843934000 +0100 @@ -19,26 +19,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd" diff --git a/tomcat/tomcat.spec b/tomcat/tomcat.spec index 07b7d65c18..9e8bc3c2af 100644 --- a/tomcat/tomcat.spec +++ b/tomcat/tomcat.spec @@ -31,8 +31,8 @@ Distribution: OpenPKG Community Class: PLUS Group: Web License: Apache Software License 2.0 -Version: 9.0.30 -Release: 20191213 +Version: 9.0.31 +Release: 20200211 # list of sources Source0: http://www.apache.org/dist/tomcat/tomcat-9/v%{version}/bin/apache-tomcat-%{version}.tar.gz