Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2017-08-13 14:53:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk"
Sun Aug 13 14:53:34 2017 rev:87 rq:515332 version:1.7.0.151
Changes:
--------
---
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes
2017-07-30 11:21:54.387735350 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes
2017-08-13 14:53:41.339107681 +0200
@@ -1,0 +2,145 @@
+Wed Aug 9 07:51:42 UTC 2017 - [email protected]
+
+- Update to 2.6.11 - OpenJDJ 7u151
+ * Security fixes
+ - S8163958, CVE-2017-10102, bsc#1049316: Improved garbage
+ collection
+ - S8167228: Update to libpng 1.6.28
+ - S8169209, CVE-2017-10053, bsc#1049305: Improved image
+ post-processing steps
+ - S8169392, CVE-2017-10067, bsc#1049306: Additional jar
+ validation steps
+ - S8170966, CVE-2017-10081, bsc#1049309: Right parenthesis issue
+ - S8172204, CVE-2017-10087, bsc#1049311: Better Thread Pool
+ execution
+ - S8172461, CVE-2017-10089, bsc#1049312: Service Registration
+ Lifecycle
+ - S8172465, CVE-2017-10090, bsc#1049313: Better handling of
+ channel groups
+ - S8172469, CVE-2017-10096, bsc#1049314: Transform Transformer
+ Exceptions
+ - S8173286, CVE-2017-10101, bsc#1049315: Better reading of text
+ catalogs
+ - S8173697, CVE-2017-10107, bsc#1049318: Less Active Activations
+ - S8173770, CVE-2017-10074, bsc#1049307: Image conversion
+ improvements
+ - S8174098, CVE-2017-10110, bsc#1049321: Better image fetching
+ - S8174105, CVE-2017-10108, bsc#1049319: Better naming
+ attribution
+ - S8174113, CVE-2017-10109, bsc#1049320: Better sourcing of code
+ - S8174770: Check registry registration location
+ - S8174873: Improved certificate processing
+ - S8175106, CVE-2017-10115, bsc#1049324: Higher quality DSA
+ operations
+ - S8175110, CVE-2017-10118, bsc#1049326: Higher quality ECDSA
+ operations
+ - S8176055: JMX diagnostic improvements
+ - S8176067, CVE-2017-10116, bsc#1049325: Proper directory lookup
+ processing
+ - S8176760, CVE-2017-10135, bsc#1049328: Better handling of
+ PKCS8 material
+ - S8178135, CVE-2017-10176, bsc#1049329: Additional elliptic
+ curve support
+ - S8181420, CVE-2017-10074, bsc#1049307: PPC: Image conversion
+ improvements
+ - S8183551, CVE-2017-10074, bsc#1049307, PR3423: AArch64: Image
+ conversion improvements
+ - S8184119, CVE-2017-10111, bsc#1049322: Incorrect return
+ processing for the LF editor of MethodHandles.permuteArguments
+ - bsc#1049332, CVE-2017-10243: Unspecified vulnerability in
+ subcomponent JAX-WS
+ - bsc#1049327, CVE-2017-10125: Unspecified vulnerability in
+ subcomponent deployment
+ - bsc#1049323, CVE-2017-10114: Unspecified vulnerability in
+ subcomponent JavaFX
+ - bsc#1049317, CVE-2017-10105: Unspecified vulnerability in
+ subcomponent deployment
+ - bsc#1049310, CVE-2017-10086: Unspecified vulnerability in
+ subcomponent JavaFX
+ - bsc#1049331, CVE-2017-10198: Incorrect enforcement of
+ certificate path restrictions
+ - bsc#1049330, CVE-2017-10193: Incorrect key size constraint
+ check
+ * Import of OpenJDK 7 u151 build 0
+ - S7117357: Warnings in sun.instrument, tools and other sun.*
+ classes
+ - S7117570: Warnings in sun.mangement.* and its subpackages
+ - S7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs
+ demo, etc.
+ - S8022440: suppress deprecation warnings in sun.rmi
+ - S8024069: replace_in_map() should operate on parent maps
+ - S8026796: Make replace_in_map() on parent maps generic
+ - S8030787: [Parfait] JNI-related warnings from b119 for
+ jdk/src/share/native/sun/awt/image
+ - S8030875: Macros for checking and returning on exceptions
+ - S8031737: CHECK_NULL and CHECK_EXCEPTION macros cleanup
+ - S8034912: backport of 8031737 to jdk8u breaks linux buld.
+ - S8035629: [parfait] JNI exc pending in
+ jdk/src/windows/native/sun/windows/ShellFolder2.cpp
+ - S8037287: Windows build failed after JDK-8030787
+ - S8048703: ReplacedNodes dumps it's content to tty
+ - S8080492: [Parfait] Uninitialised variable in
+ jdk/src/java/desktop/windows/native/libawt/
+ - S8139870: sun.management.LazyCompositeData.isTypeMatched()
+ fails for composite types with items of ArrayType
+ - S8143377: Test PKCS8Test.java fails
+ - S8149450: LdapCtx.processReturnCode() throwing Null Pointer
+ Exception
+ - S8155690: Update libPNG library to the latest up-to-date
+ - S8156804: Better constraint checking (sync with upstream
+ version)
+ - S8162461: Hang due to JNI up-call made whilst holding JNI
+ critical lock
+ - S8165231: java.nio.Bits.unaligned() doesn't return true on ppc
+ - S8165367: Additional tests for JEP 288: Disable SHA-1
+ Certificates
+ - S8173145: Menu is activated after using mnemonic Alt/Key
+ combination
+ - S8174164: SafePointNode::_replaced_nodes breaks with
+ irreducible loops
+ - S8175097: [TESTBUG] 8174164 fix missed the test
+ - S8175251: Failed to load RSA private key from pkcs12
+ - S8176731: JCK tests in api/javax_xml/transform/ spec
+ conformance started failing after 8172469
+ - S8176769: Remove accidental spec change in jdk8u
+ - S8177449: (tz) Support tzdata2017b
+ - S8178996: [macos] JComboBox doesn't display popup in mixed
+ JavaFX Swing Application on 8u131 and Mac OS 10.12
+ - S8179014: JFileChooser with Windows look and feel crashes on
+ win 10
+ - S8179887: Build failure with glibc >= 2.24: error:
+ 'int readdir_r(DIR*, dirent*, dirent**)' is deprecated
+ - S8180582: The bind to rmiregistry is rejected by
+ registryFilter even though registryFilter is set
+ - S8181591: 8u141 L10n resource file update
+ - S8182054: Improve wsdl support
+ - S8184993: Jar file verification failing with
+ SecurityException: digest missing xxx
+ - S8185501: Missing import in JAXP code
+ - S8185502: No overflow operator on OpenJDK 7
+ * Import of OpenJDK 7 u151 build 1
+ - S8185716: OpenJDK 7 PPC64 port uses a different ins_encode
+ format in ppc.ad
+ * Backports
+ - S7177216, PR3398, RH1446700: native2ascii changes file
+ permissions of input file
+ - S8179084, PR3410, RH1455694: HotSpot VM fails to start when
+ AggressiveHeap is set
+ - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may
+ lead to crashes or invalid results
+ * AArch64 port
+ - S8144028, PR3431: Use AArch64 bit-test instructions in C2
+ - S8152537, PR3431: aarch64: Make use of CBZ and CBNZ when
+ comparing unsigned values with zero.
+- Modified patch:
+ * java-1.7.0-openjdk-java-access-bridge-security.patch
+ - rediff to the changed context
+
+-------------------------------------------------------------------
+Fri Aug 4 18:38:21 UTC 2017 - [email protected]
+
+- Add no-exec-shield-workaround.patch: drop exec shield
+ workaround, since it crashes on recent kernels, and Exec Shield
+ is gone (boo#1052318).
+
+-------------------------------------------------------------------
java-1_7_0-openjdk.changes: same change
Old:
----
icedtea-2.6.10.tar.xz
icedtea-2.6.10.tar.xz.sig
New:
----
icedtea-2.6.11.tar.xz
icedtea-2.6.11.tar.xz.sig
no-exec-shield-workaround.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.OrZ6FQ/_old 2017-08-13 14:53:44.994594761 +0200
+++ /var/tmp/diff_new_pack.OrZ6FQ/_new 2017-08-13 14:53:45.006593077 +0200
@@ -19,7 +19,7 @@
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
%global jit_arches %{ix86} x86_64 ppc64 ppc64le %{arm} %{aarch64}
%global test_arches %{ix86} x86_64 ppc64 ppc64le
-%global icedtea_version 2.6.10
+%global icedtea_version 2.6.11
%global icedtea_sound_version 1.0.1
%global mauvedate 2008-10-22
%global buildoutputdir openjdk.build/
@@ -31,7 +31,7 @@
# Standard JPackage naming and versioning defines.
%global priority 1705
%global javaver 1.7.0
-%global buildver 141
+%global buildver 151
# Standard JPackage directories and symbolic links.
%global sdklnk java-%{javaver}-openjdk
%global archname %{sdklnk}
@@ -200,6 +200,7 @@
Patch200: abrt_friendly_hs_log_jdk7.patch
# remove unsused definition of min conflicting with macro
Patch201: aarch64-remove-unused-code.patch
+Patch202: no-exec-shield-workaround.patch
#
# Optional component packages
#
@@ -630,6 +631,7 @@
patch -p0 -i %{PATCH108}
patch -p0 -i %{PATCH200}
patch -p0 -i %{PATCH201}
+patch -p0 -i %{PATCH202}
%if ! %{with zero}
patch -p0 -i %{PATCH403}
java-1_7_0-openjdk.spec: same change
++++++ corba.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/corba-4d807b58849e/.hgtags
new/corba-803456f62297/.hgtags
--- old/corba-4d807b58849e/.hgtags 2017-05-03 04:50:27.000000000 +0200
+++ new/corba-803456f62297/.hgtags 2017-08-03 18:03:27.000000000 +0200
@@ -670,3 +670,7 @@
61c10a1eaa7b6f77e63f90e624a82a664a451d42 jdk7u141-b00
caa46a309b1195a0301956e7416633b717553925 jdk7u141-b01
39240de9d27767c8bad74e34f83f0a4902a9ef85 jdk7u141-b02
+4d807b58849e7d0aa829ba744c9d94ffb78d0943 icedtea-2.6.10
+ff69bc83070b70b07cc9eea4731e9332acdcdff7 icedtea-2.6.11pre01
+d232281a177cd3f80d48eca3f1bbc3919f720a1e jdk7u151-b00
+f74af33b4963a7c484ffa605f11e41efd92966e3 jdk7u151-b01
++++++ hotspot.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/hotspot.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/hotspot.tar.bz2 differ: char
11, line 1
++++++ icedtea-2.6.10.tar.xz -> icedtea-2.6.11.tar.xz ++++++
++++ 8710 lines of diff (skipped)
++++++ java-1.7.0-openjdk-java-access-bridge-security.patch ++++++
--- /var/tmp/diff_new_pack.OrZ6FQ/_old 2017-08-13 14:53:48.174148620 +0200
+++ /var/tmp/diff_new_pack.OrZ6FQ/_new 2017-08-13 14:53:48.178148058 +0200
@@ -1,22 +1,22 @@
--- openjdk/jdk/src/share/lib/security/java.security-linux.orig
+++ openjdk/jdk/src/share/lib/security/java.security-linux
-@@ -154,7 +154,9 @@
- com.sun.org.apache.xml.internal.security.,\
+@@ -155,7 +155,9 @@
com.sun.org.glassfish.,\
org.jcp.xml.dsig.internal.,\
-- oracle.jrockit.jfr.
-+ oracle.jrockit.jfr.,\
+ oracle.jrockit.jfr.,\
+- org.jcp.xml.dsig.internal.
++ org.jcp.xml.dsig.internal.,\
+ org.GNOME.Accessibility.,\
+ org.GNOME.Bonobo.
#
# List of comma-separated packages that start with or equal this string
# will cause a security exception to be thrown when
-@@ -192,7 +194,9 @@
- com.sun.org.apache.xml.internal.security.,\
+@@ -193,7 +195,9 @@
com.sun.org.glassfish.,\
org.jcp.xml.dsig.internal.,\
-- oracle.jrockit.jfr.
-+ oracle.jrockit.jfr.,\
+ oracle.jrockit.jfr.,\
+- org.jcp.xml.dsig.internal.
++ org.jcp.xml.dsig.internal.,\
+ org.GNOME.Accessibility.,\
+ org.GNOME.Bonobo.
#
++++++ jaxp.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaxp-4099d8cf255f/.hgtags
new/jaxp-46f2d7395127/.hgtags
--- old/jaxp-4099d8cf255f/.hgtags 2017-05-03 04:50:27.000000000 +0200
+++ new/jaxp-46f2d7395127/.hgtags 2017-08-03 18:03:27.000000000 +0200
@@ -671,3 +671,7 @@
f347b141975453f642ae1140a45aa7c6127551dd jdk7u141-b00
e096a279a1c226d7d3a4aa19d5beeba1fb0507cf jdk7u141-b01
b4b91a7beb185c0a8a14b83d2b05cfd7fc33c6fe jdk7u141-b02
+4099d8cf255f2eac54b9d2ed1db1bc452ddbe4e4 icedtea-2.6.10
+f16026b79deb95d60dc9d213a0a417c626d00e4c icedtea-2.6.11pre01
+26391fa1d876e3bf563f21328d7ea24d5d657b21 jdk7u151-b00
+57fc772ac86ac6cbd297cd6f09a63f9c016c271c jdk7u151-b01
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-4099d8cf255f/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
new/jaxp-46f2d7395127/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
---
old/jaxp-4099d8cf255f/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
2017-05-03 04:50:27.000000000 +0200
+++
new/jaxp-46f2d7395127/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
2017-08-03 18:03:27.000000000 +0200
@@ -483,7 +483,7 @@
{"ER0000" , "{0}" },
{ ER_NO_CURLYBRACE,
- "Fel: Uttryck kan inte inneh\u00E5lla '{'"},
+ "Fel: Uttryck f\u00E5r inte inneh\u00E5lla '{'"},
{ ER_ILLEGAL_ATTRIBUTE ,
"{0} har ett otill\u00E5tet attribut: {1}"},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
new/jaxp-46f2d7395127/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
---
old/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
2017-05-03 04:50:27.000000000 +0200
+++
new/jaxp-46f2d7395127/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
2017-08-03 18:03:27.000000000 +0200
@@ -33,4 +33,4 @@
# Messages from erroneous set-up
IncompatibleNamespaceContext = Typ av NamespaceContext \u00E4r inkompatibel
med XInclude; det kr\u00E4vs en instans av XIncludeNamespaceSupport
-ExpandedSystemId = Kunde inte ut\u00F6ka system-ID:t f\u00F6r inkluderad resurs
+ExpandedSystemId = Kunde inte ut\u00F6ka system-id:t f\u00F6r inkluderad resurs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties
new/jaxp-46f2d7395127/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties
---
old/jaxp-4099d8cf255f/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties
2017-05-03 04:50:27.000000000 +0200
+++
new/jaxp-46f2d7395127/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties
2017-08-03 18:03:27.000000000 +0200
@@ -80,7 +80,7 @@
cvc-pattern-valid = cvc-pattern-valid: V\u00E4rdet ''{0}'' \u00E4r
ogiltigt med aktuellt m\u00F6nster ''{1}'' f\u00F6r typ ''{2}''.
cvc-totalDigits-valid = cvc-totalDigits-valid: V\u00E4rdet ''{0}'' har
{1} siffror, men det totala antalet siffror \u00E4r begr\u00E4nsat till {2}.
cvc-type.2 = cvc-type.2: Typdefinitionen kan inte vara abstrakt
f\u00F6r elementet {0}.
- cvc-type.3.1.1 = cvc-type.3.1.1: Elementet ''{0}'' har enkel typ och
kan inte inneh\u00E5lla attribut, ut\u00F6ver s\u00E5dana vars namnrymd \u00E4r
identisk med ''http://www.w3.org/2001/XMLSchema-instance'' och vars [lokala
namn] har n\u00E5gotdera av ''type'', ''nil'', ''schemaLocation'' eller
''noNamespaceSchemaLocation''. Hittade dock attributet ''{1}''.
+ cvc-type.3.1.1 = cvc-type.3.1.1: Elementet ''{0}'' har enkel typ och
f\u00E5r inte inneh\u00E5lla attribut, ut\u00F6ver s\u00E5dana vars namnrymd
\u00E4r identisk med ''http://www.w3.org/2001/XMLSchema-instance'' och vars
[lokala namn] har n\u00E5gotdera av ''type'', ''nil'', ''schemaLocation'' eller
''noNamespaceSchemaLocation''. Hittade dock attributet ''{1}''.
cvc-type.3.1.2 = cvc-type.3.1.2: Elementet ''{0}'' har enkel typ och
f\u00E5r inte inneh\u00E5lla [underordnade] med elementinformation.
cvc-type.3.1.3 = cvc-type.3.1.3: V\u00E4rdet ''{1}'' i elementet
''{0}'' \u00E4r ogiltigt.
@@ -251,7 +251,7 @@
rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: Det finns ingen
fullst\u00E4ndigt fungerande mappning mellan partiklarna.
# We're using sch-props-correct.2 instead of the old src-redefine.1
# src-redefine.1 = src-redefine.1: The component ''{0}'' is begin
redefined, but its corresponding component isn't in the schema document being
redefined (with namespace ''{2}''), but in a different document, with namespace
''{1}''.
- sch-props-correct.2 = sch-props-correct.2: Ett schema kan inte
inneh\u00E5lla tv\u00E5 globala komponenter med samma namn. Detta schema har
tv\u00E5 f\u00F6rekomster av ''{0}''.
+ sch-props-correct.2 = sch-props-correct.2: Ett schema f\u00E5r inte
inneh\u00E5lla tv\u00E5 globala komponenter med samma namn. Detta schema har
tv\u00E5 f\u00F6rekomster av ''{0}''.
st-props-correct.2 = st-props-correct.2: Cirkul\u00E4ra definitioner
har identifierats f\u00F6r enkel typ ''{0}''. Detta inneb\u00E4r att ''{0}''
ing\u00E5r i sin egen typhierarki, vilket \u00E4r fel.
st-props-correct.3 = st-props-correct.3: Ett fel intr\u00E4ffade
f\u00F6r typ ''{0}''. V\u00E4rdet f\u00F6r '{'slutgiltigt'}' i
'{'bastypdefinitionen'}', ''{1}'', f\u00F6rbjuder h\u00E4rledning med
begr\u00E4nsning.
totalDigits-valid-restriction = totalDigits-valid-restriction: I
definitionen f\u00F6r {2} \u00E4r v\u00E4rdet ''{0}'' f\u00F6r ''totalDigits''
ogiltigt eftersom det m\u00E5ste vara mindre \u00E4n eller lika med v\u00E4rdet
f\u00F6r ''totalDigits'' som har angetts som ''{1}'' i n\u00E5gon typ f\u00F6r
\u00F6verordnad.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-4099d8cf255f/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java
new/jaxp-46f2d7395127/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java
---
old/jaxp-4099d8cf255f/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java
2017-05-03 04:50:27.000000000 +0200
+++
new/jaxp-46f2d7395127/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java
1970-01-01 01:00:00.000000000 +0100
@@ -1,101 +0,0 @@
-/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
- */
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * $Id: DTMConfigurationException.java,v 1.2.4.1 2005/09/15 08:14:52
suresh_emailid Exp $
- */
-package com.sun.org.apache.xml.internal.dtm;
-
-import javax.xml.transform.SourceLocator;
-
-/**
- * Indicates a serious configuration error.
- */
-public class DTMConfigurationException extends DTMException {
- static final long serialVersionUID = -4607874078818418046L;
-
- /**
- * Create a new <code>DTMConfigurationException</code> with no
- * detail mesage.
- */
- public DTMConfigurationException() {
- super("Configuration Error");
- }
-
- /**
- * Create a new <code>DTMConfigurationException</code> with
- * the <code>String </code> specified as an error message.
- *
- * @param msg The error message for the exception.
- */
- public DTMConfigurationException(String msg) {
- super(msg);
- }
-
- /**
- * Create a new <code>DTMConfigurationException</code> with a
- * given <code>Exception</code> base cause of the error.
- *
- * @param e The exception to be encapsulated in a
- * DTMConfigurationException.
- */
- public DTMConfigurationException(Throwable e) {
- super(e);
- }
-
- /**
- * Create a new <code>DTMConfigurationException</code> with the
- * given <code>Exception</code> base cause and detail message.
- *
- * @param msg The detail message.
- * @param e The exception to be wrapped in a DTMConfigurationException
- */
- public DTMConfigurationException(String msg, Throwable e) {
- super(msg, e);
- }
-
- /**
- * Create a new DTMConfigurationException from a message and a Locator.
- *
- * <p>This constructor is especially useful when an application is
- * creating its own exception from within a DocumentHandler
- * callback.</p>
- *
- * @param message The error or warning message.
- * @param locator The locator object for the error or warning.
- */
- public DTMConfigurationException(String message,
- SourceLocator locator) {
- super(message, locator);
- }
-
- /**
- * Wrap an existing exception in a DTMConfigurationException.
- *
- * @param message The error or warning message, or null to
- * use the message from the embedded exception.
- * @param locator The locator object for the error or warning.
- * @param e Any exception.
- */
- public DTMConfigurationException(String message,
- SourceLocator locator,
- Throwable e) {
- super(message, locator, e);
- }
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-4099d8cf255f/src/com/sun/org/apache/xml/internal/dtm/DTMException.java
new/jaxp-46f2d7395127/src/com/sun/org/apache/xml/internal/dtm/DTMException.java
---
old/jaxp-4099d8cf255f/src/com/sun/org/apache/xml/internal/dtm/DTMException.java
2017-05-03 04:50:27.000000000 +0200
+++
new/jaxp-46f2d7395127/src/com/sun/org/apache/xml/internal/dtm/DTMException.java
2017-08-03 18:03:27.000000000 +0200
@@ -1,13 +1,13 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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
*
@@ -17,129 +17,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
- * $Id: DTMException.java,v 1.3 2005/09/28 13:48:50 pvedula Exp $
- */
package com.sun.org.apache.xml.internal.dtm;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.xml.transform.SourceLocator;
-
-import com.sun.org.apache.xml.internal.res.XMLErrorResources;
-import com.sun.org.apache.xml.internal.res.XMLMessages;
-
-
/**
- * This class specifies an exceptional condition that occured
+ * This class specifies an exceptional condition that occurred
* in the DTM module.
*/
public class DTMException extends RuntimeException {
static final long serialVersionUID = -775576419181334734L;
- /** Field locator specifies where the error occured.
- * @serial */
- SourceLocator locator;
-
- /**
- * Method getLocator retrieves an instance of a SourceLocator
- * object that specifies where an error occured.
- *
- * @return A SourceLocator object, or null if none was specified.
- */
- public SourceLocator getLocator() {
- return locator;
- }
-
- /**
- * Method setLocator sets an instance of a SourceLocator
- * object that specifies where an error occured.
- *
- * @param location A SourceLocator object, or null to clear the location.
- */
- public void setLocator(SourceLocator location) {
- locator = location;
- }
-
- /** Field containedException specifies a wrapped exception. May be null.
- * @serial */
- Throwable containedException;
-
- /**
- * This method retrieves an exception that this exception wraps.
- *
- * @return An Throwable object, or null.
- * @see #getCause
- */
- public Throwable getException() {
- return containedException;
- }
-
- /**
- * Returns the cause of this throwable or <code>null</code> if the
- * cause is nonexistent or unknown. (The cause is the throwable that
- * caused this throwable to get thrown.)
- */
- public Throwable getCause() {
-
- return ((containedException == this)
- ? null
- : containedException);
- }
-
- /**
- * Initializes the <i>cause</i> of this throwable to the specified value.
- * (The cause is the throwable that caused this throwable to get thrown.)
- *
- * <p>This method can be called at most once. It is generally called from
- * within the constructor, or immediately after creating the
- * throwable. If this throwable was created
- * with {@link #DTMException(Throwable)} or
- * {@link #DTMException(String,Throwable)}, this method cannot be called
- * even once.
- *
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
- * @return a reference to this <code>Throwable</code> instance.
- * @throws IllegalArgumentException if <code>cause</code> is this
- * throwable. (A throwable cannot
- * be its own cause.)
- * @throws IllegalStateException if this throwable was
- * created with {@link #DTMException(Throwable)} or
- * {@link #DTMException(String,Throwable)}, or this method has
already
- * been called on this throwable.
- */
- public synchronized Throwable initCause(Throwable cause) {
-
- if ((this.containedException == null) && (cause != null)) {
- throw new
IllegalStateException(XMLMessages.createXMLMessage(XMLErrorResources.ER_CANNOT_OVERWRITE_CAUSE,
null)); //"Can't overwrite cause");
- }
-
- if (cause == this) {
- throw new IllegalArgumentException(
-
XMLMessages.createXMLMessage(XMLErrorResources.ER_SELF_CAUSATION_NOT_PERMITTED,
null)); //"Self-causation not permitted");
- }
-
- this.containedException = cause;
-
- return this;
- }
-
/**
* Create a new DTMException.
*
* @param message The error or warning message.
*/
public DTMException(String message) {
-
super(message);
-
- this.containedException = null;
- this.locator = null;
}
/**
@@ -148,11 +41,7 @@
* @param e The exception to be wrapped.
*/
public DTMException(Throwable e) {
-
- super(e.getMessage());
-
- this.containedException = e;
- this.locator = null;
+ super(e);
}
/**
@@ -166,220 +55,6 @@
* @param e Any exception
*/
public DTMException(String message, Throwable e) {
-
- super(((message == null) || (message.length() == 0))
- ? e.getMessage()
- : message);
-
- this.containedException = e;
- this.locator = null;
- }
-
- /**
- * Create a new DTMException from a message and a Locator.
- *
- * <p>This constructor is especially useful when an application is
- * creating its own exception from within a DocumentHandler
- * callback.</p>
- *
- * @param message The error or warning message.
- * @param locator The locator object for the error or warning.
- */
- public DTMException(String message, SourceLocator locator) {
-
- super(message);
-
- this.containedException = null;
- this.locator = locator;
- }
-
- /**
- * Wrap an existing exception in a DTMException.
- *
- * @param message The error or warning message, or null to
- * use the message from the embedded exception.
- * @param locator The locator object for the error or warning.
- * @param e Any exception
- */
- public DTMException(String message, SourceLocator locator,
- Throwable e) {
-
- super(message);
-
- this.containedException = e;
- this.locator = locator;
- }
-
- /**
- * Get the error message with location information
- * appended.
- */
- public String getMessageAndLocation() {
-
- StringBuffer sbuffer = new StringBuffer();
- String message = super.getMessage();
-
- if (null != message) {
- sbuffer.append(message);
- }
-
- if (null != locator) {
- String systemID = locator.getSystemId();
- int line = locator.getLineNumber();
- int column = locator.getColumnNumber();
-
- if (null != systemID) {
- sbuffer.append("; SystemID: ");
- sbuffer.append(systemID);
- }
-
- if (0 != line) {
- sbuffer.append("; Line#: ");
- sbuffer.append(line);
- }
-
- if (0 != column) {
- sbuffer.append("; Column#: ");
- sbuffer.append(column);
- }
- }
-
- return sbuffer.toString();
- }
-
- /**
- * Get the location information as a string.
- *
- * @return A string with location info, or null
- * if there is no location information.
- */
- public String getLocationAsString() {
-
- if (null != locator) {
- StringBuffer sbuffer = new StringBuffer();
- String systemID = locator.getSystemId();
- int line = locator.getLineNumber();
- int column = locator.getColumnNumber();
-
- if (null != systemID) {
- sbuffer.append("; SystemID: ");
- sbuffer.append(systemID);
- }
-
- if (0 != line) {
- sbuffer.append("; Line#: ");
- sbuffer.append(line);
- }
-
- if (0 != column) {
- sbuffer.append("; Column#: ");
- sbuffer.append(column);
- }
-
- return sbuffer.toString();
- } else {
- return null;
- }
- }
-
- /**
- * Print the the trace of methods from where the error
- * originated. This will trace all nested exception
- * objects, as well as this object.
- */
- public void printStackTrace() {
- printStackTrace(new java.io.PrintWriter(System.err, true));
- }
-
- /**
- * Print the the trace of methods from where the error
- * originated. This will trace all nested exception
- * objects, as well as this object.
- * @param s The stream where the dump will be sent to.
- */
- public void printStackTrace(java.io.PrintStream s) {
- printStackTrace(new java.io.PrintWriter(s));
- }
-
- /**
- * Print the the trace of methods from where the error
- * originated. This will trace all nested exception
- * objects, as well as this object.
- * @param s The writer where the dump will be sent to.
- */
- public void printStackTrace(java.io.PrintWriter s) {
-
- if (s == null) {
- s = new java.io.PrintWriter(System.err, true);
- }
-
- try {
- String locInfo = getLocationAsString();
-
- if (null != locInfo) {
- s.println(locInfo);
- }
-
- super.printStackTrace(s);
- } catch (Throwable e) {}
-
- boolean isJdk14OrHigher = false;
- try {
- Throwable.class.getMethod("getCause", (Class[]) null);
- isJdk14OrHigher = true;
- } catch (NoSuchMethodException nsme) {
- // do nothing
- }
-
- // The printStackTrace method of the Throwable class in jdk 1.4
- // and higher will include the cause when printing the backtrace.
- // The following code is only required when using jdk 1.3 or lower
- if (!isJdk14OrHigher) {
- Throwable exception = getException();
-
- for (int i = 0; (i < 10) && (null != exception); i++) {
- s.println("---------");
-
- try {
- if (exception instanceof DTMException) {
- String locInfo =
- ((DTMException) exception)
- .getLocationAsString();
-
- if (null != locInfo) {
- s.println(locInfo);
- }
- }
-
- exception.printStackTrace(s);
- } catch (Throwable e) {
- s.println("Could not print stack trace...");
- }
-
- try {
- Method meth =
- ((Object)
exception).getClass().getMethod("getException",
- (Class[]) null);
-
- if (null != meth) {
- Throwable prev = exception;
-
- exception = (Throwable) meth.invoke(exception,
(Object[]) null);
-
- if (prev == exception) {
- break;
- }
- } else {
- exception = null;
- }
- } catch (InvocationTargetException ite) {
- exception = null;
- } catch (IllegalAccessException iae) {
- exception = null;
- } catch (NoSuchMethodException nsme) {
- exception = null;
- }
- }
- }
+ super(message, e);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-4099d8cf255f/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java
new/jaxp-46f2d7395127/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java
---
old/jaxp-4099d8cf255f/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java
2017-05-03 04:50:27.000000000 +0200
+++
new/jaxp-46f2d7395127/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java
2017-08-03 18:03:27.000000000 +0200
@@ -1,13 +1,13 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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
*
@@ -17,9 +17,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
- * $Id: DTMManager.java,v 1.2.4.1 2005/09/15 08:14:54 suresh_emailid Exp $
- */
package com.sun.org.apache.xml.internal.dtm;
import com.sun.org.apache.xml.internal.res.XMLErrorResources;
@@ -27,7 +24,6 @@
import com.sun.org.apache.xml.internal.utils.PrefixResolver;
import com.sun.org.apache.xml.internal.utils.XMLStringFactory;
import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
-import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
/**
* A DTMManager instance can be used to create DTM and
@@ -130,17 +126,17 @@
*
* @return new DTMManager instance, never null.
*
- * @throws DTMConfigurationException
+ * @throws DTMException
* if the implementation is not available or cannot be instantiated.
*/
public static DTMManager newInstance(XMLStringFactory xsf)
- throws DTMConfigurationException
+ throws DTMException
{
return newInstance(xsf, true);
}
public static DTMManager newInstance(XMLStringFactory xsf, boolean
useServicesMechanism)
- throws DTMConfigurationException
+ throws DTMException
{
DTMManager factoryImpl = null;
try
@@ -154,14 +150,14 @@
}
catch (ConfigurationError e)
{
- throw new DTMConfigurationException(XMLMessages.createXMLMessage(
+ throw new DTMException(XMLMessages.createXMLMessage(
XMLErrorResources.ER_NO_DEFAULT_IMPL, null), e.getException());
//"No default implementation found");
}
if (factoryImpl == null)
{
- throw new DTMConfigurationException(XMLMessages.createXMLMessage(
+ throw new DTMException(XMLMessages.createXMLMessage(
XMLErrorResources.ER_NO_DEFAULT_IMPL, null));
//"No default implementation found");
}
@@ -375,20 +371,6 @@
// -------------------- private methods --------------------
- /**
- * Temp debug code - this will be removed after we test everything
- */
- private static boolean debug;
-
- static
- {
- try
- {
- debug = SecuritySupport.getSystemProperty("dtm.debug") != null;
- }
- catch (SecurityException ex){}
- }
-
/** This value, set at compile time, controls how many bits of the
* DTM node identifier numbers are used to identify a node within a
* document, and thus sets the maximum number of nodes per
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-4099d8cf255f/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java
new/jaxp-46f2d7395127/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java
---
old/jaxp-4099d8cf255f/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java
2017-05-03 04:50:27.000000000 +0200
+++
new/jaxp-46f2d7395127/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java
2017-08-03 18:03:27.000000000 +0200
@@ -233,7 +233,7 @@
"Axeltravers underst\u00F6ds inte: {0}"},
{ ER_NO_DTMIDS_AVAIL,
- "Inga fler DTM-ID:n \u00E4r tillg\u00E4ngliga"},
+ "Inga fler DTM-id:n \u00E4r tillg\u00E4ngliga"},
{ ER_NOT_SUPPORTED,
"Underst\u00F6ds inte: {0}"},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-4099d8cf255f/src/javax/xml/transform/TransformerConfigurationException.java
new/jaxp-46f2d7395127/src/javax/xml/transform/TransformerConfigurationException.java
---
old/jaxp-4099d8cf255f/src/javax/xml/transform/TransformerConfigurationException.java
2017-05-03 04:50:27.000000000 +0200
+++
new/jaxp-46f2d7395127/src/javax/xml/transform/TransformerConfigurationException.java
2017-08-03 18:03:27.000000000 +0200
@@ -30,6 +30,8 @@
*/
public class TransformerConfigurationException extends TransformerException {
+ private static final long serialVersionUID = 1285547467942875745L;
+
/**
* Create a new <code>TransformerConfigurationException</code> with no
* detail mesage.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-4099d8cf255f/src/javax/xml/transform/TransformerException.java
new/jaxp-46f2d7395127/src/javax/xml/transform/TransformerException.java
--- old/jaxp-4099d8cf255f/src/javax/xml/transform/TransformerException.java
2017-05-03 04:50:27.000000000 +0200
+++ new/jaxp-46f2d7395127/src/javax/xml/transform/TransformerException.java
2017-08-03 18:03:27.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -27,34 +27,44 @@
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.CodeSigner;
+import java.security.CodeSource;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
/**
- * This class specifies an exceptional condition that occured
+ * This class specifies an exceptional condition that occurred
* during the transformation process.
*/
public class TransformerException extends Exception {
- /** Field locator specifies where the error occured */
+ private static final long serialVersionUID = 975798773772956428L;
+
+ /** Field locator specifies where the error occurred */
SourceLocator locator;
/**
* Method getLocator retrieves an instance of a SourceLocator
- * object that specifies where an error occured.
+ * object that specifies where an error occurred.
*
* @return A SourceLocator object, or null if none was specified.
*/
public SourceLocator getLocator() {
- return locator;
+ return this.locator;
}
/**
* Method setLocator sets an instance of a SourceLocator
- * object that specifies where an error occured.
+ * object that specifies where an error occurred.
*
* @param location A SourceLocator object, or null to clear the location.
*/
public void setLocator(SourceLocator location) {
- locator = location;
+ this.locator = location;
}
/** Field containedException specifies a wrapped exception. May be null.
*/
@@ -74,7 +84,9 @@
* Returns the cause of this throwable or <code>null</code> if the
* cause is nonexistent or unknown. (The cause is the throwable that
* caused this throwable to get thrown.)
+ * @return the cause, or null if unknown
*/
+ @Override
public Throwable getCause() {
return ((containedException == this)
@@ -106,6 +118,7 @@
* {@link #TransformerException(String,Throwable)}, or this method
has already
* been called on this throwable.
*/
+ @Override
public synchronized Throwable initCause(Throwable cause) {
if (this.containedException != null) {
@@ -128,11 +141,7 @@
* @param message The error or warning message.
*/
public TransformerException(String message) {
-
- super(message);
-
- this.containedException = null;
- this.locator = null;
+ this(message, null, null);
}
/**
@@ -141,11 +150,7 @@
* @param e The exception to be wrapped.
*/
public TransformerException(Throwable e) {
-
- super(e.toString());
-
- this.containedException = e;
- this.locator = null;
+ this(null, null, e);
}
/**
@@ -159,13 +164,7 @@
* @param e Any exception
*/
public TransformerException(String message, Throwable e) {
-
- super(((message == null) || (message.length() == 0))
- ? e.toString()
- : message);
-
- this.containedException = e;
- this.locator = null;
+ this(message, null, e);
}
/**
@@ -179,11 +178,7 @@
* @param locator The locator object for the error or warning.
*/
public TransformerException(String message, SourceLocator locator) {
-
- super(message);
-
- this.containedException = null;
- this.locator = locator;
+ this(message, locator, null);
}
/**
@@ -196,8 +191,9 @@
*/
public TransformerException(String message, SourceLocator locator,
Throwable e) {
-
- super(message);
+ super(((message == null) || (message.length() == 0))
+ ? ((e == null) ? "" : e.toString())
+ : message);
this.containedException = e;
this.locator = locator;
@@ -211,33 +207,16 @@
* location information appended.
*/
public String getMessageAndLocation() {
-
- StringBuffer sbuffer = new StringBuffer();
- String message = super.getMessage();
+ StringBuilder sbuffer = new StringBuilder();
+ String message = super.getMessage();
+ String location = getLocationAsString();
if (null != message) {
sbuffer.append(message);
}
- if (null != locator) {
- String systemID = locator.getSystemId();
- int line = locator.getLineNumber();
- int column = locator.getColumnNumber();
-
- if (null != systemID) {
- sbuffer.append("; SystemID: ");
- sbuffer.append(systemID);
- }
-
- if (0 != line) {
- sbuffer.append("; Line#: ");
- sbuffer.append(line);
- }
-
- if (0 != column) {
- sbuffer.append("; Column#: ");
- sbuffer.append(column);
- }
+ if (null != location) {
+ sbuffer.append(location);
}
return sbuffer.toString();
@@ -250,9 +229,34 @@
* if there is no location information.
*/
public String getLocationAsString() {
+ if (locator == null) {
+ return null;
+ }
- if (null != locator) {
- StringBuffer sbuffer = new StringBuffer();
+ if (System.getSecurityManager() == null) {
+ return getLocationString();
+ } else {
+ return AccessController.doPrivileged(
+ new PrivilegedAction<String>() {
+ public String run() {
+ return getLocationString();
+ }
+ },
+ new AccessControlContext(new ProtectionDomain[]
{getNonPrivDomain()})
+ );
+ }
+ }
+
+ /**
+ * Constructs the location string.
+ * @return the location string
+ */
+ private String getLocationString() {
+ if (locator == null) {
+ return null;
+ }
+
+ StringBuilder sbuffer = new StringBuilder();
String systemID = locator.getSystemId();
int line = locator.getLineNumber();
int column = locator.getColumnNumber();
@@ -273,9 +277,6 @@
}
return sbuffer.toString();
- } else {
- return null;
- }
}
/**
@@ -283,6 +284,7 @@
* originated. This will trace all nested exception
* objects, as well as this object.
*/
+ @Override
public void printStackTrace() {
printStackTrace(new java.io.PrintWriter(System.err, true));
}
@@ -293,6 +295,7 @@
* objects, as well as this object.
* @param s The stream where the dump will be sent to.
*/
+ @Override
public void printStackTrace(java.io.PrintStream s) {
printStackTrace(new java.io.PrintWriter(s));
}
@@ -303,6 +306,7 @@
* objects, as well as this object.
* @param s The writer where the dump will be sent to.
*/
+ @Override
public void printStackTrace(java.io.PrintWriter s) {
if (s == null) {
@@ -356,15 +360,22 @@
} else {
exception = null;
}
- } catch (InvocationTargetException ite) {
- exception = null;
- } catch (IllegalAccessException iae) {
- exception = null;
- } catch (NoSuchMethodException nsme) {
+ } catch (InvocationTargetException | IllegalAccessException
+ | NoSuchMethodException e) {
exception = null;
}
}
// insure output is written
s.flush();
}
+
+ /**
+ * Creates a ProtectionDomain that has no permission.
+ * @return a ProtectionDomain
+ */
+ private ProtectionDomain getNonPrivDomain() {
+ CodeSource nullSource = new CodeSource(null, (CodeSigner[]) null);
+ PermissionCollection noPermission = new Permissions();
+ return new ProtectionDomain(nullSource, noPermission);
+}
}
++++++ jaxws.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaxws-bc4f48c1ccba/.hgtags
new/jaxws-e17af60ebbd6/.hgtags
--- old/jaxws-bc4f48c1ccba/.hgtags 2017-05-03 04:50:27.000000000 +0200
+++ new/jaxws-e17af60ebbd6/.hgtags 2017-08-03 18:03:27.000000000 +0200
@@ -670,3 +670,7 @@
90c86962aa2e81ecd8d5d79a282f2492447e4c6e jdk7u141-b00
506e24eee4e1887fbfdd77512f830b75e14c5759 jdk7u141-b01
1af82a2d3d16626b8d2f5e633d23c027975406b8 jdk7u141-b02
+bc4f48c1ccba5dc37b360629ebf4539e85d481bd icedtea-2.6.10
+f8bd60e998968cc16e72c76a7dc8eadb3a980960 icedtea-2.6.11pre01
+1f0dd7a7e0ccaa340db533da400bb83ca1ad3cf2 jdk7u151-b00
+3233576db658552e8933b1cd86f5586507564f44 jdk7u151-b01
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-bc4f48c1ccba/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java
new/jaxws-e17af60ebbd6/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java
---
old/jaxws-bc4f48c1ccba/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java
2017-05-03 04:50:27.000000000 +0200
+++
new/jaxws-e17af60ebbd6/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java
2017-08-03 18:03:27.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -79,6 +79,15 @@
*/
public boolean nocompile;
+ /**
+ * If true XML security features when parsing XML documents will be
disabled.
+ * The default value is false.
+ *
+ * Boolean
+ * @since 2.2.9
+ */
+ public boolean disableXmlSecurity;
+
public enum Target {
V2_0, V2_1, V2_2;
@@ -310,6 +319,9 @@
throw new
BadCommandLineException(WscompileMessages.WSCOMPILE_NO_SUCH_DIRECTORY(sourceDir.getPath()));
}
return 2;
+ } else if (args[i].equals("-disableXmlSecurity")) {
+ disableXmlSecurity();
+ return 1;
} else if (args[i].equals("-extension")) {
compatibilityMode = EXTENSION;
return 1;
@@ -326,6 +338,11 @@
return 0;
}
+ // protected method to allow overriding
+ protected void disableXmlSecurity() {
+ disableXmlSecurity= true;
+ }
+
/**
* Obtains an operand and reports an error if it's not there.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-bc4f48c1ccba/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java
new/jaxws-e17af60ebbd6/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java
---
old/jaxws-bc4f48c1ccba/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java
2017-05-03 04:50:27.000000000 +0200
+++
new/jaxws-e17af60ebbd6/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java
2017-08-03 18:03:27.000000000 +0200
@@ -445,4 +445,10 @@
}
}
}
+
+ @Override
+ protected void disableXmlSecurity() {
+ super.disableXmlSecurity();
+ schemaCompiler.getOptions().disableXmlSecurity = true;
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-bc4f48c1ccba/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
new/jaxws-e17af60ebbd6/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
---
old/jaxws-bc4f48c1ccba/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
2017-05-03 04:50:27.000000000 +0200
+++
new/jaxws-e17af60ebbd6/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
2017-08-03 18:03:27.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -26,15 +26,12 @@
package com.sun.tools.internal.ws.wsdl.parser;
import com.sun.istack.internal.NotNull;
-import com.sun.tools.internal.ws.resources.WscompileMessages;
-import com.sun.tools.internal.ws.wscompile.AbortException;
-import com.sun.tools.internal.ws.wscompile.DefaultAuthenticator;
+import com.sun.tools.internal.ws.util.xml.XmlUtil;
import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
import com.sun.tools.internal.ws.wscompile.WsimportOptions;
import com.sun.tools.internal.ws.wsdl.document.schema.SchemaConstants;
import com.sun.tools.internal.xjc.reader.internalizer.LocatorTable;
import com.sun.xml.internal.bind.marshaller.DataWriter;
-import com.sun.xml.internal.ws.util.JAXWSUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -51,9 +48,6 @@
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXResult;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLSession;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -118,13 +112,13 @@
this.entityResolver = entityResolver;
this.errorReceiver = errReceiver;
this.logic = logic;
+ // secure xml processing can be switched off if input requires it
+ boolean disableXmlSecurity = options == null ? false :
options.disableXmlSecurity;
+
+ DocumentBuilderFactory dbf =
XmlUtil.newDocumentBuilderFactory(disableXmlSecurity);
+ this.parserFactory = XmlUtil.newSAXParserFactory(disableXmlSecurity);
try {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
this.documentBuilder = dbf.newDocumentBuilder();
-
- this.parserFactory = SAXParserFactory.newInstance();
- this.parserFactory.setNamespaceAware(true);
} catch (ParserConfigurationException e) {
throw new AssertionError(e);
}
@@ -368,7 +362,10 @@
public void dump(OutputStream out) throws IOException {
try {
// create identity transformer
- Transformer it = TransformerFactory.newInstance().newTransformer();
+ // secure xml processing can be switched off if input requires it
+ boolean secureProcessingEnabled = options == null ||
!options.disableXmlSecurity;
+ TransformerFactory tf =
XmlUtil.newTransformerFactory(secureProcessingEnabled);
+ Transformer it = tf.newTransformer();
for (Map.Entry<String, Document> e : core.entrySet()) {
out.write(("---<< " + e.getKey() + '\n').getBytes());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-bc4f48c1ccba/src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java
new/jaxws-e17af60ebbd6/src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java
---
old/jaxws-bc4f48c1ccba/src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java
2017-05-03 04:50:27.000000000 +0200
+++
new/jaxws-e17af60ebbd6/src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java
2017-08-03 18:03:27.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -104,6 +104,15 @@
public String encoding;
/**
+ * If true XML security features when parsing XML documents will be
disabled.
+ * The default value is false.
+ *
+ * Boolean
+ * @since 2.2.6
+ */
+ public boolean disableXmlSecurity;
+
+ /**
* Check the source schemas with extra scrutiny.
* The exact meaning depends on the schema language.
*/
@@ -540,6 +549,10 @@
enableIntrospection = true;
return 1;
}
+ if (args[i].equals("-disableXmlSecurity")) {
+ disableXmlSecurity = true;
+ return 1;
+ }
if (args[i].equals("-contentForWildcard")) {
contentForWildcard = true;
return 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-bc4f48c1ccba/src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java
new/jaxws-e17af60ebbd6/src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java
---
old/jaxws-bc4f48c1ccba/src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java
2017-05-03 04:50:27.000000000 +0200
+++
new/jaxws-e17af60ebbd6/src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java
2017-08-03 18:03:27.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -25,29 +25,27 @@
package com.sun.xml.internal.ws.util;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.util.xml.XmlUtil;
+import javax.xml.XMLConstants;
+import javax.xml.namespace.NamespaceContext;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import javax.xml.XMLConstants;
-import javax.xml.namespace.NamespaceContext;
-import java.io.IOException;
-import java.io.InputStream;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.ArrayList;
-import com.sun.istack.internal.NotNull;
-import com.sun.istack.internal.Nullable;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* @author: JAXWS Development Team
@@ -63,8 +61,7 @@
synchronized (DOMUtil.class) {
if (db == null) {
try {
- DocumentBuilderFactory dbf =
DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
+ DocumentBuilderFactory dbf =
XmlUtil.newDocumentBuilderFactory();
db = dbf.newDocumentBuilder();
} catch (ParserConfigurationException e) {
throw new FactoryConfigurationError(e);
@@ -74,28 +71,6 @@
}
}
- public static Node createDOMNode(InputStream inputStream) {
-
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- dbf.setValidating(false);
- try {
- DocumentBuilder builder = dbf.newDocumentBuilder();
- try {
- return builder.parse(inputStream);
- } catch (SAXException e) {
- e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
- } catch (IOException e) {
- e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
- }
- } catch (ParserConfigurationException pce) {
- IllegalArgumentException iae = new
IllegalArgumentException(pce.getMessage());
- iae.initCause(pce);
- throw iae;
- }
- return null;
- }
-
/**
* Traverses a DOM node and writes out on a streaming writer.
*
@@ -112,6 +87,7 @@
switch (child.getNodeType()) {
case Node.PROCESSING_INSTRUCTION_NODE:
writer.writeProcessingInstruction(child.getNodeValue());
+ break;
case Node.DOCUMENT_TYPE_NODE:
break;
case Node.CDATA_SECTION_NODE:
@@ -126,6 +102,7 @@
case Node.ELEMENT_NODE:
serializeNode((Element) child, writer);
break;
+ default: break;
}
}
}
@@ -222,8 +199,9 @@
for (Node n = e.getFirstChild(); n != null; n = n.getNextSibling()) {
if (n.getNodeType() == Node.ELEMENT_NODE) {
Element c = (Element) n;
- if (c.getLocalName().equals(local) &&
c.getNamespaceURI().equals(nsUri))
+ if (c.getLocalName().equals(local) &&
c.getNamespaceURI().equals(nsUri)) {
return c;
+ }
}
}
return null;
@@ -232,8 +210,11 @@
private static
@NotNull
String fixNull(@Nullable String s) {
- if (s == null) return "";
- else return s;
+ if (s == null) {
+ return "";
+ } else {
+ return s;
+ }
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-bc4f48c1ccba/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java
new/jaxws-e17af60ebbd6/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java
---
old/jaxws-bc4f48c1ccba/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java
2017-05-03 04:50:27.000000000 +0200
+++
new/jaxws-e17af60ebbd6/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java
2017-08-03 18:03:27.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -40,13 +40,18 @@
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
import org.xml.sax.InputSource;
+import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
+import javax.xml.stream.XMLInputFactory;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
@@ -57,16 +62,22 @@
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamSource;
import javax.xml.ws.WebServiceException;
+import javax.xml.xpath.XPathFactory;
+import javax.xml.xpath.XPathFactoryConfigurationException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
* @author WS Development Team
@@ -75,6 +86,27 @@
private final static String LEXICAL_HANDLER_PROPERTY =
"http://xml.org/sax/properties/lexical-handler";;
+ private static final String DISALLOW_DOCTYPE_DECL =
"http://apache.org/xml/features/disallow-doctype-decl";;
+
+ private static final String EXTERNAL_GE =
"http://xml.org/sax/features/external-general-entities";;
+
+ private static final String EXTERNAL_PE =
"http://xml.org/sax/features/external-parameter-entities";;
+
+ private static final String LOAD_EXTERNAL_DTD =
"http://apache.org/xml/features/nonvalidating/load-external-dtd";;
+
+ private static final Logger LOGGER =
Logger.getLogger(XmlUtil.class.getName());
+
+ private static final String DISABLE_XML_SECURITY =
"com.sun.xml.internal.ws.disableXmlSecurity";
+
+ private static boolean XML_SECURITY_DISABLED =
AccessController.doPrivileged(
+ new PrivilegedAction<Boolean>() {
+ @Override
+ public Boolean run() {
+ return Boolean.getBoolean(DISABLE_XML_SECURITY);
+ }
+ }
+ );
+
public static String getPrefix(String s) {
int i = s.indexOf(':');
if (i == -1)
@@ -163,7 +195,7 @@
}
public static String getTextForNode(Node node) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
NodeList children = node.getChildNodes();
if (children.getLength() == 0)
@@ -334,15 +366,108 @@
* {@link ErrorHandler} that always treat the error as fatal.
*/
public static final ErrorHandler DRACONIAN_ERROR_HANDLER = new
ErrorHandler() {
+ @Override
public void warning(SAXParseException exception) {
}
+ @Override
public void error(SAXParseException exception) throws SAXException {
throw exception;
}
+ @Override
public void fatalError(SAXParseException exception) throws
SAXException {
throw exception;
}
};
+
+ public static DocumentBuilderFactory newDocumentBuilderFactory() {
+ return newDocumentBuilderFactory(false);
+ }
+
+ public static DocumentBuilderFactory newDocumentBuilderFactory(boolean
disableSecurity) {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ String featureToSet = XMLConstants.FEATURE_SECURE_PROCESSING;
+ try {
+ boolean securityOn = !isXMLSecurityDisabled(disableSecurity);
+ factory.setFeature(featureToSet, securityOn);
+ factory.setNamespaceAware(true);
+ if (securityOn) {
+ factory.setExpandEntityReferences(false);
+ featureToSet = DISALLOW_DOCTYPE_DECL;
+ factory.setFeature(featureToSet, true);
+ featureToSet = EXTERNAL_GE;
+ factory.setFeature(featureToSet, false);
+ featureToSet = EXTERNAL_PE;
+ factory.setFeature(featureToSet, false);
+ featureToSet = LOAD_EXTERNAL_DTD;
+ factory.setFeature(featureToSet, false);
+ }
+ } catch (ParserConfigurationException e) {
+ LOGGER.log(Level.WARNING, "Factory [{0}] doesn't support
"+featureToSet+" feature!", new Object[] {factory.getClass().getName()} );
+ }
+ return factory;
+ }
+
+ public static TransformerFactory newTransformerFactory(boolean
secureXmlProcessingEnabled) {
+ TransformerFactory factory = TransformerFactory.newInstance();
+ try {
+ factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
isXMLSecurityDisabled(secureXmlProcessingEnabled));
+ } catch (TransformerConfigurationException e) {
+ LOGGER.log(Level.WARNING, "Factory [{0}] doesn't support secure
xml processing!", new Object[]{factory.getClass().getName()});
+ }
+ return factory;
+ }
+
+ public static TransformerFactory newTransformerFactory() {
+ return newTransformerFactory(true);
+ }
+
+ public static SAXParserFactory newSAXParserFactory(boolean
disableSecurity) {
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ String featureToSet = XMLConstants.FEATURE_SECURE_PROCESSING;
+ try {
+ boolean securityOn = !isXMLSecurityDisabled(disableSecurity);
+ factory.setFeature(featureToSet, securityOn);
+ factory.setNamespaceAware(true);
+ if (securityOn) {
+ featureToSet = DISALLOW_DOCTYPE_DECL;
+ factory.setFeature(featureToSet, true);
+ featureToSet = EXTERNAL_GE;
+ factory.setFeature(featureToSet, false);
+ featureToSet = EXTERNAL_PE;
+ factory.setFeature(featureToSet, false);
+ featureToSet = LOAD_EXTERNAL_DTD;
+ factory.setFeature(featureToSet, false);
+ }
+ } catch (ParserConfigurationException | SAXNotRecognizedException |
SAXNotSupportedException e) {
+ LOGGER.log(Level.WARNING, "Factory [{0}] doesn't support
"+featureToSet+" feature!", new Object[]{factory.getClass().getName()});
+ }
+ return factory;
+ }
+
+ public static XPathFactory newXPathFactory(boolean
secureXmlProcessingEnabled) {
+ XPathFactory factory = XPathFactory.newInstance();
+ try {
+ factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
isXMLSecurityDisabled(secureXmlProcessingEnabled));
+ } catch (XPathFactoryConfigurationException e) {
+ LOGGER.log(Level.WARNING, "Factory [{0}] doesn't support secure
xml processing!", new Object[] { factory.getClass().getName() } );
+ }
+ return factory;
+ }
+
+ public static XMLInputFactory newXMLInputFactory(boolean
secureXmlProcessingEnabled) {
+ XMLInputFactory factory = XMLInputFactory.newInstance();
+ if (isXMLSecurityDisabled(secureXmlProcessingEnabled)) {
+ // TODO-Miran: are those apppropriate defaults?
+ factory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
+
factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
+ }
+ return factory;
+ }
+
+ private static boolean isXMLSecurityDisabled(boolean runtimeDisabled) {
+ return XML_SECURITY_DISABLED || runtimeDisabled;
+ }
+
}
++++++ jdk.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/jdk.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/jdk.tar.bz2 differ: char 11,
line 1
++++++ langtools.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/langtools-6e30439005f6/.hgtags
new/langtools-cddb1f9f8b9c/.hgtags
--- old/langtools-6e30439005f6/.hgtags 2017-05-03 04:50:27.000000000 +0200
+++ new/langtools-cddb1f9f8b9c/.hgtags 2017-08-03 18:03:28.000000000 +0200
@@ -670,3 +670,7 @@
b1802aa8be3a49d2a5c07160f2406165e309efde jdk7u141-b00
853798299f7a4f38745632dc256219fbf75f861e jdk7u141-b01
ba8ba083c4392a1ddfe40467de1e08d77443807e jdk7u141-b02
+6e30439005f6e6a63661192738e27e8d374d72d8 icedtea-2.6.10
+a4814b6ff893d36aea91ccb16990d8a34840c07f icedtea-2.6.11pre01
+4624941508c189c7b81c3393664741640a9b0467 jdk7u151-b00
+205349c408f4715dbbaf428ceafca676e2333979 jdk7u151-b01
++++++ no-exec-shield-workaround.patch ++++++
--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2017-05-02
21:50:28.000000000 -0500
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2017-08-03
13:12:34.998333096 -0500
@@ -4979,10 +4979,6 @@
Linux::capture_initial_stack(JavaThread::stack_size_at_create());
-#if defined(IA32) && !defined(ZERO)
- workaround_expand_exec_shield_cs_limit();
-#endif
-
Linux::libpthread_init();
if (PrintMiscellaneous && (Verbose || WizardMode)) {
tty->print_cr("[HotSpot is running with %s, %s(%s)]\n",
++++++ openjdk.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icedtea7-forest-2-6-b3f98f0d4549/.hgtags
new/icedtea7-forest-2-6-499e7894cc44/.hgtags
--- old/icedtea7-forest-2-6-b3f98f0d4549/.hgtags 2017-05-03
04:50:27.000000000 +0200
+++ new/icedtea7-forest-2-6-499e7894cc44/.hgtags 2017-08-03
18:03:27.000000000 +0200
@@ -668,3 +668,7 @@
e3b3add63d287cd07398949308308135ded4197e jdk7u141-b00
b21d7bc25e0f96c6ed9b19e1ea0ea6253c34d7fe jdk7u141-b01
db8fe12e5e508b18dd0aeb166099406a774b0d04 jdk7u141-b02
+b3f98f0d454923698116f756711d79c0578f1a8e icedtea-2.6.10
+54009dd18b706ad1ef023cd472a8c1a76f9faac6 icedtea-2.6.11pre01
+ae6c3762cdc9b1610211cd1ad1a29ed1a7f8471e jdk7u151-b00
+c63b09823b9fa0ddeb37c1ac534569a9227c5bf6 jdk7u151-b01
