Hello community, here is the log from the commit of package tomcat6 checked in at Fri Nov 28 16:06:47 CET 2008. -------- --- tomcat6/tomcat6.changes 2008-09-12 09:32:08.000000000 +0200 +++ tomcat6/tomcat6.changes 2008-11-24 14:05:38.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 24 14:05:10 CET 2008 - mvyskocil@suse.cz + +- Fixed bnc#446598 - Tomcat6: tomcat6.conf overwrites sysconfig/tomcat6 values + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtcnative-1-0.spec ++++++ --- /var/tmp/diff_new_pack.B28120/_old 2008-11-28 16:05:56.000000000 +0100 +++ /var/tmp/diff_new_pack.B28120/_new 2008-11-28 16:05:56.000000000 +0100 @@ -29,7 +29,7 @@ Name: libtcnative-1-0 Version: %{major}.%{minor}.%{micro} -Release: 6 +Release: 7 Summary: JNI wrappers for Apache Portable Runtime for Tomcat Group: Productivity/Networking/Web/Servers License: The Apache Software License ++++++ tomcat6.spec ++++++ --- /var/tmp/diff_new_pack.B28120/_old 2008-11-28 16:05:56.000000000 +0100 +++ /var/tmp/diff_new_pack.B28120/_new 2008-11-28 16:05:56.000000000 +0100 @@ -36,7 +36,7 @@ Name: tomcat6 Version: %{major_version}.%{minor_version}.%{macro_version} -Release: 13 +Release: 14 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API Group: Productivity/Networking/Web/Servers License: The Apache Software License @@ -453,6 +453,8 @@ %{appdir}/examples %changelog +* Mon Nov 24 2008 mvyskocil@suse.cz +- Fixed bnc#446598 - Tomcat6: tomcat6.conf overwrites sysconfig/tomcat6 values * Fri Sep 12 2008 mvyskocil@suse.cz - Update to 6.0.18. This obsoletes patches: apache-tomcat-CVE-2008-1232 ++++++ tomcat6-6.0.wrapper ++++++ --- /var/tmp/diff_new_pack.B28120/_old 2008-11-28 16:05:57.000000000 +0100 +++ /var/tmp/diff_new_pack.B28120/_new 2008-11-28 16:05:57.000000000 +0100 @@ -1,9 +1,10 @@ #!/bin/bash # Get the tomcat config (use this for environment specific settings) -if [ -z "${TOMCAT_CFG}" ]; then - TOMCAT_CFG="/etc/tomcat6/tomcat6.conf" -fi +# Don't read a conf file again - bnc#446598 +#if [ -z "${TOMCAT_CFG}" ]; then +# TOMCAT_CFG="/etc/tomcat6/tomcat6.conf" +#fi if [ -r "$TOMCAT_CFG" ]; then . $TOMCAT_CFG ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org