[tomcat8] 02/04: Refreshed the patches

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit 4f0697aff279608eda695331d2ced7e9ec59faa0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 26 14:56:23 2017 +0200

    Refreshed the patches
---
 debian/changelog                             |  8 ++++++++
 debian/patches/0018-fix-manager-webapp.patch | 25 +++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 59ac932..d379064 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tomcat8 (8.5.16-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 26 Jun 2017 14:56:03 +0200
+
 tomcat8 (8.5.15-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0018-fix-manager-webapp.patch b/debian/patches/0018-fix-manager-webapp.patch
index d395295..7236c70 100644
--- a/debian/patches/0018-fix-manager-webapp.patch
+++ b/debian/patches/0018-fix-manager-webapp.patch
@@ -28,7 +28,7 @@ Last-Update: 2013-08-01
  </Context>]]></source>
 --- a/conf/catalina.policy
 +++ b/conf/catalina.policy
-@@ -202,14 +202,14 @@
+@@ -203,7 +203,7 @@
  // - default CATALINA_HOME == CATALINA_BASE
  // - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE
  // - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME
@@ -37,11 +37,32 @@ Last-Update: 2013-08-01
      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina";
      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.ha.session";
      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager";
-     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager.util";
+@@ -211,7 +211,7 @@
      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util";
+     permission org.apache.catalina.security.DeployXmlPermission "manager";
  };
 -grant codeBase "file:${catalina.home}/webapps/manager/-" {
 +grant codeBase "file:${catalina.home}/../tomcat8-admin/manager/-" {
      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina";
      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.ha.session";
      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager";
+@@ -226,10 +226,10 @@
+ // - default CATALINA_HOME == CATALINA_BASE
+ // - CATALINA_HOME != CATALINA_BASE, per instance Host Manager in CATALINA_BASE
+ // - CATALINA_HOME != CATALINA_BASE, shared Host Manager in CATALINA_HOME
+-grant codeBase "file:${catalina.base}/webapps/host-manager/-" {
++grant codeBase "file:${catalina.base}/../tomcat8-admin/host-manager/-" {
+     permission org.apache.catalina.security.DeployXmlPermission "host-manager";
+ };
+-grant codeBase "file:${catalina.home}/webapps/host-manager/-" {
++grant codeBase "file:${catalina.home}/../tomcat8-admin/host-manager/-" {
+     permission org.apache.catalina.security.DeployXmlPermission "host-manager";
+ };
+ 
+@@ -275,4 +275,4 @@
+ //
+ // The permissions granted to a specific JAR
+ // grant codeBase "war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" {
+-// };
+\ No newline at end of file
++// };

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git