Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2016-09-23 11:31:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-14 09:49:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2016-09-23 11:31:44.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 2 13:20:00 UTC 2016 - [email protected] + +- Backport fix for inifinite loop in the jar scanner for 8.0.36. (bnc#993862) + Added: tomcat-8.0.36-jar-scanner-loop.patch + +------------------------------------------------------------------- New: ---- tomcat-8.0.36-jar-scanner-loop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.ZaVgjP/_old 2016-09-23 11:31:45.000000000 +0200 +++ /var/tmp/diff_new_pack.ZaVgjP/_new 2016-09-23 11:31:45.000000000 +0200 @@ -78,6 +78,8 @@ 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 +# PATCH-FIX-SLE: SLES 12 SP2 tomcat8.0.36 rpms are not working properly mainly while compiling JSP's with org.apache.jasper.JspC class (bnc#993862) +Patch5: tomcat-8.0.36-jar-scanner-loop.patch BuildRequires: ant >= 1.8.1 BuildRequires: ant-antlr BuildRequires: ecj >= 4.4.0 @@ -246,6 +248,7 @@ %patch2 -p1 %patch3 %patch4 -p1 +%patch5 -p1 # remove date from docs sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl ++++++ tomcat-8.0.36-jar-scanner-loop.patch ++++++ diff --git a/java/org/apache/tomcat/util/scan/StandardJarScanner.java b/java/org/apache/tomcat/util/scan/StandardJarScanner.java index a217571..992eb88 100644 --- a/java/org/apache/tomcat/util/scan/StandardJarScanner.java +++ b/java/org/apache/tomcat/util/scan/StandardJarScanner.java @@ -269,6 +269,7 @@ public class StandardJarScanner implements JarScanner { log.debug(sm.getString("jarScan.classloaderJarScan", url)); } try { + processedURLs.add(url); process(scanType, callback, url, null, isWebapp, classPathUrlsToProcess); } catch (IOException ioe) { log.warn(sm.getString("jarScan.classloaderFail", url), ioe); @@ -412,7 +413,7 @@ public class StandardJarScanner implements JarScanner { public ClassPathEntry(URL url) { String path = url.getPath(); - int end = path.indexOf(Constants.JAR_EXT); + int end = path.lastIndexOf(Constants.JAR_EXT); if (end != -1) { jar = true; int start = path.lastIndexOf('/', end);
