pool/jakarta-taglibs-standard
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 942904 from Java:packages

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/942904
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jakarta-taglibs-standard?expand=0&rev=18
This commit is contained in:
Dominique Leuenberger 2021-12-28 11:26:36 +00:00 committed by Git OBS Bridge
commit b46fa89ca4
7 changed files with 146 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
CVE-2015-0254.patch
View File

@ -10,10 +10,10 @@ Origin: upstream, http://svn.apache.org/r1642442, http://svn.apache.org/r1642613
Forwarded: not-needed Forwarded: not-needed
Last-Update: 2015-03-14 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 --- /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 @@ @@ -0,0 +1,86 @@
+/* +/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more + * 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.2-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/standard/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
package javax.servlet.jsp.jstl.tlv; 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) if (failed)
return vmFromString( 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.2-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/standard/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
@@ -24,7 +24,6 @@ import javax.servlet.jsp.tagext.PageData @@ -24,7 +24,6 @@ import javax.servlet.jsp.tagext.PageData
import javax.servlet.jsp.tagext.TagLibraryValidator; import javax.servlet.jsp.tagext.TagLibraryValidator;
import javax.servlet.jsp.tagext.ValidationMessage; 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. * 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.2-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/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
@@ -45,6 +45,7 @@ import javax.servlet.jsp.tagext.BodyTagS @@ -45,6 +45,7 @@ import javax.servlet.jsp.tagext.BodyTagS
import javax.servlet.jsp.tagext.TryCatchFinally; 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 <tt>url</tt>. The session ID * Strips a servlet session ID from <tt>url</tt>. The session ID
* is encoded as a URL "path parameter" beginning with "jsessionid=". * is encoded as a URL "path parameter" beginning with "jsessionid=".
* We thus remove anything we find between ";jsessionid=" (inclusive) * 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.2-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/standard/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
@@ -22,6 +22,8 @@ import javax.servlet.jsp.JspTagException @@ -22,6 +22,8 @@ import javax.servlet.jsp.JspTagException
import javax.servlet.jsp.PageContext; import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyTagSupport; 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) // 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.2-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/standard/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
@@ -24,6 +24,7 @@ import javax.servlet.jsp.PageContext; @@ -24,6 +24,7 @@ import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyTagSupport; 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 { } else {
return (context + url); 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 --- /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 @@ @@ -0,0 +1,132 @@
+/* +/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more + * 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 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 not use this file except in compliance with
+ * the License. You may obtain a copy of the License at + * the License. You may obtain a copy of the License at
+ * + *
+ * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0
+ * + *
+ * Unless required by applicable law or agreed to in writing, software + * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * 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.2-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/standard/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
@@ -16,36 +16,26 @@ @@ -16,36 +16,26 @@
package org.apache.taglibs.standard.tag.common.xml; 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.2-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/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
@@ -16,43 +16,29 @@ @@ -16,43 +16,29 @@
package org.apache.taglibs.standard.tag.common.xml; 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 // 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) { public void setScope(String scope) {
this.scope = Util.getScope(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; - return null;
- -
- // remove "jstl" marker from 'base' - // remove "jstl" marker from 'base'
- if (base != null && base.startsWith("jstl:")) - // NOTE: how 'base' is determined varies among different Xalan
- base = base.substring(5); - // xsltc implementations
- int index;
- if (base != null && (index = base.indexOf("jstl:")) != -1) {
- base = base.substring(index + 5);
- }
- -
- // we're only concerned with relative URLs - // we're only concerned with relative URLs
- if (ImportSupport.isAbsoluteUrl(href) - 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 --- /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 @@ @@ -0,0 +1,90 @@
+/* +/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more + * 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 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 not use this file except in compliance with
+ * the License. You may obtain a copy of the License at + * the License. You may obtain a copy of the License at
+ * + *
+ * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0
+ * + *
+ * Unless required by applicable law or agreed to in writing, software + * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * 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 --- /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 @@ @@ -0,0 +1,279 @@
+/* +/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more + * 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.2-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/standard/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
package org.apache.taglibs.standard.tlv; 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) { } catch (IOException ex) {
return vmFromString(ex.toString()); 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 --- /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 @@ @@ -0,0 +1,44 @@
+/* +/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more + * 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); + 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 --- /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 @@ @@ -0,0 +1,80 @@
+/* +/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more + * 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; + 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 --- /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 @@ @@ -0,0 +1,345 @@
+/* +/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more + * Licensed to the Apache Software Foundation (ASF) under one or more

3
jakarta-taglibs-standard-1.1.1-src.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c51b9543ee4e7a064b8cd617411c95e9755eaf53e66cff67884577461653974
size 217797

0
jakarta-taglibs-standard-1.1.1-build.patch → jakarta-taglibs-standard-1.1.2-build.patch
View File

151
jakarta-taglibs-standard-1.1.1-remove-enums.patch → jakarta-taglibs-standard-1.1.2-remove-enums.patch
View File

@ -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 +++ 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
*/ */
- Enumeration enum = numberMap.keys(); - Enumeration enum_ = numberMap.keys();
+ Enumeration enum2 = numberMap.keys(); + Enumeration enum2 = numberMap.keys();
// don't use 'enum' for attribute name because it is a // don't use 'enum' for attribute name because it is a
// reserved word in EcmaScript. // reserved word in EcmaScript.
- sce.getServletContext().setAttribute("enumeration", enum); - sce.getServletContext().setAttribute("enumeration", enum_);
+ sce.getServletContext().setAttribute("enumeration", enum2); + sce.getServletContext().setAttribute("enumeration", enum2);
/** /**
* Message arguments for parametric replacement * 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 +++ 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]; jj_expentry[i] = jj_lasttokens[i];
} }
boolean exists = false; boolean exists = false;
- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) { - for (java.util.Enumeration enum_ = jj_expentries.elements(); enum_.hasMoreElements();) {
- int[] oldentry = (int[])(enum.nextElement()); - int[] oldentry = (int[])(enum_.nextElement());
+ for (java.util.Enumeration enum2 = jj_expentries.elements(); enum2.hasMoreElements();) { + for (java.util.Enumeration enum2 = jj_expentries.elements(); enum2.hasMoreElements();) {
+ int[] oldentry = (int[])(enum2.nextElement()); + int[] oldentry = (int[])(enum2.nextElement());
if (oldentry.length == jj_expentry.length) { if (oldentry.length == jj_expentry.length) {
exists = true; exists = true;
for (int i = 0; i < jj_expentry.length; i++) { 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 +++ standard/src/org/apache/taglibs/standard/functions/Functions.java
@@ -204,11 +204,11 @@ @@ -204,11 +204,11 @@ public class Functions {
return count; return count;
} }
if (obj instanceof Enumeration) { if (obj instanceof Enumeration) {
- Enumeration enum = (Enumeration)obj; - Enumeration enum_ = (Enumeration)obj;
+ Enumeration enum2 = (Enumeration)obj; + Enumeration enum2 = (Enumeration)obj;
count = 0; count = 0;
- while (enum.hasMoreElements()) { - while (enum_.hasMoreElements()) {
+ while (enum2.hasMoreElements()) { + while (enum2.hasMoreElements()) {
count++; count++;
- enum.nextElement(); - enum_.nextElement();
+ enum2.nextElement(); + enum2.nextElement();
} }
return count; return count;
} }
@@ -231,4 +231,4 @@ @@ -231,4 +231,4 @@ public class Functions {
return buf.toString(); 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 +++ 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 (); List l = new ArrayList ();
- Enumeration enum = request.getHeaders ((String) pKey); - Enumeration enum_ = request.getHeaders ((String) pKey);
+ Enumeration enum2 = request.getHeaders ((String) pKey); + Enumeration enum2 = request.getHeaders ((String) pKey);
- if (enum != null) { - if (enum_ != null) {
+ if (enum2 != null) { + if (enum2 != null) {
- while (enum.hasMoreElements ()) { - while (enum_.hasMoreElements ()) {
+ while (enum2.hasMoreElements ()) { + while (enum2.hasMoreElements ()) {
- l.add (enum.nextElement ()); - l.add (enum_.nextElement ());
+ l.add (enum2.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 +++ 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]; jj_expentry[i] = jj_lasttokens[i];
} }
boolean exists = false; boolean exists = false;
- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) { - for (java.util.Enumeration enum_ = jj_expentries.elements(); enum_.hasMoreElements();) {
- int[] oldentry = (int[])(enum.nextElement()); - int[] oldentry = (int[])(enum_.nextElement());
+ for (java.util.Enumeration enum2 = jj_expentries.elements(); enum2.hasMoreElements();) { + for (java.util.Enumeration enum2 = jj_expentries.elements(); enum2.hasMoreElements();) {
+ int[] oldentry = (int[])(enum2.nextElement()); + int[] oldentry = (int[])(enum2.nextElement());
if (oldentry.length == jj_expentry.length) { if (oldentry.length == jj_expentry.length) {
exists = true; exists = true;
for (int i = 0; i < jj_expentry.length; i++) { for (int i = 0; i < jj_expentry.length; i++) {
--- standard/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java Index: standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
+++ standard/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java ===================================================================
@@ -246,9 +246,9 @@ --- standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java.orig
// 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
+++ standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java +++ 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, private static Locale findFormattingMatch(PageContext pageContext,
Locale[] avail) { Locale[] avail) {
Locale match = null; Locale match = null;
- for (Enumeration enum = Util.getRequestLocales((HttpServletRequest)pageContext.getRequest()); - for (Enumeration enum_ = Util.getRequestLocales((HttpServletRequest)pageContext.getRequest());
- enum.hasMoreElements(); ) { - enum_.hasMoreElements(); ) {
- Locale locale = (Locale)enum.nextElement(); - Locale locale = (Locale)enum_.nextElement();
+ for (Enumeration enum2 = Util.getRequestLocales((HttpServletRequest)pageContext.getRequest()); + for (Enumeration enum2 = Util.getRequestLocales((HttpServletRequest)pageContext.getRequest());
+ enum2.hasMoreElements(); ) { + enum2.hasMoreElements(); ) {
+ Locale locale = (Locale)enum2.nextElement(); + Locale locale = (Locale)enum2.nextElement();
match = findFormattingMatch(locale, avail); match = findFormattingMatch(locale, avail);
if (match != null) { if (match != null) {
break; 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 +++ standard/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
@@ -74,10 +74,10 @@ @@ -74,10 +74,10 @@ public class XPathUtil {
globalVarSize = 0; globalVarSize = 0;
Vector variableVector = new Vector ( ); Vector variableVector = new Vector ( );
// Now construct attributes in different scopes // Now construct attributes in different scopes
- Enumeration enum = pageContext.getAttributeNamesInScope( - Enumeration enum_ = pageContext.getAttributeNamesInScope(
+ Enumeration enum2 = pageContext.getAttributeNamesInScope( + Enumeration enum2 = pageContext.getAttributeNamesInScope(
PageContext.PAGE_SCOPE ); PageContext.PAGE_SCOPE );
- while ( enum.hasMoreElements() ) { - while ( enum_.hasMoreElements() ) {
- String varName = (String)enum.nextElement(); - String varName = (String)enum_.nextElement();
+ while ( enum2.hasMoreElements() ) { + while ( enum2.hasMoreElements() ) {
+ String varName = (String)enum2.nextElement(); + String varName = (String)enum2.nextElement();
QName varQName = new QName ( PAGE_NS_URL, PAGE_P, varName); QName varQName = new QName ( PAGE_NS_URL, PAGE_P, varName);
//Adding both namespace qualified QName and just localName //Adding both namespace qualified QName and just localName
variableVector.addElement( varQName ); variableVector.addElement( varQName );
@@ -86,10 +86,10 @@ @@ -86,10 +86,10 @@ public class XPathUtil {
variableVector.addElement( new QName(null, varName ) ); variableVector.addElement( new QName(null, varName ) );
globalVarSize++; globalVarSize++;
} }
- enum = pageContext.getAttributeNamesInScope( - enum_ = pageContext.getAttributeNamesInScope(
+ enum2 = pageContext.getAttributeNamesInScope( + enum2 = pageContext.getAttributeNamesInScope(
PageContext.REQUEST_SCOPE ); PageContext.REQUEST_SCOPE );
- while ( enum.hasMoreElements() ) { - while ( enum_.hasMoreElements() ) {
- String varName = (String)enum.nextElement(); - String varName = (String)enum_.nextElement();
+ while ( enum2.hasMoreElements() ) { + while ( enum2.hasMoreElements() ) {
+ String varName = (String)enum2.nextElement(); + String varName = (String)enum2.nextElement();
QName varQName = new QName ( REQUEST_NS_URL,REQUEST_P, varName); QName varQName = new QName ( REQUEST_NS_URL,REQUEST_P, varName);
//Adding both namespace qualified QName and just localName //Adding both namespace qualified QName and just localName
variableVector.addElement( varQName ); variableVector.addElement( varQName );
@@ -97,10 +97,10 @@ @@ -97,10 +97,10 @@ public class XPathUtil {
variableVector.addElement( new QName(null, varName ) ); variableVector.addElement( new QName(null, varName ) );
globalVarSize++; globalVarSize++;
} }
- enum = pageContext.getAttributeNamesInScope( - enum_ = pageContext.getAttributeNamesInScope(
+ enum2 = pageContext.getAttributeNamesInScope( + enum2 = pageContext.getAttributeNamesInScope(
PageContext.SESSION_SCOPE ); PageContext.SESSION_SCOPE );
- while ( enum.hasMoreElements() ) { - while ( enum_.hasMoreElements() ) {
- String varName = (String)enum.nextElement(); - String varName = (String)enum_.nextElement();
+ while ( enum2.hasMoreElements() ) { + while ( enum2.hasMoreElements() ) {
+ String varName = (String)enum2.nextElement(); + String varName = (String)enum2.nextElement();
QName varQName = new QName ( SESSION_NS_URL, SESSION_P,varName); QName varQName = new QName ( SESSION_NS_URL, SESSION_P,varName);
//Adding both namespace qualified QName and just localName //Adding both namespace qualified QName and just localName
variableVector.addElement( varQName ); variableVector.addElement( varQName );
@@ -108,10 +108,10 @@ @@ -108,10 +108,10 @@ public class XPathUtil {
variableVector.addElement( new QName(null, varName ) ); variableVector.addElement( new QName(null, varName ) );
globalVarSize++; globalVarSize++;
} }
- enum = pageContext.getAttributeNamesInScope( - enum_ = pageContext.getAttributeNamesInScope(
+ enum2 = pageContext.getAttributeNamesInScope( + enum2 = pageContext.getAttributeNamesInScope(
PageContext.APPLICATION_SCOPE ); PageContext.APPLICATION_SCOPE );
- while ( enum.hasMoreElements() ) { - while ( enum_.hasMoreElements() ) {
- String varName = (String)enum.nextElement(); - String varName = (String)enum_.nextElement();
+ while ( enum2.hasMoreElements() ) { + while ( enum2.hasMoreElements() ) {
+ String varName = (String)enum2.nextElement(); + String varName = (String)enum2.nextElement();
QName varQName = new QName ( APP_NS_URL, APP_P,varName ); QName varQName = new QName ( APP_NS_URL, APP_P,varName );
//Adding both namespace qualified QName and just localName //Adding both namespace qualified QName and just localName
variableVector.addElement( varQName ); variableVector.addElement( varQName );
@@ -119,25 +119,25 @@ @@ -119,25 +119,25 @@ public class XPathUtil {
variableVector.addElement( new QName(null, varName ) ); variableVector.addElement( new QName(null, varName ) );
globalVarSize++; globalVarSize++;
} }
- enum = pageContext.getRequest().getParameterNames(); - enum_ = pageContext.getRequest().getParameterNames();
- while ( enum.hasMoreElements() ) { - while ( enum_.hasMoreElements() ) {
- String varName = (String)enum.nextElement(); - String varName = (String)enum_.nextElement();
+ enum2 = pageContext.getRequest().getParameterNames(); + enum2 = pageContext.getRequest().getParameterNames();
+ while ( enum2.hasMoreElements() ) { + while ( enum2.hasMoreElements() ) {
+ String varName = (String)enum2.nextElement(); + String varName = (String)enum2.nextElement();
@ -186,9 +185,9 @@
variableVector.addElement( varQName ); variableVector.addElement( varQName );
globalVarSize++; globalVarSize++;
} }
- enum = pageContext.getServletContext().getInitParameterNames(); - enum_ = pageContext.getServletContext().getInitParameterNames();
- while ( enum.hasMoreElements() ) { - while ( enum_.hasMoreElements() ) {
- String varName = (String)enum.nextElement(); - String varName = (String)enum_.nextElement();
+ enum2 = pageContext.getServletContext().getInitParameterNames(); + enum2 = pageContext.getServletContext().getInitParameterNames();
+ while ( enum2.hasMoreElements() ) { + while ( enum2.hasMoreElements() ) {
+ String varName = (String)enum2.nextElement(); + String varName = (String)enum2.nextElement();
@ -197,9 +196,9 @@
variableVector.addElement( varQName ); variableVector.addElement( varQName );
globalVarSize++; globalVarSize++;
} }
- enum = ((HttpServletRequest)pageContext.getRequest()).getHeaderNames(); - enum_ = ((HttpServletRequest)pageContext.getRequest()).getHeaderNames();
- while ( enum.hasMoreElements() ) { - while ( enum_.hasMoreElements() ) {
- String varName = (String)enum.nextElement(); - String varName = (String)enum_.nextElement();
+ enum2 = ((HttpServletRequest)pageContext.getRequest()).getHeaderNames(); + enum2 = ((HttpServletRequest)pageContext.getRequest()).getHeaderNames();
+ while ( enum2.hasMoreElements() ) { + while ( enum2.hasMoreElements() ) {
+ String varName = (String)enum2.nextElement(); + String varName = (String)enum2.nextElement();

BIN
jakarta-taglibs-standard-1.1.2-src.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

13
jakarta-taglibs-standard.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Dec 28 09:01:48 UTC 2021 - David Anes <david.anes@suse.com>
- 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 Mon Sep 18 15:40:25 UTC 2017 - fstrba@suse.com

11
jakarta-taglibs-standard.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package jakarta-taglibs-standard # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 %define short_name taglibs-standard
Name: jakarta-taglibs-standard Name: jakarta-taglibs-standard
Version: 1.1.1 Version: 1.1.2
Release: 0 Release: 0
Summary: Open Source Implementation of the JSP Standard Tag Library Summary: Open Source Implementation of the JSP Standard Tag Library
License: Apache-2.0 License: Apache-2.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: http://tomcat.apache.org/taglibs/ URL: http://tomcat.apache.org/taglibs/
Source0: jakarta-taglibs-standard-%{version}-src.tar.bz2 Source0: http://archive.apache.org/dist/jakarta/taglibs/standard/source/%{name}-%{version}-src.tar.gz
Patch0: %{name}-%{version}-build.patch Patch0: %{name}-%{version}-build.patch
Patch1: %{name}-java6-compatibility.patch Patch1: %{name}-java6-compatibility.patch
Patch2: %{name}-%{version}-remove-enums.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} %fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files %files
%license LICENSE
%doc standard/README_src.txt standard/README_bin.txt standard/dist/doc/doc/standard-doc/*.html %doc standard/README_src.txt standard/README_bin.txt standard/dist/doc/doc/standard-doc/*.html
%{_javadir}/* %{_javadir}/*