[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.42-1-3-g031ca79

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit 8d327c26e0308256c6499bb300e38d62c7b6f667
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Aug 1 12:04:34 2013 +0200

    Closing launchpad bug 1128067 and 1088681

diff --git a/debian/changelog b/debian/changelog
index b51a26b..78ad16d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tomcat7 (7.0.42-2) UNRELEASED; urgency=low
+
+  * Removed -Djava.net.preferIPv4Stack=true
+    from init script (lp: #1088681),
+    thanks Hendrik Haddorp.
+  * Added webapp manager path patch (lp: #1128067)
+    thanks TJ.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Thu, 01 Aug 2013 11:53:03 +0200
+
 tomcat7 (7.0.42-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/fix-manager-webapp.path b/debian/patches/fix-manager-webapp.path
new file mode 100644
index 0000000..e94ea42
--- /dev/null
+++ b/debian/patches/fix-manager-webapp.path
@@ -0,0 +1,49 @@
+DESCRIPTION: this patch changes the manager path from webapps/manager to
+../tomcat7-admin/manager
+
+Author: TJ <ubuntu at iam.tj>, Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1128067
+Reviewed-By: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Last-Update: <2013-08-01>
+
+--- tomcat7-7.0.42.orig/webapps/host-manager/manager.xml
++++ tomcat7-7.0.42/webapps/host-manager/manager.xml
+@@ -24,7 +24,7 @@
+ -->
+ 
+ 
+-<Context docBase="${catalina.home}/webapps/manager"
++<Context docBase="${catalina.home}/../tomcat7-admin/manager"
+          privileged="true" antiResourceLocking="false" antiJARLocking="false">
+ 
+ </Context>
+--- tomcat7-7.0.42.orig/webapps/docs/manager-howto.xml
++++ tomcat7-7.0.42/webapps/docs/manager-howto.xml
+@@ -72,7 +72,7 @@ Manager web application <code>Context</c
+ example:</p>
+ <pre>
+ <Context privileged="true" antiResourceLocking="false"
+-         docBase="${catalina.home}/webapps/manager">
++         docBase="${catalina.home}/../tomcat7-admin/manager">
+   <Valve className="org.apache.catalina.valves.RemoteAddrValve"
+          allow="127\.0\.0\.1" />
+ </Context>
+--- tomcat7-7.0.42.orig/conf/catalina.policy
++++ tomcat7-7.0.42/conf/catalina.policy
+@@ -196,14 +196,14 @@ grant {
+ // - default CATALINA_HOME == CATALINA_BASE
+ // - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE
+ // - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME
+-grant codeBase "file:${catalina.base}/webapps/manager/-" {
++grant codeBase "file:${catalina.base}/../tomcat7-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";
+     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager.util";
+     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util";
+ };
+-grant codeBase "file:${catalina.home}/webapps/manager/-" {
++grant codeBase "file:${catalina.home}/../tomcat7-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";
diff --git a/debian/patches/series b/debian/patches/series
index 74b48e2..1821c71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 0014-JDTCompiler.patch
 0015_disable_test_TestCometProcessor.patch
 0017-use-jdbc-pool-default.patch
+fix-manager-webapp.path
diff --git a/debian/tomcat7.init b/debian/tomcat7.init
index eeea1dc..967ba23 100644
--- a/debian/tomcat7.init
+++ b/debian/tomcat7.init
@@ -149,7 +149,6 @@ catalina_sh() {
 
 	AUTHBIND_COMMAND=""
 	if [ "$AUTHBIND" = "yes" -a "$1" = "start" ]; then
-		JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
 		AUTHBIND_COMMAND="/usr/bin/authbind --deep /bin/bash -c "
 	fi
 

-- 
tomcat7: Servlet and JSP engine