diff --git a/CVE-2015-0254.patch b/CVE-2015-0254.patch
index afc53e4..8f97ae7 100644
--- a/CVE-2015-0254.patch
+++ b/CVE-2015-0254.patch
@@ -10,10 +10,10 @@ Origin: upstream, http://svn.apache.org/r1642442, http://svn.apache.org/r1642613
Forwarded: not-needed
Last-Update: 2015-03-14
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/javax/servlet/jsp/jstl/tlv/ParserUtil.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/javax/servlet/jsp/jstl/tlv/ParserUtil.java
===================================================================
--- /dev/null
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/javax/servlet/jsp/jstl/tlv/ParserUtil.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/javax/servlet/jsp/jstl/tlv/ParserUtil.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -101,10 +101,10 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/javax/servlet/jsp/jstl/tl
+ }
+ }
+}
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
===================================================================
---- jakarta-taglibs-standard-1.1.1-src.orig/standard/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
+--- jakarta-taglibs-standard-1.1.2-src.orig/standard/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
@@ -17,6 +17,7 @@
package javax.servlet.jsp.jstl.tlv;
@@ -135,10 +135,10 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/javax/servlet/jsp/jstl/tl
if (failed)
return vmFromString(
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
===================================================================
---- jakarta-taglibs-standard-1.1.1-src.orig/standard/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
+--- jakarta-taglibs-standard-1.1.2-src.orig/standard/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
@@ -24,7 +24,6 @@ import javax.servlet.jsp.tagext.PageData
import javax.servlet.jsp.tagext.TagLibraryValidator;
import javax.servlet.jsp.tagext.ValidationMessage;
@@ -192,10 +192,10 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/javax/servlet/jsp/jstl/tl
/**
* Handler for SAX events.
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
===================================================================
---- jakarta-taglibs-standard-1.1.1-src.orig/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
+--- jakarta-taglibs-standard-1.1.2-src.orig/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
@@ -45,6 +45,7 @@ import javax.servlet.jsp.tagext.BodyTagS
import javax.servlet.jsp.tagext.TryCatchFinally;
@@ -280,10 +280,10 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
* Strips a servlet session ID from url. The session ID
* is encoded as a URL "path parameter" beginning with "jsessionid=".
* We thus remove anything we find between ";jsessionid=" (inclusive)
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
===================================================================
---- jakarta-taglibs-standard-1.1.1-src.orig/standard/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
+--- jakarta-taglibs-standard-1.1.2-src.orig/standard/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
@@ -22,6 +22,8 @@ import javax.servlet.jsp.JspTagException
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -336,10 +336,10 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
}
// Releases any resources we may have (or inherit)
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
===================================================================
---- jakarta-taglibs-standard-1.1.1-src.orig/standard/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
+--- jakarta-taglibs-standard-1.1.2-src.orig/standard/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
@@ -24,6 +24,7 @@ import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -408,10 +408,10 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
} else {
return (context + url);
}
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStack.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStack.java
===================================================================
--- /dev/null
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStack.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStack.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -420,9 +420,9 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
-+ *
++ *
+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
++ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -545,10 +545,10 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
+ }
+ }
+}
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
===================================================================
---- jakarta-taglibs-standard-1.1.1-src.orig/standard/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
+--- jakarta-taglibs-standard-1.1.2-src.orig/standard/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
@@ -16,36 +16,26 @@
package org.apache.taglibs.standard.tag.common.xml;
@@ -866,10 +866,10 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
}
//*********************************************************************
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
===================================================================
---- jakarta-taglibs-standard-1.1.1-src.orig/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
+--- jakarta-taglibs-standard-1.1.2-src.orig/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
@@ -16,43 +16,29 @@
package org.apache.taglibs.standard.tag.common.xml;
@@ -1250,7 +1250,7 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
//*********************************************************************
// Tag attributes
-@@ -294,84 +249,4 @@ public abstract class TransformSupport e
+@@ -294,88 +249,4 @@ public abstract class TransformSupport e
public void setScope(String scope) {
this.scope = Util.getScope(scope);
}
@@ -1291,8 +1291,12 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
- return null;
-
- // remove "jstl" marker from 'base'
-- if (base != null && base.startsWith("jstl:"))
-- base = base.substring(5);
+- // NOTE: how 'base' is determined varies among different Xalan
+- // xsltc implementations
+- int index;
+- if (base != null && (index = base.indexOf("jstl:")) != -1) {
+- base = base.substring(index + 5);
+- }
-
- // we're only concerned with relative URLs
- if (ImportSupport.isAbsoluteUrl(href)
@@ -1335,10 +1339,10 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
- }
-
}
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java
===================================================================
--- /dev/null
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1347,9 +1351,9 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
-+ *
++ *
+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
++ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -1430,10 +1434,10 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
+ }
+ }
+}
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java
===================================================================
--- /dev/null
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java
@@ -0,0 +1,279 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1714,10 +1718,10 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
+ }
+ }
+}
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
===================================================================
---- jakarta-taglibs-standard-1.1.1-src.orig/standard/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
+--- jakarta-taglibs-standard-1.1.2-src.orig/standard/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
@@ -17,6 +17,7 @@
package org.apache.taglibs.standard.tlv;
@@ -1779,10 +1783,10 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
} catch (IOException ex) {
return vmFromString(ex.toString());
}
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/util/UnclosableWriter.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/util/UnclosableWriter.java
===================================================================
--- /dev/null
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/util/UnclosableWriter.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/util/UnclosableWriter.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1828,10 +1832,10 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
+ w.write(cbuf, off, len);
+ }
+}
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/util/UrlUtil.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/util/UrlUtil.java
===================================================================
--- /dev/null
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/util/UrlUtil.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/util/UrlUtil.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1913,10 +1917,10 @@ Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standa
+ return true;
+ }
+}
-Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/util/XmlUtil.java
+Index: jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/util/XmlUtil.java
===================================================================
--- /dev/null
-+++ jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/util/XmlUtil.java
++++ jakarta-taglibs-standard-1.1.2-src/standard/src/org/apache/taglibs/standard/util/XmlUtil.java
@@ -0,0 +1,345 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/jakarta-taglibs-standard-1.1.1-src.tar.bz2 b/jakarta-taglibs-standard-1.1.1-src.tar.bz2
deleted file mode 100644
index 708e5eb..0000000
--- a/jakarta-taglibs-standard-1.1.1-src.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c51b9543ee4e7a064b8cd617411c95e9755eaf53e66cff67884577461653974
-size 217797
diff --git a/jakarta-taglibs-standard-1.1.1-build.patch b/jakarta-taglibs-standard-1.1.2-build.patch
similarity index 100%
rename from jakarta-taglibs-standard-1.1.1-build.patch
rename to jakarta-taglibs-standard-1.1.2-build.patch
diff --git a/jakarta-taglibs-standard-1.1.1-remove-enums.patch b/jakarta-taglibs-standard-1.1.2-remove-enums.patch
similarity index 61%
rename from jakarta-taglibs-standard-1.1.1-remove-enums.patch
rename to jakarta-taglibs-standard-1.1.2-remove-enums.patch
index c3d085f..14d3159 100644
--- a/jakarta-taglibs-standard-1.1.1-remove-enums.patch
+++ b/jakarta-taglibs-standard-1.1.2-remove-enums.patch
@@ -1,183 +1,182 @@
---- standard/examples/src/org/apache/taglibs/standard/examples/startup/Init.java
+Index: standard/examples/src/org/apache/taglibs/standard/examples/startup/Init.java
+===================================================================
+--- standard/examples/src/org/apache/taglibs/standard/examples/startup/Init.java.orig
+++ standard/examples/src/org/apache/taglibs/standard/examples/startup/Init.java
-@@ -122,10 +122,10 @@
+@@ -122,10 +122,10 @@ public class Init implements ServletCont
/**
* Enumeration
*/
-- Enumeration enum = numberMap.keys();
+- Enumeration enum_ = numberMap.keys();
+ Enumeration enum2 = numberMap.keys();
// don't use 'enum' for attribute name because it is a
// reserved word in EcmaScript.
-- sce.getServletContext().setAttribute("enumeration", enum);
+- sce.getServletContext().setAttribute("enumeration", enum_);
+ sce.getServletContext().setAttribute("enumeration", enum2);
/**
* Message arguments for parametric replacement
---- standard/src/org/apache/taglibs/standard/extra/spath/SPathParser.java
+Index: standard/src/org/apache/taglibs/standard/extra/spath/SPathParser.java
+===================================================================
+--- standard/src/org/apache/taglibs/standard/extra/spath/SPathParser.java.orig
+++ standard/src/org/apache/taglibs/standard/extra/spath/SPathParser.java
-@@ -437,8 +437,8 @@
+@@ -437,8 +437,8 @@ public class SPathParser implements SPat
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
-- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
-- int[] oldentry = (int[])(enum.nextElement());
+- for (java.util.Enumeration enum_ = jj_expentries.elements(); enum_.hasMoreElements();) {
+- int[] oldentry = (int[])(enum_.nextElement());
+ for (java.util.Enumeration enum2 = jj_expentries.elements(); enum2.hasMoreElements();) {
+ int[] oldentry = (int[])(enum2.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
---- standard/src/org/apache/taglibs/standard/functions/Functions.java
+Index: standard/src/org/apache/taglibs/standard/functions/Functions.java
+===================================================================
+--- standard/src/org/apache/taglibs/standard/functions/Functions.java.orig
+++ standard/src/org/apache/taglibs/standard/functions/Functions.java
-@@ -204,11 +204,11 @@
+@@ -204,11 +204,11 @@ public class Functions {
return count;
}
if (obj instanceof Enumeration) {
-- Enumeration enum = (Enumeration)obj;
+- Enumeration enum_ = (Enumeration)obj;
+ Enumeration enum2 = (Enumeration)obj;
count = 0;
-- while (enum.hasMoreElements()) {
+- while (enum_.hasMoreElements()) {
+ while (enum2.hasMoreElements()) {
count++;
-- enum.nextElement();
+- enum_.nextElement();
+ enum2.nextElement();
}
return count;
}
-@@ -231,4 +231,4 @@
+@@ -231,4 +231,4 @@ public class Functions {
return buf.toString();
}
-}
-\ No newline at end of file
+}
---- standard/src/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
+\ No newline at end of file
+Index: standard/src/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
+===================================================================
+--- standard/src/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java.orig
+++ standard/src/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
-@@ -980,13 +980,13 @@
+@@ -980,13 +980,13 @@ public class ImplicitObjects
List l = new ArrayList ();
-- Enumeration enum = request.getHeaders ((String) pKey);
+- Enumeration enum_ = request.getHeaders ((String) pKey);
+ Enumeration enum2 = request.getHeaders ((String) pKey);
-- if (enum != null) {
+- if (enum_ != null) {
+ if (enum2 != null) {
-- while (enum.hasMoreElements ()) {
+- while (enum_.hasMoreElements ()) {
+ while (enum2.hasMoreElements ()) {
-- l.add (enum.nextElement ());
+- l.add (enum_.nextElement ());
+ l.add (enum2.nextElement ());
}
---- standard/src/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
+Index: standard/src/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
+===================================================================
+--- standard/src/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java.orig
+++ standard/src/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
-@@ -1104,8 +1104,8 @@
+@@ -1104,8 +1104,8 @@ public class ELParser implements ELParse
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
-- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
-- int[] oldentry = (int[])(enum.nextElement());
+- for (java.util.Enumeration enum_ = jj_expentries.elements(); enum_.hasMoreElements();) {
+- int[] oldentry = (int[])(enum_.nextElement());
+ for (java.util.Enumeration enum2 = jj_expentries.elements(); enum2.hasMoreElements();) {
+ int[] oldentry = (int[])(enum2.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
---- standard/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
-+++ standard/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
-@@ -246,9 +246,9 @@
-
- // Determine locale from client's browser settings.
-
-- for (Enumeration enum = Util.getRequestLocales((HttpServletRequest)pageContext.getRequest());
-- enum.hasMoreElements(); ) {
-- Locale pref = (Locale) enum.nextElement();
-+ for (Enumeration enum2 = Util.getRequestLocales((HttpServletRequest)pageContext.getRequest());
-+ enum2.hasMoreElements(); ) {
-+ Locale pref = (Locale) enum2.nextElement();
- ResourceBundle match = findMatch(basename, pref);
- if (match != null) {
- locCtxt = new LocalizationContext(match, pref);
---- standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
+Index: standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
+===================================================================
+--- standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java.orig
+++ standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
-@@ -401,9 +401,9 @@
+@@ -401,9 +401,9 @@ public abstract class SetLocaleSupport e
private static Locale findFormattingMatch(PageContext pageContext,
Locale[] avail) {
Locale match = null;
-- for (Enumeration enum = Util.getRequestLocales((HttpServletRequest)pageContext.getRequest());
-- enum.hasMoreElements(); ) {
-- Locale locale = (Locale)enum.nextElement();
+- for (Enumeration enum_ = Util.getRequestLocales((HttpServletRequest)pageContext.getRequest());
+- enum_.hasMoreElements(); ) {
+- Locale locale = (Locale)enum_.nextElement();
+ for (Enumeration enum2 = Util.getRequestLocales((HttpServletRequest)pageContext.getRequest());
+ enum2.hasMoreElements(); ) {
+ Locale locale = (Locale)enum2.nextElement();
match = findFormattingMatch(locale, avail);
if (match != null) {
break;
---- standard/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
+Index: standard/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
+===================================================================
+--- standard/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java.orig
+++ standard/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
-@@ -74,10 +74,10 @@
+@@ -74,10 +74,10 @@ public class XPathUtil {
globalVarSize = 0;
Vector variableVector = new Vector ( );
// Now construct attributes in different scopes
-- Enumeration enum = pageContext.getAttributeNamesInScope(
-+ Enumeration enum2 = pageContext.getAttributeNamesInScope(
+- Enumeration enum_ = pageContext.getAttributeNamesInScope(
++ Enumeration enum2 = pageContext.getAttributeNamesInScope(
PageContext.PAGE_SCOPE );
-- while ( enum.hasMoreElements() ) {
-- String varName = (String)enum.nextElement();
+- while ( enum_.hasMoreElements() ) {
+- String varName = (String)enum_.nextElement();
+ while ( enum2.hasMoreElements() ) {
+ String varName = (String)enum2.nextElement();
QName varQName = new QName ( PAGE_NS_URL, PAGE_P, varName);
//Adding both namespace qualified QName and just localName
variableVector.addElement( varQName );
-@@ -86,10 +86,10 @@
+@@ -86,10 +86,10 @@ public class XPathUtil {
variableVector.addElement( new QName(null, varName ) );
globalVarSize++;
}
-- enum = pageContext.getAttributeNamesInScope(
-+ enum2 = pageContext.getAttributeNamesInScope(
+- enum_ = pageContext.getAttributeNamesInScope(
++ enum2 = pageContext.getAttributeNamesInScope(
PageContext.REQUEST_SCOPE );
-- while ( enum.hasMoreElements() ) {
-- String varName = (String)enum.nextElement();
+- while ( enum_.hasMoreElements() ) {
+- String varName = (String)enum_.nextElement();
+ while ( enum2.hasMoreElements() ) {
+ String varName = (String)enum2.nextElement();
QName varQName = new QName ( REQUEST_NS_URL,REQUEST_P, varName);
//Adding both namespace qualified QName and just localName
variableVector.addElement( varQName );
-@@ -97,10 +97,10 @@
+@@ -97,10 +97,10 @@ public class XPathUtil {
variableVector.addElement( new QName(null, varName ) );
globalVarSize++;
}
-- enum = pageContext.getAttributeNamesInScope(
-+ enum2 = pageContext.getAttributeNamesInScope(
+- enum_ = pageContext.getAttributeNamesInScope(
++ enum2 = pageContext.getAttributeNamesInScope(
PageContext.SESSION_SCOPE );
-- while ( enum.hasMoreElements() ) {
-- String varName = (String)enum.nextElement();
+- while ( enum_.hasMoreElements() ) {
+- String varName = (String)enum_.nextElement();
+ while ( enum2.hasMoreElements() ) {
+ String varName = (String)enum2.nextElement();
QName varQName = new QName ( SESSION_NS_URL, SESSION_P,varName);
//Adding both namespace qualified QName and just localName
variableVector.addElement( varQName );
-@@ -108,10 +108,10 @@
+@@ -108,10 +108,10 @@ public class XPathUtil {
variableVector.addElement( new QName(null, varName ) );
globalVarSize++;
}
-- enum = pageContext.getAttributeNamesInScope(
-+ enum2 = pageContext.getAttributeNamesInScope(
+- enum_ = pageContext.getAttributeNamesInScope(
++ enum2 = pageContext.getAttributeNamesInScope(
PageContext.APPLICATION_SCOPE );
-- while ( enum.hasMoreElements() ) {
-- String varName = (String)enum.nextElement();
+- while ( enum_.hasMoreElements() ) {
+- String varName = (String)enum_.nextElement();
+ while ( enum2.hasMoreElements() ) {
+ String varName = (String)enum2.nextElement();
QName varQName = new QName ( APP_NS_URL, APP_P,varName );
//Adding both namespace qualified QName and just localName
variableVector.addElement( varQName );
-@@ -119,25 +119,25 @@
+@@ -119,25 +119,25 @@ public class XPathUtil {
variableVector.addElement( new QName(null, varName ) );
globalVarSize++;
}
-- enum = pageContext.getRequest().getParameterNames();
-- while ( enum.hasMoreElements() ) {
-- String varName = (String)enum.nextElement();
+- enum_ = pageContext.getRequest().getParameterNames();
+- while ( enum_.hasMoreElements() ) {
+- String varName = (String)enum_.nextElement();
+ enum2 = pageContext.getRequest().getParameterNames();
+ while ( enum2.hasMoreElements() ) {
+ String varName = (String)enum2.nextElement();
@@ -186,9 +185,9 @@
variableVector.addElement( varQName );
globalVarSize++;
}
-- enum = pageContext.getServletContext().getInitParameterNames();
-- while ( enum.hasMoreElements() ) {
-- String varName = (String)enum.nextElement();
+- enum_ = pageContext.getServletContext().getInitParameterNames();
+- while ( enum_.hasMoreElements() ) {
+- String varName = (String)enum_.nextElement();
+ enum2 = pageContext.getServletContext().getInitParameterNames();
+ while ( enum2.hasMoreElements() ) {
+ String varName = (String)enum2.nextElement();
@@ -197,9 +196,9 @@
variableVector.addElement( varQName );
globalVarSize++;
}
-- enum = ((HttpServletRequest)pageContext.getRequest()).getHeaderNames();
-- while ( enum.hasMoreElements() ) {
-- String varName = (String)enum.nextElement();
+- enum_ = ((HttpServletRequest)pageContext.getRequest()).getHeaderNames();
+- while ( enum_.hasMoreElements() ) {
+- String varName = (String)enum_.nextElement();
+ enum2 = ((HttpServletRequest)pageContext.getRequest()).getHeaderNames();
+ while ( enum2.hasMoreElements() ) {
+ String varName = (String)enum2.nextElement();
diff --git a/jakarta-taglibs-standard-1.1.2-src.tar.gz b/jakarta-taglibs-standard-1.1.2-src.tar.gz
new file mode 100644
index 0000000..73739b3
--- /dev/null
+++ b/jakarta-taglibs-standard-1.1.2-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47a0222c426d93dcc9d7493520d52dba85ba256385d351cdc957cf4b6b30fe23
+size 287031
diff --git a/jakarta-taglibs-standard.changes b/jakarta-taglibs-standard.changes
index 8491ce7..69553af 100644
--- a/jakarta-taglibs-standard.changes
+++ b/jakarta-taglibs-standard.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Dec 28 09:01:48 UTC 2021 - David Anes
+
+- Update to 1.1.2, a missing released version that went into oblivion.
+- Update Source0 to download from apache website.
+- Marked LICENSE file as a license.
+- Rebased patches:
+ * CVE-2015-0254.patch
+ * jakarta-taglibs-standard-1.1.2-build.patch
+ (replaces jakarta-taglibs-standard-1.1.1-build.patch)
+ * jakarta-taglibs-standard-1.1.2-remove-enums.patch
+ (replaces jakarta-taglibs-standard-1.1.1-remove-enums.patch)
+
-------------------------------------------------------------------
Mon Sep 18 15:40:25 UTC 2017 - fstrba@suse.com
diff --git a/jakarta-taglibs-standard.spec b/jakarta-taglibs-standard.spec
index e153793..9f8980c 100644
--- a/jakarta-taglibs-standard.spec
+++ b/jakarta-taglibs-standard.spec
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-taglibs-standard
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,19 +12,19 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define short_name taglibs-standard
Name: jakarta-taglibs-standard
-Version: 1.1.1
+Version: 1.1.2
Release: 0
Summary: Open Source Implementation of the JSP Standard Tag Library
License: Apache-2.0
Group: Development/Libraries/Java
-Url: http://tomcat.apache.org/taglibs/
-Source0: jakarta-taglibs-standard-%{version}-src.tar.bz2
+URL: http://tomcat.apache.org/taglibs/
+Source0: http://archive.apache.org/dist/jakarta/taglibs/standard/source/%{name}-%{version}-src.tar.gz
Patch0: %{name}-%{version}-build.patch
Patch1: %{name}-java6-compatibility.patch
Patch2: %{name}-%{version}-remove-enums.patch
@@ -89,6 +89,7 @@ cp -pr standard/dist/standard/javadoc/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files
+%license LICENSE
%doc standard/README_src.txt standard/README_bin.txt standard/dist/doc/doc/standard-doc/*.html
%{_javadir}/*