Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2013-02-22 19:35:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2013-01-22 17:59:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2013-02-22 19:35:38.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Feb 16 07:29:52 UTC 2013 - [email protected] + +- Fix tomcat init scripts generating malformed classpath + (http://youtrack.jetbrains.com/issue/JT-18545) + bnc#804992 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat-7.0-digest.script ++++++ --- /var/tmp/diff_new_pack.Kc4W8t/_old 2013-02-22 19:35:39.000000000 +0100 +++ /var/tmp/diff_new_pack.Kc4W8t/_new 2013-02-22 19:35:39.000000000 +0100 @@ -28,6 +28,9 @@ fi CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" + +#sanitize the classpath - remove double and trailing colons +CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`" export CLASSPATH # Configuration ++++++ tomcat-7.0-tomcat-sysd ++++++ --- /var/tmp/diff_new_pack.Kc4W8t/_old 2013-02-22 19:35:39.000000000 +0100 +++ /var/tmp/diff_new_pack.Kc4W8t/_new 2013-02-22 19:35:39.000000000 +0100 @@ -34,7 +34,6 @@ fi set_javacmd - # CLASSPATH munging if [[ -n "$JSSE_HOME" ]]; then CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)" @@ -43,6 +42,9 @@ CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)" +#sanitize the classpath - remove double and trailing colons +CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`" + # See how we were called. function start() { ++++++ tomcat-7.0-tool-wrapper.script ++++++ --- /var/tmp/diff_new_pack.Kc4W8t/_old 2013-02-22 19:35:39.000000000 +0100 +++ /var/tmp/diff_new_pack.Kc4W8t/_new 2013-02-22 19:35:39.000000000 +0100 @@ -28,6 +28,10 @@ fi CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" + +#sanitize the classpath - remove double and trailing colons +CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`" + export CLASSPATH # Configuration ++++++ tomcat-7.0.wrapper ++++++ --- /var/tmp/diff_new_pack.Kc4W8t/_old 2013-02-22 19:35:39.000000000 +0100 +++ /var/tmp/diff_new_pack.Kc4W8t/_new 2013-02-22 19:35:39.000000000 +0100 @@ -25,6 +25,9 @@ CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)" + +#sanitize the classpath - remove double and trailing colons +CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`" if [ "$1" = "start" ]; then ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
