upgrading package: tomcat 9.0.30 -> 9.0.31

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.orig	2020-02-05 20:36:14.000000000 +0100
-+++ conf/server.xml	2016-03-24 20:12:32.863012059 +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 @@
+@@ -85,7 +85,7 @@
-          using the JSSE engine, the JSSE configuration attributes must be used.
+          the SSLImplementation selected. JSSE style configuration is used below.
      -->
      <!--
 -    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
 +    <Connector address="127.0.0.1" port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
                 maxThreads="150" SSLEnabled="true">
          <SSLHostConfig>
-             <Certificate certificateKeystoreFile="conf/keystore-rsa.pem"
+             <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
-@@ -95,7 +95,7 @@
+@@ -100,7 +100,7 @@
-          the OpenSSL configuration attributes must be used.
+          configuration is used below.
      -->
      <!--
 -    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
 +    <Connector address="127.0.0.1" port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
                 maxThreads="150" SSLEnabled="true" >
          <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
-         <SSLHostConfig honorCipherOrder="false" >
+         <SSLHostConfig>
-@@ -108,7 +108,7 @@
+@@ -113,12 +113,10 @@
      -->
  
      <!-- Define an AJP 1.3 Connector on port 8009 -->
--    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+-    <!--
-+    <Connector address="127.0.0.1" port="8009" protocol="AJP/1.3" redirectPort="8443" />
+     <Connector protocol="AJP/1.3"
- 
+-               address="::1"
++               address="127.0.0.1"
+                port="8009"
+                redirectPort="8443" />
+-    -->
  
      <!-- An Engine represents the entry point (within Catalina) that processes
-@@ -152,7 +152,7 @@
+          every request.  The Engine implementation for Tomcat stand alone
+@@ -161,7 +159,7 @@
          <!-- Access log processes all example.
               Documentation at: /docs/config/valve.html
               Note: The pattern used is equivalent to using pattern="common" -->
@@ -63,8 +68,8 @@ Index: conf/server.xml
                 pattern="%h %l %u %t &quot;%r&quot; %s %b" />
  
 Index: conf/tomcat-users.xml
---- conf/tomcat-users.xml.orig	2016-03-24 20:11:18.072603000 +0100
+--- conf/tomcat-users.xml.orig	2020-02-05 20:36:14.000000000 +0100
-+++ conf/tomcat-users.xml	2016-03-24 20:13:15.832969414 +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"

tomcat/tomcat.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        PLUS
 Group:        Web
 License:      Apache Software License 2.0
-Version:      9.0.30
+Version:      9.0.31
-Release:      20191213
+Release:      20200211
 
 #   list of sources
 Source0:      http://www.apache.org/dist/tomcat/tomcat-9/v%{version}/bin/apache-tomcat-%{version}.tar.gz