Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2016-04-28 16:55:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2016-04-12 19:34:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2016-04-28 16:59:38.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Apr 21 21:22:56 UTC 2016 - [email protected] + +- Version update to 8.0.33: + * Another bugfix release for 8.0 series, full details: + http://tomcat.apache.org/tomcat-8.0-doc/changelog.html#Tomcat_8.0.33_(markt) +- Rebase tomcat-8.0-tomcat-users-webapp.patch +- Rebase tomcat-7.0.53-JDTCompiler-java.patch + to tomcat-8.0.33-JDTCompiler-java.patch + +------------------------------------------------------------------- Old: ---- apache-tomcat-8.0.32-src.tar.gz apache-tomcat-8.0.32-src.tar.gz.asc tomcat-7.0.53-JDTCompiler-java.patch New: ---- apache-tomcat-8.0.33-src.tar.gz apache-tomcat-8.0.33-src.tar.gz.asc tomcat-8.0.33-JDTCompiler-java.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.NUyd5z/_old 2016-04-28 16:59:43.000000000 +0200 +++ /var/tmp/diff_new_pack.NUyd5z/_new 2016-04-28 16:59:43.000000000 +0200 @@ -22,7 +22,7 @@ %define elspec 3.0 %define major_version 8 %define minor_version 0 -%define micro_version 32 +%define micro_version 33 %define packdname apache-tomcat-%{version}-src # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %global basedir /srv/%{name} @@ -75,7 +75,7 @@ #PATCH-FIX-OPENSUSE: skip few windows specific parts of build Patch2: tomcat-8.0.9-property-build.windows.patch # PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373 -Patch3: tomcat-7.0.53-JDTCompiler-java.patch +Patch3: tomcat-8.0.33-JDTCompiler-java.patch # PATCH-FIX-SLE: Change security manager default policies bnc#891264 Patch4: tomcat-7.0-sle.catalina.policy.patch BuildRequires: ant >= 1.8.1 ++++++ apache-tomcat-8.0.32-src.tar.gz -> apache-tomcat-8.0.33-src.tar.gz ++++++ ++++ 9114 lines of diff (skipped) ++++++ tomcat-8.0-tomcat-users-webapp.patch ++++++ --- /var/tmp/diff_new_pack.NUyd5z/_old 2016-04-28 16:59:44.000000000 +0200 +++ /var/tmp/diff_new_pack.NUyd5z/_new 2016-04-28 16:59:44.000000000 +0200 @@ -1,8 +1,8 @@ --- conf/tomcat-users.xml~ 2008-01-28 17:41:06.000000000 -0500 +++ conf/tomcat-users.xml 2008-03-07 19:40:07.000000000 -0500 @@ -23,4 +23,14 @@ - <user username="both" password="tomcat" roles="tomcat,role1"/> - <user username="role1" password="tomcat" roles="role1"/> + <user username="both" password="<must-be-changed>" roles="tomcat,role1"/> + <user username="role1" password="<must-be-changed>" roles="role1"/> --> + +<!-- <role rolename="admin"/> --> ++++++ tomcat-7.0.53-JDTCompiler-java.patch -> tomcat-8.0.33-JDTCompiler-java.patch ++++++ --- /work/SRC/openSUSE:Factory/tomcat/tomcat-7.0.53-JDTCompiler-java.patch 2014-05-26 14:44:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat-8.0.33-JDTCompiler-java.patch 2016-04-28 16:59:38.000000000 +0200 @@ -1,17 +1,19 @@ -Index: java/org/apache/jasper/compiler/JDTCompiler.java -=================================================================== ---- java/org/apache/jasper/compiler/JDTCompiler.java (revision 1585931) -+++ java/org/apache/jasper/compiler/JDTCompiler.java (working copy) -@@ -335,7 +335,7 @@ +--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2016-04-22 11:13:13.194743602 +0200 ++++ java/org/apache/jasper/compiler/JDTCompiler.java 2016-04-22 11:17:02.457841335 +0200 +@@ -311,10 +311,10 @@ public class JDTCompiler extends org.apa CompilerOptions.VERSION_1_7); } else if(opt.equals("1.8")) { settings.put(CompilerOptions.OPTION_Source, - CompilerOptions.VERSION_1_8); + "1.8"); // CompilerOptions.VERSION_1_8 + } else if(opt.equals("1.9")) { + settings.put(CompilerOptions.OPTION_Source, +- CompilerOptions.VERSION_1_9); ++ "1.9"); // CompilerOptions.VERSION_1_9 } else { log.warn("Unknown source VM " + opt + " ignored."); settings.put(CompilerOptions.OPTION_Source, -@@ -379,9 +379,9 @@ +@@ -358,14 +358,14 @@ public class JDTCompiler extends org.apa CompilerOptions.VERSION_1_7); } else if(opt.equals("1.8")) { settings.put(CompilerOptions.OPTION_TargetPlatform, @@ -20,6 +22,13 @@ settings.put(CompilerOptions.OPTION_Compliance, - CompilerOptions.VERSION_1_8); + "1.8"); // CompilerOptions.VERSION_1_8 + } else if(opt.equals("1.9")) { + settings.put(CompilerOptions.OPTION_TargetPlatform, +- CompilerOptions.VERSION_1_9); ++ "1.9"); // CompilerOptions.VERSION_1_9 + settings.put(CompilerOptions.OPTION_Compliance, +- CompilerOptions.VERSION_1_9); ++ "1.9"); // CompilerOptions.VERSION_1_9 } else { log.warn("Unknown target VM " + opt + " ignored."); settings.put(CompilerOptions.OPTION_TargetPlatform,
