[pkg-java] r13416 - trunk/tomcat6/debian

[Tony Mancill]

Author: tmancill
Date: 2011-03-12 18:25:15 +0000 (Sat, 12 Mar 2011)
New Revision: 13416

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/tomcat6-instance-create
Log:
patch tomcat6-instance-create (#617553)

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2011-03-12 09:37:20 UTC (rev 13415)
+++ trunk/tomcat6/debian/changelog	2011-03-12 18:25:15 UTC (rev 13416)
@@ -1,3 +1,12 @@
+tomcat6 (6.0.32-2) UNRELEASED; urgency=low
+
+  * Patch debian/tomcat6-instance-create (LP: #707405)
+    tomcat6-instance-create should accept -1 as the value of -c option
+    as per http://tomcat.apache.org/tomcat-6.0-doc/config/server.html
+    Thanks to Dave Walker.  (Closes: #617553)
+
+ -- tony mancill <tmancill at debian.org>  Sat, 12 Mar 2011 10:22:36 -0800
+
 tomcat6 (6.0.32-1) unstable; urgency=low
 
   * Team upload.

Modified: trunk/tomcat6/debian/tomcat6-instance-create
===================================================================
--- trunk/tomcat6/debian/tomcat6-instance-create	2011-03-12 09:37:20 UTC (rev 13415)
+++ trunk/tomcat6/debian/tomcat6-instance-create	2011-03-12 18:25:15 UTC (rev 13416)
@@ -23,11 +23,22 @@
   type=$1
   port=$2
   # Fail if port is non-numeric
-  num=`expr ${port} + 1 2> /dev/null`
-  if [ $? != 0 ] || [ $num -lt 2 ]; then
+  if ! echo $port | grep -Eq '^\-?[0-9]+$' ; then
     echo "Error: ${type} port '${port}' is not a valid TCP port number."
     exit 1
   fi
+  
+  # If Control port is -1 , no need to check any further. 
+  if [ "$type" = "Control" ] && [ $port -eq -1 ]; then
+   echo "Warning: Control port disabled. You will have to shutdown the server manually, by using OS signals."
+   return
+  fi
+  
+  # Fail if port is 0 or negative 
+  if [ $port -le 0 ]; then
+   echo "Error: ${type} port '${port}' is not a valid TCP port number."
+   exit 1
+  fi
 
   # Fail if port is above 65535
   if [ ${port} -gt 65535 ]; then