[pkg-java] r5262 - trunk/tomcat5.5/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-01-01 23:45:58 +0000 (Tue, 01 Jan 2008)
New Revision: 5262

Modified:
   trunk/tomcat5.5/debian/changelog
   trunk/tomcat5.5/debian/tomcat5.5.init
Log:
tomcat5.5 (5.5.25-5) UNRELEASED; urgency=low

  * debian/tomcat5.5.init: Check if tomcat-users.xml exists. Closes: #445857.
    Thanks to Javier Serrano Polo for the patch.

 -- Michael Koch <konqueror at gmx.de>  Tue, 01 Jan 2008 13:52:20 +0100



Modified: trunk/tomcat5.5/debian/changelog
===================================================================
--- trunk/tomcat5.5/debian/changelog	2008-01-01 22:57:38 UTC (rev 5261)
+++ trunk/tomcat5.5/debian/changelog	2008-01-01 23:45:58 UTC (rev 5262)
@@ -1,3 +1,10 @@
+tomcat5.5 (5.5.25-5) UNRELEASED; urgency=low
+
+  * debian/tomcat5.5.init: Check if tomcat-users.xml exists. Closes: #445857.
+    Thanks to Javier Serrano Polo for the patch.
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 01 Jan 2008 13:52:20 +0100
+
 tomcat5.5 (5.5.25-4) unstable; urgency=high
 
   * CVE-2007-5342: Fix unauthorized modification of data because of

Modified: trunk/tomcat5.5/debian/tomcat5.5.init
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.init	2008-01-01 22:57:38 UTC (rev 5261)
+++ trunk/tomcat5.5/debian/tomcat5.5.init	2008-01-01 23:45:58 UTC (rev 5262)
@@ -146,10 +146,14 @@
 
 		# Clean up and set permissions on required files
 		find "$CATALINA_BASE"/temp/ -mindepth 1 -exec rm -fr {} +
-		chown --dereference "$TOMCAT5_USER" "$CATALINA_BASE/conf" \
-			"$CATALINA_BASE/conf/tomcat-users.xml" \
-			"$CATALINA_BASE/logs" "$CATALINA_BASE/temp" \
-			"$CATALINA_BASE/webapps" "$CATALINA_BASE/work" \
+		REQUIRED_FILES='"$CATALINA_BASE/conf"
+			"$CATALINA_BASE/logs" "$CATALINA_BASE/temp"
+			"$CATALINA_BASE/webapps" "$CATALINA_BASE/work"'
+		if [ -e "$CATALINA_BASE/conf/tomcat-users.xml" ]; then
+			REQUIRED_FILES=$REQUIRED_FILES'
+				"$CATALINA_BASE/conf/tomcat-users.xml"'
+		fi
+		eval chown --dereference "$TOMCAT5_USER" $REQUIRED_FILES \
 			|| true
 
 		$DAEMON -user "$TOMCAT5_USER" -cp "$JSVC_CLASSPATH" \