pool/tomcat
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 674514 from home:ecsos:server

Browse Source 
- Add tomcat-9.0-tomcat-webapps.patch to fix missing context for
  manager and host-mamanger.

OBS-URL: https://build.opensuse.org/request/show/674514
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=151
This commit is contained in:
Matei Albu 2019-02-14 15:16:41 +00:00 committed by Git OBS Bridge
parent 59ec06a2d1
commit d7994db69e
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tomcat-9.0-tomcat-webapps.patch Normal file
View File

@ -0,0 +1,23 @@
Index: apache-tomcat-9.0.14-src/conf/server.xml
===================================================================
--- apache-tomcat-9.0.14-src.orig/conf/server.xml
+++ apache-tomcat-9.0.14-src/conf/server.xml
@@ -161,7 +161,18 @@
prefix="localhost_access_log" suffix=".txt"
pattern="%h %l %u %t "%r" %s %b" />
+ <!-- Path and rights to manager and host-manager -->
+ <Context antiResourceLocking="false" docBase="/usr/share/tomcat/tomcat-webapps/host-manager" path="/host-manager" privileged="true">
+ <Valve allow="127\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1" className="org.apache.catalina.valves.RemoteAddrValve"/>
+ <Manager sessionAttributeValueClassNameFilter="java\.lang\.(?:Boolean|Integer|Long|Number|String)|org\.apache\.catalina\.filters\.CsrfPreventionFilter\$LruCache(?:\$1)?|java\.util\.(?:Linked)?HashMap"/>
+ </Context>
+ <Context antiResourceLocking="false" privileged="true" path="/manager" docBase="/usr/share/tomcat/tomcat-webapps/manager">
+ <Valve className="org.apache.catalina.valves.RemoteAddrValve" allow="127\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1"/>
+ <Manager sessionAttributeValueClassNameFilter="java\.lang\.(?:Boolean|Integer|Long|Number|String)|org\.apache\.catalina\.filters\.CsrfPreventionFilter\$LruCache(?:\$1)?|java\.util\.(?:Linked)?HashMap"/>
+ </Context>
+
</Host>
</Engine>
</Service>
</Server>
+

6
tomcat.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 13 09:11:49 UTC 2019 - ecsos@opensuse.org
- Add tomcat-9.0-tomcat-webapps.patch to fix missing context for
manager and host-mamanger.
-------------------------------------------------------------------
Tue Feb 5 09:50:35 UTC 2019 - malbu@suse.com

3
tomcat.spec
View File

@ -89,6 +89,8 @@ Patch3: %{name}-%{major_version}.%{minor_version}-sle.catalina.policy.pa
Patch4: %{name}-%{major_version}.%{minor_version}-javadoc.patch
# PATCH-FIX-OPENSUSE: disable adding OSGi metadata to JAR files because bndtools is not avalable in SLES/OpenSUSE
Patch5: tomcat-9.0-disable-osgi-build.patch
# PATCH-FIX-OPENSUSE: insert missing context for manager and host-manager
Patch6: tomcat-9.0-tomcat-webapps.patch
BuildRequires: ant >= 1.8.1
BuildRequires: ant-antlr
@ -266,6 +268,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
%patch3
%patch4 -p1
%patch5 -p1
%patch6 -p1
# remove date from docs
sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl