File icedtea6-1.13.13-b44.patch of Package java-1_6_0-openjdk
--- icedtea6-1.13.13/Makefile.am 2017-01-04 21:22:49.112782727 +0100
+++ icedtea6-1.13.13/Makefile.am 2018-01-26 12:14:38.877594047 +0100
@@ -1,8 +1,8 @@
# Dependencies
-OPENJDK_DATE = 04_jan_2017
+OPENJDK_DATE = 30_aug_2017
OPENJDK_SHA256SUM = 8e34d451cec65fae8b4304651058ed4dc8d07bd45baa2f49780009097afc1a15
-OPENJDK_VERSION = b41
+OPENJDK_VERSION = b44
OPENJDK_URL = https://java.net/downloads/openjdk6/
CACAO_VERSION = 68fe50ac34ec
@@ -487,7 +487,6 @@
patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch \
patches/openjdk/8009217-fix_test_compile.patch \
patches/openjdk/8009610-blacklist_malware_certificate.patch \
- patches/openjdk/8010714-xml_dsig_retrievalmethod.patch \
patches/openjdk/8011154-awt_regression.patch \
patches/openjdk/8011313-OCSP_timeout_wrong_value.patch \
patches/openjdk/8011992-MlibOpsTest_failed.patch \
@@ -702,10 +701,6 @@
patches/libraries-gif.patch
endif
-if !USE_NON_NSS_CURVES
-ICEDTEA_PATCHES += patches/rh1022017.patch
-endif
-
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
# Bootstrapping patches
--- icedtea6-1.13.13/patches/ecj/override.patch 2017-01-03 08:07:33.312934516 +0100
+++ icedtea6-1.13.13/patches/ecj/override.patch 2018-01-26 13:01:56.170108422 +0100
@@ -362,3 +362,608 @@
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
Component c = delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+diff -urEbwB openjdk-ecj.orig/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java openjdk-ecj/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java
+--- openjdk-ecj.orig/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2018-01-26 12:05:53.109027195 +0100
++++ openjdk-ecj/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2018-01-26 12:26:19.139726291 +0100
+@@ -251,7 +251,6 @@
+ * Returns a document either by finding it in the cache or
+ * downloading it and putting it in the cache.
+ */
+- @Override
+ public DOM retrieveDocument(String baseURI, String href, Translet trs) {
+ CachedDocument doc;
+
+diff -urEbwB openjdk-ecj.orig/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java openjdk-ecj/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
+--- openjdk-ecj.orig/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java 2018-01-26 12:05:53.097027195 +0100
++++ openjdk-ecj/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java 2018-01-26 12:28:31.035726789 +0100
+@@ -231,7 +231,6 @@
+ * @param listener The error listener to use with the TransformerFactory
+ * @throws IllegalArgumentException
+ */
+- @Override
+ public void setErrorListener(ErrorListener listener)
+ throws IllegalArgumentException
+ {
+@@ -249,7 +248,6 @@
+ *
+ * @return The error listener used with the TransformerFactory
+ */
+- @Override
+ public ErrorListener getErrorListener() {
+ return _errorListener;
+ }
+@@ -262,7 +260,6 @@
+ * @return An object representing the attribute value
+ * @throws IllegalArgumentException
+ */
+- @Override
+ public Object getAttribute(String name)
+ throws IllegalArgumentException
+ {
+@@ -299,7 +296,6 @@
+ * @param value An object representing the attribute value
+ * @throws IllegalArgumentException
+ */
+- @Override
+ public void setAttribute(String name, Object value)
+ throws IllegalArgumentException
+ {
+@@ -419,7 +415,6 @@
+ * or the <code>Transformer</code>s or <code>Template</code>s it creates cannot support this feature.
+ * @throws NullPointerException If the <code>name</code> parameter is null.
+ */
+- @Override
+ public void setFeature(String name, boolean value)
+ throws TransformerConfigurationException {
+
+@@ -455,7 +450,6 @@
+ * @param name The feature name
+ * @return 'true' if feature is supported, 'false' if not
+ */
+- @Override
+ public boolean getFeature(String name) {
+ // All supported features should be listed here
+ String[] features = {
+@@ -500,7 +494,6 @@
+ * @return The URLResolver used for this TransformerFactory and all
+ * Templates and Transformer objects created using this factory
+ */
+- @Override
+ public URIResolver getURIResolver() {
+ return _uriResolver;
+ }
+@@ -515,7 +508,6 @@
+ * @param resolver The URLResolver used for this TransformerFactory and all
+ * Templates and Transformer objects created using this factory
+ */
+- @Override
+ public void setURIResolver(URIResolver resolver) {
+ _uriResolver = resolver;
+ }
+@@ -535,7 +527,6 @@
+ * @return A Source object suitable for passing to the TransformerFactory.
+ * @throws TransformerConfigurationException
+ */
+- @Override
+ public Source getAssociatedStylesheet(Source source, String media,
+ String title, String charset)
+ throws TransformerConfigurationException {
+@@ -624,7 +615,6 @@
+ * @return A Transformer object that simply copies the source to the result.
+ * @throws TransformerConfigurationException
+ */
+- @Override
+ public Transformer newTransformer()
+ throws TransformerConfigurationException
+ {
+@@ -650,7 +640,6 @@
+ * @return A Templates object that can be used to create Transformers.
+ * @throws TransformerConfigurationException
+ */
+- @Override
+ public Transformer newTransformer(Source source) throws
+ TransformerConfigurationException
+ {
+@@ -714,7 +703,6 @@
+ * @return A Templates object that can be used to create Transformers.
+ * @throws TransformerConfigurationException
+ */
+- @Override
+ public Templates newTemplates(Source source)
+ throws TransformerConfigurationException
+ {
+@@ -912,7 +900,6 @@
+ * @return A TemplatesHandler object that can handle SAX events
+ * @throws TransformerConfigurationException
+ */
+- @Override
+ public TemplatesHandler newTemplatesHandler()
+ throws TransformerConfigurationException
+ {
+@@ -932,7 +919,6 @@
+ * @return A TransformerHandler object that can handle SAX events
+ * @throws TransformerConfigurationException
+ */
+- @Override
+ public TransformerHandler newTransformerHandler()
+ throws TransformerConfigurationException
+ {
+@@ -953,7 +939,6 @@
+ * @return A TransformerHandler object that can handle SAX events
+ * @throws TransformerConfigurationException
+ */
+- @Override
+ public TransformerHandler newTransformerHandler(Source src)
+ throws TransformerConfigurationException
+ {
+@@ -974,7 +959,6 @@
+ * @return A TransformerHandler object that can handle SAX events
+ * @throws TransformerConfigurationException
+ */
+- @Override
+ public TransformerHandler newTransformerHandler(Templates templates)
+ throws TransformerConfigurationException
+ {
+@@ -992,7 +976,6 @@
+ * @return An XMLFilter object, or null if this feature is not supported.
+ * @throws TransformerConfigurationException
+ */
+- @Override
+ public XMLFilter newXMLFilter(Source src)
+ throws TransformerConfigurationException
+ {
+@@ -1010,7 +993,6 @@
+ * @return An XMLFilter object, or null if this feature is not supported.
+ * @throws TransformerConfigurationException
+ */
+- @Override
+ public XMLFilter newXMLFilter(Templates templates)
+ throws TransformerConfigurationException
+ {
+@@ -1042,7 +1024,6 @@
+ * @throws TransformerException if the application chooses to discontinue
+ * the transformation (always does in our case).
+ */
+- @Override
+ public void error(TransformerException e)
+ throws TransformerException
+ {
+@@ -1071,7 +1052,6 @@
+ * @throws TransformerException if the application chooses to discontinue
+ * the transformation (always does in our case).
+ */
+- @Override
+ public void fatalError(TransformerException e)
+ throws TransformerException
+ {
+@@ -1100,7 +1080,6 @@
+ * @throws TransformerException if the application chooses to discontinue
+ * the transformation (never does in our case).
+ */
+- @Override
+ public void warning(TransformerException e)
+ throws TransformerException
+ {
+@@ -1124,7 +1103,6 @@
+ * @param xsltc The compiler that resuests the document
+ * @return An InputSource with the loaded document
+ */
+- @Override
+ public InputSource loadSource(String href, String context, XSLTC xsltc) {
+ try {
+ if (_uriResolver != null) {
+@@ -1243,7 +1221,6 @@
+ // Find all the auxiliary files which have a name pattern of "transletClass$nnn.class".
+ final String transletAuxPrefix = transletName + "$";
+ File[] auxfiles = transletParentFile.listFiles(new FilenameFilter() {
+- @Override
+ public boolean accept(File dir, String name)
+ {
+ return (name.endsWith(".class") && name.startsWith(transletAuxPrefix));
+diff -urEbwB openjdk-ecj.orig/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java openjdk-ecj/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java
+--- openjdk-ecj.orig/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java 2018-01-26 12:05:53.097027195 +0100
++++ openjdk-ecj/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java 2018-01-26 12:41:31.482941340 +0100
+@@ -96,7 +96,6 @@
+ * resolved.
+ * @return The systemID that was set with setSystemId(String id)
+ */
+- @Override
+ public String getSystemId() {
+ return _systemId;
+ }
+@@ -107,7 +106,6 @@
+ * resolved.
+ * @param id Base URI for this stylesheet
+ */
+- @Override
+ public void setSystemId(String id) {
+ _systemId = id;
+ }
+@@ -118,7 +116,6 @@
+ * order to set parameters and output properties.
+ * @return The Transformer object
+ */
+- @Override
+ public Transformer getTransformer() {
+ return _transformer;
+ }
+@@ -130,7 +127,6 @@
+ * @param result A Result instance, should not be null
+ * @throws IllegalArgumentException if result is invalid for some reason
+ */
+- @Override
+ public void setResult(Result result) throws IllegalArgumentException {
+ _result = result;
+
+@@ -170,7 +166,6 @@
+ * Implements org.xml.sax.ContentHandler.characters()
+ * Receive notification of character data.
+ */
+- @Override
+ public void characters(char[] ch, int start, int length)
+ throws SAXException
+ {
+@@ -181,7 +176,6 @@
+ * Implements org.xml.sax.ContentHandler.startDocument()
+ * Receive notification of the beginning of a document.
+ */
+- @Override
+ public void startDocument() throws SAXException {
+ // Make sure setResult() was called before the first SAX event
+ if (_result == null) {
+@@ -234,7 +228,6 @@
+ * Implements org.xml.sax.ContentHandler.endDocument()
+ * Receive notification of the end of a document.
+ */
+- @Override
+ public void endDocument() throws SAXException {
+ // Signal to the DOMBuilder that the document is complete
+ _handler.endDocument();
+@@ -265,7 +258,6 @@
+ * Implements org.xml.sax.ContentHandler.startElement()
+ * Receive notification of the beginning of an element.
+ */
+- @Override
+ public void startElement(String uri, String localName,
+ String qname, Attributes attributes)
+ throws SAXException
+@@ -277,7 +269,6 @@
+ * Implements org.xml.sax.ContentHandler.endElement()
+ * Receive notification of the end of an element.
+ */
+- @Override
+ public void endElement(String namespaceURI, String localName, String qname)
+ throws SAXException
+ {
+@@ -288,7 +279,6 @@
+ * Implements org.xml.sax.ContentHandler.processingInstruction()
+ * Receive notification of a processing instruction.
+ */
+- @Override
+ public void processingInstruction(String target, String data)
+ throws SAXException
+ {
+@@ -298,7 +288,6 @@
+ /**
+ * Implements org.xml.sax.ext.LexicalHandler.startCDATA()
+ */
+- @Override
+ public void startCDATA() throws SAXException {
+ if (_lexHandler != null) {
+ _lexHandler.startCDATA();
+@@ -308,7 +297,6 @@
+ /**
+ * Implements org.xml.sax.ext.LexicalHandler.endCDATA()
+ */
+- @Override
+ public void endCDATA() throws SAXException {
+ if (_lexHandler != null) {
+ _lexHandler.endCDATA();
+@@ -319,7 +307,6 @@
+ * Implements org.xml.sax.ext.LexicalHandler.comment()
+ * Receieve notification of a comment
+ */
+- @Override
+ public void comment(char[] ch, int start, int length)
+ throws SAXException
+ {
+@@ -333,7 +320,6 @@
+ * Receive notification of ignorable whitespace in element
+ * content. Similar to characters(char[], int, int).
+ */
+- @Override
+ public void ignorableWhitespace(char[] ch, int start, int length)
+ throws SAXException
+ {
+@@ -344,7 +330,6 @@
+ * Implements org.xml.sax.ContentHandler.setDocumentLocator()
+ * Receive an object for locating the origin of SAX document events.
+ */
+- @Override
+ public void setDocumentLocator(Locator locator) {
+ _locator = locator;
+
+@@ -357,7 +342,6 @@
+ * Implements org.xml.sax.ContentHandler.skippedEntity()
+ * Receive notification of a skipped entity.
+ */
+- @Override
+ public void skippedEntity(String name) throws SAXException {
+ _handler.skippedEntity(name);
+ }
+@@ -366,7 +350,6 @@
+ * Implements org.xml.sax.ContentHandler.startPrefixMapping()
+ * Begin the scope of a prefix-URI Namespace mapping.
+ */
+- @Override
+ public void startPrefixMapping(String prefix, String uri)
+ throws SAXException {
+ _handler.startPrefixMapping(prefix, uri);
+@@ -376,7 +359,6 @@
+ * Implements org.xml.sax.ContentHandler.endPrefixMapping()
+ * End the scope of a prefix-URI Namespace mapping.
+ */
+- @Override
+ public void endPrefixMapping(String prefix) throws SAXException {
+ _handler.endPrefixMapping(prefix);
+ }
+@@ -384,7 +366,6 @@
+ /**
+ * Implements org.xml.sax.ext.LexicalHandler.startDTD()
+ */
+- @Override
+ public void startDTD(String name, String publicId, String systemId)
+ throws SAXException
+ {
+@@ -396,7 +377,6 @@
+ /**
+ * Implements org.xml.sax.ext.LexicalHandler.endDTD()
+ */
+- @Override
+ public void endDTD() throws SAXException {
+ if (_lexHandler != null) {
+ _lexHandler.endDTD();
+@@ -406,7 +386,6 @@
+ /**
+ * Implements org.xml.sax.ext.LexicalHandler.startEntity()
+ */
+- @Override
+ public void startEntity(String name) throws SAXException {
+ if (_lexHandler != null) {
+ _lexHandler.startEntity(name);
+@@ -416,7 +395,6 @@
+ /**
+ * Implements org.xml.sax.ext.LexicalHandler.endEntity()
+ */
+- @Override
+ public void endEntity(String name) throws SAXException {
+ if (_lexHandler != null) {
+ _lexHandler.endEntity(name);
+@@ -426,7 +404,6 @@
+ /**
+ * Implements org.xml.sax.DTDHandler.unparsedEntityDecl()
+ */
+- @Override
+ public void unparsedEntityDecl(String name, String publicId,
+ String systemId, String notationName) throws SAXException
+ {
+@@ -439,7 +416,6 @@
+ /**
+ * Implements org.xml.sax.DTDHandler.notationDecl()
+ */
+- @Override
+ public void notationDecl(String name, String publicId, String systemId)
+ throws SAXException
+ {
+@@ -451,7 +427,6 @@
+ /**
+ * Implements org.xml.sax.ext.DeclHandler.attributeDecl()
+ */
+- @Override
+ public void attributeDecl(String eName, String aName, String type,
+ String valueDefault, String value) throws SAXException
+ {
+@@ -463,7 +438,6 @@
+ /**
+ * Implements org.xml.sax.ext.DeclHandler.elementDecl()
+ */
+- @Override
+ public void elementDecl(String name, String model)
+ throws SAXException
+ {
+@@ -475,7 +449,6 @@
+ /**
+ * Implements org.xml.sax.ext.DeclHandler.externalEntityDecl()
+ */
+- @Override
+ public void externalEntityDecl(String name, String publicId, String systemId)
+ throws SAXException
+ {
+@@ -487,7 +460,6 @@
+ /**
+ * Implements org.xml.sax.ext.DeclHandler.externalEntityDecl()
+ */
+- @Override
+ public void internalEntityDecl(String name, String value)
+ throws SAXException
+ {
+diff -urEbwB openjdk-ecj.orig/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java openjdk-ecj/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
+--- openjdk-ecj.orig/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2018-01-26 12:05:53.097027195 +0100
++++ openjdk-ecj/jaxp/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2018-01-26 12:30:53.213993193 +0100
+@@ -221,7 +221,6 @@
+ _errorListener = errorListener;
+ }
+
+- @Override
+ public void displayMessage(String msg) {
+ if(_errorListener == null) {
+ System.err.println(msg);
+@@ -293,7 +292,6 @@
+ * @param result Will contain the output from the transformation
+ * @throws TransformerException
+ */
+- @Override
+ public void transform(Source source, Result result)
+ throws TransformerException
+ {
+@@ -747,7 +745,6 @@
+ *
+ * @return The error event handler currently in effect
+ */
+- @Override
+ public ErrorListener getErrorListener() {
+ return _errorListener;
+ }
+@@ -761,7 +758,6 @@
+ * @param listener The error event listener to use
+ * @throws IllegalArgumentException
+ */
+- @Override
+ public void setErrorListener(ErrorListener listener)
+ throws IllegalArgumentException {
+ if (listener == null) {
+@@ -811,7 +807,6 @@
+ *
+ * @return Properties in effect for this Transformer
+ */
+- @Override
+ public Properties getOutputProperties() {
+ return (Properties) _properties.clone();
+ }
+@@ -825,7 +820,6 @@
+ * @param name A non-null string that contains the name of the property
+ * @throws IllegalArgumentException if the property name is not known
+ */
+- @Override
+ public String getOutputProperty(String name)
+ throws IllegalArgumentException
+ {
+@@ -845,7 +839,6 @@
+ * @param properties The properties to use for the Transformer
+ * @throws IllegalArgumentException Never, errors are ignored
+ */
+- @Override
+ public void setOutputProperties(Properties properties)
+ throws IllegalArgumentException
+ {
+@@ -882,7 +875,6 @@
+ * @param value The value to assign to the property
+ * @throws IllegalArgumentException Never, errors are ignored
+ */
+- @Override
+ public void setOutputProperty(String name, String value)
+ throws IllegalArgumentException
+ {
+@@ -1152,7 +1144,6 @@
+ * @param name The name of the parameter
+ * @param value The value to assign to the parameter
+ */
+- @Override
+ public void setParameter(String name, Object value) {
+
+ if (value == null) {
+@@ -1176,7 +1167,6 @@
+ * Clear all parameters set with setParameter. Clears the translet's
+ * parameter stack.
+ */
+- @Override
+ public void clearParameters() {
+ if (_isIdentity && _parameters != null) {
+ _parameters.clear();
+@@ -1194,7 +1184,6 @@
+ * @param name The name of the parameter
+ * @return An object that contains the value assigned to the parameter
+ */
+- @Override
+ public final Object getParameter(String name) {
+ if (_isIdentity) {
+ return (_parameters != null) ? _parameters.get(name) : null;
+@@ -1210,7 +1199,6 @@
+ *
+ * @return The URLResolver object currently in use
+ */
+- @Override
+ public URIResolver getURIResolver() {
+ return _uriResolver;
+ }
+@@ -1221,7 +1209,6 @@
+ *
+ * @param resolver The URIResolver to use in document()
+ */
+- @Override
+ public void setURIResolver(URIResolver resolver) {
+ _uriResolver = resolver;
+ }
+@@ -1240,7 +1227,6 @@
+ * @param href The href argument passed to the document function.
+ * @param translet A reference to the translet requesting the document
+ */
+- @Override
+ public DOM retrieveDocument(String baseURI, String href, Translet translet) {
+ try {
+ // Argument to document function was: document('');
+@@ -1283,7 +1269,6 @@
+ * @throws TransformerException if the application chooses to discontinue
+ * the transformation (always does in our case).
+ */
+- @Override
+ public void error(TransformerException e)
+ throws TransformerException
+ {
+@@ -1312,7 +1297,6 @@
+ * @throws TransformerException if the application chooses to discontinue
+ * the transformation (always does in our case).
+ */
+- @Override
+ public void fatalError(TransformerException e)
+ throws TransformerException
+ {
+@@ -1341,7 +1325,6 @@
+ * @throws TransformerException if the application chooses to discontinue
+ * the transformation (never does in our case).
+ */
+- @Override
+ public void warning(TransformerException e)
+ throws TransformerException
+ {
+@@ -1362,7 +1345,6 @@
+ * created
+ * @since 1.5
+ */
+- @Override
+ public void reset() {
+
+ _method = null;
+diff -urEbwB openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XmlUtil.java openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XmlUtil.java
+--- openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XmlUtil.java 2018-01-26 12:05:52.745027193 +0100
++++ openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/util/xml/XmlUtil.java 2018-01-26 12:48:04.228842690 +0100
+@@ -89,7 +89,6 @@
+
+ private static boolean XML_SECURITY_DISABLED = AccessController.doPrivileged(
+ new PrivilegedAction<Boolean>() {
+- @Override
+ public Boolean run() {
+ return Boolean.getBoolean(DISABLE_XML_SECURITY);
+ }
+diff -urEbwB openjdk-ecj.orig/jdk/src/share/classes/sun/security/util/AnchorCertificates.java openjdk-ecj/jdk/src/share/classes/sun/security/util/AnchorCertificates.java
+--- openjdk-ecj.orig/jdk/src/share/classes/sun/security/util/AnchorCertificates.java 2018-01-26 12:05:53.657027197 +0100
++++ openjdk-ecj/jdk/src/share/classes/sun/security/util/AnchorCertificates.java 2018-01-26 13:01:34.106108339 +0100
+@@ -48,7 +48,6 @@
+
+ static {
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+- @Override
+ public Void run() {
+ File f = new File(System.getProperty("java.home"),
+ "lib/security/cacerts");
+diff -urEbwB openjdk-ecj.orig/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java openjdk-ecj/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java
+--- openjdk-ecj.orig/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java 2018-01-26 12:05:54.501027200 +0100
++++ openjdk-ecj/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java 2018-01-26 12:08:21.705027756 +0100
+@@ -103,7 +103,6 @@
+ String d = documentation();
+ if (env.javaScriptScanner != null) {
+ env.javaScriptScanner.parse(d, new JavaScriptScanner.Reporter() {
+- @Override
+ public void report() {
+ env.error(DocImpl.this, "javadoc.JavaScript_in_comment");
+ throw new FatalError();
--- icedtea6-1.13.13/patches/libraries-jpeg.patch 2017-01-03 08:07:33.396933160 +0100
+++ icedtea6-1.13.13/patches/libraries-jpeg.patch 2018-01-26 12:14:38.877594047 +0100
@@ -80,7 +80,7 @@
#undef MAX
#define MAX(a,b) ((a) > (b) ? (a) : (b))
-@@ -76,6 +78,62 @@
+@@ -77,6 +79,62 @@
static jfieldID JPEGHuffmanTable_lengthsID;
static jfieldID JPEGHuffmanTable_valuesID;
@@ -143,7 +143,7 @@
/*
* Defined in jpegdecoder.c. Copy code from there if and
* when that disappears. */
-@@ -627,7 +685,7 @@
+@@ -629,7 +687,7 @@
return;
}
@@ -152,7 +152,7 @@
}
-@@ -652,7 +710,7 @@
+@@ -654,7 +712,7 @@
return;
}
@@ -161,7 +161,7 @@
}
-@@ -670,7 +728,7 @@
+@@ -672,7 +730,7 @@
free(cinfo->dest);
cinfo->dest = NULL;
}
@@ -170,7 +170,7 @@
free(info);
}
}
-@@ -710,14 +768,14 @@
+@@ -713,14 +771,14 @@
decomp = (j_decompress_ptr) cinfo;
if (decomp->quant_tbl_ptrs[i] == NULL) {
decomp->quant_tbl_ptrs[i] =
@@ -187,7 +187,7 @@
}
quant_ptr = comp->quant_tbl_ptrs[i];
}
-@@ -808,14 +866,14 @@
+@@ -815,14 +873,14 @@
decomp = (j_decompress_ptr) cinfo;
if (decomp->dc_huff_tbl_ptrs[i] == NULL) {
decomp->dc_huff_tbl_ptrs[i] =
@@ -204,7 +204,7 @@
}
huff_ptr = comp->dc_huff_tbl_ptrs[i];
}
-@@ -833,14 +891,14 @@
+@@ -842,14 +900,14 @@
decomp = (j_decompress_ptr) cinfo;
if (decomp->ac_huff_tbl_ptrs[i] == NULL) {
decomp->ac_huff_tbl_ptrs[i] =
@@ -221,16 +221,16 @@
}
huff_ptr = comp->ac_huff_tbl_ptrs[i];
}
-@@ -1410,6 +1468,8 @@
- jclass ImageInputStreamClass,
+@@ -1427,6 +1485,8 @@
jclass qTableClass,
jclass huffClass) {
-+
-+ initIDs();
- JPEGImageReader_readInputDataID = (*env)->GetMethodID(env,
++ initIDs();
++
+ CHECK_NULL(JPEGImageReader_readInputDataID = (*env)->GetMethodID(env,
cls,
-@@ -1496,7 +1556,7 @@
+ "readInputData",
+@@ -1516,7 +1576,7 @@
}
/* We set up the normal JPEG error routines, then override error_exit. */
@@ -239,7 +239,7 @@
jerr->pub.error_exit = sun_jpeg_error_exit;
/* We need to setup our own print routines */
jerr->pub.output_message = sun_jpeg_output_message;
-@@ -1513,11 +1573,11 @@
+@@ -1533,11 +1593,11 @@
}
/* Perform library initialization */
@@ -253,7 +253,7 @@
/*
* Now set up our source.
-@@ -1536,7 +1596,7 @@
+@@ -1556,7 +1616,7 @@
cinfo->src->init_source = imageio_init_source;
cinfo->src->fill_input_buffer = imageio_fill_input_buffer;
cinfo->src->skip_input_data = imageio_skip_input_data;
@@ -262,7 +262,7 @@
cinfo->src->term_source = imageio_term_source;
/* set up the association to persist for future calls */
-@@ -1655,7 +1715,7 @@
+@@ -1676,7 +1736,7 @@
src->bytes_in_buffer = 0;
}
@@ -271,16 +271,16 @@
if (ret == JPEG_HEADER_TABLES_ONLY) {
retval = JNI_TRUE;
-@@ -1784,7 +1844,7 @@
- cinfo->num_components,
- profileData);
+@@ -1809,7 +1869,7 @@
+ cinfo->err->error_exit((j_common_ptr) cinfo);
+ }
if (reset) {
- jpeg_abort_decompress(cinfo);
+ jpegabortdecompress(cinfo);
}
+ RELEASE_ARRAYS(env, data, src->next_input_byte);
}
-
-@@ -2016,7 +2076,7 @@
+@@ -2018,7 +2078,7 @@
TRUE);
}
@@ -289,7 +289,7 @@
if (progressive) {
cinfo->buffered_image = TRUE;
cinfo->input_scan_number = minProgressivePass+1; // Java count from 0
-@@ -2028,7 +2088,7 @@
+@@ -2030,7 +2090,7 @@
data->streamBuf.suspendable = FALSE;
@@ -297,17 +297,17 @@
+ jpegstartdecompress(cinfo);
if (numBands != cinfo->output_components) {
- JNU_ThrowByName(env, "javax/imageio/IIOException",
-@@ -2060,7 +2120,7 @@
+ RELEASE_ARRAYS(env, data, src->next_input_byte);
+@@ -2063,7 +2123,7 @@
if (progressive) {
// initialize the next pass. Note that this skips up to
// the first interesting pass.
- jpeg_start_output(cinfo, cinfo->input_scan_number);
+ jpegstartoutput(cinfo, cinfo->input_scan_number);
if (wantUpdates) {
+ RELEASE_ARRAYS(env, data, src->next_input_byte);
(*env)->CallVoidMethod(env, this,
- JPEGImageReader_passStartedID,
-@@ -2076,7 +2136,7 @@
+@@ -2088,7 +2148,7 @@
// Skip until the first interesting line
while ((data->abortFlag == JNI_FALSE)
&& ((jint)cinfo->output_scanline < sourceYStart)) {
@@ -316,7 +316,7 @@
}
scanlineLimit = sourceYStart+sourceHeight;
-@@ -2089,7 +2149,7 @@
+@@ -2101,7 +2161,7 @@
while ((data->abortFlag == JNI_FALSE)
&& ((jint)cinfo->output_scanline < scanlineLimit)) {
@@ -325,7 +325,7 @@
// Now mangle it into our buffer
out = data->pixelBuf.buf.bp;
-@@ -2151,13 +2211,13 @@
+@@ -2156,13 +2216,13 @@
skipLines = linesLeft;
}
for(i = 0; i < skipLines; i++) {
@@ -342,19 +342,32 @@
|| (cinfo->input_scan_number > maxProgressivePass)) {
done = TRUE;
}
-@@ -2177,9 +2237,9 @@
- if (cinfo->output_scanline == cinfo->output_height) {
- // if ((cinfo->output_scanline == cinfo->output_height) &&
- //(jpeg_input_complete(cinfo))) { // We read the whole file
-- jpeg_finish_decompress(cinfo);
-+ jpegfinishdecompress(cinfo);
- } else {
+@@ -2187,20 +2247,20 @@
+ if ((cinfo->output_scanline != cinfo->output_height) ||
+ data->abortFlag == JNI_TRUE)
+ {
- jpeg_abort_decompress(cinfo);
+- } else if ((!jpeg_input_complete(cinfo)) &&
+ jpegabortdecompress(cinfo);
++ } else if ((!jpeginputcomplete(cinfo)) &&
+ (progressive &&
+ (cinfo->input_scan_number > maxProgressivePass))) {
+ /* We haven't reached EOI, but we need to skip to there */
+ (*cinfo->src->term_source) (cinfo);
+ /* We can use jpeg_abort to release memory and reset global_state */
+- jpeg_abort((j_common_ptr) cinfo);
++ jpegabort((j_common_ptr) cinfo);
+ (*env)->CallVoidMethod(env,
+ this,
+ JPEGImageReader_skipPastImageID,
+ imageIndex);
+ } else {
+- jpeg_finish_decompress(cinfo);
++ jpegfinishdecompress(cinfo);
}
free(scanLinePtr);
-@@ -2225,7 +2285,7 @@
+@@ -2246,7 +2306,7 @@
cinfo = (j_decompress_ptr) data->jpegObj;
@@ -363,7 +376,7 @@
}
-@@ -2439,6 +2499,150 @@
+@@ -2460,6 +2520,150 @@
/********************** end of destination manager ************/
@@ -514,16 +527,16 @@
/********************** Writer JNI calls **********************/
-@@ -2449,6 +2653,8 @@
+@@ -2470,6 +2674,8 @@
jclass qTableClass,
jclass huffClass) {
+ initIDs();
+
- JPEGImageWriter_writeOutputDataID = (*env)->GetMethodID(env,
+ CHECK_NULL(JPEGImageWriter_writeOutputDataID = (*env)->GetMethodID(env,
cls,
"writeOutputData",
-@@ -2522,7 +2728,7 @@
+@@ -2538,7 +2744,7 @@
}
/* We set up the normal JPEG error routines, then override error_exit. */
@@ -532,7 +545,7 @@
jerr->pub.error_exit = sun_jpeg_error_exit;
/* We need to setup our own print routines */
jerr->pub.output_message = sun_jpeg_output_message;
-@@ -2539,7 +2745,7 @@
+@@ -2555,7 +2761,7 @@
}
/* Perform library initialization */
@@ -541,7 +554,7 @@
/* Now set up the destination */
dest = malloc(sizeof(struct jpeg_destination_mgr));
-@@ -2645,7 +2851,7 @@
+@@ -2663,7 +2869,7 @@
return;
}
@@ -550,7 +563,7 @@
data->streamBuf.suspendable = FALSE;
if (qtables != NULL) {
-@@ -2660,7 +2866,7 @@
+@@ -2678,7 +2884,7 @@
DCHuffmanTables, ACHuffmanTables, TRUE);
}
@@ -559,7 +572,7 @@
RELEASE_ARRAYS(env, data, NULL);
}
-@@ -2843,9 +3049,9 @@
+@@ -2877,9 +3083,9 @@
cinfo->input_components = numBands;
cinfo->in_color_space = inCs;
@@ -571,16 +584,16 @@
cinfo->optimize_coding = optimize;
-@@ -2882,7 +3088,7 @@
- (*env)->ReleaseIntArrayElements(env, QtableSelectors,
- qsels, JNI_ABORT);
+@@ -2916,7 +3122,7 @@
+ }
+ if (!success) return data->abortFlag;
- jpeg_suppress_tables(cinfo, TRUE); // Disable writing any current
+ jpegsuppresstables(cinfo, TRUE); // Disable writing any current
qlen = setQTables(env, (j_common_ptr) cinfo, qtables, writeDQT);
-@@ -2907,7 +3113,7 @@
+@@ -2942,7 +3148,7 @@
if (progressive) {
if (numScans == 0) { // then use default scans
@@ -589,7 +602,7 @@
} else {
cinfo->num_scans = numScans;
// Copy the scanInfo to a local array
-@@ -2949,7 +3155,7 @@
+@@ -2985,7 +3191,7 @@
#endif
// start the compressor; tables must already be set
@@ -598,7 +611,7 @@
if (haveMetadata) {
// Flush the buffer
-@@ -3015,7 +3221,7 @@
+@@ -3048,7 +3254,7 @@
}
}
// write it out
@@ -607,7 +620,7 @@
targetLine += stepY;
}
-@@ -3024,9 +3230,9 @@
+@@ -3057,9 +3263,9 @@
* so use jpeg_abort instead of jpeg_finish_compress.
*/
if (cinfo->next_scanline == cinfo->image_height) {
@@ -617,8 +630,8 @@
- jpeg_abort((j_common_ptr)cinfo);
+ jpegabort((j_common_ptr)cinfo);
}
- free(scanLinePtr);
- RELEASE_ARRAYS(env, data, NULL);
+
+ if (scale != NULL) {
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c
--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2013-12-18 16:51:41.301457861 +0000
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2013-12-18 16:59:48.548719452 +0000
@@ -666,7 +679,7 @@
/* Initialize the Java VM instance variable when the library is
first loaded */
JavaVM *jvm;
-@@ -462,6 +490,76 @@
+@@ -467,6 +495,76 @@
Java_sun_awt_image_JPEGImageDecoder_initIDs(JNIEnv *env, jclass cls,
jclass InputStreamClass)
{
@@ -740,9 +753,9 @@
+ dlclose(handle);
+ }
+
- sendHeaderInfoID = (*env)->GetMethodID(env, cls, "sendHeaderInfo",
- "(IIZZZ)Z");
- sendPixelsByteID = (*env)->GetMethodID(env, cls, "sendPixels", "([BI)Z");
+ CHECK_NULL(sendHeaderInfoID = (*env)->GetMethodID(env, cls, "sendHeaderInfo",
+ "(IIZZZ)Z"));
+ CHECK_NULL(sendPixelsByteID = (*env)->GetMethodID(env, cls, "sendPixels", "([BI)Z"));
@@ -519,7 +617,7 @@
/* Step 1: allocate and initialize JPEG decompression object */
--- icedtea6-1.13.13/patches/libraries-splashscreen.patch 2017-01-03 08:07:33.396933160 +0100
+++ icedtea6-1.13.13/patches/libraries-splashscreen.patch 2018-01-26 12:14:38.877594047 +0100
@@ -13,12 +13,12 @@
png.c \
pngerror.c \
pngget.c \
-@@ -45,10 +48,18 @@
- pngwio.c \
- pngwrite.c \
- pngwtran.c \
-- pngwutil.c \
-+ pngwutil.c
+@@ -41,10 +44,18 @@
+ pngrtran.c \
+ pngrutil.c \
+ pngset.c \
+- pngtrans.c \
++ pngtrans.c
+endif
+
+ifneq ($(SYSTEM_GIF),true)
--- icedtea6-1.13.13/patches/openjdk/6989466-compiler_warnings.patch 2017-01-03 08:07:33.452932256 +0100
+++ icedtea6-1.13.13/patches/openjdk/6989466-compiler_warnings.patch 2018-01-26 12:14:38.881594047 +0100
@@ -338,24 +338,24 @@
diff -Nru openjdk.orig/jdk/src/windows/native/java/lang/java_props_md.c openjdk/jdk/src/windows/native/java/lang/java_props_md.c
--- openjdk.orig/jdk/src/windows/native/java/lang/java_props_md.c 2015-04-10 16:39:20.000000000 +0100
+++ openjdk/jdk/src/windows/native/java/lang/java_props_md.c 2015-07-22 02:17:14.903050654 +0100
-@@ -800,7 +800,7 @@
+@@ -854,7 +854,7 @@
break;
}
- sprintf(buf, "%d.%d", ver.dwMajorVersion, ver.dwMinorVersion);
+ sprintf(buf, "%d.%d", majorVersion, minorVersion);
- sprops.os_version = strdup(buf);
+ sprops.os_version = _strdup(buf);
#if _M_IA64
sprops.os_arch = "ia64";
#elif _M_AMD64
-@@ -811,7 +811,7 @@
- sprops.os_arch = "unknown";
- #endif
+@@ -961,7 +961,7 @@
+ char* ctry;
+ char* variant;
-- sprops.patch_level = strdup(ver.szCSDVersion);
-+ sprops.patch_level = _strdup(ver.szCSDVersion);
+- lang = strdup(langIDMap[index].javaID);
++ lang = _strdup(langIDMap[index].javaID);
+ ctry = lang;
- sprops.desktop = "windows";
- }
+ while (*ctry != '_' && *ctry != 0)
diff -Nru openjdk.orig/jdk/src/windows/native/java/util/TimeZone_md.c openjdk/jdk/src/windows/native/java/util/TimeZone_md.c
--- openjdk.orig/jdk/src/windows/native/java/util/TimeZone_md.c 2015-04-10 16:39:20.000000000 +0100
+++ openjdk/jdk/src/windows/native/java/util/TimeZone_md.c 2015-07-22 02:17:14.903050654 +0100
--- icedtea6-1.13.13/patches/openjdk/7199862-pr2198-ensure_cache_connection_still_alive.patch 2017-01-03 08:07:33.464932061 +0100
+++ icedtea6-1.13.13/patches/openjdk/7199862-pr2198-ensure_cache_connection_still_alive.patch 2018-01-26 12:14:38.881594047 +0100
@@ -1,13 +1,6 @@
diff -r c4ed64237075 src/share/classes/sun/net/www/http/HttpClient.java
--- openjdk/jdk/src/share/classes/sun/net/www/http/HttpClient.java Wed Apr 01 00:13:50 2015 +0100
+++ openjdk/jdk/src/share/classes/sun/net/www/http/HttpClient.java Thu Apr 02 18:21:08 2015 +0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1994, 2007, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
@@ -251,16 +251,17 @@
*/
public static HttpClient New(URL url)
@@ -111,13 +104,6 @@
diff -r c4ed64237075 src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
--- openjdk/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Wed Apr 01 00:13:50 2015 +0100
+++ openjdk/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Thu Apr 02 18:21:08 2015 +0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
@@ -619,7 +619,7 @@
*/
protected void setNewClient (URL url, boolean useCache)
--- icedtea6-1.13.13/patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch 2017-01-03 08:07:33.468931997 +0100
+++ icedtea6-1.13.13/patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch 2018-01-26 12:14:38.881594047 +0100
@@ -66,25 +66,21 @@
streamBufferPtr sb;
sun_jpeg_error_ptr jerr;
-@@ -579,13 +588,13 @@
+@@ -596,10 +605,10 @@
resetStreamBuffer(env, sb); // Removes any old stream
- /* Now we need a new global reference for the stream */
- if (stream != NULL) { // Fix for 4411955
- sb->stream = (*env)->NewGlobalRef(env, stream);
-- if (sb->stream == NULL) {
+- CHECK_NULL(sb->stream);
+ /* Now we need a new weak global reference for the I/O provider */
+ if (io != NULL) { // Fix for 4411955
+ sb->ioRef = (*env)->NewWeakGlobalRef(env, io);
-+ if (sb->ioRef == NULL) {
- JNU_ThrowByName(env,
- "java/lang/OutOfMemoryError",
-- "Setting Stream");
-+ "Setting I/O provider");
- return;
- }
++ CHECK_NULL(sb->ioRef);
}
+
+ /* And finally reset state */
@@ -895,6 +904,7 @@
streamBufferPtr sb = &data->streamBuf;
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
