Accepting request 780241 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/780241
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tomcat?expand=0&rev=65

tomcat-9.0.31-secretRequired-default.patch

@@ -0,0 +1,13 @@
+Index: apache-tomcat-9.0.31-src/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+===================================================================
+--- apache-tomcat-9.0.31-src.orig/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
++++ apache-tomcat-9.0.31-src/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+@@ -180,7 +180,7 @@ public abstract class AbstractAjpProtoco
+     }
+ 
+ 
+-    private boolean secretRequired = true;
++    private boolean secretRequired = false;
+     public void setSecretRequired(boolean secretRequired) {
+         this.secretRequired = secretRequired;
+     }

tomcat.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 28 10:15:08 UTC 2020 - Matei Albu <malbu@suse.com>
+
+- Change default value of AJP connector secretRequired to false
+- Added patch:
+  * tomcat-9.0.31-secretRequired-default.patch
+
 -------------------------------------------------------------------
 Tue Feb 25 13:24:14 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 

tomcat.spec

@@ -81,6 +81,9 @@ Patch3:         %{name}-%{major_version}.%{minor_version}-javadoc.patch
 Patch4:         tomcat-9.0-osgi-build.patch
 # PATCH-FIX-OPENSUSE: cast ByteBuffer to Buffer in cases where there is a risk of using Java 9+ apis
 Patch5:         tomcat-9.0.31-java8compat.patch
+# PATCH-FIX-OPENSUSE: set ajp connector secreteRequired to false by default to avoid tomcat not starting
+Patch6:         tomcat-9.0.31-secretRequired-default.patch
+
 BuildRequires:  ant >= 1.8.1
 BuildRequires:  ant-antlr
 BuildRequires:  apache-commons-collections
@@ -258,6 +261,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # remove date from docs
 sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl