[tomcat7] 01/06: Fixed the test failure in TestNamingContext

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch jessie
in repository tomcat7.

commit e9331e48b57c1068fc495887b59ddcd1499d24f7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 23 21:23:02 2016 +0100

    Fixed the test failure in TestNamingContext
---
 debian/changelog                   | 7 +++++++
 debian/patches/CVE-2016-6797.patch | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1c00500..c6fbbbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat7 (7.0.56-3+deb8u6) UNRELEASED; urgency=medium
+
+  * Fixed a test failure in the new TestNamingContext test added with the fix
+    for CVE-2016-6797
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 23 Nov 2016 21:21:55 +0100
+
 tomcat7 (7.0.56-3+deb8u5) jessie-security; urgency=high
 
   * Fixed CVE-2016-0762: The Realm implementations did not process the supplied
diff --git a/debian/patches/CVE-2016-6797.patch b/debian/patches/CVE-2016-6797.patch
index c1a1b94..4ee06c1 100644
--- a/debian/patches/CVE-2016-6797.patch
+++ b/debian/patches/CVE-2016-6797.patch
@@ -181,7 +181,7 @@ Origin: backport, https://svn.apache.org/r1757275
 +        Tomcat tomcat = getTomcatInstance();
 +        tomcat.enableNaming();
 +
-+        org.apache.catalina.Context ctx = tomcat.addContext("", null);
++        org.apache.catalina.Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir"));
 +
 +        tomcat.start();
 +

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