Hello community,
here is the log from the commit of package java-1_8_0-openjdk for openSUSE:Factory checked in at 2017-01-31 12:31:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_8_0-openjdk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes 2016-11-11 14:31:58.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/java-1_8_0-openjdk.changes 2017-02-03 17:42:58.139963972 +0100
@@ -1,0 +2,316 @@
+Sun Jan 29 20:44:57 UTC 2017 - fstrba@suse.com
+
+- Upgrade to version jdk8u121 (icedtea 3.3.0) - bsc#1020905
+ * Security fixes
+ - S8138725: Add options for Javadoc generation
+ - S8140353: Improve signature checking
+ - S8151934, CVE-2017-3231: Resolve class resolution
+ - S8156804, CVE-2017-3241: Better constraint checking
+ - S8158406: Limited Parameter Processing
+ - S8158997: JNDI Protocols Switch
+ - S8159507: RuntimeVisibleAnnotation validation
+ - S8161218: Better bytecode loading
+ - S8161743, CVE-2017-3252: Provide proper login context
+ - S8162577: Standardize logging levels
+ - S8162973: Better component components
+ - S8164143, CVE-2017-3260: Improve components for menu items
+ - S8164147, CVE-2017-3261: Improve streaming socket output
+ - S8165071, CVE-2016-2183: Expand TLS support
+ - S8165344, CVE-2017-3272: Update concurrency support
+ - S8166988, CVE-2017-3253: Improve image processing performance
+ - S8167104, CVE-2017-3289: Additional class construction
+ refinements
+ - S8167223, CVE-2016-5552: URL handling improvements
+ - S8168705, CVE-2016-5547: Better ObjectIdentifier validation
+ - S8168714, CVE-2016-5546: Tighten ECDSA validation
+ - S8168728, CVE-2016-5548: DSA signing improvments
+ - S8168724, CVE-2016-5549: ECDSA signing improvments
+ * New features
+ - PR3300: wget not required when downloading is disabled
+ - PR3301: Support RHEL multilib installations which use the
+ /usr/lib/jvm/java-1.x.0-openjdk.${arch} naming
+ - PR3303: Allow Kerberos to be detected by old libs & headers
+ method if pkg-config check fails
+ * Import of OpenJDK 8 u112 build 16
+ - S6477756: GraphicsDevice.getConfigurations() is slow taking 3
+ or more seconds
+ - S7172749: Xrender: Class cast exception in 2D code running an
+ AWT regression test
+ - S8017629: G1: UseSHM in combination with a G1HeapRegionSize >
+ os::large_page_size() falls back to use small pages
+ - S8022203: Intermittent test failures in demo/jvmti/hprof
+ - S8022582: Relax response flags checking in
+ sun.security.krb5.KrbKdcRep.check.
+ - S8027575: b113 causing a lot of memory allocation and
+ regression for wls_webapp_atomics
+ - S8028486: java/awt/Window/WindowsLeak/WindowsLeak.java fails
+ - S8030780: test/com/sun/corba/cachedSocket/7056731.sh leaves
+ HelloServer behind
+ - S8036630: Null ProtectionDomain in JVM can cause NPE because
+ principals field is not initialized to an empty array
+ - S8042660: vm/mlvm/anonloader/stress/byteMutation failed with:
+ assert(index >=0 && index < _length) failed: symbol index
+ overflow
+ - S8044193: Need to add known answer tests for AES cipher
+ - S8044575: testlibrary_tests/whitebox/vm_flags/UintxTest.java
+ failed: assert(!res ||
+ TypeEntriesAtCall::arguments_profiling_enabled()) failed: no
+ profiling of arguments
+ - S8048601: Tests for JCE crypto ciphers (part 1)
+ - S8048621: Implement basic keystore tests
+ - S8048622: Enhance tests for PKCS11 keystores with NSS
+ - S8049021: Add smartcardio tests with APDU buffer
+ - S8049312: AES/CICO test failed with on several modes
+ - S8050402: Tests to check for use of policy files
+ - S8050409: Test for JAAS getPrivateCredentials
+ - S8054326: Confusing message in "Current rem set statistics"
+ - S8055772: get_source.sh : version check assumes English
+ localization
+ - S8057791: Selection in JList is drawn with wrong colors in
+ Nimbus L&F
+ - S8058865: JMX Test Refactoring
+ - S8067964: Native2ascii doesn't close one of the streams it
+ opens
+ - S8071487:
+ javax/management/monitor/GaugeMonitorDeadlockTest.java timed
+ out
+ - S8071909: Port testlibrary improvments in jdk/test to
+ hotspot/test as required for DCMD test port
+ - S8073542: File Leak in
+ jdk/src/java/base/unix/native/libnet/PlainDatagramSocketImpl.c
+ - S8074784: Additional tests for XML DSig API
+ - S8075007: Additional tests for krb5-related cipher suites
+ with unbound server
+ - S8075297: Tests for RFEs 4515853 and 4745056
+ - S8075299: Additional tests for krb5 settings
+ - S8075301: Tests for sun.security.krb5.principal system
+ property
+ - S8077276: allocating heap with UseLargePages and HugeTLBFS
+ may trash existing memory mappings (linux)
+ - S8078268: javax.swing.text.html.parser.Parser parseScript
+ incorrectly optimized
+ - S8078382: Wrong glyph is displayed for a derived font
+ - S8080729: [macosx] java 7 and 8 JDialogs on multiscreen jump
+ to parent frame on focus
+ - S8085903: New fix for memory leak in ProtectionDomain cache
+ - S8098581: SecureRandom.nextBytes() hurts performance with
+ small size requests
+ - S8129740: Incorrect class file created when passing lambda in
+ inner class constructor
+ - S8130127: streamline input parameter of Nashorn scripting
+ $EXEC function
+ - S8130309: Need to bailout cleanly if creation of stubs fails
+ when codecache is out of space
+ - S8130317: "ant test" fails to complete on Windows when run
+ under cygwin shell
+ - S8133070: Hot lock on BulkCipher.isAvailable
+ - S8133309: Some unicode characters do not display any more
+ after upgrading to Windows 10
+ - S8134232: KeyStore.load() throws an IOException with a wrong
+ cause in case of wrong password
+ - S8135322: ConstantPool::release_C_heap_structures not run in
+ some circumstances
+ - S8136998: JComboBox prevents wheel mouse scrolling of
+ JScrollPane
+ - S8137240: Negative lookahead in RegEx breaks backreference
+ - S8138906: [TEST_BUG] Test test/script/trusted/JDK-8087292.js
+ intermittently fails.
+ - S8141148: LDAP "follow" throws ClassCastException with Java 8
+ - S8141541: Simplify Nashorn's Context class loader handling
+ - S8143640: Showing incorrect result while passing specific
+ argument in the Java launcher tools
+ - S8143642: Nashorn shebang argument handling is broken
+ - S8144160: Regression: two tests fail on Windows with "ant
+ test" target
+ - S8144221: fix Nashorn shebang argument handling on Mac/Linux
+ - S8144703: ClassCastException: sun.font.CompositeFont cannot
+ be cast to PhysicalFont
+ - S8145305: fix Nashorn shebang handling on Cygwin
+ - S8145984: [macosx] sun.lwawt.macosx.CAccessible leaks
+ - S8146975: NullPointerException in
+ IIOPInputStream.inputClassFields
+ - S8147026: Convert an assert in ClassLoaderData to a guarantee
+ - S8147451: Crash in
+ Method::checked_resolve_jmethod_id(_jmethodID*)
+ - S8147585: Annotations with lambda expressions has parameter
+ result in wrong behavior.
+ - S8147969: Print size of DH keysize when errors are encountered
+ - S8148140: arguments are handled differently in apply for JS
+ functions and AbstractJSObjects
+ - S8148984: [macosx] Chinese Comma cannot be entered using
+ Pinyin Input Method on OS X
+ - S8150219: ReferenceError in 1.8.0_72
+ - S8150234: Windows 10 App Containers disallow access to ICMP
+ calls
+ - S8150814: correct package declaration in Nashorn test
+ - S8151722: TESTBUG: New test compiler/native/TestDirtyInt.sh
+ should be modified
+ - S8153149: Uninitialised memory in WinAccessBridge.cpp:1128
+ - S8153192: (se) Selector.select(long) uses wrong timeout after
+ EINTR (lnx)
+ - S8153781: Issue in XMLScanner:
+ EXPECTED_SQUARE_BRACKET_TO_CLOSE_INTERNAL_SUBSET when skipping
+ large DOCTYPE section with CRLF at wrong place
+ - S8153948: sun/security/mscapi/ShortRSAKey1024.sh fails with
+ "Field length overflow"
+ - S8154009: Some methods of java.security.Security require more
+ permissions, than necessary
+ - S8154069: Jaws reads wrong values from comboboxes when no
+ element is selected
+ - S8154144: Tests in com/sun/jdi fails intermittently with "jdb
+ input stream closed prematurely"
+ - S8154469: Update FSF address
+ - S8154553: Incorrect GPL header in package-info.java reported
+ - S8154558: Incorrect GPL header in ProcessEnvironment_md.c
+ reported
+ - S8154816: Caps Lock doesn't work as expected when using
+ Pinyin Simplified input method
+ - S8154831: CastII/ConvI2L for a range check is prematurely
+ eliminated
+ - S8155001: SystemTray.remove() leaks GDI Objects in Windows
+ - S8155106: MHs.Lookup.findConstructor returns handles for
+ array classes
+ - S8155214: java/lang/invoke/PermuteArgsTest.java fails due to
+ exhausted code cache
+ - S8156478: 3 Buffer overrun defect groups in jexec.c
+ - S8156521: Minor fixes and cleanups in NetworkInterface.c
+ - S8156714: Parsing issue with automatic semicolon insertion
+ - S8156836: SIGSEGV: Test
+ test/compiler/jsr292/VMAnonymousClasses.java fails with JTREG
+ 4.2 b02
+ - S8156896: Script stack trace should display function names
+ - S8157160: JSON.stringify does not work on ScriptObjectMirror
+ objects
+ - S8157242: Some java/lang/invoke tests miss othervm
+ - S8157444: exclude jjs shebang handling test from runs
+ - S8157603: TestCipher.java doesn't check one of the decrypted
+ message as expected
+ - S8157680: Callback parameter of any JS builtin implementation
+ should accept any Callable
+ - S8157819: TypeError when a java.util.Comparator object is
+ invoked as a function
+ - S8158059: The fix for 8050402 was partially committed
+ - S8158072: Need a test for JDK-7172749
+ - S8158111: Make handling of 3rd party providers more stable
+ - S8158178: java.awt.SplashScreen.getSize() returns incorrect
+ size for high dpi splash screens
+ - S8158338: Nashorn's ScriptLoader split delegation has to be
++++ 119 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes
++++ and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/java-1_8_0-openjdk.changes
Old:
----
icedtea-3.2.0.tar.xz
New:
----
icedtea-3.3.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_8_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.6SXTX5/_old 2017-02-03 17:43:00.643609600 +0100
+++ /var/tmp/diff_new_pack.6SXTX5/_new 2017-02-03 17:43:00.647609034 +0100
@@ -1,7 +1,7 @@
#
# spec file for package java-1_8_0-openjdk
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
%global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64}
-%global icedtea_version 3.2.0
+%global icedtea_version 3.3.0
%global icedtea_sound_version 1.0.1
%global buildoutputdir openjdk.build/
# Convert an absolute path to a relative path. Each symbolic link is
@@ -32,7 +32,7 @@
# priority must be 6 digits in total
%global priority 1805
%global javaver 1.8.0
-%global updatever 111
+%global updatever 121
# Standard JPackage directories and symbolic links.
%global sdklnk java-%{javaver}-openjdk
%global archname %{sdklnk}
@@ -312,6 +312,7 @@
# Require jpackage-utils for ownership of /usr/lib/jvm/
Group: Development/Languages/Java
Requires: jpackage-utils
+%requires_eq mozilla-nss
# Post requires update-alternatives to install tool update-alternatives.
Requires(post): update-alternatives
# Postun requires update-alternatives to uninstall tool update-alternatives.
@@ -473,7 +474,6 @@
--enable-sunec \
%endif
--enable-bootstrap \
- --disable-infinality \
--disable-downloading \
--with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
%ifnarch %{arm} %{aarch64}
++++++ corba.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-9d3757e6da35/.hgtags new/corba-8eb9dd5fe2fb/.hgtags
--- old/corba-9d3757e6da35/.hgtags 2016-11-03 19:13:03.000000000 +0100
+++ new/corba-8eb9dd5fe2fb/.hgtags 2017-01-24 21:01:15.000000000 +0100
@@ -688,6 +688,10 @@
459f130b3f85a53d487f9d02b5d379a9eaaab400 icedtea-3.2.0pre03
56b133772ec1aa4f44f2eee2c4103c645f764935 jdk8u102-b14
8ba5a41487af9fe72aeb92e790327d12dce0de8c jdk8u102-b31
+8f015ee0842df021532a4b88c436ea9daed785b6 jdk8u102-b32
+f98a2ad119c097d532b013c275f67ad50a4236b7 jdk8u102-b33
+4da84a2c86c336c06265a2a7e9e3b7b7b4596f74 jdk8u102-b34
+ea8f493651778ad4f577839b28d6484b3a89b6c1 jdk8u102-b35
52cca1ce8b473ecd751da2350d4b3ef111b5676e jdk8u111-b00
d123c31c3bc21ccf02ac7368f5476dd9975e15e3 jdk8u111-b01
981c4d9dab16b3fa7333e5baa5497c299acd5172 jdk8u111-b02
@@ -702,3 +706,37 @@
dad7b1a59da60d68ff26bf7414b87995fecaaba6 jdk8u111-b11
a42cdfaa1218a636d2cd0b89a233362cdf32dd4b jdk8u111-b12
2214875a44e52789acf404b56543f613516ee498 jdk8u111-b13
+9d3757e6da3538863558e7ca61e95b722c79ada2 icedtea-3.2.0
+7898951ff63c9ea721b8f669b9c749d6c3a2db99 jdk8u111-b14
+b87d82f5c33dfb55bfc81254044f28eea5d7424a jdk8u112-b00
+1f2394102288d9073652064784e31a3f52fc5d4b jdk8u112-b01
+40c934289deefd68915f6519d71a4e315c69117a jdk8u112-b02
+ddb3a8afe0ad50e04d360efa96aee78cb599ea72 jdk8u112-b03
+1d0047d03f04c0c15c7856e0f177b9e15e94a692 jdk8u112-b04
+b6cdfd0b4a9cff1ed1bb43ef7fb21dc4d2dfe7d8 jdk8u112-b06
+9d09ca09ea33e6af774914606f94960e5af4fc9b jdk8u112-b07
+0ac6b67980512ce025a280d42c05156293613dbb jdk8u112-b08
+0d9ae87a0dfe893922b730312d9173ad5dd5f0d6 jdk8u112-b09
+09fb07ae151729154a2dd253d06bdad8955c2685 jdk8u112-b10
+4363b0b339a482ec9eefee11dc5877a618e8c681 jdk8u112-b11
+be34a52805408eb5edaf3d8de4fae47632a757c5 jdk8u112-b12
+4d45315307323fcb9dd84c3f0b0a1dc76f2b3b5f jdk8u112-b13
+18bbb95d097e04ea2b88df8910056fe294da0149 jdk8u112-b14
+30f83ac389f06c38dc0b6f71b1d8344c01436a16 jdk8u112-b15
+8ef3cc2bbc7dc687e9502ae957337b1ded1b32d4 jdk8u112-b16
+fbc3183924c82a612dc92cda261f19e227df2b32 icedtea-3.3.0pre01
+7d4291146927c3430652a07f506d530c2eff7eb9 jdk8u112-b31
+3a25f8a752524bad7e78800158c485b890be3982 jdk8u121-b00
+1ebd97292358cd158b6f7d5884526207fbfe796e jdk8u121-b01
+349d130d7a7f2bcaaed8dd2696030022eb4e7b75 jdk8u121-b02
+2090928e4b80e849fff4797ee05b99c076f14667 jdk8u121-b03
+a80781c494079d7d92f806f1f4cf57e856435781 jdk8u121-b04
+cf1b7263a217eb891597aa5b64edde94970600c6 jdk8u121-b05
+f98001da328ffdb5de76c4ba6672f3bda4c22e51 jdk8u121-b06
+367d1b35f2b2ccf47ba0c1c565613c4741b58056 jdk8u121-b07
+43598d9344e383d039eabeb3ee59316d0cc3e4c6 jdk8u121-b08
+c0210b2071599fa54aec59576ca942461ed8160a jdk8u121-b09
+e24a55876a79b630e8cfca7a1b38a0ee372f8533 jdk8u121-b10
+acbfa2934b2411dd20aacb42d1c8dd198fe9f8e9 jdk8u121-b11
+cc9a5d631b77582d52aceaf6d6066e99533d1756 jdk8u121-b12
+b05ee049200f51d91493047c31906988750a9ab2 icedtea-3.3.0pre02
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-9d3757e6da35/LICENSE new/corba-8eb9dd5fe2fb/LICENSE
--- old/corba-9d3757e6da35/LICENSE 2016-11-03 19:13:03.000000000 +0100
+++ new/corba-8eb9dd5fe2fb/LICENSE 2017-01-24 21:01:15.000000000 +0100
@@ -3,7 +3,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
@@ -287,8 +287,8 @@
more details.
You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc., 59
- Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-9d3757e6da35/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java new/corba-8eb9dd5fe2fb/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java
--- old/corba-9d3757e6da35/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2016-11-03 19:13:03.000000000 +0100
+++ new/corba-8eb9dd5fe2fb/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2017-01-24 21:01:15.000000000 +0100
@@ -2230,7 +2230,7 @@
* REVISIT -- This code doesn't do what the comment says to when
* getField() is null!
*/
- private void inputClassFields(Object o, Class cl,
+ private void inputClassFields(Object o, final Class<?> cl,
ObjectStreamField[] fields,
com.sun.org.omg.SendingContext.CodeBase sender)
throws InvalidClassException, StreamCorruptedException,
@@ -2264,21 +2264,31 @@
}
try {
- Class fieldCl = fields[i].getClazz();
+ Class<?> fieldCl = fields[i].getClazz();
if ((objectValue != null)
&& (!fieldCl.isAssignableFrom(
objectValue.getClass()))) {
throw new IllegalArgumentException("Field mismatch");
}
- Field classField = null;
+ Field declaredClassField = null;
+ final String inputStreamFieldName = fields[i].getName();
try {
- classField = cl.getDeclaredField(fields[i].getName());
- } catch (NoSuchFieldException nsfEx) {
- throw new IllegalArgumentException(nsfEx);
+ declaredClassField = getDeclaredField( cl, inputStreamFieldName);
+ } catch (PrivilegedActionException paEx) {
+ throw new IllegalArgumentException(
+ (NoSuchFieldException) paEx.getException());
} catch (SecurityException secEx) {
- throw new IllegalArgumentException(secEx.getCause());
+ throw new IllegalArgumentException(secEx);
+ } catch (NullPointerException npEx) {
+ continue;
+ } catch (NoSuchFieldException e) {
+ continue;
}
- Class<?> declaredFieldClass = classField.getType();
+
+ if (declaredClassField == null) {
+ continue;
+ }
+ Class<?> declaredFieldClass = declaredClassField.getType();
// check input field type is a declared field type
// input field is a subclass of the declared field
@@ -2291,15 +2301,24 @@
}
bridge.putObject( o, fields[i].getFieldID(), objectValue ) ;
// reflective code: fields[i].getField().set( o, objectValue ) ;
- } catch (IllegalArgumentException e) {
- ClassCastException exc = new ClassCastException("Assigning instance of class " +
- objectValue.getClass().getName() +
- " to field " +
- currentClassDesc.getName() +
- '#' +
- fields[i].getField().getName());
- exc.initCause( e ) ;
- throw exc ;
+ } catch (IllegalArgumentException iaEx) {
+ String objectValueClassName = "null";
+ String currentClassDescClassName = "null";
+ String fieldName = "null";
+ if (objectValue != null) {
+ objectValueClassName = objectValue.getClass().getName();
+ }
+ if (currentClassDesc != null) {
+ currentClassDescClassName = currentClassDesc.getName();
+ }
+ if (fields[i] != null && fields[i].getField() != null) {
+ fieldName = fields[i].getField().getName();
+ }
+ ClassCastException ccEx = new ClassCastException(
+ "Assigning instance of class " + objectValueClassName
+ + " to field " + currentClassDescClassName + '#' + fieldName);
+ ccEx.initCause( iaEx ) ;
+ throw ccEx ;
}
} // end : for loop
}
@@ -2595,9 +2614,9 @@
}
- private static void setObjectField(Object o, Class c, String fieldName, Object v) {
+ private static void setObjectField(Object o, Class<?> c, String fieldName, Object v) {
try {
- Field fld = c.getDeclaredField( fieldName ) ;
+ Field fld = getDeclaredField( c, fieldName ) ;
Class fieldCl = fld.getType();
if(v != null && !fieldCl.isInstance(v)) {
throw new Exception();
@@ -2617,10 +2636,10 @@
}
}
- private static void setBooleanField(Object o, Class c, String fieldName, boolean v)
+ private static void setBooleanField(Object o, Class<?> c, String fieldName, boolean v)
{
try {
- Field fld = c.getDeclaredField( fieldName ) ;
+ Field fld = getDeclaredField( c, fieldName ) ;
if ((fld != null) && (fld.getType() == Boolean.TYPE)) {
long key = bridge.objectFieldOffset( fld ) ;
bridge.putBoolean( o, key, v ) ;
@@ -2640,10 +2659,10 @@
}
}
- private static void setByteField(Object o, Class c, String fieldName, byte v)
+ private static void setByteField(Object o, Class<?> c, String fieldName, byte v)
{
try {
- Field fld = c.getDeclaredField( fieldName ) ;
+ Field fld = getDeclaredField( c, fieldName ) ;
if ((fld != null) && (fld.getType() == Byte.TYPE)) {
long key = bridge.objectFieldOffset( fld ) ;
bridge.putByte( o, key, v ) ;
@@ -2663,10 +2682,10 @@
}
}
- private static void setCharField(Object o, Class c, String fieldName, char v)
+ private static void setCharField(Object o, Class<?> c, String fieldName, char v)
{
try {
- Field fld = c.getDeclaredField( fieldName ) ;
+ Field fld = getDeclaredField( c, fieldName ) ;
if ((fld != null) && (fld.getType() == Character.TYPE)) {
long key = bridge.objectFieldOffset( fld ) ;
bridge.putChar( o, key, v ) ;
@@ -2686,10 +2705,10 @@
}
}
- private static void setShortField(Object o, Class c, String fieldName, short v)
+ private static void setShortField(Object o, Class<?> c, String fieldName, short v)
{
try {
- Field fld = c.getDeclaredField( fieldName ) ;
+ Field fld = getDeclaredField( c, fieldName ) ;
if ((fld != null) && (fld.getType() == Short.TYPE)) {
long key = bridge.objectFieldOffset( fld ) ;
bridge.putShort( o, key, v ) ;
@@ -2709,10 +2728,10 @@
}
}
- private static void setIntField(Object o, Class c, String fieldName, int v)
+ private static void setIntField(Object o, final Class<?> c, final String fieldName, int v)
{
try {
- Field fld = c.getDeclaredField( fieldName ) ;
+ Field fld = getDeclaredField( c, fieldName ) ;
if ((fld != null) && (fld.getType() == Integer.TYPE)) {
long key = bridge.objectFieldOffset( fld ) ;
bridge.putInt( o, key, v ) ;
@@ -2732,10 +2751,10 @@
}
}
- private static void setLongField(Object o, Class c, String fieldName, long v)
+ private static void setLongField(Object o, Class<?> c, String fieldName, long v)
{
try {
- Field fld = c.getDeclaredField( fieldName ) ;
+ Field fld = getDeclaredField( c, fieldName ) ;
if ((fld != null) && (fld.getType() == Long.TYPE)) {
long key = bridge.objectFieldOffset( fld ) ;
bridge.putLong( o, key, v ) ;
@@ -2755,10 +2774,10 @@
}
}
- private static void setFloatField(Object o, Class c, String fieldName, float v)
+ private static void setFloatField(Object o, Class<?> c, String fieldName, float v)
{
try {
- Field fld = c.getDeclaredField( fieldName ) ;
+ Field fld = getDeclaredField( c, fieldName ) ;
if ((fld != null) && (fld.getType() == Float.TYPE)) {
long key = bridge.objectFieldOffset( fld ) ;
bridge.putFloat( o, key, v ) ;
@@ -2778,10 +2797,10 @@
}
}
- private static void setDoubleField(Object o, Class c, String fieldName, double v)
+ private static void setDoubleField(Object o, Class<?> c, String fieldName, double v)
{
try {
- Field fld = c.getDeclaredField( fieldName ) ;
+ Field fld = getDeclaredField(c, fieldName ) ;
if ((fld != null) && (fld.getType() == Double.TYPE)) {
long key = bridge.objectFieldOffset( fld ) ;
bridge.putDouble( o, key, v ) ;
@@ -2801,6 +2820,23 @@
}
}
+
+ private static Field getDeclaredField(final Class<?> c,
+ final String fieldName)
+ throws PrivilegedActionException, NoSuchFieldException, SecurityException {
+ if (System.getSecurityManager() == null) {
+ return c.getDeclaredField(fieldName);
+ } else {
+ return AccessController
+ .doPrivileged(new PrivilegedExceptionAction<Field>() {
+ public Field run()
+ throws NoSuchFieldException {
+ return c.getDeclaredField(fieldName);
+ }
+ });
+ }
+ }
+
/**
* This class maintains a map of stream position to
* an Object currently being deserialized. It is used
@@ -2811,12 +2847,12 @@
*/
static class ActiveRecursionManager
{
- private Map offsetToObjectMap;
+ private Map offsetToObjectMap;
public ActiveRecursionManager() {
// A hash map is unsynchronized and allows
// null values
- offsetToObjectMap = new HashMap();
+ offsetToObjectMap = new HashMap<>();
}
// Called right after allocating a new object.
++++++ hotspot.tar.xz ++++++
/work/SRC/openSUSE:Factory/java-1_8_0-openjdk/hotspot.tar.xz /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/hotspot.tar.xz differ: char 26, line 1
++++++ icedtea-3.2.0.tar.xz -> icedtea-3.3.0.tar.xz ++++++
++++ 2269 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-3.2.0/ChangeLog new/icedtea-3.3.0/ChangeLog
--- old/icedtea-3.2.0/ChangeLog 2016-11-08 19:15:28.527595069 +0100
+++ new/icedtea-3.3.0/ChangeLog 2017-01-26 13:39:46.781523445 +0100
@@ -1,3 +1,181 @@
+2017-01-26 Andrew John Hughes
+
+ PR3304: zip still a requirement of the underlying
+ OpenJDK build
+ * NEWS: Updated.
+ * configure.ac:
+ Use IT_FIND_TOOL macro to require zip.
+
+2017-01-26 Andrew John Hughes
+
+ PR3303: Allow Kerberos to be detected by old libs
+ and headers method if pkg-config check fails
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add same fix to OpenJDK configure.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_KERBEROS): Use old IcedTea 2.x method
+ with explicit library and header detection if pkg-config
+ check fails.
+ * patches/pr3303.patch: Fix Kerberos detection in OpenJDK
+ in the same way.
+
+2017-01-25 Andrew John Hughes
+
+ PR3302: zip should be optional, as it's only used
+ in the manually invoked dist-openjdk and
+ dist-openjdk-fsg rules
+ * Makefile.am:
+ (dist-openjdk): Check if ${ZIP} is set and fail
+ if not.
+ (dist-openjdk-fsg): Likewise.
+ * NEWS: Updated.
+ * configure.ac:
+ Use the non-failing AC_PATH_TOOL macro for zip.
+
+2017-01-25 Andrew John Hughes
+
+ PR3301: Support RHEL multilib installations which
+ use the /usr/lib/jvm/java-1.x.0-openjdk.${arch} naming
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_SET_ARCH_SETTINGS): Set RPM_ARCH where the
+ RPM architecture name is known (Fedora/RHEL build
+ platforms). Remove unused CROSS_TARGET_ARCH from
+ sparc, s390x and sh.
+ (IT_CHECK_FOR_JDK): Depend on IT_SET_ARCH_SETTINGS.
+ Use ${RPM_ARCH} instead of explicit 'x86_64'.
+
+2016-02-15 Andrew John Hughes
+
+ PR3300: wget not required when downloading is disabled
+ * NEWS: Updated.
+ * configure.ac:
+ Only check for wget if downloading is enabled.
+
+2017-01-24 Andrew John Hughes
+
+ PR3271: Replace 'infinality' with
+ 'improved font rendering'
+ * INSTALL:
+ Rename --enable-infinality to
+ --enable-improved-font-rendering, as
+ the code no longer relies on the infinality
+ patch set.
+ * Makefile.am:
+ Use ENABLE_IMPROVED_FONT_RENDERING, not
+ ENABLE_INFINALITY.
+ * acinclude.m4:
+ (IT_ENABLE_IMPROVED_FONT_RENDERING): Renamed
+ from IT_ENABLE_INFINALITY. Fix variables to match
+ and remove unneeded test for infinality patches.
+ * configure.ac:
+ Invoke IT_ENABLE_IMPROVED_FONT_RENDERING instead
+ of IT_ENABLE_INFINALITY.
+
+2017-01-24 Andrew John Hughes
+
+ Bump to icedtea-3.3.0.
+ * Makefile.am:
+ (CORBA_CHANGESET): Update to icedtea-3.3.0 tag.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (NASHORN_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (NASHORN_SHA256SUM): Likewise.
+ (ICEDTEA_CONFIGURE): Change --enable/disable-infinality to
+ --enable/disable-improved-font-rendering, following PR3271.
+ * NEWS: Updated.
+ * configure.ac: Bump to 3.3.0.
+ * hotspot.map.in: Update to icedtea-3.3.0 tag.
+
+2017-01-23 Andrew John Hughes
+
+ Bump shenandoah to aarch64-shenandoah-jdk8u121-b14.
+ * hotspot.map.in: Update shenandoah to
+ aarch64-shenandoah-jdk8u121-b14 tag.
+
+2017-01-23 Andrew John Hughes
+
+ Bump to icedtea-3.3.0pre02.
+ * Makefile.am:
+ (JDK_UPDATE_VERSION): Bump to 121.
+ (BUILD_VERSION): Set to b13.
+ (CORBA_CHANGESET): Update to icedtea-3.3.0pre02 tag.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (NASHORN_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (NASHORN_SHA256SUM): Likewise.
+ * NEWS: Updated.
+ * configure.ac: Bump to 3.3.0pre02.
+ * hotspot.map.in: Update to icedtea-3.3.0pre02 tag.
+ * patches/pr2126.patch:
+ Extend following changes made in 8148516.
+ * patches/rh1022017.patch:
+ Adapt to changes made in 8148516.
+
+2017-01-23 Andrew John Hughes
+
+ Bump shenandoah to aarch64-shenandoah-jdk8u112-b16.
+ * patches/hotspot/shenandoah/8154210.patch,
+ * patches/hotspot/shenandoah/8160122-pr3074.patch:
+ Remove patches applied upstream.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove above patches.
+ * hotspot.map.in: Update shenandoah to
+ aarch64-shenandoah-jdk8u112-b16 tag.
+ * patches/hotspot/shenandoah/8158260-pr2991-rh1341258.patch:
+ Remove ppc.ad changes which were applied upstream. Keep testcase
+ patches.
+ * patches/hotspot/shenandoah/pr2777.patch:
+ Regenerate against new HotSpot tarball.
+
+2016-11-07 Andrew John Hughes
+
+ Bump to icedtea-3.3.0pre01.
+ * Makefile.am:
+ (JDK_UPDATE_VERSION): Bump to 112.
+ (BUILD_VERSION): Set to b16.
+ (CORBA_CHANGESET): Update to icedtea-3.3.0pre01 tag.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (NASHORN_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (NASHORN_SHA256SUM): Likewise.
+ * NEWS: Updated.
+ * configure.ac: Bump to 3.3.0pre01.
+ * hotspot.map.in: Update to icedtea-3.3.0pre01 tag.
+
+2016-11-08 Andrew John Hughes
+
+ * NEWS: Add 3.3.0 section.
+ * configure.ac: Bump to 3.3.0pre00.
+
2016-11-08 Andrew John Hughes
* NEWS: Remove duplicate line and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-3.2.0/INSTALL new/icedtea-3.3.0/INSTALL
--- old/icedtea-3.2.0/INSTALL 2016-11-08 06:16:10.095458896 +0100
+++ new/icedtea-3.3.0/INSTALL 2017-01-26 13:39:46.789523314 +0100
@@ -215,7 +215,7 @@
below.
* --enable-sunec: Build the SunEC crypto provider against system NSS.
* --enable-non-nss-curves: Define curves beyond the three specified by NSS (NIST P-{256,384,521})
-* --enable-infinality: Use fontconfig for better font rendering
+* --enable-improved-font-rendering: Use fontconfig for better font rendering
* --enable-headless: Build OpenJDK without graphical UI support
* --disable-cache: Don't use ccache to speed up recompilations (default is to use if available)
* --enable-native-debuginfo: Include debuginfo in native binaries.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-3.2.0/Makefile.am new/icedtea-3.3.0/Makefile.am
--- old/icedtea-3.2.0/Makefile.am 2016-11-08 06:16:10.107458700 +0100
+++ new/icedtea-3.3.0/Makefile.am 2017-01-26 13:39:46.793523249 +0100
@@ -1,24 +1,24 @@
# Dependencies
-JDK_UPDATE_VERSION = 111
-BUILD_VERSION = b14
+JDK_UPDATE_VERSION = 121
+BUILD_VERSION = b13
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 9d3757e6da35
-JAXP_CHANGESET = 81c2773fbb0d
-JAXWS_CHANGESET = f57f3ddddff6
-JDK_CHANGESET = 0cc71de3df18
-LANGTOOLS_CHANGESET = a553c153d376
-OPENJDK_CHANGESET = 200203ccf4bb
-NASHORN_CHANGESET = 0fb33c8b64d1
-
-CORBA_SHA256SUM = 902607987e26c67489f01fe8cf693fbbbd5850f3b9b06ff12af5486b75822387
-JAXP_SHA256SUM = 61d6c7a44746ace38812582474b66c2c96f1ce9c7bd5b9ad251b4d5982bee6d6
-JAXWS_SHA256SUM = 1285b9cb273b6fa97f985ace4cb6b5dc1963b1d5e0ae06ad4802f5ff678465b9
-JDK_SHA256SUM = 92557d8fbf826a643c730bbb4081e87140eb45e40e5662fd3d75829b5f61c9c5
-LANGTOOLS_SHA256SUM = 94d1754bba9020b2ee658c7adc2388ac38208e71e55650dc0393d24b20816a4d
-OPENJDK_SHA256SUM = 6c1040b4044efdd0c413d15865304f1ac46230d91435a31347a7b755e91e7924
-NASHORN_SHA256SUM = 5f72fedfa82415fdf98a0a9bf01d2c171b060810b314bf5bb1c69b57123dc910
+CORBA_CHANGESET = 8eb9dd5fe2fb
+JAXP_CHANGESET = faf1c4a9a51d
+JAXWS_CHANGESET = 5f5237104669
+JDK_CHANGESET = 3642a826880b
+LANGTOOLS_CHANGESET = d10a13bdc98c
+OPENJDK_CHANGESET = d5760f7cce54
+NASHORN_CHANGESET = 8c0fe384c4e7
+
+CORBA_SHA256SUM = 19492bdd85166ce55d0f85f96e1d3d0b21e61f4604349ea0b94f6a0aa1388b61
+JAXP_SHA256SUM = ba5933a2bbf04b0786fd5f046d43314f1b1b2bf2888c586521b37410783bccef
+JAXWS_SHA256SUM = a443f3243978a87a055ab103468878e5e072706ab0c82d1949ba869fc63571b6
+JDK_SHA256SUM = 688e962ab13055eb6b8668bb48b50eecc7f02f5120b541cfa58f516f875f9f9d
+LANGTOOLS_SHA256SUM = 1b0b0fb49c81955573ce509e1801530faa6477e606192fec4b0f951904fb8ac0
+OPENJDK_SHA256SUM = 887c5bc24b068efced7d5209367149ca27d8fea330cd5a5fff7767c353b00921
+NASHORN_SHA256SUM = 0ec045c9c4506f63602d86e72b0c3fdccd75fa95c47ee6a1238639274dc8e92d
HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
@@ -340,7 +340,8 @@
# Patch list
ICEDTEA_PATCHES = \
- patches/override-redirect-metacity.patch
+ patches/override-redirect-metacity.patch \
+ patches/pr3303.patch
# Conditional patches
@@ -350,9 +351,7 @@
patches/hotspot/$(HSBUILD)/8041658.patch \
patches/hotspot/$(HSBUILD)/8087218-pr2740.patch \
patches/hotspot/$(HSBUILD)/8145096-pr2854.patch \
- patches/hotspot/$(HSBUILD)/8154210.patch \
patches/hotspot/$(HSBUILD)/8158260-pr2991-rh1341258.patch \
- patches/hotspot/$(HSBUILD)/8160122-pr3074.patch \
patches/hotspot/$(HSBUILD)/crash_dump.patch \
patches/hotspot/$(HSBUILD)/no_devirt.patch \
patches/hotspot/$(HSBUILD)/pr1368.patch \
@@ -577,15 +576,15 @@
--with-cacerts-file=$(CACERTS_FILE)
endif
-if ENABLE_INFINALITY
+if ENABLE_IMPROVED_FONT_RENDERING
ICEDTEA_CONFIGURE += \
- --enable-infinality
+ --enable-improved-font-rendering
ICEDTEA_CONFIGURE_ENV += \
FONTCONFIG_LIBS="${FONTCONFIG_LIBS}" \
FONTCONFIG_CFLAGS="${FONTCONFIG_CFLAGS}"
else
ICEDTEA_CONFIGURE += \
- --disable-infinality
+ --disable-improved-font-rendering
endif
if BUILD_HEADLESS
@@ -859,11 +858,17 @@
# Creates archive of openjdk.
dist-openjdk: stamps/extract-cacao.stamp
+ if test "x${ZIP}" = "x"; then \
+ echo "ERROR: zip not found"; exit 1; \
+ fi
find openjdk/ -name \\.hg* | xargs rm -rf
$(ZIP) -r openjdk-$(COMBINED_VERSION) openjdk/
# Creates archive of openjdk that is compliant with Free Software guidelines.
dist-openjdk-fsg: stamps/patch-fsg.stamp
+ if test "x${ZIP}" = "x"; then \
+ echo "ERROR: zip not found"; exit 1; \
+ fi
$(ZIP) -r openjdk-fsg-$(COMBINED_VERSION) openjdk/
dist-openjdk-fsg-xz: stamps/patch-fsg.stamp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-3.2.0/NEWS new/icedtea-3.3.0/NEWS
--- old/icedtea-3.2.0/NEWS 2016-11-08 19:15:28.531595004 +0100
+++ new/icedtea-3.3.0/NEWS 2017-01-26 13:39:46.801523120 +0100
@@ -10,6 +10,205 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release 3.3.0 (2017-01-XX):
+
+* Security fixes
+ - S8138725: Add options for Javadoc generation
+ - S8140353: Improve signature checking
+ - S8151934, CVE-2017-3231: Resolve class resolution
+ - S8156804, CVE-2017-3241: Better constraint checking
+ - S8158406: Limited Parameter Processing
+ - S8158997: JNDI Protocols Switch
+ - S8159507: RuntimeVisibleAnnotation validation
+ - S8161218: Better bytecode loading
+ - S8161743, CVE-2017-3252: Provide proper login context
+ - S8162577: Standardize logging levels
+ - S8162973: Better component components
+ - S8164143, CVE-2017-3260: Improve components for menu items
+ - S8164147, CVE-2017-3261: Improve streaming socket output
+ - S8165071, CVE-2016-2183: Expand TLS support
+ - S8165344, CVE-2017-3272: Update concurrency support
+ - S8166988, CVE-2017-3253: Improve image processing performance
+ - S8167104, CVE-2017-3289: Additional class construction refinements
+ - S8167223, CVE-2016-5552: URL handling improvements
+ - S8168705, CVE-2016-5547: Better ObjectIdentifier validation
+ - S8168714, CVE-2016-5546: Tighten ECDSA validation
+ - S8168728, CVE-2016-5548: DSA signing improvments
+ - S8168724, CVE-2016-5549: ECDSA signing improvments
+* New features
+ - PR3300: wget not required when downloading is disabled
+ - PR3301: Support RHEL multilib installations which use the /usr/lib/jvm/java-1.x.0-openjdk.${arch} naming
+ - PR3303: Allow Kerberos to be detected by old libs & headers method if pkg-config check fails
+* Import of OpenJDK 8 u112 build 16
+ - S6477756: GraphicsDevice.getConfigurations() is slow taking 3 or more seconds
+ - S7172749: Xrender: Class cast exception in 2D code running an AWT regression test
+ - S8017629: G1: UseSHM in combination with a G1HeapRegionSize > os::large_page_size() falls back to use small pages
+ - S8022203: Intermittent test failures in demo/jvmti/hprof
+ - S8022582: Relax response flags checking in sun.security.krb5.KrbKdcRep.check.
+ - S8027575: b113 causing a lot of memory allocation and regression for wls_webapp_atomics
+ - S8028486: java/awt/Window/WindowsLeak/WindowsLeak.java fails
+ - S8030780: test/com/sun/corba/cachedSocket/7056731.sh leaves HelloServer behind
+ - S8036630: Null ProtectionDomain in JVM can cause NPE because principals field is not initialized to an empty array
+ - S8042660: vm/mlvm/anonloader/stress/byteMutation failed with: assert(index >=0 && index < _length) failed: symbol index overflow
+ - S8044193: Need to add known answer tests for AES cipher
+ - S8044575: testlibrary_tests/whitebox/vm_flags/UintxTest.java failed: assert(!res || TypeEntriesAtCall::arguments_profiling_enabled()) failed: no profiling of arguments
+ - S8048601: Tests for JCE crypto ciphers (part 1)
+ - S8048621: Implement basic keystore tests
+ - S8048622: Enhance tests for PKCS11 keystores with NSS
+ - S8049021: Add smartcardio tests with APDU buffer
+ - S8049312: AES/CICO test failed with on several modes
+ - S8050402: Tests to check for use of policy files
+ - S8050409: Test for JAAS getPrivateCredentials
+ - S8054326: Confusing message in "Current rem set statistics"
+ - S8055772: get_source.sh : version check assumes English localization
+ - S8057791: Selection in JList is drawn with wrong colors in Nimbus L&F
+ - S8058865: JMX Test Refactoring
+ - S8067964: Native2ascii doesn't close one of the streams it opens
+ - S8071487: javax/management/monitor/GaugeMonitorDeadlockTest.java timed out
+ - S8071909: Port testlibrary improvments in jdk/test to hotspot/test as required for DCMD test port
+ - S8073542: File Leak in jdk/src/java/base/unix/native/libnet/PlainDatagramSocketImpl.c
+ - S8074784: Additional tests for XML DSig API
+ - S8075007: Additional tests for krb5-related cipher suites with unbound server
+ - S8075297: Tests for RFEs 4515853 and 4745056
+ - S8075299: Additional tests for krb5 settings
+ - S8075301: Tests for sun.security.krb5.principal system property
+ - S8077276: allocating heap with UseLargePages and HugeTLBFS may trash existing memory mappings (linux)
+ - S8078268: javax.swing.text.html.parser.Parser parseScript incorrectly optimized
+ - S8078382: Wrong glyph is displayed for a derived font
+ - S8080729: [macosx] java 7 and 8 JDialogs on multiscreen jump to parent frame on focus
+ - S8085903: New fix for memory leak in ProtectionDomain cache
+ - S8098581: SecureRandom.nextBytes() hurts performance with small size requests
+ - S8129740: Incorrect class file created when passing lambda in inner class constructor
+ - S8130127: streamline input parameter of Nashorn scripting $EXEC function
+ - S8130309: Need to bailout cleanly if creation of stubs fails when codecache is out of space
+ - S8130317: "ant test" fails to complete on Windows when run under cygwin shell
+ - S8133070: Hot lock on BulkCipher.isAvailable
+ - S8133309: Some unicode characters do not display any more after upgrading to Windows 10
+ - S8134232: KeyStore.load() throws an IOException with a wrong cause in case of wrong password
+ - S8135322: ConstantPool::release_C_heap_structures not run in some circumstances
+ - S8136998: JComboBox prevents wheel mouse scrolling of JScrollPane
+ - S8137240: Negative lookahead in RegEx breaks backreference
+ - S8138906: [TEST_BUG] Test test/script/trusted/JDK-8087292.js intermittently fails.
+ - S8141148: LDAP "follow" throws ClassCastException with Java 8
+ - S8141541: Simplify Nashorn's Context class loader handling
+ - S8143640: Showing incorrect result while passing specific argument in the Java launcher tools
+ - S8143642: Nashorn shebang argument handling is broken
+ - S8144160: Regression: two tests fail on Windows with "ant test" target
+ - S8144221: fix Nashorn shebang argument handling on Mac/Linux
+ - S8144703: ClassCastException: sun.font.CompositeFont cannot be cast to PhysicalFont
+ - S8145305: fix Nashorn shebang handling on Cygwin
+ - S8145984: [macosx] sun.lwawt.macosx.CAccessible leaks
+ - S8146975: NullPointerException in IIOPInputStream.inputClassFields
+ - S8147026: Convert an assert in ClassLoaderData to a guarantee
+ - S8147451: Crash in Method::checked_resolve_jmethod_id(_jmethodID*)
+ - S8147585: Annotations with lambda expressions has parameter result in wrong behavior.
+ - S8147969: Print size of DH keysize when errors are encountered
+ - S8148140: arguments are handled differently in apply for JS functions and AbstractJSObjects
+ - S8148984: [macosx] Chinese Comma cannot be entered using Pinyin Input Method on OS X
+ - S8150219: ReferenceError in 1.8.0_72
+ - S8150234: Windows 10 App Containers disallow access to ICMP calls
+ - S8150814: correct package declaration in Nashorn test
+ - S8151722: TESTBUG: New test compiler/native/TestDirtyInt.sh should be modified
+ - S8153149: Uninitialised memory in WinAccessBridge.cpp:1128
+ - S8153192: (se) Selector.select(long) uses wrong timeout after EINTR (lnx)
+ - S8153781: Issue in XMLScanner: EXPECTED_SQUARE_BRACKET_TO_CLOSE_INTERNAL_SUBSET when skipping large DOCTYPE section with CRLF at wrong place
+ - S8153948: sun/security/mscapi/ShortRSAKey1024.sh fails with "Field length overflow"
+ - S8154009: Some methods of java.security.Security require more permissions, than necessary
+ - S8154069: Jaws reads wrong values from comboboxes when no element is selected
+ - S8154144: Tests in com/sun/jdi fails intermittently with "jdb input stream closed prematurely"
+ - S8154469: Update FSF address
+ - S8154553: Incorrect GPL header in package-info.java reported
+ - S8154558: Incorrect GPL header in ProcessEnvironment_md.c reported
+ - S8154816: Caps Lock doesn't work as expected when using Pinyin Simplified input method
+ - S8154831: CastII/ConvI2L for a range check is prematurely eliminated
+ - S8155001: SystemTray.remove() leaks GDI Objects in Windows
+ - S8155106: MHs.Lookup.findConstructor returns handles for array classes
+ - S8155214: java/lang/invoke/PermuteArgsTest.java fails due to exhausted code cache
+ - S8156478: 3 Buffer overrun defect groups in jexec.c
+ - S8156521: Minor fixes and cleanups in NetworkInterface.c
+ - S8156714: Parsing issue with automatic semicolon insertion
+ - S8156836: SIGSEGV: Test test/compiler/jsr292/VMAnonymousClasses.java fails with JTREG 4.2 b02
+ - S8156896: Script stack trace should display function names
+ - S8157160: JSON.stringify does not work on ScriptObjectMirror objects
+ - S8157242: Some java/lang/invoke tests miss othervm
+ - S8157444: exclude jjs shebang handling test from runs
+ - S8157603: TestCipher.java doesn't check one of the decrypted message as expected
+ - S8157680: Callback parameter of any JS builtin implementation should accept any Callable
+ - S8157819: TypeError when a java.util.Comparator object is invoked as a function
+ - S8158059: The fix for 8050402 was partially committed
+ - S8158072: Need a test for JDK-7172749
+ - S8158111: Make handling of 3rd party providers more stable
+ - S8158178: java.awt.SplashScreen.getSize() returns incorrect size for high dpi splash screens
+ - S8158338: Nashorn's ScriptLoader split delegation has to be adjusted
+ - S8158373: SIGSEGV: Metadata::mark_on_stack
+ - S8158467: AccessControlException is thrown on public Java class access if "script app loader" is set to null
+ - S8158495: CCE: sun.java2d.NullSurfaceData cannot be cast to sun.java2d.opengl.OGLSurfaceData
+ - S8158802: com.sun.jndi.ldap.SimpleClientId produces wrong hash code
+ - S8158871: Long response times with G1 and StringDeduplication
+ - S8159822: Non-synchronized access to shared members of com.sun.jndi.ldap.pool.Pool
+ - S8160122: Backport of JDK-8159244 used wrong version of the JDK 9 fix
+ - S8160518: Semicolon is not recognized as comment starting character (Kerberos)
+ - S8160693: ScriptRunData.java uses bitwise AND instead of logical AND
+ - S8161144: Fix for JDK-8147451 failed: Crash in Method::checked_resolve_jmethod_id(_jmethodID*)
+ - S8162510: 8u112 L10n resource file updates
+ - S8164453: 8u112 L10n resource file update - msgdrop 20
+* Import of OpenJDK 8 u121 build 13
+ - S8037099: [macosx] Remove all references to GC from native OBJ-C code
+ - S8059212: Modify sun/security/smartcardio manual regression tests so that they do not just fail if no cardreader found
+ - S8139565: Restrict certificates with DSA keys less than 1024 bits
+ - S8140422: Add mechanism to allow non default root CAs to be not subject to algorithm restrictions
+ - S8148516: Improve the default strength of EC in JDK
+ - S8151893: Add security property to configure XML Signature secure validation mode
+ - S8152438: Threads may do significant work out of the non-shared overflow buffer
+ - S8153438: Avoid repeated "Please insert a smart card" popup windows
+ - S8154005: Add algorithm constraint that specifies the restriction date
+ - S8154015: Apply algorithm constraints to timestamped code
+ - S8159410: InetAddress.isReachable returns true for non existing IP adresses
+ - S8160108: Implement Serialization Filtering
+ - S8161228: URL objects with custom protocol handlers have port changed after deserializing
+ - S8161571: Verifying ECDSA signatures permits trailing bytes
+ - S8163304: jarsigner -verbose -verify should print the algorithms used to sign the jar
+ - S8163583: [macosx] Press "To Back" button on the Dialog,the Dialog moves behind the Frame
+ - S8164908: ReflectionFactory support for IIOP and custom serialization
+ - S8165230: RMIConnection addNotificationListeners failing with specific inputs
+ - S8166389: [TEST_BUG] closed/java/security/Security/ReadProp/ReadProp.sh failing
+ - S8166393: disabledAlgorithms property should not be strictly parsed
+ - S8166432: Bad 8u112 merge of sun/security/tools/jarsigner/warnings/Test.java
+ - S8166591: [macos 10.12] Trackpad scrolling of text on OS X 10.12 Sierra is very fast (Trackpad, Retina only)
+ - S8166739: Improve extensibility of ObjectInputFilter information passed to the filter
+ - S8166875: (tz) Support tzdata2016g
+ - S8166878: Connection reset during TLS handshake
+ - S8167356: Follow up fix for jdk8 backport of 8164143. Changes for CMenuComponent.m were missed
+ - S8167459: Add debug output for indicating if a chosen ciphersuite was legacy
+ - S8167472: Chrome interop regression with JDK-8148516
+ - S8167591: Add MD5 to signed JAR restrictions
+ - S8168861: AnchorCertificates uses hardcoded password for cacerts keystore
+ - S8168963: Backout JDK-8154005
+ - S8168993: JDK8u121 L10n resource file update
+ - S8169072: Backout JDK-8154015
+ - S8169191: (tz) Support tzdata2016i
+ - S8169688: Backout (remove) MD5 from jdk.jar.disabledAlgorithms for January CPU
+ - S8169911: Enhanced tests for jarsigner -verbose -verify after JDK-8163304
+ - S8170131: Certificates not being blocked by jdk.tls.disabledAlgorithms property
+ - S8170268: 8u121 L10n resource file update - msgdrop 20
+* Bug fixes
+ - PR3271: Always round glyph advance in 26.6 space
+ - PR3271: Fix compatibility with vanilla Fontconfig
+ - PR3271: Fix glyph y advance
+ - PR3271: Replace 'infinality' with 'improved font rendering' (--enable-improved-font-rendering)
+ - PR3271: Simplify glyph advance handling
+ - PR3286: -ffp-contract not available on older GCCs
+ - PR3302: zip should be optional, as it's only used in the manually invoked dist-openjdk and dist-openjdk-fsg rules
+ - PR3304: zip still a requirement of the underlying OpenJDK build
+* PPC port
+ - S8170873, PR3280: PPC64/aarch64: Poor StrictMath performance due to non-optimized compilation
+* AArch64 port
+ - S8130309, PR3280: Need to bailout cleanly if creation of stubs fails when codecache is out of space (AArch64 changes)
+ - S8132875, PR3280: AArch64: Fix error introduced into AArch64 CodeCache by commit for 8130309
+ - S8165673, PR3280: AArch64: Fix JNI floating point argument handling
+ - S8170188, PR3280: jtreg test compiler/types/TestMeetIncompatibleInterfaceArrays.java causes JVM crash
+ - S8170873, PR3280: PPC64/aarch64: Poor StrictMath performance due to non-optimized compilation
+
New in release 3.2.0 (2016-11-08):
* Security fixes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-3.2.0/acinclude.m4 new/icedtea-3.3.0/acinclude.m4
--- old/icedtea-3.2.0/acinclude.m4 2016-11-08 06:16:10.119458503 +0100
+++ new/icedtea-3.3.0/acinclude.m4 2017-01-26 13:39:46.805523055 +0100
@@ -5,12 +5,14 @@
BUILD_ARCH_DIR=amd64
INSTALL_ARCH_DIR=amd64
JRE_ARCH_DIR=amd64
+ RPM_ARCH=x86_64
ARCHFLAG="-m64"
;;
i?86)
BUILD_ARCH_DIR=i586
INSTALL_ARCH_DIR=i386
JRE_ARCH_DIR=i386
+ RPM_ARCH=i686
ARCH_PREFIX=${LINUX32}
ARCHFLAG="-m32"
;;
@@ -23,12 +25,14 @@
BUILD_ARCH_DIR=arm
INSTALL_ARCH_DIR=arm
JRE_ARCH_DIR=arm
+ RPM_ARCH=armv7hl
ARCHFLAG="-D_LITTLE_ENDIAN"
;;
arm64|aarch64)
BUILD_ARCH_DIR=aarch64
INSTALL_ARCH_DIR=aarch64
JRE_ARCH_DIR=aarch64
+ RPM_ARCH=aarch64
ARCHFLAG="-D_LITTLE_ENDIAN"
;;
mips)
@@ -45,6 +49,7 @@
BUILD_ARCH_DIR=ppc
INSTALL_ARCH_DIR=ppc
JRE_ARCH_DIR=ppc
+ RPM_ARCH=ppc
ARCH_PREFIX=${LINUX32}
ARCHFLAG="-m32"
;;
@@ -52,19 +57,20 @@
BUILD_ARCH_DIR=ppc64
INSTALL_ARCH_DIR=ppc64
JRE_ARCH_DIR=ppc64
+ RPM_ARCH=ppc64
ARCHFLAG="-m64"
;;
powerpc64le)
BUILD_ARCH_DIR=ppc64le
INSTALL_ARCH_DIR=ppc64le
JRE_ARCH_DIR=ppc64le
+ RPM_ARCH=ppc64le
ARCHFLAG="-m64"
;;
sparc)
BUILD_ARCH_DIR=sparc
INSTALL_ARCH_DIR=sparc
JRE_ARCH_DIR=sparc
- CROSS_TARGET_ARCH=sparc
ARCH_PREFIX=${LINUX32}
ARCHFLAG="-m32"
;;
@@ -78,6 +84,7 @@
BUILD_ARCH_DIR=s390
INSTALL_ARCH_DIR=s390
JRE_ARCH_DIR=s390
+ RPM_ARCH=s390
ARCH_PREFIX=${LINUX32}
ARCHFLAG="-m31"
;;
@@ -85,14 +92,13 @@
BUILD_ARCH_DIR=s390x
INSTALL_ARCH_DIR=s390x
JRE_ARCH_DIR=s390x
- CROSS_TARGET_ARCH=s390x
+ RPM_ARCH=s390x
ARCHFLAG="-m64"
;;
sh*)
BUILD_ARCH_DIR=sh
INSTALL_ARCH_DIR=sh
JRE_ARCH_DIR=sh
- CROSS_TARGET_ARCH=sh
;;
*)
BUILD_ARCH_DIR=`uname -m`
@@ -1016,6 +1022,7 @@
AC_DEFUN([IT_CHECK_FOR_JDK],
[
+ AC_REQUIRE([IT_SET_ARCH_SETTINGS])
AC_MSG_CHECKING([for a JDK home directory])
AC_ARG_WITH([jdk-home],
[AS_HELP_STRING([--with-jdk-home[[=PATH]]],
@@ -1040,10 +1047,10 @@
BOOTSTRAP_VMS="/usr/lib/jvm/cacao";
fi
ICEDTEA7_VMS="/usr/lib/jvm/icedtea-7 /usr/lib/jvm/icedtea7 /usr/lib/jvm/java-1.7.0-openjdk
- /usr/lib/jvm/java-1.7.0-openjdk.x86_64 /usr/lib64/jvm/java-1.7.0-openjdk
+ /usr/lib/jvm/java-1.7.0-openjdk.${RPM_ARCH} /usr/lib64/jvm/java-1.7.0-openjdk
/usr/lib/jvm/java-1.7.0 /usr/lib/jvm/java-7-openjdk"
ICEDTEA8_VMS="/usr/lib/jvm/icedtea-8 /usr/lib/jvm/java-1.8.0-openjdk
- /usr/lib/jvm/java-1.8.0-openjdk.x86_64 /usr/lib64/jvm/java-1.8.0-openjdk
+ /usr/lib/jvm/java-1.8.0-openjdk.${RPM_ARCH} /usr/lib64/jvm/java-1.8.0-openjdk
/usr/lib/jvm/java-1.8.0 /usr/lib/jvm/java-8-openjdk"
for dir in ${ICEDTEA8_VMS} ${ICEDTEA7_VMS} ${BOOTSTRAP_VMS} \
/usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea \
@@ -1808,7 +1815,12 @@
dnl Check for krb5 header and library.
PKG_CHECK_MODULES(KRB5, krb5, [KRB5_FOUND=yes], [KRB5_FOUND=no])
if test "x${KRB5_FOUND}" = "xno"; then
- AC_MSG_ERROR([Could not find Kerberos; install Kerberos or build with --disable-system-kerberos to use the default cache location.])
+ AC_MSG_NOTICE([Could not find Kerberos using pkg-config; trying via krb5.h and krb5 library])
+ AC_CHECK_LIB([krb5], [krb5_cc_default],
+ , [AC_MSG_ERROR([Could not find Kerberos library; install Kerberos or build with --disable-system-kerberos to use the default cache location.])])
+ AC_CHECK_HEADER([krb5.h],
+ , [AC_MSG_ERROR([Could not find Kerberos header; install Kerberos or build with --disable-system-kerberos to use the default cache location.])])
+ KRB5_LIBS="-lkrb5"
fi
fi
AM_CONDITIONAL(USE_SYSTEM_KERBEROS, test x"${ENABLE_SYSTEM_KERBEROS}" = "xyes")
@@ -2077,50 +2089,34 @@
AM_CONDITIONAL([ENABLE_JAVA_DEBUGINFO], test x"${enable_java_debuginfo}" = "xyes")
])
-AC_DEFUN_ONCE([IT_ENABLE_INFINALITY],
+AC_DEFUN_ONCE([IT_ENABLE_IMPROVED_FONT_RENDERING],
[
AC_REQUIRE([IT_CHECK_FOR_FREETYPE])
AC_MSG_CHECKING([whether to use fontconfig to provide better font rendering])
- AC_ARG_ENABLE([infinality],
- [AS_HELP_STRING(--enable-infinality,build with fontconfig font rendering [[default=no]])],
+ AC_ARG_ENABLE([improved-font-rendering],
+ [AS_HELP_STRING(--enable-improved-font-rendering,build with fontconfig font rendering [[default=no]])],
[
case "${enableval}" in
yes)
- enable_infinality=yes
+ enable_improved_font_rendering=yes
;;
*)
- enable_infinality=no
+ enable_improved_font_rendering=no
;;
esac
],
[
- enable_infinality=no
+ enable_improved_font_rendering=no
])
- AC_MSG_RESULT([$enable_infinality])
- AM_CONDITIONAL([ENABLE_INFINALITY], test x"${enable_infinality}" = "xyes")
- if test "x${enable_infinality}" = "xyes"; then
+ AC_MSG_RESULT([$enable_improved_font_rendering])
+ AM_CONDITIONAL([ENABLE_IMPROVED_FONT_RENDERING], test x"${enable_improved_font_rendering}" = "xyes")
+ if test "x${enable_improved_font_rendering}" = "xyes"; then
dnl Check for Fontconfig+ headers and libraries.
PKG_CHECK_MODULES(FONTCONFIG, fontconfig,[FONTCONFIG_FOUND=yes],[FONTCONFIG_FOUND=no])
if test "x${FONTCONFIG_FOUND}" = xno
then
- AC_MSG_ERROR([Infinality support requires fontconfig. Either install fontconfig or --disable-infinality])
+ AC_MSG_ERROR([Improved font rendering support requires fontconfig. Either install fontconfig or --disable-improved-font-rendering])
fi
- AC_MSG_CHECKING([if FreeType is patched with infinality support])
- AC_LANG_PUSH([C])
- CFLAGS_SAVED=$CFLAGS
- CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #include
- #include FT_FREETYPE_H
- #ifndef FT_CONFIG_OPTION_INFINALITY_PATCHSET
- #if TT_CONFIG_OPTION_SUBPIXEL_HINTING < 1
- #error Infinality not supported
- #endif
- #endif
- ]])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); \
- AC_MSG_ERROR([Infinality support requires infinality support in FreeType.])])
- CFLAGS=$CFLAGS_SAVED
- AC_LANG_POP([C])
AC_SUBST(FONTCONFIG_CFLAGS)
AC_SUBST(FONTCONFIG_LIBS)
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-3.2.0/configure.ac new/icedtea-3.3.0/configure.ac
--- old/icedtea-3.2.0/configure.ac 2016-11-08 06:16:10.119458503 +0100
+++ new/icedtea-3.3.0/configure.ac 2017-01-26 13:39:46.805523055 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [3.2.0], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [3.3.0], [distro-pkg-dev@openjdk.java.net])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
@@ -29,7 +29,6 @@
IT_FIND_TOOLS([TAR], [gtar tar])
IT_FIND_TOOL([CHMOD], [chmod])
IT_FIND_TOOLS([SHA256SUM], [gsha256sum sha256sum])
-IT_FIND_TOOL([WGET], [wget])
IT_FIND_TOOL([ZIP], [zip])
IT_FIND_TOOL([UNZIP], [unzip])
IT_FIND_TOOL([CPIO], [cpio])
@@ -42,6 +41,11 @@
dnl check for it explicitly rather than using AC_PROG_AWK.
IT_FIND_TOOL([GAWK], [gawk])
IT_FIND_TOOL([WHICH], [which])
+
+if test "x$enable_downloading" = "xyes"; then
+ IT_FIND_TOOL([WGET], [wget])
+fi
+
AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
AC_PATH_TOOL([LINUX32],[linux32])
@@ -162,7 +166,7 @@
IT_CHECK_FOR_KERBEROS
IT_CHECK_FOR_PCSC
IT_CHECK_FOR_SCTP
-IT_ENABLE_INFINALITY
+IT_ENABLE_IMPROVED_FONT_RENDERING
AC_CONFIG_FILES([remove-intree-libraries.sh])
dnl Check for Xproto headers and libraries.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-3.2.0/hotspot.map.in new/icedtea-3.3.0/hotspot.map.in
--- old/icedtea-3.2.0/hotspot.map.in 2016-11-08 06:16:09.915461851 +0100
+++ new/icedtea-3.3.0/hotspot.map.in 2017-01-26 13:39:46.733524222 +0100
@@ -1,3 +1,3 @@
# version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ be4aeaa327f7 9dd74ff7ac16b6104410c7c331f39e96fe50940e4023201b1a2898a8314e1fbf
-shenandoah drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 24002f5b584e ddd945ebb130efcf36e4cfd0c18ab8f9cfda3c5cc4ef281ab512a558a63cd04c
+default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 6efaf77e82a1 280f706bb0aaada0903e9e907811ea12bc1c216fdaeb2694910f3a99217f6e89
+shenandoah drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ d9a978177779 0593a1105f0e1e59ec05298d608a2fa5d610a0e548e849ab013119f3b7a67229
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-3.2.0/patches/hotspot/shenandoah/8154210.patch new/icedtea-3.3.0/patches/hotspot/shenandoah/8154210.patch
--- old/icedtea-3.2.0/patches/hotspot/shenandoah/8154210.patch 2016-11-08 06:16:09.923461720 +0100
+++ new/icedtea-3.3.0/patches/hotspot/shenandoah/8154210.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-# HG changeset patch
-# User aph
-# Date 1461121375 -3600
-# Wed Apr 20 04:02:55 2016 +0100
-# Node ID 5605c859f0ec47d6f507cc83e783554a4210ccf6
-# Parent 7458e5178c8646a9b4f76ac3d13b222abed3f16f
-8154210: Zero: Better byte behaviour
-Summary: Complete support for 8132051 on Zero and fix failure on 64-bit big-endian systems
-Reviewed-by: andrew, chrisphi
-
-diff -r 7458e5178c86 -r 5605c859f0ec src/cpu/zero/vm/cppInterpreter_zero.cpp
---- openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Tue May 17 03:03:36 2016 +0100
-+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Wed Apr 20 04:02:55 2016 +0100
-@@ -220,9 +220,16 @@
- // Push our result
- for (int i = 0; i < result_slots; i++) {
- // Adjust result to smaller
-- intptr_t res = result[-i];
-+ union {
-+ intptr_t res;
-+ jint res_jint;
-+ };
-+ res = result[-i];
- if (result_slots == 1) {
-- res = narrow(method->result_type(), res);
-+ BasicType t = method->result_type();
-+ if (is_subword_type(t)) {
-+ res_jint = (jint)narrow(t, res_jint);
-+ }
- }
- stack->push(res);
- }
-diff -r 7458e5178c86 -r 5605c859f0ec src/share/vm/interpreter/bytecodeInterpreter.cpp
---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Tue May 17 03:03:36 2016 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Wed Apr 20 04:02:55 2016 +0100
-@@ -593,8 +593,9 @@
- /* 0xDC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
-
- /* 0xE0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
--/* 0xE4 */ &&opc_default, &&opc_fast_aldc, &&opc_fast_aldc_w, &&opc_return_register_finalizer,
--/* 0xE8 */ &&opc_invokehandle,&&opc_default, &&opc_default, &&opc_default,
-+/* 0xE4 */ &&opc_default, &&opc_default, &&opc_fast_aldc, &&opc_fast_aldc_w,
-+/* 0xE8 */ &&opc_return_register_finalizer,
-+ &&opc_invokehandle, &&opc_default, &&opc_default,
- /* 0xEC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
-
- /* 0xF0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-3.2.0/patches/hotspot/shenandoah/8158260-pr2991-rh1341258.patch new/icedtea-3.3.0/patches/hotspot/shenandoah/8158260-pr2991-rh1341258.patch
--- old/icedtea-3.2.0/patches/hotspot/shenandoah/8158260-pr2991-rh1341258.patch 2016-11-08 06:16:09.931461589 +0100
+++ new/icedtea-3.3.0/patches/hotspot/shenandoah/8158260-pr2991-rh1341258.patch 2017-01-26 13:39:46.745524029 +0100
@@ -32,27 +32,6 @@
if (FLAG_IS_DEFAULT(UseMontgomeryMultiplyIntrinsic)) {
UseMontgomeryMultiplyIntrinsic = true;
}
-diff -Nru openjdk.orig/hotspot/src/cpu/ppc/vm/ppc.ad openjdk/hotspot/src/cpu/ppc/vm/ppc.ad
---- openjdk.orig/hotspot/src/cpu/ppc/vm/ppc.ad 2016-08-03 06:40:06.000000000 +0100
-+++ openjdk/hotspot/src/cpu/ppc/vm/ppc.ad 2016-08-04 06:46:19.679689919 +0100
-@@ -5461,7 +5461,7 @@
- %}
-
- // Match loading integer and casting it to long.
--instruct loadI2L(iRegLdst dst, memory mem) %{
-+instruct loadI2L(iRegLdst dst, memoryAlg4 mem) %{
- match(Set dst (ConvI2L (LoadI mem)));
- predicate(_kids[0]->_leaf->as_Load()->is_unordered());
- ins_cost(MEMORY_REF_COST);
-@@ -5477,7 +5477,7 @@
- %}
-
- // Match loading integer and casting it to long - acquire.
--instruct loadI2L_ac(iRegLdst dst, memory mem) %{
-+instruct loadI2L_ac(iRegLdst dst, memoryAlg4 mem) %{
- match(Set dst (ConvI2L (LoadI mem)));
- ins_cost(3*MEMORY_REF_COST);
-
diff -Nru openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
--- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp 2016-08-03 06:40:06.000000000 +0100
+++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp 2016-08-04 06:46:19.679689919 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-3.2.0/patches/hotspot/shenandoah/8160122-pr3074.patch new/icedtea-3.3.0/patches/hotspot/shenandoah/8160122-pr3074.patch
--- old/icedtea-3.2.0/patches/hotspot/shenandoah/8160122-pr3074.patch 2016-11-08 06:16:09.931461589 +0100
+++ new/icedtea-3.3.0/patches/hotspot/shenandoah/8160122-pr3074.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-# HG changeset patch
-# User thartmann
-# Date 1467007851 -7200
-# Mon Jun 27 08:10:51 2016 +0200
-# Node ID 173a1f83c930134bf2696680754b99162e411c63
-# Parent f22b5be95347c669a1463d9e05ec3bf11420208e
-8160122, PR3074: Backport of JDK-8159244 used wrong version of the JDK 9 fix
-Summary: Correct backport of 8159244.
-Reviewed-by: kvn
-
-diff --git a/src/share/vm/opto/stringopts.cpp b/src/share/vm/opto/stringopts.cpp
---- openjdk/hotspot/src/share/vm/opto/stringopts.cpp
-+++ openjdk/hotspot/src/share/vm/opto/stringopts.cpp
-@@ -1641,16 +1641,11 @@
- }
- kit.store_String_value(kit.control(), result, char_array);
-
-- // Do not let stores that initialize this object be reordered with
-- // a subsequent store that would make this object accessible by
-- // other threads.
-- // Record what AllocateNode this StoreStore protects so that
-- // escape analysis can go from the MemBarStoreStoreNode to the
-- // AllocateNode and eliminate the MemBarStoreStoreNode if possible
-- // based on the escape status of the AllocateNode.
-- AllocateNode* alloc = AllocateNode::Ideal_allocation(result, _gvn);
-- assert(alloc != NULL, "should be newly allocated");
-- kit.insert_mem_bar(Op_MemBarStoreStore, alloc->proj_out(AllocateNode::RawAddress));
-+ // The value field is final. Emit a barrier here to ensure that the effect
-+ // of the initialization is committed to memory before any code publishes
-+ // a reference to the newly constructed object (see Parse::do_exits()).
-+ assert(AllocateNode::Ideal_allocation(result, _gvn) != NULL, "should be newly allocated");
-+ kit.insert_mem_bar(Op_MemBarRelease, result);
- } else {
- result = C->top();
- }
-diff --git a/test/compiler/stringopts/TestStringObjectInitialization.java b/test/compiler/stringopts/TestStringObjectInitialization.java
---- openjdk/hotspot/test/compiler/stringopts/TestStringObjectInitialization.java
-+++ openjdk/hotspot/test/compiler/stringopts/TestStringObjectInitialization.java
-@@ -27,6 +27,7 @@
- /*
- * @test
- * @bug 8159244
-+ * @requires vm.gc == "Parallel" | vm.gc == "null"
- * @summary Verifies that no partially initialized String object escapes from
- * C2's String concat optimization in a highly concurrent setting.
- * This test triggers the bug in about 1 out of 10 runs.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-3.2.0/patches/hotspot/shenandoah/pr2777.patch new/icedtea-3.3.0/patches/hotspot/shenandoah/pr2777.patch
--- old/icedtea-3.2.0/patches/hotspot/shenandoah/pr2777.patch 2016-11-08 06:16:09.931461589 +0100
+++ new/icedtea-3.3.0/patches/hotspot/shenandoah/pr2777.patch 2017-01-26 13:39:46.745524029 +0100
@@ -7,9 +7,9 @@
PR2777: Fix MAX/MIN template usage on s390
Summary: The templates can't be used without casting on s390 as size_t != uintx
-diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Mon Jan 11 17:16:42 2016 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Thu Jan 28 02:50:10 2016 +0000
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2017-01-22 19:56:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2017-01-23 11:25:16.256881284 +0000
@@ -2659,7 +2659,7 @@
if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
@@ -19,9 +19,9 @@
}
assert(n_blks > 0, "Error");
_cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
-diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Mon Jan 11 17:16:42 2016 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Thu Jan 28 02:50:10 2016 +0000
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2017-01-22 22:57:03.693835101 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2017-01-23 11:25:16.256881284 +0000
@@ -963,7 +963,7 @@
if (free_percentage < desired_free_percentage) {
size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
@@ -49,10 +49,10 @@
// Do not give up existing stack until we have managed to
// get the double capacity that we desired.
ReservedSpace rs(ReservedSpace::allocation_align_size_up(
-diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/g1/concurrentMark.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Mon Jan 11 17:16:42 2016 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Thu Jan 28 02:50:10 2016 +0000
-@@ -3903,7 +3903,7 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2017-01-22 19:56:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2017-01-23 11:25:16.256881284 +0000
+@@ -3923,7 +3923,7 @@
// of things to do) or totally (at the very end).
size_t target_size;
if (partially) {
@@ -61,9 +61,9 @@
} else {
target_size = 0;
}
-diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Mon Jan 11 17:16:42 2016 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Thu Jan 28 02:50:10 2016 +0000
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2017-01-22 19:56:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2017-01-23 11:25:16.256881284 +0000
@@ -1726,7 +1726,7 @@
verify_region_sets_optional();
@@ -73,9 +73,9 @@
ergo_verbose1(ErgoHeapSizing,
"attempt heap expansion",
ergo_format_reason("allocation request failed")
-diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp Mon Jan 11 17:16:42 2016 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp Thu Jan 28 02:50:10 2016 +0000
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp 2017-01-22 19:56:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp 2017-01-23 11:25:16.256881284 +0000
@@ -89,7 +89,7 @@
void pretouch_internal(size_t start_page, size_t end_page);
@@ -85,9 +85,9 @@
// Returns the address of the given page index.
char* page_start(size_t index) const;
-diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp Mon Jan 11 17:16:42 2016 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp Thu Jan 28 02:50:10 2016 +0000
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2017-01-22 19:56:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2017-01-23 11:25:16.256881284 +0000
@@ -38,7 +38,7 @@
_cancel(false),
_empty(true),
@@ -97,21 +97,21 @@
_queues = NEW_C_HEAP_ARRAY(G1StringDedupWorkerQueue, _nqueues, mtGC);
for (size_t i = 0; i < _nqueues; i++) {
new (_queues + i) G1StringDedupWorkerQueue(G1StringDedupWorkerQueue::default_segment_size(), _max_cache_size, _max_size);
-diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Mon Jan 11 17:16:42 2016 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Thu Jan 28 02:50:10 2016 +0000
-@@ -110,7 +110,7 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2017-01-22 19:56:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2017-01-23 11:26:19.311842674 +0000
+@@ -120,7 +120,7 @@
};
- G1StringDedupEntryCache::G1StringDedupEntryCache() {
-- _nlists = MAX2(ParallelGCThreads, (size_t)1);
-+ _nlists = MAX2((size_t) ParallelGCThreads, (size_t)1);
- _lists = PaddedArray::create_unfreeable((uint)_nlists);
- }
-
-diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/g1/heapRegion.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp Mon Jan 11 17:16:42 2016 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp Thu Jan 28 02:50:10 2016 +0000
+ G1StringDedupEntryCache::G1StringDedupEntryCache(size_t max_size) :
+- _nlists(MAX2(ParallelGCThreads, (size_t)1)),
++ _nlists(MAX2((size_t) ParallelGCThreads, (size_t)1)),
+ _max_list_length(0),
+ _cached(PaddedArray::create_unfreeable((uint)_nlists)),
+ _overflowed(PaddedArray::create_unfreeable((uint)_nlists)) {
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2017-01-22 19:56:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2017-01-23 11:25:16.256881284 +0000
@@ -108,7 +108,7 @@
uintx region_size = G1HeapRegionSize;
if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {
@@ -121,21 +121,9 @@
(uintx) HeapRegionBounds::min_size());
}
-diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp Mon Jan 11 17:16:42 2016 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp Thu Jan 28 02:50:10 2016 +0000
-@@ -200,7 +200,7 @@
- const size_t num_overflow_elems = of_stack->size();
- const size_t space_available = queue->max_elems() - queue->size();
- const size_t num_take_elems = MIN3(space_available / 4,
-- ParGCDesiredObjsFromOverflowList,
-+ (size_t) ParGCDesiredObjsFromOverflowList,
- num_overflow_elems);
- // Transfer the most recent num_take_elems from the overflow
- // stack to our work queue.
-diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Mon Jan 11 17:16:42 2016 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Thu Jan 28 02:50:10 2016 +0000
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2017-01-22 22:57:03.693835101 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2017-01-23 11:25:16.260881219 +0000
@@ -920,8 +920,8 @@
void PSParallelCompact::initialize_dead_wood_limiter()
{
@@ -147,9 +135,21 @@
_dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
DEBUG_ONLY(_dwl_initialized = true;)
_dwl_adjustment = normal_distribution(1.0);
-diff -r be477dd4629d -r c313c4782bb3 src/share/vm/memory/collectorPolicy.cpp
---- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp Mon Jan 11 17:16:42 2016 +0000
-+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp Thu Jan 28 02:50:10 2016 +0000
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2017-01-22 22:57:03.697835035 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2017-01-23 11:25:16.260881219 +0000
+@@ -200,7 +200,7 @@
+ const size_t num_overflow_elems = of_stack->size();
+ const size_t space_available = queue->max_elems() - queue->size();
+ const size_t num_take_elems = MIN3(space_available / 4,
+- ParGCDesiredObjsFromOverflowList,
++ (size_t) ParGCDesiredObjsFromOverflowList,
+ num_overflow_elems);
+ // Transfer the most recent num_take_elems from the overflow
+ // stack to our work queue.
+diff -Nru openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+--- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp 2017-01-22 19:56:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2017-01-23 11:25:16.260881219 +0000
@@ -385,7 +385,7 @@
uintx calculated_size = NewSize + OldSize;
double shrink_factor = (double) MaxHeapSize / calculated_size;
@@ -207,9 +207,9 @@
_initial_gen1_size = OldSize;
// If the user has explicitly set an OldSize that is inconsistent
-diff -r be477dd4629d -r c313c4782bb3 src/share/vm/memory/metaspace.cpp
---- openjdk/hotspot/src/share/vm/memory/metaspace.cpp Mon Jan 11 17:16:42 2016 +0000
-+++ openjdk/hotspot/src/share/vm/memory/metaspace.cpp Thu Jan 28 02:50:10 2016 +0000
+diff -Nru openjdk.orig/hotspot/src/share/vm/memory/metaspace.cpp openjdk/hotspot/src/share/vm/memory/metaspace.cpp
+--- openjdk.orig/hotspot/src/share/vm/memory/metaspace.cpp 2017-01-22 19:56:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/memory/metaspace.cpp 2017-01-23 11:25:16.260881219 +0000
@@ -1455,7 +1455,7 @@
void MetaspaceGC::post_initialize() {
@@ -246,9 +246,9 @@
_first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size);
// Arbitrarily set the initial virtual space to a multiple
// of the boot class loader size.
-diff -r be477dd4629d -r c313c4782bb3 src/share/vm/oops/objArrayKlass.inline.hpp
---- openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp Mon Jan 11 17:16:42 2016 +0000
-+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp Thu Jan 28 02:50:10 2016 +0000
+diff -Nru openjdk.orig/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
+--- openjdk.orig/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2017-01-22 19:56:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2017-01-23 11:25:16.260881219 +0000
@@ -48,7 +48,7 @@
const size_t beg_index = size_t(index);
assert(beg_index < len || len == 0, "index too large");
@@ -267,10 +267,10 @@
const size_t end_index = beg_index + stride;
T* const base = (T*)a->base();
T* const beg = base + beg_index;
-diff -r be477dd4629d -r c313c4782bb3 src/share/vm/runtime/arguments.cpp
---- openjdk/hotspot/src/share/vm/runtime/arguments.cpp Mon Jan 11 17:16:42 2016 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp Thu Jan 28 02:50:10 2016 +0000
-@@ -1264,7 +1264,7 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2017-01-22 22:57:03.429839455 +0000
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2017-01-23 11:25:16.260881219 +0000
+@@ -1270,7 +1270,7 @@
(ParallelGCThreads == 0 ? 1 : ParallelGCThreads);
const size_t preferred_max_new_size_unaligned =
MIN2(max_heap/(NewRatio+1), ScaleForWordSize(young_gen_per_worker * parallel_gc_threads));
@@ -279,7 +279,7 @@
align_size_up(preferred_max_new_size_unaligned, os::vm_page_size());
// Unless explicitly requested otherwise, size young gen
-@@ -1295,7 +1295,7 @@
+@@ -1301,7 +1301,7 @@
" max_heap: " SIZE_FORMAT,
min_heap_size(), InitialHeapSize, max_heap);
}
@@ -288,7 +288,7 @@
if (FLAG_IS_CMDLINE(NewSize)) {
min_new = NewSize;
}
-@@ -1314,7 +1314,7 @@
+@@ -1320,7 +1320,7 @@
// so it's NewRatio x of NewSize.
if (FLAG_IS_DEFAULT(OldSize)) {
if (max_heap > NewSize) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-3.2.0/patches/pr2126.patch new/icedtea-3.3.0/patches/pr2126.patch
--- old/icedtea-3.2.0/patches/pr2126.patch 2016-11-08 06:16:09.943461392 +0100
+++ new/icedtea-3.3.0/patches/pr2126.patch 2017-01-26 13:39:46.749523963 +0100
@@ -552,3 +552,72 @@
specCollection = Collections.unmodifiableCollection(oidMap.values());
}
}
+diff --git a/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
+--- openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
++++ openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
+@@ -62,29 +62,6 @@
+
+ // See sun.security.util.CurveDB for the OIDs
+ private static enum NamedEllipticCurve {
+- T163_K1(1, "sect163k1", "1.3.132.0.1", true), // NIST K-163
+- T163_R1(2, "sect163r1", "1.3.132.0.2", false),
+- T163_R2(3, "sect163r2", "1.3.132.0.15", true), // NIST B-163
+- T193_R1(4, "sect193r1", "1.3.132.0.24", false),
+- T193_R2(5, "sect193r2", "1.3.132.0.25", false),
+- T233_K1(6, "sect233k1", "1.3.132.0.26", true), // NIST K-233
+- T233_R1(7, "sect233r1", "1.3.132.0.27", true), // NIST B-233
+- T239_K1(8, "sect239k1", "1.3.132.0.3", false),
+- T283_K1(9, "sect283k1", "1.3.132.0.16", true), // NIST K-283
+- T283_R1(10, "sect283r1", "1.3.132.0.17", true), // NIST B-283
+- T409_K1(11, "sect409k1", "1.3.132.0.36", true), // NIST K-409
+- T409_R1(12, "sect409r1", "1.3.132.0.37", true), // NIST B-409
+- T571_K1(13, "sect571k1", "1.3.132.0.38", true), // NIST K-571
+- T571_R1(14, "sect571r1", "1.3.132.0.39", true), // NIST B-571
+-
+- P160_K1(15, "secp160k1", "1.3.132.0.9", false),
+- P160_R1(16, "secp160r1", "1.3.132.0.8", false),
+- P160_R2(17, "secp160r2", "1.3.132.0.30", false),
+- P192_K1(18, "secp192k1", "1.3.132.0.31", false),
+- P192_R1(19, "secp192r1", "1.2.840.10045.3.1.1", true), // NIST P-192
+- P224_K1(20, "secp224k1", "1.3.132.0.32", false),
+- P224_R1(21, "secp224r1", "1.3.132.0.33", true), // NIST P-224
+- P256_K1(22, "secp256k1", "1.3.132.0.10", false),
+ P256_R1(23, "secp256r1", "1.2.840.10045.3.1.7", true), // NIST P-256
+ P384_R1(24, "secp384r1", "1.3.132.0.34", true), // NIST P-384
+ P521_R1(25, "secp521r1", "1.3.132.0.35", true); // NIST P-521
+diff --git a/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java b/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java
+--- openjdk/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java
++++ openjdk/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java
+@@ -41,7 +41,7 @@
+ * @bug 8076221
+ * @summary Check if weak cipher suites are disabled
+ * @run main/othervm DisabledAlgorithms default
+- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,secp192r1"
++ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
+ * DisabledAlgorithms empty
+ */
+ public class DisabledAlgorithms {
+diff --git a/test/sun/security/ec/TestEC.java b/test/sun/security/ec/TestEC.java
+--- openjdk/jdk/test/sun/security/ec/TestEC.java
++++ openjdk/jdk/test/sun/security/ec/TestEC.java
+@@ -35,7 +35,7 @@
+ * @library ../pkcs11/sslecc
+ * @library ../../../java/security/testlibrary
+ * @compile -XDignore.symbol.file TestEC.java
+- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
++ * @run main/othervm -Djdk.tls.namedGroups="secp256r1" TestEC
+ */
+
+ import java.security.NoSuchProviderException;
+diff --git a/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java b/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java
+--- openjdk/jdk/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java
++++ openjdk/jdk/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java
+@@ -26,7 +26,7 @@
+ * @bug 4496785
+ * @summary Verify that all ciphersuites work in all configurations
+ * @author Andreas Sterbenz
+- * @run main/othervm/timeout=300 -Djdk.tls.namedGroups="secp256r1,secp192r1"
++ * @run main/othervm/timeout=300 -Djdk.tls.namedGroups="secp256r1"
+ * ClientJSSEServerJSSE
+ */
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-3.2.0/patches/pr3303.patch new/icedtea-3.3.0/patches/pr3303.patch
--- old/icedtea-3.2.0/patches/pr3303.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/icedtea-3.3.0/patches/pr3303.patch 2017-01-26 13:39:46.749523963 +0100
@@ -0,0 +1,95 @@
+diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
+--- openjdk///common/autoconf/generated-configure.sh
++++ openjdk///common/autoconf/generated-configure.sh
+@@ -3999,7 +3999,7 @@
+ #CUSTOM_AUTOCONF_INCLUDE
+
+ # Do not change or remove the following line, it is needed for consistency checks:
+-DATE_WHEN_GENERATED=1485316663
++DATE_WHEN_GENERATED=1485433878
+
+ ###############################################################################
+ #
+@@ -35679,7 +35679,64 @@
+ if test "x${KRB5_FOUND}" = "xyes"; then
+ USE_EXTERNAL_KRB5=true
+ else
+- as_fn_error $? "--enable-system-kerberos specified, but Kerberos not found." "$LINENO" 5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find Kerberos using pkg-config; trying via krb5.h and krb5 library" >&5
++$as_echo "$as_me: Could not find Kerberos using pkg-config; trying via krb5.h and krb5 library" >&6;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_cc_default in -lkrb5" >&5
++$as_echo_n "checking for krb5_cc_default in -lkrb5... " >&6; }
++if ${ac_cv_lib_krb5_krb5_cc_default+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lkrb5 $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char krb5_cc_default ();
++int
++main ()
++{
++return krb5_cc_default ();
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_link "$LINENO"; then :
++ ac_cv_lib_krb5_krb5_cc_default=yes
++else
++ ac_cv_lib_krb5_krb5_cc_default=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb5_krb5_cc_default" >&5
++$as_echo "$ac_cv_lib_krb5_krb5_cc_default" >&6; }
++if test "x$ac_cv_lib_krb5_krb5_cc_default" = xyes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBKRB5 1
++_ACEOF
++
++ LIBS="-lkrb5 $LIBS"
++
++else
++ as_fn_error $? "Could not find Kerberos library; install Kerberos or build with --disable-system-kerberos to use the default cache location." "$LINENO" 5
++fi
++
++ ac_fn_cxx_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default"
++if test "x$ac_cv_header_krb5_h" = xyes; then :
++
++else
++ as_fn_error $? "Could not find Kerberos header; install Kerberos or build with --disable-system-kerberos to use the default cache location." "$LINENO" 5
++fi
++
++
++ KRB5_LIBS="-lkrb5"
+ fi
+ else
+ USE_EXTERNAL_KRB5=false
+diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
+--- openjdk///common/autoconf/libraries.m4
++++ openjdk///common/autoconf/libraries.m4
+@@ -942,7 +942,12 @@
+ if test "x${KRB5_FOUND}" = "xyes"; then
+ USE_EXTERNAL_KRB5=true
+ else
+- AC_MSG_ERROR([--enable-system-kerberos specified, but Kerberos not found.])
++ AC_MSG_NOTICE([Could not find Kerberos using pkg-config; trying via krb5.h and krb5 library])
++ AC_CHECK_LIB([krb5], [krb5_cc_default],
++ , [AC_MSG_ERROR([Could not find Kerberos library; install Kerberos or build with --disable-system-kerberos to use the default cache location.])])
++ AC_CHECK_HEADER([krb5.h],
++ , [AC_MSG_ERROR([Could not find Kerberos header; install Kerberos or build with --disable-system-kerberos to use the default cache location.])])
++ KRB5_LIBS="-lkrb5"
+ fi
+ else
+ USE_EXTERNAL_KRB5=false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-3.2.0/patches/rh1022017.patch new/icedtea-3.3.0/patches/rh1022017.patch
--- old/icedtea-3.2.0/patches/rh1022017.patch 2016-11-08 06:16:09.943461392 +0100
+++ new/icedtea-3.3.0/patches/rh1022017.patch 2017-01-26 13:39:46.749523963 +0100
@@ -1,44 +1,28 @@
-diff -r a5c3d9643077 src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
---- openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java Tue Feb 10 16:24:28 2015 +0000
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java Thu May 14 04:01:02 2015 +0100
-@@ -37,25 +37,11 @@
- // the extension value to send in the ClientHello message
- static final SupportedEllipticCurvesExtension DEFAULT;
-
-- private static final boolean fips;
--
- static {
-- int[] ids;
-- fips = SunJSSE.isFIPS();
-- if (fips == false) {
-- ids = new int[] {
-- // NIST curves first
-- // prefer NIST P-256, rest in order of increasing key length
-- 23, 1, 3, 19, 21, 6, 7, 9, 10, 24, 11, 12, 25, 13, 14,
-- // non-NIST curves
-- 15, 16, 17, 2, 18, 4, 5, 20, 8, 22,
-- };
-- } else {
-- ids = new int[] {
-- // same as above, but allow only NIST curves in FIPS mode
-- 23, 1, 3, 19, 21, 6, 7, 9, 10, 24, 11, 12, 25, 13, 14,
-- };
-- }
-+ int[] ids = new int[] {
-+ // NSS currently only supports these three NIST curves
-+ 23, 24, 25
-+ };
- DEFAULT = new SupportedEllipticCurvesExtension(ids);
- }
-
-@@ -150,10 +136,6 @@
- if ((index <= 0) || (index >= NAMED_CURVE_OID_TABLE.length)) {
- return false;
- }
-- if (fips == false) {
-- // in non-FIPS mode, we support all valid indices
-- return true;
-- }
- return DEFAULT.contains(index);
- }
+diff --git a/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
+--- openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
++++ openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
+@@ -160,20 +160,10 @@
+ }
+ }
+ } else { // default curves
+- int[] ids;
+- if (requireFips) {
+- ids = new int[] {
+- // only NIST curves in FIPS mode
+- 23, 24, 25, 9, 10, 11, 12, 13, 14,
+- };
+- } else {
+- ids = new int[] {
+- // NIST curves first
+- 23, 24, 25, 9, 10, 11, 12, 13, 14,
+- // non-NIST curves
+- 22,
+- };
+- }
++ int[] ids = new int[] {
++ // NSS currently only supports these three NIST curves
++ 23, 24, 25
++ };
+ idList = new ArrayList<>(ids.length);
+ for (int curveId : ids) {
++++++ java-1_8_0-openjdk-gcc6.patch ++++++
++++ 781 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk-gcc6.patch
++++ and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/java-1_8_0-openjdk-gcc6.patch
++++++ jaxp.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/.hgtags new/jaxp-faf1c4a9a51d/.hgtags
--- old/jaxp-81c2773fbb0d/.hgtags 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/.hgtags 2017-01-24 21:01:16.000000000 +0100
@@ -658,6 +658,10 @@
11f747b59cb0a09287fc3f522b2150aa04879b3d icedtea-3.2.0pre03
1f032000ff4b70c3adc02669b6324880199f8db8 jdk8u102-b14
ff603463199f8a2140cb97fd3ff98046dfeecb3f jdk8u102-b31
+58dea534c1d49731a40de645cfa3450949f31d26 jdk8u102-b32
+d31aad84c2727e40792cba85073713424b6b209f jdk8u102-b33
+6d28aaf99e9383e968654867e9fd2195046f33f4 jdk8u102-b34
+d3c5785df6b5aacdba20221b2f819aae93becac7 jdk8u102-b35
a6a032a5490f4000bdfb25a2f604b22bcdf95ecf jdk8u111-b00
4389b3cda88c98df36b36116999c4591a9b8e12c jdk8u111-b01
1ffc284c45e0fb86c066b832d7be50766b68eb25 jdk8u111-b02
@@ -672,3 +676,37 @@
d80acd543dcb4ddb011dec05da364727da907ec2 jdk8u111-b11
59b4011136ae60b43855f99d316119ca61d84460 jdk8u111-b12
41ed5205949c82e729533e897382b39342029cff jdk8u111-b13
+81c2773fbb0d6f39798689230d3c4f9372667870 icedtea-3.2.0
+f1d0b6e8107011c46fca3621bcf8c0a873f379f7 jdk8u111-b14
+4e861d8430460a72ee3e5c79a85e772b06684adc jdk8u112-b00
+664dd77016540cb9cee7b1bfa27a0a6970f7cf1f jdk8u112-b01
+80ce57123e23ff53f19c034ea5892b186730ddf3 jdk8u112-b02
+fa8960424b5baf4aa0c1e0172115e85317f04127 jdk8u112-b03
+cfc0c92fdbac159ab3434b96d650324cf6dc91dd jdk8u112-b04
+e677228a078a680d8761b3fd22938effe9f7e18d jdk8u112-b06
+7ebdc1fa55fa3f0c21cc009bf1bb8cfd39a92099 jdk8u112-b07
+6ee652d363bb2e0a9f7f0ea7d0d8f4de727aec7c jdk8u112-b08
+45d7c35417517939a600614f0dd0cb16a3098937 jdk8u112-b09
+17cfa0cd7c3c621236f4dd891f8808c3a03c3542 jdk8u112-b10
+ed365ea4cf5fb4d9407e9484f0cb5cd2e2c7786c jdk8u112-b11
+382516531501b0136ae56e9bccc6d09de805ce39 jdk8u112-b12
+eca53abf6800f86146fbcc0e81af4346526e3ad0 jdk8u112-b13
+15749f6d0d05bc1acc005643ba494ff09387cbdc jdk8u112-b14
+b07754d40ea6415af3b267327e748522ea17b131 jdk8u112-b15
+66ef33852d93fe8469724cbdbbdd57dd0e506a6f jdk8u112-b16
+9bea504f196a8de4e3006165de4d26c1d03852b0 icedtea-3.3.0pre01
+376ba5ed85cc43ef8f13eddc592126e42887ac60 jdk8u112-b31
+9bbba018c96a17c5b5583e26a38d3c1e910178ef jdk8u121-b00
+21da1526aeaf09fde06ec0a5504b564b591f7d03 jdk8u121-b01
+a0ad630d453b3b3c5b1185056a9216281f3085cd jdk8u121-b02
+e76bf2e89efd4b98fa399e4c7db489fc86275257 jdk8u121-b03
+05ac2cb9826a084578dd3b52582323b2473da631 jdk8u121-b04
+49e1091960832ddb247de2825414577d398ba15f jdk8u121-b05
+e31f5ceba6bf5ab6ddfdd1bffef3536e6af8f78b jdk8u121-b06
+d12a9b165b4789915a6ef267099db9721a9887f8 jdk8u121-b07
+c7325d95eaba9e5ef329527107bafc68346d4264 jdk8u121-b08
+f805dcb18704a7028b9d193e8fe661381d473213 jdk8u121-b09
+989c624fdc1f306f1b6068b0529268a46e21ee6b jdk8u121-b10
+77c3d617ae4c28c6e29d51411ab2b2c9eb24683f jdk8u121-b11
+f9cb265fd35fc60dccd75075614f8e897af92ab3 jdk8u121-b12
+6febbabbb8799c09d6ef661d67e60fde6f18d509 icedtea-3.3.0pre02
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/LICENSE new/jaxp-faf1c4a9a51d/LICENSE
--- old/jaxp-81c2773fbb0d/LICENSE 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/LICENSE 2017-01-24 21:01:16.000000000 +0100
@@ -3,7 +3,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
@@ -287,8 +287,8 @@
more details.
You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc., 59
- Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java 2017-01-24 21:01:16.000000000 +0100
@@ -752,7 +752,7 @@
load(0, true, true);
}
else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
- invokeListeners(0);
+ invokeListeners(1);
fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
load(1, false, false);
fCurrentEntity.position = 0;
@@ -904,7 +904,7 @@
load(0, true, true);
}
else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
- invokeListeners(0);
+ invokeListeners(1);
fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
load(1, false, false);
fCurrentEntity.startPosition = 0;
@@ -1352,7 +1352,7 @@
fCurrentEntity.lineNumber++;
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count - 1) {
- invokeListeners(0);
+ invokeListeners(1);
fCurrentEntity.ch[0] = (char)c;
entityChanged = load(1, true, false);
if (!entityChanged) {
@@ -1406,8 +1406,9 @@
fCurrentEntity.lineNumber++;
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count - 1) {
+ invokeListeners(1);
fCurrentEntity.ch[0] = (char)c;
- entityChanged = load(1, true, true);
+ entityChanged = load(1, true, false);
if (!entityChanged) {
// the load change the position to be 1,
// need to restore it when entity not changed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java 2017-01-24 21:01:16.000000000 +0100
@@ -3,11 +3,13 @@
*/
/*
- * Copyright 2005 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
*
@@ -19,17 +21,19 @@
*/
package com.sun.org.apache.xerces.internal.impl;
-import com.sun.xml.internal.stream.dtd.nonvalidating.DTDGrammar;
-import java.io.EOFException;
-import java.io.IOException;
+import com.sun.org.apache.xerces.internal.impl.Constants;
import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
+import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
+import com.sun.org.apache.xerces.internal.impl.XMLEntityHandler;
import com.sun.org.apache.xerces.internal.util.SymbolTable;
import com.sun.org.apache.xerces.internal.util.XMLAttributesImpl;
import com.sun.org.apache.xerces.internal.util.XMLChar;
import com.sun.org.apache.xerces.internal.util.XMLStringBuffer;
+import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.xni.XMLDTDContentModelHandler;
import com.sun.org.apache.xerces.internal.xni.XMLDTDHandler;
import com.sun.org.apache.xerces.internal.xni.XMLResourceIdentifier;
@@ -41,8 +45,9 @@
import com.sun.org.apache.xerces.internal.xni.parser.XMLDTDScanner;
import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
import com.sun.org.apache.xerces.internal.xni.Augmentations;
-import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
-import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+import com.sun.xml.internal.stream.dtd.nonvalidating.DTDGrammar;
+import java.io.EOFException;
+import java.io.IOException;
/**
* This class is responsible for scanning the declarations found
@@ -386,15 +391,25 @@
*/
@Override
public boolean skipDTD(boolean supportDTD) throws IOException {
- if (!supportDTD) {
- fStringBuffer.clear();
- if (!fEntityScanner.scanData("]", fStringBuffer)) {
- fEntityScanner.fCurrentEntity.position--;
- }
+ if (supportDTD)
+ return false;
- return true;
+ fStringBuffer.clear();
+ while (fEntityScanner.scanData("]", fStringBuffer)) {
+ int c = fEntityScanner.peekChar();
+ if (c != -1) {
+ if (XMLChar.isHighSurrogate(c)) {
+ scanSurrogates(fStringBuffer);
+ }
+ if (isInvalidLiteral(c)) {
+ reportFatalError("InvalidCharInDTD",
+ new Object[] { Integer.toHexString(c) });
+ fEntityScanner.scanChar(null);
+ }
+ }
}
- return false;
+ fEntityScanner.fCurrentEntity.position--;
+ return true;
}
//
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java 2017-01-24 21:01:16.000000000 +0100
@@ -3,13 +3,14 @@
*/
/*
- * Copyright 2005 The Apache Software Foundation.
+ * 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
*
- * 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
+ * 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,
@@ -18,7 +19,6 @@
* limitations under the License.
*/
-
package com.sun.org.apache.xerces.internal.impl;
import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java 2017-01-24 21:01:16.000000000 +0100
@@ -3,13 +3,14 @@
*/
/*
- * Copyright 2005 The Apache Software Foundation.
+ * 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
*
- * 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
+ * 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,
@@ -20,7 +21,6 @@
package com.sun.org.apache.xerces.internal.impl;
-
import com.sun.org.apache.xerces.internal.impl.dtd.XMLDTDDescription;
import com.sun.org.apache.xerces.internal.impl.validation.ValidationManager;
import com.sun.org.apache.xerces.internal.util.NamespaceSupport;
@@ -1107,8 +1107,7 @@
if (!moreToScan) {
// end doctype declaration
if (!fEntityScanner.skipChar(']', null)) {
- reportFatalError("EXPECTED_SQUARE_BRACKET_TO_CLOSE_INTERNAL_SUBSET",
- null);
+ reportFatalError("DoctypedeclNotClosed", new Object[]{fDoctypeName});
}
fEntityScanner.skipSpaces();
if (!fEntityScanner.skipChar('>', null)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java 2017-01-24 21:01:16.000000000 +0100
@@ -44,8 +44,8 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.util.ArrayList;
import java.util.Locale;
-import java.util.Vector;
/**
* Implements the entity scanner methods.
@@ -58,11 +58,10 @@
*/
public class XMLEntityScanner implements XMLLocator {
-
- protected Entity.ScannedEntity fCurrentEntity = null ;
+ protected Entity.ScannedEntity fCurrentEntity = null;
protected int fBufferSize = XMLEntityManager.DEFAULT_BUFFER_SIZE;
- protected XMLEntityManager fEntityManager ;
+ protected XMLEntityManager fEntityManager;
/** Security manager. */
protected XMLSecurityManager fSecurityManager = null;
@@ -72,8 +71,9 @@
/** Debug switching readers for encodings. */
private static final boolean DEBUG_ENCODINGS = false;
+
/** Listeners which should know when load is being called */
- private Vector listeners = new Vector();
+ private ArrayList<XMLBufferListener> listeners = new ArrayList<>();
private static final boolean [] VALID_NAMES = new boolean[127];
@@ -140,9 +140,10 @@
VALID_NAMES[58]=true;
VALID_NAMES[95]=true;
}
- // SAPJVM: Remember, that the XML version has explicitly been set,
+
+ // Remember, that the XML version has explicitly been set,
// so that XMLStreamReader.getVersion() can find that out.
- boolean xmlVersionSetExplicitly = false;
+ protected boolean xmlVersionSetExplicitly = false;
// indicates that the operation is for detecting XML version
boolean detectingVersion = false;
@@ -261,7 +262,7 @@
* @param xmlVersion the XML version of the current entity
*/
public final void setXMLVersion(String xmlVersion) {
- xmlVersionSetExplicitly = true; // SAPJVM
+ xmlVersionSetExplicitly = true;
fCurrentEntity.xmlVersion = xmlVersion;
} // setXMLVersion(String)
@@ -553,8 +554,7 @@
// scan character
int offset = fCurrentEntity.position;
int c = fCurrentEntity.ch[fCurrentEntity.position++];
- if (c == '\n' ||
- (c == '\r' && isExternal)) {
+ if (c == '\n' || (c == '\r' && isExternal)) {
fCurrentEntity.lineNumber++;
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count) {
@@ -1027,7 +1027,7 @@
if (fCurrentEntity.position == fCurrentEntity.count) {
load(0, true, true);
} else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
- invokeListeners(0);
+ invokeListeners(1);
fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
load(1, false, false);
fCurrentEntity.position = 0;
@@ -1186,7 +1186,7 @@
if (fCurrentEntity.position == fCurrentEntity.count) {
load(0, true, true);
} else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
- invokeListeners(0);
+ invokeListeners(1);
fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
load(1, false, false);
fCurrentEntity.position = 0;
@@ -1339,8 +1339,8 @@
* <p>
* <strong>Note:</strong> The characters are consumed.
* <p>
- * <strong>Note:</strong> This assumes that the length of the delimiter
- * and that the delimiter contains at least one character.
+ * <strong>Note:</strong> This assumes that the delimiter contains at
+ * least one character.
* <p>
* <strong>Note:</strong> This method does not guarantee to return
* the longest run of character data. This method may return before
@@ -1523,7 +1523,7 @@
} while (!done);
return !done;
- } // scanData(String,XMLString)
+ } // scanData(String, XMLStringBuffer)
/**
* Skips a character appearing immediately on the input.
@@ -1650,7 +1650,7 @@
fCurrentEntity.lineNumber++;
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count - 1) {
- invokeListeners(0);
+ invokeListeners(1);
fCurrentEntity.ch[0] = (char)c;
entityChanged = load(1, true, false);
if (!entityChanged){
@@ -1827,8 +1827,7 @@
final int length = s.length;
//first make sure that required capacity is avaible
if(arrangeCapacity(length, false)){
- int beforeSkip = fCurrentEntity.position ;
- int afterSkip = fCurrentEntity.position + length ;
+ int beforeSkip = fCurrentEntity.position;
if(DEBUG_SKIP_STRING){
System.out.println("skipString,length = " + new String(s) + "," + length);
@@ -2210,8 +2209,9 @@
* is being changed.
*/
public void registerListener(XMLBufferListener listener) {
- if(!listeners.contains(listener))
+ if (!listeners.contains(listener)) {
listeners.add(listener);
+ }
}
/**
@@ -2219,9 +2219,8 @@
* @param loadPos Starting position from which new data is being loaded into scanner buffer.
*/
public void invokeListeners(int loadPos){
- for(int i=0;ihttp://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,7 +21,6 @@
package com.sun.org.apache.xerces.internal.impl;
-
import com.sun.org.apache.xerces.internal.util.Status;
import com.sun.xml.internal.stream.XMLEntityStorage;
import java.io.IOException;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties 2017-01-24 21:01:16.000000000 +0100
@@ -145,6 +145,7 @@
MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = White space is required after \"<!DOCTYPE\" in the document type declaration.
MSG_ROOT_ELEMENT_TYPE_REQUIRED = The root element type must appear after \"<!DOCTYPE\" in the document type declaration.
DoctypedeclUnterminated = The document type declaration for root element type \"{0}\" must end with ''>''.
+ DoctypedeclNotClosed = The document type declaration for root element type \"{0}\" must be closed with '']''.
PEReferenceWithinMarkup = The parameter entity reference \"%{0};\" cannot occur within markup in the internal subset of the DTD.
MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = The markup declarations contained or pointed to by the document type declaration must be well-formed.
# 2.10 White Space Handling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties 2017-01-24 21:01:16.000000000 +0100
@@ -145,6 +145,7 @@
MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Leerstelle nach "<!DOCTYPE" in der Dokumenttypdeklaration erforderlich.
MSG_ROOT_ELEMENT_TYPE_REQUIRED = Root-Elementtyp muss nach "<!DOCTYPE" in der Dokumenttypdeklaration enthalten sein.
DoctypedeclUnterminated = Dokumenttypdeklaration f\u00FCr Root-Elementtyp "{0}" muss mit ">" enden.
+ DoctypedeclNotClosed = Dokumenttypdeklaration f\u00FCr Root-Elementtyp "{0}" muss mit '']'' enden.
PEReferenceWithinMarkup = Parameterentityreferenz "%{0};" darf nicht in Markup in der internen Teilmenge der DTD vorkommen.
MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Die Markup-Deklarationen, die in der Dokumenttypdeklaration enthalten sind bzw. auf die von der Dokumenttypdeklaration verwiesen wird, m\u00FCssen ordnungsgem\u00E4\u00DF formatiert sein.
# 2.10 White Space Handling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties 2017-01-24 21:01:16.000000000 +0100
@@ -145,6 +145,7 @@
MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Es necesario un espacio en blanco despu\u00E9s de "<!DOCTYPE" en la declaraci\u00F3n de tipo de documento.
MSG_ROOT_ELEMENT_TYPE_REQUIRED = El tipo de elemento ra\u00EDz debe aparecer despu\u00E9s de "<!DOCTYPE" en la declaraci\u00F3n de tipo de documento.
DoctypedeclUnterminated = La declaraci\u00F3n de tipo de documento para el tipo de elemento ra\u00EDz "{0}" debe finalizar en ''>''.
+ DoctypedeclNotClosed = La declaraci\u00F3n de tipo de documento para el tipo de elemento ra\u00EDz "{0}" debe finalizar en '']''.
PEReferenceWithinMarkup = La referencia de entidad del par\u00E1metro "%{0};" no puede producirse en el marcador en el subconjunto interno del DTD.
MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Las declaraciones de marcador que se incluyen o a las que apunta la declaraci\u00F3n de tipo de documento deben tener el formato correcto.
# 2.10 White Space Handling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties 2017-01-24 21:01:16.000000000 +0100
@@ -145,6 +145,7 @@
MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Un espace est obligatoire apr\u00E8s "<!DOCTYPE" dans la d\u00E9claration de type de document.
MSG_ROOT_ELEMENT_TYPE_REQUIRED = Le type d'\u00E9l\u00E9ment racine doit figurer apr\u00E8s "<!DOCTYPE" dans la d\u00E9claration de type de document.
DoctypedeclUnterminated = La d\u00E9claration de type de document pour le type d''\u00E9l\u00E9ment racine "{0}" doit se terminer par ''>''.
+ DoctypedeclNotClosed = La d\u00E9claration de type de document pour le type d''\u00E9l\u00E9ment racine "{0}" doit se terminer par '']''.
PEReferenceWithinMarkup = La r\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre "%{0};" ne peut pas survenir dans le balisage du sous-ensemble interne de la DTD.
MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Les d\u00E9clarations de balisage contenues dans la d\u00E9claration de type de document ou sur lesquelles pointe cette derni\u00E8re doivent avoir un format correct.
# 2.10 White Space Handling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties 2017-01-24 21:01:16.000000000 +0100
@@ -145,6 +145,7 @@
MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u00C8 richiesto uno spazio dopo "<!DOCTYPE" nella dichiarazione del tipo di documento.
MSG_ROOT_ELEMENT_TYPE_REQUIRED = Il tipo di elemento radice deve comparire dopo "<!DOCTYPE" nella dichiarazione del tipo di documento.
DoctypedeclUnterminated = La dichiarazione del tipo di documento per il tipo di elemento radice "{0}" deve terminare con ''>''.
+ DoctypedeclNotClosed = La dichiarazione del tipo di documento per il tipo di elemento radice "{0}" deve terminare con '']''.
PEReferenceWithinMarkup = Il riferimento di entit\u00E0 di parametro "%{0};" non pu\u00F2 essere presente nel markup del set secondario interno del DTD.
MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Le dichiarazioni di markup contenute o indicate dalla dichiarazione del tipo di documento devono avere un formato corretto.
# 2.10 White Space Handling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties 2017-01-24 21:01:16.000000000 +0100
@@ -145,6 +145,7 @@
MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001"<!DOCTYPE"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001"<!DOCTYPE"\u306E\u5F8C\u306B\u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
DoctypedeclUnterminated = \u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ DoctypedeclNotClosed = \u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u306F'']''\u3067\u9589\u3058\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
PEReferenceWithinMarkup = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"%{0};"\u306F\u3001DTD\u306E\u5185\u90E8\u30B5\u30D6\u30BB\u30C3\u30C8\u306E\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u5185\u306B\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u306B\u542B\u307E\u308C\u308B\u304B\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u304C\u6307\u3057\u3066\u3044\u308B\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u5BA3\u8A00\u306F\u6574\u5F62\u5F0F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
# 2.10 White Space Handling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties 2017-01-24 21:01:16.000000000 +0100
@@ -145,6 +145,7 @@
MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!DOCTYPE" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
MSG_ROOT_ELEMENT_TYPE_REQUIRED = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!DOCTYPE" \uB2E4\uC74C\uC5D0 \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
DoctypedeclUnterminated = \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+ DoctypedeclNotClosed = \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC740 '']''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
PEReferenceWithinMarkup = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 "%{0};"\uC740 DTD\uC758 \uB0B4\uBD80 \uBD80\uBD84 \uC9D1\uD569\uC5D0 \uC788\uB294 \uB9C8\uD06C\uC5C5 \uC548\uC5D0 \uD45C\uC2DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC744 \uD3EC\uD568\uD558\uAC70\uB098 \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC774 \uAC00\uB9AC\uD0A4\uB294 \uB9C8\uD06C\uC5C5 \uC120\uC5B8\uC740 \uC62C\uBC14\uB978 \uD615\uC2DD\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
# 2.10 White Space Handling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties 2017-01-24 21:01:16.000000000 +0100
@@ -145,6 +145,7 @@
MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!DOCTYPE" na declara\u00E7\u00E3o do tipo de documento.
MSG_ROOT_ELEMENT_TYPE_REQUIRED = O tipo de elemento-raiz deve aparecer ap\u00F3s "<!DOCTYPE" na declara\u00E7\u00E3o do tipo de documento.
DoctypedeclUnterminated = A declara\u00E7\u00E3o do tipo de documento do tipo de elemento "{0}" deve terminar com ''>''.
+ DoctypedeclNotClosed = A declara\u00E7\u00E3o do tipo de documento do tipo de elemento "{0}" deve terminar com '']''.
PEReferenceWithinMarkup = A refer\u00EAncia da entidade do par\u00E2metro "%{0};" n\u00E3o pode ocorrer na marca\u00E7\u00E3o no subconjunto interno do DTD.
MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = As declara\u00E7\u00F5es de marca\u00E7\u00E3o contidas ou apontadas pela declara\u00E7\u00E3o do tipo de documento devem estar corretas.
# 2.10 White Space Handling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties 2017-01-24 21:01:16.000000000 +0100
@@ -145,6 +145,7 @@
MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Tomt utrymme kr\u00E4vs efter "<!DOCTYPE" i dokumenttypdeklarationen.
MSG_ROOT_ELEMENT_TYPE_REQUIRED = Rotelementtyp m\u00E5ste anges efter "<!DOCTYPE" i dokumenttypdeklarationen.
DoctypedeclUnterminated = Dokumenttypdeklarationen f\u00F6r rotelementtyp "{0}" m\u00E5ste avslutas med ''>''.
+ DoctypedeclNotClosed = Dokumenttypsdeklarationen f\u00F6r rotelementtypen "{0}" m\u00E5ste st\u00E4ngas med '']''.
PEReferenceWithinMarkup = Parameterreferensen "%{0};" f\u00E5r inte f\u00F6rekomma i kodtexten i den interna delm\u00E4ngden i DTD.
MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Kodtextdeklarationerna som finns med eller pekas till fr\u00E5n dokumenttypdeklarationen m\u00E5ste vara v\u00E4lformulerade.
# 2.10 White Space Handling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties 2017-01-24 21:01:16.000000000 +0100
@@ -145,6 +145,7 @@
MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u5728\u6587\u6863\u7C7B\u578B\u58F0\u660E\u4E2D\u7684 "<!DOCTYPE" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u5728\u6587\u6863\u7C7B\u578B\u58F0\u660E\u4E2D, \u6839\u5143\u7D20\u7C7B\u578B\u5FC5\u987B\u51FA\u73B0\u5728 "<!DOCTYPE" \u540E\u9762\u3002
DoctypedeclUnterminated = \u6839\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u6587\u6863\u7C7B\u578B\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
+ DoctypedeclNotClosed = \u6839\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u6587\u6863\u7C7B\u578B\u58F0\u660E\u5FC5\u987B\u4EE5 '']'' \u7ED3\u5C3E\u3002
PEReferenceWithinMarkup = \u53C2\u6570\u5B9E\u4F53\u5F15\u7528 "%{0};" \u4E0D\u80FD\u51FA\u73B0\u5728 DTD \u7684\u5185\u90E8\u5B50\u96C6\u4E2D\u7684\u6807\u8BB0\u5185\u3002
MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u6587\u6863\u7C7B\u578B\u58F0\u660E\u5305\u542B\u6216\u6307\u5411\u7684\u6807\u8BB0\u58F0\u660E\u5FC5\u987B\u683C\u5F0F\u6B63\u786E\u3002
# 2.10 White Space Handling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties 2017-01-24 21:01:16.000000000 +0100
@@ -145,6 +145,7 @@
MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u5728\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u4E2D "<!DOCTYPE" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u5728\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u4E2D\uFF0C\u6839\u5143\u7D20\u985E\u578B\u5FC5\u9808\u51FA\u73FE\u5728 "<!DOCTYPE" \u4E4B\u5F8C\u3002
DoctypedeclUnterminated = \u6839\u5143\u7D20\u985E\u578B "{0}" \u7684\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
+ DoctypedeclNotClosed = \u6839\u5143\u7D20\u985E\u578B "{0}" \u7684\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA '']''\u3002
PEReferenceWithinMarkup = DTD \u5167\u90E8\u5B57\u96C6\u7684\u6A19\u8A18\u5167\u4E0D\u80FD\u51FA\u73FE\u53C3\u6578\u5BE6\u9AD4\u53C3\u7167 "%{0};"\u3002
MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u6587\u4EF6\u985E\u578B\u5BA3\u544A\u5305\u542B\u6216\u6307\u5411\u7684\u6A19\u8A18\u5BA3\u544A\u5FC5\u9808\u683C\u5F0F\u6B63\u78BA\u3002
# 2.10 White Space Handling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java
--- old/jaxp-81c2773fbb0d/src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java 2016-11-03 19:13:04.000000000 +0100
+++ new/jaxp-faf1c4a9a51d/src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java 2017-01-24 21:01:16.000000000 +0100
@@ -1,15 +1,16 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
*/
+
/*
- * Copyright 2004,2005 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
+ * 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,
@@ -17,18 +18,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.sun.org.apache.xerces.internal.util;
+import com.sun.org.apache.xerces.internal.xni.XMLResourceIdentifier;
+import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
import java.io.InputStream;
import java.io.Reader;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import com.sun.org.apache.xerces.internal.xni.XMLResourceIdentifier;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
-
/**
* This class represents an input source for an XML resource
* retrievable over HTTP. In addition to the properties
++++++ jaxws.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-f57f3ddddff6/.hgtags new/jaxws-5f5237104669/.hgtags
--- old/jaxws-f57f3ddddff6/.hgtags 2016-11-03 19:13:07.000000000 +0100
+++ new/jaxws-5f5237104669/.hgtags 2017-01-24 21:01:17.000000000 +0100
@@ -647,6 +647,10 @@
20d379a7883648ad90af8bf79e4d23ce58fcf94c icedtea-3.2.0pre03
81f2d81a48d74d2d4882c11330366517b73ee064 jdk8u102-b14
de23881ca76c9c69f4e47e9b15d09a91fbb17176 jdk8u102-b31
+f638db3f652d3ec698aad0193c118c8afdaa001b jdk8u102-b32
+c28a73050d99040158ade12858b38d27686800ce jdk8u102-b33
+0cf16c3a71ab070daa1aee4367afdd8c4aa1daa3 jdk8u102-b34
+afa2263b5de8018a2b4a3cd5f66e438cb8ffe0e9 jdk8u102-b35
d3b054313ed2d29f9dbbdfd71a7ab3c4ad4eb5b6 jdk8u111-b00
6b861e233c89df49ba9b0357578f556f4953df57 jdk8u111-b01
a896244473b934376ae7b48a281a0401774c9074 jdk8u111-b02
@@ -661,3 +665,37 @@
730d8fc6bbfc5c642770b15e4787e1d0545c8f32 jdk8u111-b11
6ccfdf9a9af5f2df5cbd5ecd5f17aecef289094b jdk8u111-b12
914f31660407050cb04357f472d8365d5a781cd7 jdk8u111-b13
+f57f3ddddff63b25bbe59d93213a379a9663c085 icedtea-3.2.0
+1439cb8c6e86560934b9642cf36cddbfcb8f87be jdk8u111-b14
+2d1c73175b3a5bd829503734e6eb65426bd12e16 jdk8u112-b00
+10388356386d4c6eaf63dc50a05b5a373b4dde98 jdk8u112-b01
+903e66791568904247b4181ebe3e05275788f02c jdk8u112-b02
+560d4d5c7a319e4b9316ef922c815307e32accf2 jdk8u112-b03
+da39da2c7a855575acf7bff86e5707c9aa723160 jdk8u112-b04
+454315c9ffd47f1abec15a51ff51f25c92d09254 jdk8u112-b06
+5f7c72e72f8ce44962a27ee24405c52348d1f38e jdk8u112-b07
+f3d512b7322957a8714f04f2d4714065ebca15f6 jdk8u112-b08
+92dbc9db48db7d3f61b1af0d1f8139257c6ae497 jdk8u112-b09
+29aaa22088eeff4e87fccc88318c088a95e2ab35 jdk8u112-b10
+c6d719a4fcd78b692f70f49daf83bf7610f5e0bc jdk8u112-b11
+bb36d2dbebb7d4ebb4de8e666f00187eca81efd9 jdk8u112-b12
+abb5568d79259d63bf349abf7f5e7461eddc2b40 jdk8u112-b13
+14fa3ed278a279dc85c150bf54b2ec4fa29cf347 jdk8u112-b14
+5f84e87f91d5bc36ed026b88d183821e5109d730 jdk8u112-b15
+d82dd7a24a496e26987caa328d1fb4fc794a4770 jdk8u112-b16
+b97cf465bf9f4b4b9f7c19fabeaa7e54f248451f icedtea-3.3.0pre01
+021da5d50285a523d4622a727ea1a7019f2b52e4 jdk8u112-b31
+452662a83e5bc6dc7e9425ddd10f6c8fc98d50d8 jdk8u121-b00
+9cd16be39ca6f2c8f7cc99ad07a77bb9d0696c75 jdk8u121-b01
+f092b9a890ceeca4a2f4d55cf7d6f3f113cdb462 jdk8u121-b02
+c1b0f76c9fe9657d3f5cdd1e23bfd1d499018431 jdk8u121-b03
+44674172423a0d361466e34eedcaec18a8810b13 jdk8u121-b04
+18da635b5919a0b7cdde8573a0d502efdbf3673e jdk8u121-b05
+5b76a2126855f8949ab8fbadfa3ee2f29da9c21c jdk8u121-b06
+f10aa5b29848eab891bdd173540d91fd31f9ff20 jdk8u121-b07
+105d3bbf5e3b2b24da665b332d2dbf44980c87f2 jdk8u121-b08
+9f2588382771f855c4450f59b470d069a1cb1d01 jdk8u121-b09
+c317f0eacd602a8765d25b0fcd382f76af3697a5 jdk8u121-b10
+89aa912be940d6c30f59b80c826f212541912a56 jdk8u121-b11
+52b3f9fb54ee4304a9c34a2fe07f0c9a49472185 jdk8u121-b12
+7912f05c2a6d8fdbf55534c921f06e81dbaf8d8d icedtea-3.3.0pre02
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-f57f3ddddff6/LICENSE new/jaxws-5f5237104669/LICENSE
--- old/jaxws-f57f3ddddff6/LICENSE 2016-11-03 19:13:07.000000000 +0100
+++ new/jaxws-5f5237104669/LICENSE 2017-01-24 21:01:17.000000000 +0100
@@ -3,7 +3,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
@@ -287,8 +287,8 @@
more details.
You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc., 59
- Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
++++++ jdk.tar.xz ++++++
/work/SRC/openSUSE:Factory/java-1_8_0-openjdk/jdk.tar.xz /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/jdk.tar.xz differ: char 26, line 1
++++++ langtools.tar.xz ++++++
++++ 2901 lines of diff (skipped)
++++++ nashorn.tar.xz ++++++
++++ 2455 lines of diff (skipped)
++++++ openjdk.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-200203ccf4bb/.hgtags new/icedtea8-forest-d5760f7cce54/.hgtags
--- old/icedtea8-forest-200203ccf4bb/.hgtags 2016-11-03 19:13:01.000000000 +0100
+++ new/icedtea8-forest-d5760f7cce54/.hgtags 2017-01-25 05:18:48.000000000 +0100
@@ -653,6 +653,10 @@
66db642828d473d3b824d4d0228468ec8a4ebac5 icedtea-3.2.0pre03
daafd7d3a76a0c448e4982afd7c4e9471ab1c916 jdk8u102-b14
3a3064f9363c79f70a0d9b2201342acc880e1e76 jdk8u102-b31
+fb4fc26136253424c0a4f4f5a10dc54f612b64fd jdk8u102-b32
+b8ca429448f7d3dfbdea3a6c349a7a3850fdd27f jdk8u102-b33
+57cbdae98283951a2e2fc382223c5736a9d8d57c jdk8u102-b34
+39483f225bc2a196d07a500940e74b3b2e13f9c3 jdk8u102-b35
fe901996777f50198be2c785cd7e3b8198692bbe jdk8u111-b00
38fc232c37019c1e3fdf87495ca9b6e689a08a34 jdk8u111-b01
b363f4507ef46d86951d7d00eff4fb6624ebb728 jdk8u111-b02
@@ -667,3 +671,37 @@
fc69426e3eeb88652a433088ddf715ca100606d2 jdk8u111-b11
5b64df33d63a60d21edd5094173a21b1f2431b0a jdk8u111-b12
7b105a10b1a3e656939e47e87fcf9e8066fa78f0 jdk8u111-b13
+200203ccf4bb3c1a24b356d5f3ce39f0f51fd5b7 icedtea-3.2.0
+07c7b5880ac35b894978c3313e6e40a487d4756d jdk8u111-b14
+31aca84184b4d54890b4fade1c614927203051b4 jdk8u112-b00
+37bd26595d994939ccf98d8c444e692c4fdfff55 jdk8u112-b01
+817d9fb584baecae7c989dfd7009a7f0ac7c6360 jdk8u112-b02
+d1d3129671c90db26f04ed837e2f105ee9586bef jdk8u112-b03
+b2a03d93ed533a0459f27dc109a8be1f7d2f1024 jdk8u112-b04
+e1418dc5266e03bf6b06a193da6cdb99ca309f75 jdk8u112-b06
+29e1388fa1cafeb05d9c337226c505916c6586b9 jdk8u112-b07
+00809b3e07ee374850dd61ade9432b0d9716ebfc jdk8u112-b08
+9eca585fba8b8dbdca3320d20bf6eaddd0a9081f jdk8u112-b09
+78a5e7d66e4f84a6bf6cc74c7ecafc3ff62d0fad jdk8u112-b10
+3360efec9958585e54a54a738636433b92e81b46 jdk8u112-b11
+bbde0cbbfc1b4f7260162a738ea1e9018ddea413 jdk8u112-b12
+c7043839334d65f6cefd0f7d54705cbb61e40377 jdk8u112-b13
+b4441c5520688b42c52caa36861744429ec4385a jdk8u112-b14
+bfb88850a367a747e77f4cb164a12ea54ec8e8da jdk8u112-b15
+14388b14d4847c3eacce677eae37980e6fa545cd jdk8u112-b16
+cc0c4b0b1c3ee397524f001a8969d361feb288dd icedtea-3.3.0pre01
+1a7a5fe22a028e438a724d909d27da2ea96c6d86 jdk8u112-b31
+58ac6fce1d10c1fba366ad58950a6a54b27a5bcb jdk8u121-b00
+a2c5309f998f8aa207a6e381464263e9a7dd50e0 jdk8u121-b01
+a2aa2e98905609a0b5809a38163239a7c97d31c1 jdk8u121-b02
+863cc5f631621da7026ae42828016a8070a1056d jdk8u121-b03
+c14b6b6d51d86fb36c8af1021e0bdf55f9cf7440 jdk8u121-b04
+ee85a5feaf10020ca74f071c609f44d8c4b2866c jdk8u121-b05
+7fdb1ca64ac7f62e3b17c699e493568da38ea4f3 jdk8u121-b06
+22eb8db7bf5b140e5d84fd91c7ea16c02736cd13 jdk8u121-b07
+b9e523138b2dc4e8456c3ac295f9bb57d21f1f77 jdk8u121-b08
+6eb8178c697ef3d55d99f222121093e6ad0363c4 jdk8u121-b09
+51c053cb4468768757cb25e687edd8e021ff2eb3 jdk8u121-b10
+bfe05759587ddc30a32c00637180588cec309ee3 jdk8u121-b11
+97c858f7f7c827730d05eb69134ac89e156f8685 jdk8u121-b12
+92468d1e29e3d87c9e1f3f89ada465700676e470 icedtea-3.3.0pre02
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-200203ccf4bb/LICENSE new/icedtea8-forest-d5760f7cce54/LICENSE
--- old/icedtea8-forest-200203ccf4bb/LICENSE 2016-11-03 19:13:01.000000000 +0100
+++ new/icedtea8-forest-d5760f7cce54/LICENSE 2017-01-25 05:18:48.000000000 +0100
@@ -3,7 +3,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
@@ -287,8 +287,8 @@
more details.
You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc., 59
- Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-200203ccf4bb/common/autoconf/generated-configure.sh new/icedtea8-forest-d5760f7cce54/common/autoconf/generated-configure.sh
--- old/icedtea8-forest-200203ccf4bb/common/autoconf/generated-configure.sh 2016-11-03 19:13:01.000000000 +0100
+++ new/icedtea8-forest-d5760f7cce54/common/autoconf/generated-configure.sh 2017-01-25 05:18:48.000000000 +0100
@@ -651,7 +651,7 @@
USE_EXTERNAL_KRB5
KRB5_LIBS
KRB5_CFLAGS
-INFINALITY_SUPPORT
+IMPROVED_FONT_RENDERING_SUPPORT
FONTCONFIG_LIBS
FONTCONFIG_CFLAGS
USE_EXTERNAL_NSS
@@ -704,6 +704,7 @@
CFLAGS_WARNINGS_ARE_ERRORS
NO_LIFETIME_DSE_CFLAG
NO_DELETE_NULL_POINTER_CHECKS_CFLAG
+FP_CONTRACT_SUPPORTED
CXXSTD_CXXFLAG
LEGACY_EXTRA_LDFLAGS
LEGACY_EXTRA_CXXFLAGS
@@ -1101,7 +1102,7 @@
with_libpng
with_zlib
enable_system_nss
-enable_infinality
+enable_improved_font_rendering
enable_system_kerberos
enable_system_pcsc
enable_system_sctp
@@ -1794,7 +1795,8 @@
--with-freetype, disabled otherwise]
--enable-system-nss build the SunEC provider using the system NSS
libraries [disabled]
- --enable-infinality build with fontconfig-enhanced font rendering
+ --enable-improved-font-rendering
+ build with fontconfig-enhanced font rendering
[disabled]
--enable-system-kerberos
use the system Kerberos to get the cache location
@@ -2732,52 +2734,6 @@
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- test -x conftest$ac_exeext
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
@@ -4043,7 +3999,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1478057962
+DATE_WHEN_GENERATED=1485316663
###############################################################################
#
@@ -29057,6 +29013,7 @@
+
if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags" >&5
$as_echo "$as_me: WARNING: Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags" >&2;}
@@ -29176,6 +29133,102 @@
;;
esac
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler supports \"-ffp-contract=off -Werror\"" >&5
+$as_echo_n "checking if the C compiler supports \"-ffp-contract=off -Werror\"... " >&6; }
+ supports=yes
+
+ saved_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS -ffp-contract=off -Werror"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int i;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ supports=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ CFLAGS="$saved_cflags"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
+$as_echo "$supports" >&6; }
+ if test "x$supports" = "xyes" ; then
+ C_COMP_SUPPORTS="yes"
+ else
+ C_COMP_SUPPORTS="no"
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"-ffp-contract=off -Werror\"" >&5
+$as_echo_n "checking if the C++ compiler supports \"-ffp-contract=off -Werror\"... " >&6; }
+ supports=yes
+
+ saved_cxxflags="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAG -ffp-contract=off -Werror"
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int i;
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+ supports=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ CXXFLAGS="$saved_cxxflags"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
+$as_echo "$supports" >&6; }
+ if test "x$supports" = "xyes" ; then
+ CXX_COMP_SUPPORTS="yes"
+ else
+ CXX_COMP_SUPPORTS="no"
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if both compilers support \"-ffp-contract=off -Werror\"" >&5
+$as_echo_n "checking if both compilers support \"-ffp-contract=off -Werror\"... " >&6; }
+ supports=no
+ if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
+$as_echo "$supports" >&6; }
+ if test "x$supports" = "xyes" ; then
+ FP_CONTRACT_SUPPORTED="true"
+ else
+ FP_CONTRACT_SUPPORTED="false"
+ fi
+
+
+
+
REFERENCE_VERSION=6
if [[ "$REFERENCE_VERSION" =~ (.*\.){3} ]] ; then
@@ -29210,8 +29263,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int i;
_ACEOF
@@ -35425,30 +35477,30 @@
$as_echo_n "checking whether to use fontconfig to provide better font rendering... " >&6; }
# default is no
- DEFAULT_INFINALITY=no
+ DEFAULT_IMPROVED_FONT_RENDERING=no
- # Check whether --enable-infinality was given.
-if test "${enable_infinality+set}" = set; then :
- enableval=$enable_infinality;
+ # Check whether --enable-improved-font-rendering was given.
+if test "${enable_improved_font_rendering+set}" = set; then :
+ enableval=$enable_improved_font_rendering;
case "${enableval}" in
yes)
- enable_infinality=yes
+ enable_improved_font_rendering=yes
;;
*)
- enable_infinality=no
+ enable_improved_font_rendering=no
;;
esac
else
- enable_infinality=${DEFAULT_INFINALITY}
+ enable_improved_font_rendering=${DEFAULT_IMPROVED_FONT_RENDERING}
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_infinality" >&5
-$as_echo "$enable_infinality" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_improved_font_rendering" >&5
+$as_echo "$enable_improved_font_rendering" >&6; }
- if test "x${enable_infinality}" = "xyes"; then
+ if test "x${enable_improved_font_rendering}" = "xyes"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FONTCONFIG" >&5
@@ -35518,55 +35570,9 @@
fi
if test "x${FONTCONFIG_FOUND}" = xno
then
- as_fn_error $? "Could not find fontconfig; infinality support requires fontconfig." "$LINENO" 5
+ as_fn_error $? "Could not find fontconfig; improved font rendering support requires fontconfig." "$LINENO" 5
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if FreeType is patched with infinality support" >&5
-$as_echo_n "checking if FreeType is patched with infinality support... " >&6; }
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- CFLAGS_SAVED=$CFLAGS
- CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include
- #include FT_FREETYPE_H
- #ifndef FT_CONFIG_OPTION_INFINALITY_PATCHSET
- #if TT_CONFIG_OPTION_SUBPIXEL_HINTING < 1
- #error Infinality not supported
- #endif
- #endif
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }; \
- as_fn_error $? "Infinality support requires infinality support in FreeType." "$LINENO" 5
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CFLAGS=$CFLAGS_SAVED
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- INFINALITY_SUPPORT=true
+ IMPROVED_FONT_RENDERING_SUPPORT=true
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-200203ccf4bb/common/autoconf/libraries.m4 new/icedtea8-forest-d5760f7cce54/common/autoconf/libraries.m4
--- old/icedtea8-forest-200203ccf4bb/common/autoconf/libraries.m4 2016-11-03 19:13:01.000000000 +0100
+++ new/icedtea8-forest-d5760f7cce54/common/autoconf/libraries.m4 2017-01-25 05:18:48.000000000 +0100
@@ -881,50 +881,34 @@
AC_MSG_CHECKING([whether to use fontconfig to provide better font rendering])
# default is no
- DEFAULT_INFINALITY=no
+ DEFAULT_IMPROVED_FONT_RENDERING=no
- AC_ARG_ENABLE([infinality], [AS_HELP_STRING([--enable-infinality],
+ AC_ARG_ENABLE([improved-font-rendering], [AS_HELP_STRING([--enable-improved-font-rendering],
[build with fontconfig-enhanced font rendering @<:@disabled@:>@])],
[
case "${enableval}" in
yes)
- enable_infinality=yes
+ enable_improved_font_rendering=yes
;;
*)
- enable_infinality=no
+ enable_improved_font_rendering=no
;;
esac
],
[
- enable_infinality=${DEFAULT_INFINALITY}
+ enable_improved_font_rendering=${DEFAULT_IMPROVED_FONT_RENDERING}
])
- AC_MSG_RESULT([$enable_infinality])
+ AC_MSG_RESULT([$enable_improved_font_rendering])
- if test "x${enable_infinality}" = "xyes"; then
+ if test "x${enable_improved_font_rendering}" = "xyes"; then
PKG_CHECK_MODULES(FONTCONFIG, fontconfig,[FONTCONFIG_FOUND=yes],[FONTCONFIG_FOUND=no])
if test "x${FONTCONFIG_FOUND}" = xno
then
- AC_MSG_ERROR([Could not find fontconfig; infinality support requires fontconfig.])
+ AC_MSG_ERROR([Could not find fontconfig; improved font rendering support requires fontconfig.])
fi
- AC_MSG_CHECKING([if FreeType is patched with infinality support])
- AC_LANG_PUSH([C])
- CFLAGS_SAVED=$CFLAGS
- CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #include
- #include FT_FREETYPE_H
- #ifndef FT_CONFIG_OPTION_INFINALITY_PATCHSET
- #if TT_CONFIG_OPTION_SUBPIXEL_HINTING < 1
- #error Infinality not supported
- #endif
- #endif
- ]])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); \
- AC_MSG_ERROR([Infinality support requires infinality support in FreeType.])])
- CFLAGS=$CFLAGS_SAVED
- AC_LANG_POP([C])
- INFINALITY_SUPPORT=true
+ IMPROVED_FONT_RENDERING_SUPPORT=true
fi
- AC_SUBST(INFINALITY_SUPPORT)
+ AC_SUBST(IMPROVED_FONT_RENDERING_SUPPORT)
###############################################################################
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-200203ccf4bb/common/autoconf/spec.gmk.in new/icedtea8-forest-d5760f7cce54/common/autoconf/spec.gmk.in
--- old/icedtea8-forest-200203ccf4bb/common/autoconf/spec.gmk.in 2016-11-03 19:13:01.000000000 +0100
+++ new/icedtea8-forest-d5760f7cce54/common/autoconf/spec.gmk.in 2017-01-25 05:18:48.000000000 +0100
@@ -338,6 +338,7 @@
NO_DELETE_NULL_POINTER_CHECKS_CFLAG=@NO_DELETE_NULL_POINTER_CHECKS_CFLAG@
NO_LIFETIME_DSE_CFLAG=@NO_LIFETIME_DSE_CFLAG@
CXXSTD_CXXFLAG=@CXXSTD_CXXFLAG@
+FP_CONTRACT_SUPPORTED=@FP_CONTRACT_SUPPORTED@
CXX:=@FIXPATH@ @CCACHE@ @CXX@
#CXXFLAGS:=@CXXFLAGS@
@@ -692,7 +693,7 @@
SCTP_LIBS:=@SCTP_LIBS@
SCTP_CFLAGS:=@SCTP_CFLAGS@
-INFINALITY_SUPPORT:=@INFINALITY_SUPPORT@
+IMPROVED_FONT_RENDERING:=@IMPROVED_FONT_RENDERING_SUPPORT@
FONTCONFIG_LIBS:=@FONTCONFIG_LIBS@
FONTCONFIG_CFLAGS:=@FONTCONFIG_CFLAGS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-200203ccf4bb/common/autoconf/toolchain.m4 new/icedtea8-forest-d5760f7cce54/common/autoconf/toolchain.m4
--- old/icedtea8-forest-200203ccf4bb/common/autoconf/toolchain.m4 2016-11-03 19:13:01.000000000 +0100
+++ new/icedtea8-forest-d5760f7cce54/common/autoconf/toolchain.m4 2017-01-25 05:18:48.000000000 +0100
@@ -1031,6 +1031,12 @@
CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
;;
esac
+
+ TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([-ffp-contract=off -Werror],
+ [FP_CONTRACT_SUPPORTED="true"],
+ [FP_CONTRACT_SUPPORTED="false"])
+ AC_SUBST([FP_CONTRACT_SUPPORTED])
+
TOOLCHAIN_CHECK_COMPILER_VERSION(6, TOOLCHAIN_SETUP_GCC6_COMPILER_FLAGS)
;;
ossc )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-200203ccf4bb/get_source.sh new/icedtea8-forest-d5760f7cce54/get_source.sh
--- old/icedtea8-forest-200203ccf4bb/get_source.sh 2016-11-03 19:13:01.000000000 +0100
+++ new/icedtea8-forest-d5760f7cce54/get_source.sh 2017-01-25 05:18:48.000000000 +0100
@@ -67,7 +67,7 @@
error "Could not locate Mercurial command"
fi
-hgversion="`hg --version 2> /dev/null | sed -n -e 's@^Mercurial Distributed SCM (version \([^+]*\).*)\$@\1@p'`"
+hgversion="`LANGUAGE=en hg --version 2> /dev/null | sed -n -e 's@^Mercurial Distributed SCM (version \([^+]*\).*)\$@\1@p'`"
if [ "x${hgversion}" = "x" ] ; then
error "Could not determine Mercurial version of $hgwhere"
fi