Hello community,
here is the log from the commit of package java-1_8_0-openjdk for
openSUSE:Factory checked in at 2019-07-23 22:31:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_8_0-openjdk"
Tue Jul 23 22:31:30 2019 rev:65 rq:716731 version:1.8.0.222
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes
2019-07-08 15:00:49.810516883 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new.4126/java-1_8_0-openjdk.changes
2019-07-23 22:31:32.231042203 +0200
@@ -1,0 +2,556 @@
+Fri Jul 19 06:28:01 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Update to version jdk8u222 (icedtea 3.13.0)
+ * Security fixes
+ + S8191073: JpegImageReader throws IndexOutOfBoundsException
+ when trying to read image data from tables-only image
+ + S8208698, CVE-2019-2745, bsc#1141784: Improved ECC
+ Implementation
+ + S8212328, CVE-2019-2762, bsc#1141782: Exceptional throw cases
+ + S8213431, CVE-2019-2766, bsc#1141789: Improve file protocol
+ handling
+ + S8213432, CVE-2019-2769, bsc#1141783: Better copies of
+ CopiesList
+ + S8216381, CVE-2019-2786, bsc#1141787: More limited privilege
+ usage
+ + S8217563: Improve realm maintenance
+ + S8218863: Better endpoint checks
+ + S8218873: Improve JSSE endpoint checking
+ + S8218876, CVE-2019-7317, bsc#1141780: Improve PNG support
+ options
+ + S8219018: Adjust positions of glyphs
+ + S8219020: Table alternate substitutions
+ + S8219775: Certificate validation improvements
+ + S8220192: Better outlook for SecureRandom
+ + S8220517: Enhanced GIF support
+ + S8221518, CVE-2019-2816, bsc#1141785: Normalize normalization
+ + S8223511, CVE-2019-2842, bsc#1141786: Extended AES support
+ * New features
+ + PR3743: Support EA builds
+ * Import of OpenJDK 8 u222 build 01
+ + S8022879: TEST_BUG: sun/nio/cs/MalformedSurrogates.java
+ fails intermittently
+ + S8025209: Intermittent test failure
+ java/net/Socket/asyncClose/AsyncClose.java
+ + S8030690: TEST_BUG java/nio/Buffer/Chars.java fails
+ intermittently
+ + S8031563: TEST_BUG:
+ java/nio/channels/Selector/ChangingInterests.java failed once
+ + S8031666: TEST_BUG: java/net/ipv6tests/UdpTest.java failed
+ because of SocketTimeoutException
+ + S8048782: OpenJDK: PiscesCache : xmax/ymax rounding up can
+ cause RasterFormatException
+ + S8055814: [TESTBUG] runtime/NMT/NMTWithCDS.java fails with
+ product builds due to missing UnlockDiagnosticVMOptions
+ + S8073078: java/nio/file/FileStore/Basic.java sensitive to
+ NFS configuration
+ + S8129988: JSSE should create a single instance of the
+ cacerts KeyStore
+ + S8137231: sun/security/rsa/SpecTest.java timeout with Agent
+ error: java.lang.Exception
+ + S8150013: ParNew: Prune nmethods scavengable list.
+ + S8151225: Mark SpecTest.java as intermittently failing
+ + S8154156: PPC64: improve array copy stubs by using vector
+ instructions
+ + S8156035: Remove intermittent key from
+ sun/security/rsa/SpecTest.java
+ + S8157287: java/nio/file/FileStore/Basic.java failed with
+ "java.nio.file.AccessDeniedException : /zones/zoneone/root "
+ + S8192854: FONTCONFIG_CFLAGS missing from spec.gmk.in
+ + S8202768: [macos] Appkit thread slows when any Window
+ Manager active
+ + S8203627: Swing applications with JRadioButton and JCheckbox
+ fail to render correctly when using GTK3 and the GTK L&F
+ + S8205916: [test] Fix jdk/tools/launcher/RunpathTest to
+ handle both, RPATH and RUNPATH
+ + S8206955: MethodHandleProxies.asInterfaceInstance does not
+ support default methods
+ + S8207760: SAXException: Invalid UTF-16 surrogate detected:
+ d83c ?
+ + S8209951: Problematic sparc intrinsic:
+ com.sun.crypto.provider.CipherBlockChaining
+ + S8213825: assert(false) failed: Non-balanced monitor
+ enter/exit! Likely JNI locking
+ + S8214109: XToolkit is not correctly displayed color on
+ 16-bit high color setting
+ + S8214111: There is no icon in all JOptionPane target image
+ + S8214112: The whole text in target JPasswordField image are
+ not selected
+ + S8214252: Expanded & Collapsed nodes of a JTree look the
+ same on GTK3
+ + S8214253: Tooltip is transparent rather than having a black
+ background
+ + S8217263: Automate DashOffset test
+ + S8217597: [TESTBUG] old version docker does not support
+ --cpus
+ + S8218469: JSlider display issue with slider for
+ GTKLookAndFeel
+ + S8218470: JScrollBar display issue with GTKLookAndFeel
+ + S8218472: JProgressBar display issue with GTKLookAndFeel
+ + S8218473: JOptionPane display issue with GTKLookAndFeel
+ + S8218479: JTextPane display issue with GTKLookAndFeel
+ + S8220349: The fix done for JDK-8214253 have caused issues in
+ JTree behaviour
+ + S8220718: Missing ResourceMark in nmethod::metadata_do
+ + S8221789: make reconfigure broken (jdk8u only)
+ + S8222965: Backport of JDK-8129988 broke the build
+ + S8222975: Fix 'release' file to reflect actual repo checkin
+ used to compile JDK
+ * Import of OpenJDK 8 u222 build 02
+ + S8134030: test/serviceability/dcmd/gc/HeapDumpTest fails to
+ verify the dump
+ + S8151539: Remove duplicate AlwaysTrueClosures
+ + S8176100: [REDO][REDO] G1 Needs pre barrier on dereference
+ of weak JNI handles
+ + S8210416: [linux] Poor StrictMath performance due to
+ non-optimized compilation
+ + S8217315: Proper units should print more significant digits
+ + S8218674: HTML Tooltip with "img=src" on component doesn't
+ show
+ * Import of OpenJDK 8 u222 build 03
+ + S7100957: SOCKS proxying does not work with IPv6 connections
+ + S7102541: RFE: os::set_native_thread_name() cleanups
+ + S8144332: HSDB could not terminate when close button is
+ pushed.
+ + S8151322: Implement os::set_native_thread_name() on Solaris
+ + S8154387: Parallel unordered Stream.limit() tries to collect
+ 128 elements even if limit is less
+ + S8189131: Open-source the Oracle JDK Root Certificates
+ + S8189949: Remove Baltimore Cybertrust Code Signing CA
+ + S8191031: Remove several Symantec Root CAs
+ + S8191844: Remove SECOM root (secomevrootca1)
+ + S8195774: Add Entrust root certificates
+ + S8195793: Remove GTE CyberTrust Global Root
+ + S8196141: Add GoDaddy root certificates
+ + S8199779: Add T-Systems, GlobalSign and Starfield services
+ root certificates
+ + S8204923: Restore Symantec root verisignclass2g2ca
+ + S8209506: Add Google Trust Services GlobalSign root
+ certificates
+ + S8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans
+ compiled without optimization
+ + S8210432: Add additional TeliaSonera root certificate
+ + S8213213: Remove
+ src/java.desktop/unix/classes/sun/awt/X11/keysym2ucs.h
+ + S8214770: java/time/test/java/time/format/
+ /TestNonIsoFormatter.java failed in non-english locales.
+ + S8216577: Add GlobalSign's R6 Root certificate
+ + S8218152: [javac] fails and exits with no error if a bad
+ annotation processor provided
+ + S8222136: Remove two Comodo root CA certificates that are
+ expiring
+ + S8222137: Remove T-Systems root CA certificate
+ + S8223555: Cleanups in cacerts tests
+ + S8223664: Add jtreg tests for 8223528, backport to jdk8u of
+ 8176100
+ * Import of OpenJDK 8 u222 build 04
+ + S8158232: PPC64: improve byte, int and long array copy stubs
+ by using VSX instructions
+ + S8190974: Parallel stream execution within a custom
+ ForkJoinPool should obey the parallelism
+ + S8203190: SessionId.hashCode generates too many collisions
+ + S8223499: Remove two DocuSign root certificates that are
+ expiring
+ + S8223883: Fix jni.cpp copyright date after 8223528
+ * Import of OpenJDK 8 u222 build 05
+ + S8019816: [TEST_BUG][macosx] closed/java/awt/BasicStroke/
+ /DashZeroWidth.java not on EDT
+ + S8044289: In ImageIO.write() and ImageIO.read() null stream
+ is not handled properly.
+ + S8055705: Rename UnixPrintServiceLookup and
+ Win32PrintServiceLookup as a platform neutral class name
+ + S8059575: JEP-JDK-8043304: Test task: Tiered Compilation
+ level transition tests
+ + S8075939: Stream.flatMap() causes breaking of
+ short-circuiting of terminal operations
+ + S8143097: java/net/ipv6tests/UdpTest.java fails
+ intermittently with "checkTime failed: got 1998 expected 4000"
+ + S8151226: Mark UdpTest.java as intermittently failing
+ + S8166684: PPC64: implement intrinsic code with vector
+ instructions for Unsafe.copyMemory()
+ + S8185969: PPC64: Improve VSR support to use up to 64
+ registers
+ + S8193830: Xalan Update: Xalan Java 2.7.2
+ + S8196775: java/net/Socket/asyncClose/Race.java failed
+ intermittently on Windows with ConnectException: Connection
+ refused
+ + S8202414: Unsafe write after primitive array creation may
+ result in array length change
+ + S8202651: Test ComodoCA.java fails
+ + S8204929: Fonts with embedded bitmaps are not always rotated
+ + S8210886: Remove references in xwindows.md to non-existent
+ files.
+ + S8210985: Update the default SSL session cache size to 20480
+ + S8213183: InputMethod cannot be used after its restarting
+ + S8214765: All TrayIcon MessageType icons does not show up
+ with gtk3 option set
+ + S8218020: Back out accidental changes that belong elsewhere
+ + S8218020: Fix version number in mesa.md 3rd party legal file
+ + S8220495: Update GIFlib library to the 5.1.8
+ + S8222670: pathological case of JIT recompilation and code
+ cache bloat
+ + S8223537: testlibrary_tests/ctw/ClassesListTest.java fails
+ with Agent timeout frequently
+ + S8224727: Problem list test security/infra/java/security/
+ /cert/CertPathValidator/certification/ActalisCA.java
+ + S8225065: Revert 8221166 (8u backport of 8048782)
+ * Import of OpenJDK 8 u222 build 06
++++ 359 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.4126/java-1_8_0-openjdk.changes
Old:
----
aarch64.patch
icedtea-3.12.0.tar.xz
New:
----
icedtea-3.13.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_8_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.QTwjxY/_old 2019-07-23 22:31:34.839041824 +0200
+++ /var/tmp/diff_new_pack.QTwjxY/_new 2019-07-23 22:31:34.839041824 +0200
@@ -18,7 +18,7 @@
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
%global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64} %{arm}
-%global icedtea_version 3.12.0
+%global icedtea_version 3.13.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,8 +32,8 @@
# priority must be 6 digits in total
%global priority 1805
%global javaver 1.8.0
-%global updatever 212
-%global buildver 4
+%global updatever 222
+%global buildver 10
# Standard JPackage directories and symbolic links.
%global sdklnk java-%{javaver}-openjdk
%global archname %{sdklnk}
@@ -194,7 +194,6 @@
Patch1001: java-1_8_0-openjdk-suse-desktop-files.patch
Patch1002: icedtea-3.8.0-s390.patch
Patch2001: disable-doclint-by-default.patch
-Patch2002: aarch64.patch
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
@@ -525,7 +524,6 @@
%endif
patch -p0 -i %{PATCH2001}
-patch -p0 -i %{PATCH2002}
(cd openjdk/common/autoconf
bash ./autogen.sh
++++++ aarch32.tar.xz ++++++
/work/SRC/openSUSE:Factory/java-1_8_0-openjdk/aarch32.tar.xz
/work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new.4126/aarch32.tar.xz differ:
char 26, line 1
++++++ corba.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/corba-fa1553d2f23e/.hgtags
new/corba-24a4cc7d7de6/.hgtags
--- old/corba-fa1553d2f23e/.hgtags 2019-04-18 04:46:14.000000000 +0200
+++ new/corba-24a4cc7d7de6/.hgtags 2019-07-17 23:16:05.000000000 +0200
@@ -1080,8 +1080,22 @@
e46810124822721115f5bc683fed7d1cb3600290 jdk8u202-b26
6aced976491d8f592e1d102eb222d29ea64fbd84 jdk8u202-ga
2a7ec282f0ce1523347a9c9e08189139bfc097db jdk8u212-b00
+e41d4e43109e239cd13219b53798fdad651f63ef jdk8u222-b00
e41d4e43109e239cd13219b53798fdad651f63ef jdk8u212-b01
5d11a79b0bf5560625ec67efd40e9167a594b00d jdk8u212-b02
b6ed07cab3f88f5ff1c18ff26d27644102b6d63c jdk8u212-b03
7bcc11914fc5d23b20b9ee7fed6abc140eaab2cf jdk8u212-b04
b6ed07cab3f88f5ff1c18ff26d27644102b6d63c jdk8u212-ga
+fa1553d2f23ec1245aaa6750d6e10019fc911f96 icedtea-3.12.0
+84cd6d251c41e399b526a39da5cd2dea3efe5ff6 jdk8u222-b01
+0c183329d0f6f692c6175afe13f8b1434152d381 jdk8u222-b02
+4c7079509eecb3127b5ddae9454dd6aab5a23e4d jdk8u222-b03
+1b43db192b995f83f540a68363e13a633aac25f4 jdk8u222-b04
+5837b825d94bd4fbc1bff28099810e8bcb1e848a jdk8u222-b05
+74bdd387f873523cae121fa48056fb662e289679 jdk8u222-b06
+3abf299d26c40608af206c3b43c35b7ab2aade07 jdk8u222-b07
+d8e58175603e92f46baa775c878cf346181cafed jdk8u222-b08
+60d5ceb1043500475c41501de673b9582ef4d97b jdk8u222-b09
+d44170c2cecec81b5f328d40529cb78bfd0bbb1c jdk8u222-b10
+d44170c2cecec81b5f328d40529cb78bfd0bbb1c jdk8u222-ga
+1c3cdc66dde5c9a853f7c21ce817f86f30c9aa62 icedtea-3.13.0pre01
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/corba-fa1553d2f23e/THIRD_PARTY_README
new/corba-24a4cc7d7de6/THIRD_PARTY_README
--- old/corba-fa1553d2f23e/THIRD_PARTY_README 2019-04-18 04:46:14.000000000
+0200
+++ new/corba-24a4cc7d7de6/THIRD_PARTY_README 2019-07-17 23:16:05.000000000
+0200
@@ -1612,7 +1612,7 @@
-------------------------------------------------------------------------------
-%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3,
+%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3,
which may be included with JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE ---
@@ -1682,7 +1682,7 @@
--- begin of LICENSE ---
Mesa 3-D graphics library
- Version: 4.1
+ Version: 5.0
Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
@@ -2797,61 +2797,8 @@
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from the X Consortium.
-___________________________
-The files in motif/lib/Xm/util included this copyright:mkdirhier.man,
-xmkmf.man, chownxterm.c, makeg.man, mergelib.cpp, lndir.man, makestrs.man,
-checktree.c, lndir.c, makestrs.c
-Copyright (c) 1993, 1994 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealing in this Software without prior written authorization from the
-X Consortium.
-_____________________________
-Xmos_r.h:
-/*
-Copyright (c) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-*/
+--- end of LICENSE ---
_____________________________
Copyright notice for HPkeysym.h:
/*
@@ -2906,55 +2853,6 @@
performance, or use of this material.
*/
-_____________________________________
-Copyright notice in keysym2ucs.h:
-
-Copyright 1987, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
-
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-*/
--- end of LICENSE ---
@@ -3000,7 +2898,7 @@
Apache Jakarta BCEL 5.1
Apache Jakarta Regexp 1.4
Apache Santuario XML Security for Java 1.5.4
- Apache Xalan-Java 2.7.1
+ Apache Xalan-Java 2.7.2
Apache Xerces Java 2.10.0
Apache XML Resolver 1.1
++++++ 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.4126/hotspot.tar.xz differ:
char 26, line 1
++++++ icedtea-3.12.0.tar.xz -> icedtea-3.13.0.tar.xz ++++++
++++ 2292 lines of diff (skipped)
++++++ jaxp.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaxp-7a977b82f34c/.hgtags
new/jaxp-7f4569c121d6/.hgtags
--- old/jaxp-7a977b82f34c/.hgtags 2019-04-18 04:46:15.000000000 +0200
+++ new/jaxp-7f4569c121d6/.hgtags 2019-07-17 23:16:06.000000000 +0200
@@ -1044,8 +1044,22 @@
a14b334da6a14ff6c800888b31a621671ddedcd4 jdk8u202-b26
6c6166477778069fbb8bddda0b2bd490c5165fe4 jdk8u202-ga
58a54ab25e5201d29fea1ed1e165c95ce479f5cf jdk8u212-b00
+22d26c0a8eb7ddfdbebf835c59b07e8b8da47359 jdk8u222-b00
22d26c0a8eb7ddfdbebf835c59b07e8b8da47359 jdk8u212-b01
8b263aef666d72459ac637e3ff19554c9fb4e7ca jdk8u212-b02
7dca173f654edf0720e62b72ef750c673bc6ebfe jdk8u212-b03
90f8352e7f0642918735d66c38b3c6c44473691a jdk8u212-b04
7dca173f654edf0720e62b72ef750c673bc6ebfe jdk8u212-ga
+7a977b82f34cca95d43247603e1fad0a21d08f6d icedtea-3.12.0
+c3b532bf906c9a55952a22dd39b42b711411cbc0 jdk8u222-b01
+e0ba0b931da8259728a6a14366734b3f1fcb40bc jdk8u222-b02
+33e1a4d78f739eab0cedb232cdc4b328d5867d00 jdk8u222-b03
+8ea2487d70605fcea46ab51b91911b46f8f5035b jdk8u222-b04
+de624afa6e750486bc1ea3e59bf9fb7de24b1379 jdk8u222-b05
+e18fe3687a512b39b08d7d8e288b06cfd7e18840 jdk8u222-b06
+08cd0a82185d3aaa614d628977e1809d6b4879cf jdk8u222-b07
+2b416473fe205b3abea19b8de53d948fbe4f67f1 jdk8u222-b08
+60d685ed9d5bb2eb4847d6e6e4237565fe40089b jdk8u222-b09
+268ffbdb01e136ccd78a5f3f8c8aa2d58e71fcb5 jdk8u222-b10
+268ffbdb01e136ccd78a5f3f8c8aa2d58e71fcb5 jdk8u222-ga
+9862aa380ee4db1b3cfad412640d459c74462581 icedtea-3.13.0pre01
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaxp-7a977b82f34c/THIRD_PARTY_README
new/jaxp-7f4569c121d6/THIRD_PARTY_README
--- old/jaxp-7a977b82f34c/THIRD_PARTY_README 2019-04-18 04:46:15.000000000
+0200
+++ new/jaxp-7f4569c121d6/THIRD_PARTY_README 2019-07-17 23:16:06.000000000
+0200
@@ -1612,7 +1612,7 @@
-------------------------------------------------------------------------------
-%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3,
+%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3,
which may be included with JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE ---
@@ -1682,7 +1682,7 @@
--- begin of LICENSE ---
Mesa 3-D graphics library
- Version: 4.1
+ Version: 5.0
Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
@@ -2797,61 +2797,8 @@
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from the X Consortium.
-___________________________
-The files in motif/lib/Xm/util included this copyright:mkdirhier.man,
-xmkmf.man, chownxterm.c, makeg.man, mergelib.cpp, lndir.man, makestrs.man,
-checktree.c, lndir.c, makestrs.c
-Copyright (c) 1993, 1994 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealing in this Software without prior written authorization from the
-X Consortium.
-_____________________________
-Xmos_r.h:
-/*
-Copyright (c) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-*/
+--- end of LICENSE ---
_____________________________
Copyright notice for HPkeysym.h:
/*
@@ -2906,55 +2853,6 @@
performance, or use of this material.
*/
-_____________________________________
-Copyright notice in keysym2ucs.h:
-
-Copyright 1987, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
-
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-*/
--- end of LICENSE ---
@@ -3000,7 +2898,7 @@
Apache Jakarta BCEL 5.1
Apache Jakarta Regexp 1.4
Apache Santuario XML Security for Java 1.5.4
- Apache Xalan-Java 2.7.1
+ Apache Xalan-Java 2.7.2
Apache Xerces Java 2.10.0
Apache XML Resolver 1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xalan/internal/Version.java
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xalan/internal/Version.java
--- old/jaxp-7a977b82f34c/src/com/sun/org/apache/xalan/internal/Version.java
2019-04-18 04:46:15.000000000 +0200
+++ new/jaxp-7f4569c121d6/src/com/sun/org/apache/xalan/internal/Version.java
2019-07-17 23:16:06.000000000 +0200
@@ -121,7 +121,7 @@
*/
public static int getMaintenanceVersionNum()
{
- return 0;
+ return 2;
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java
---
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java
2019-04-18 04:46:15.000000000 +0200
+++
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java
2019-07-17 23:16:06.000000000 +0200
@@ -100,20 +100,19 @@
* the specified method is found in the specifed class.
*/
private boolean hasMethods() {
- LiteralExpr arg = (LiteralExpr)_arg;
// Get the class name from the namespace uri
String className = getClassNameFromUri(_namespaceOfFunct);
// Get the method name from the argument to function-available
String methodName = null;
- int colonIndex = _nameOfFunct.indexOf(":");
+ int colonIndex = _nameOfFunct.indexOf(':');
if (colonIndex > 0) {
String functionName = _nameOfFunct.substring(colonIndex+1);
int lastDotIndex = functionName.lastIndexOf('.');
if (lastDotIndex > 0) {
methodName = functionName.substring(lastDotIndex+1);
- if (className != null && !className.equals(""))
+ if (className != null && className.length() != 0)
className = className + "." + functionName.substring(0,
lastDotIndex);
else
className = functionName.substring(0, lastDotIndex);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java
---
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java
2019-04-18 04:46:15.000000000 +0200
+++
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java
2019-07-17 23:16:06.000000000 +0200
@@ -65,7 +65,7 @@
private AttributeValue _order;
private AttributeValue _caseOrder;
private AttributeValue _dataType;
- private String _lang; // bug! see 26869
+ private AttributeValue _lang; // bug! see 26869, see XALANJ-2546
private String _className = null;
private ArrayList<VariableRefBase> _closureVars = null;
@@ -153,13 +153,11 @@
}
_dataType = AttributeValue.create(this, val, parser);
- _lang = getAttribute("lang"); // bug! see 26869
- // val = getAttribute("lang");
- // _lang = AttributeValue.create(this, val, parser);
+ val = getAttribute("lang");
+ _lang = AttributeValue.create(this, val, parser);
// Get the case order; default is language dependant
- val = getAttribute("case-order");
- _caseOrder = AttributeValue.create(this, val, parser);
-
+ val = getAttribute("case-order");
+ _caseOrder = AttributeValue.create(this, val, parser);
}
/**
@@ -178,6 +176,7 @@
_order.typeCheck(stable);
_caseOrder.typeCheck(stable);
_dataType.typeCheck(stable);
+ _lang.typeCheck(stable);
return Type.Void;
}
@@ -195,16 +194,14 @@
_order.translate(classGen, methodGen);
}
- public void translateCaseOrder(ClassGenerator classGen,
+ public void translateCaseOrder(ClassGenerator classGen,
MethodGenerator methodGen) {
- _caseOrder.translate(classGen, methodGen);
+ _caseOrder.translate(classGen, methodGen);
}
public void translateLang(ClassGenerator classGen,
MethodGenerator methodGen) {
- final ConstantPoolGen cpg = classGen.getConstantPool();
- final InstructionList il = methodGen.getInstructionList();
- il.append(new PUSH(cpg, _lang)); // bug! see 26869
+ _lang.translate(classGen, methodGen);
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java
---
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java
2019-04-18 04:46:15.000000000 +0200
+++
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java
2019-07-17 23:16:06.000000000 +0200
@@ -570,7 +570,7 @@
if (_openElementName != null) {
int index;
- if ((index =_openElementName.indexOf(":")) < 0)
+ if ((index =_openElementName.indexOf(':')) < 0)
_dom.startElement(null, _openElementName, _openElementName,
_attributes);
else {
String uri
=_dom.getNamespaceURI(_openElementName.substring(0,index));
@@ -682,7 +682,7 @@
public void addAttribute(String qName, String value)
{
// "prefix:localpart" or "localpart"
- int colonpos = qName.indexOf(":");
+ int colonpos = qName.indexOf(':');
String uri = EMPTY_STRING;
String localName = qName;
if (colonpos >0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
---
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
2019-04-18 04:46:15.000000000 +0200
+++
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
2019-07-17 23:16:06.000000000 +0200
@@ -1421,8 +1421,8 @@
* This method should only be invoked if the name attribute is an AVT
*/
public static void checkAttribQName(String name) {
- final int firstOccur = name.indexOf(":");
- final int lastOccur = name.lastIndexOf(":");
+ final int firstOccur = name.indexOf(':');
+ final int lastOccur = name.lastIndexOf(':');
final String localName = name.substring(lastOccur + 1);
if (firstOccur > 0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java
---
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java
2019-04-18 04:46:15.000000000 +0200
+++
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java
2019-07-17 23:16:06.000000000 +0200
@@ -359,7 +359,7 @@
while (low <= high)
{
- int mid = (low + high) / 2;
+ int mid = (low + high) >>> 1;
int c = list[mid];
if (c > value)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java
---
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java
2019-04-18 04:46:15.000000000 +0200
+++
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java
2019-07-17 23:16:06.000000000 +0200
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -43,6 +42,7 @@
* because it is used from another package.
*
* @xsl.usage internal
+ * @LastModified: Sept 2018
*/
public final class ToHTMLStream extends ToStream
{
@@ -1021,7 +1021,7 @@
String name,
String value,
ElemDesc elemDesc)
- throws IOException
+ throws IOException, SAXException
{
writer.write(' ');
@@ -1345,7 +1345,7 @@
*/
public void writeAttrString(
final java.io.Writer writer, String string, String encoding)
- throws IOException
+ throws IOException, SAXException
{
final int end = string.length();
if (end > m_attrBuff.length)
@@ -1397,13 +1397,16 @@
}
else
{
- if (Encodings.isHighUTF16Surrogate(ch))
+ if (Encodings.isHighUTF16Surrogate(ch) ||
+ Encodings.isLowUTF16Surrogate(ch))
{
-
- writeUTF16Surrogate(ch, chars, i, end);
- i++; // two input characters processed
- // this increments by one and the for()
- // loop itself increments by another one.
+ if (writeUTF16Surrogate(ch, chars, i, end) >= 0) {
+ // move the index if the low surrogate is consumed
+ // as writeUTF16Surrogate has written the pair
+ if (Encodings.isHighUTF16Surrogate(ch)) {
+ i++;
+ }
+ }
}
// The next is kind of a hack to keep from escaping in the
case
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xml/internal/serializer/ToStream.java
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xml/internal/serializer/ToStream.java
---
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xml/internal/serializer/ToStream.java
2019-04-18 04:46:15.000000000 +0200
+++
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xml/internal/serializer/ToStream.java
2019-07-17 23:16:06.000000000 +0200
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -51,6 +50,7 @@
* serializers (xml, html, text ...) that write output to a stream.
*
* @xsl.usage internal
+ * @LastModified: Sept 2018
*/
abstract public class ToStream extends SerializerBase
{
@@ -200,6 +200,7 @@
*/
private boolean m_expandDTDEntities = true;
+ private char m_highSurrogate = 0;
/**
* Default constructor
@@ -947,45 +948,46 @@
* @param ch Character array.
* @param i position Where the surrogate was detected.
* @param end The end index of the significant characters.
- * @return 0 if the pair of characters was written out as-is,
- * the unicode code point of the character represented by
- * the surrogate pair if an entity reference with that value
- * was written out.
+ * @return the status of writing a surrogate pair.
+ * -1 -- nothing is written
+ * 0 -- the pair is written as-is
+ * code point -- the pair is written as an entity reference
*
* @throws IOException
* @throws org.xml.sax.SAXException if invalid UTF-16 surrogate detected.
*/
protected int writeUTF16Surrogate(char c, char ch[], int i, int end)
- throws IOException
+ throws IOException, SAXException
{
- int codePoint = 0;
+ int status = -1;
if (i + 1 >= end)
{
- throw new IOException(
- Utils.messages.createMessage(
- MsgKey.ER_INVALID_UTF16_SURROGATE,
- new Object[] { Integer.toHexString((int) c)}));
+ m_highSurrogate = c;
+ return status;
+ }
+
+ char high, low;
+ if (m_highSurrogate == 0) {
+ high = c;
+ low = ch[i+1];
+ status = 0;
+ } else {
+ high = m_highSurrogate;
+ low = c;
+ m_highSurrogate = 0;
}
- final char high = c;
- final char low = ch[i+1];
if (!Encodings.isLowUTF16Surrogate(low)) {
- throw new IOException(
- Utils.messages.createMessage(
- MsgKey.ER_INVALID_UTF16_SURROGATE,
- new Object[] {
- Integer.toHexString((int) c)
- + " "
- + Integer.toHexString(low)}));
+ throwIOE(high, low);
}
final java.io.Writer writer = m_writer;
// If we make it to here we have a valid high, low surrogate pair
- if (m_encodingInfo.isInEncoding(c,low)) {
+ if (m_encodingInfo.isInEncoding(high,low)) {
// If the character formed by the surrogate pair
// is in the encoding, so just write it out
- writer.write(ch,i,2);
+ writer.write(new char[]{high, low}, 0, 2);
}
else {
// Don't know what to do with this char, it is
@@ -993,24 +995,16 @@
// a surrogate pair, so write out as an entity ref
final String encoding = getEncoding();
if (encoding != null) {
- /* The output encoding is known,
- * so somthing is wrong.
- */
- codePoint = Encodings.toCodePoint(high, low);
- // not in the encoding, so write out a character reference
- writer.write('&');
- writer.write('#');
- writer.write(Integer.toString(codePoint));
- writer.write(';');
+ status = writeCharRef(writer, high, low);
} else {
/* The output encoding is not known,
* so just write it out as-is.
*/
- writer.write(ch, i, 2);
+ writer.write(new char[]{high, low}, 0, 2);
}
}
// non-zero only if character reference was written out.
- return codePoint;
+ return status;
}
/**
@@ -1100,32 +1094,7 @@
}
else if (isCData && (!escapingNotNeeded(c)))
{
- // if (i != 0)
- if (m_cdataTagOpen)
- closeCDATA();
-
- // This needs to go into a function...
- if (Encodings.isHighUTF16Surrogate(c))
- {
- writeUTF16Surrogate(c, ch, i, end);
- i++ ; // process two input characters
- }
- else
- {
- writer.write("&#");
-
- String intStr = Integer.toString((int) c);
-
- writer.write(intStr);
- writer.write(';');
- }
-
- // if ((i != 0) && (i < (end - 1)))
- // if (!m_cdataTagOpen && (i < (end - 1)))
- // {
- // writer.write(CDATA_DELIMITER_OPEN);
- // m_cdataTagOpen = true;
- // }
+ i = handleEscaping(writer, c, ch, i, end);
}
else if (
isCData
@@ -1149,29 +1118,44 @@
}
writer.write(c);
}
-
- // This needs to go into a function...
- else if (Encodings.isHighUTF16Surrogate(c))
- {
- if (m_cdataTagOpen)
- closeCDATA();
- writeUTF16Surrogate(c, ch, i, end);
- i++; // process two input characters
+ else {
+ i = handleEscaping(writer, c, ch, i, end);
}
- else
- {
- if (m_cdataTagOpen)
- closeCDATA();
- writer.write("&#");
+ }
+ }
- String intStr = Integer.toString((int) c);
+ }
- writer.write(intStr);
- writer.write(';');
+ /**
+ * Handles escaping, writes either with a surrogate pair or a character
+ * reference.
+ *
+ * @param c the current char
+ * @param ch the character array
+ * @param i the current position
+ * @param end the end index of the array
+ * @return the next index
+ *
+ * @throws IOException
+ * @throws org.xml.sax.SAXException if invalid UTF-16 surrogate detected.
+ */
+ private int handleEscaping(Writer writer, char c, char ch[], int i, int
end)
+ throws IOException, SAXException {
+ if (Encodings.isHighUTF16Surrogate(c) ||
Encodings.isLowUTF16Surrogate(c))
+ {
+ if (writeUTF16Surrogate(c, ch, i, end) >= 0) {
+ // move the index if the low surrogate is consumed
+ // as writeUTF16Surrogate has written the pair
+ if (Encodings.isHighUTF16Surrogate(c)) {
+ i++ ;
}
}
}
-
+ else
+ {
+ writeCharRef(writer, c);
+ }
+ return i;
}
/**
@@ -1242,7 +1226,7 @@
}
m_ispreserve = true;
- if (shouldIndent())
+ if (!m_cdataTagOpen && shouldIndent())
indent();
boolean writeCDataBrackets =
@@ -1564,7 +1548,7 @@
int i,
char ch,
int lastDirty,
- boolean fromTextNode) throws IOException
+ boolean fromTextNode) throws IOException, SAXException
{
int startClean = lastDirty + 1;
// if we have some clean characters accumulated
@@ -1643,54 +1627,41 @@
int len,
boolean fromTextNode,
boolean escLF)
- throws IOException
+ throws IOException, SAXException
{
int pos = accumDefaultEntity(writer, ch, i, chars, len, fromTextNode,
escLF);
if (i == pos)
{
+ if (m_highSurrogate != 0) {
+ if (!(Encodings.isLowUTF16Surrogate(ch))) {
+ throwIOE(m_highSurrogate, ch);
+ }
+ writeCharRef(writer, m_highSurrogate, ch);
+ m_highSurrogate = 0;
+ return ++pos;
+ }
+
if (Encodings.isHighUTF16Surrogate(ch))
{
-
- // Should be the UTF-16 low surrogate of the hig/low pair.
- char next;
- // Unicode code point formed from the high/low pair.
- int codePoint = 0;
-
if (i + 1 >= len)
{
- throw new IOException(
- Utils.messages.createMessage(
- MsgKey.ER_INVALID_UTF16_SURROGATE,
- new Object[] { Integer.toHexString(ch)}));
- //"Invalid UTF-16 surrogate detected: "
-
- //+Integer.toHexString(ch)+ " ?");
+ // save for the next read
+ m_highSurrogate = ch;
+ pos++;
}
else
{
- next = chars[++i];
+ // the next should be the UTF-16 low surrogate of the
hig/low pair.
+ char next = chars[++i];
if (!(Encodings.isLowUTF16Surrogate(next)))
- throw new IOException(
- Utils.messages.createMessage(
- MsgKey
- .ER_INVALID_UTF16_SURROGATE,
- new Object[] {
- Integer.toHexString(ch)
- + " "
- + Integer.toHexString(next)}));
- //"Invalid UTF-16 surrogate detected: "
+ throwIOE(ch, next);
- //+Integer.toHexString(ch)+" "+Integer.toHexString(next));
- codePoint = Encodings.toCodePoint(ch,next);
+ writeCharRef(writer, ch, next);
+ pos += 2; // count the two characters that went into
writing out this entity
}
-
- writer.write("&#");
- writer.write(Integer.toString(codePoint));
- writer.write(';');
- pos += 2; // count the two characters that went into writing
out this entity
}
else
{
@@ -1702,18 +1673,14 @@
if (isCharacterInC0orC1Range(ch) ||
(XMLVERSION11.equals(getVersion()) &&
isNELorLSEPCharacter(ch)))
{
- writer.write("&#");
- writer.write(Integer.toString(ch));
- writer.write(';');
+ writeCharRef(writer, ch);
}
else if ((!escapingNotNeeded(ch) ||
( (fromTextNode && m_charInfo.isSpecialTextChar(ch))
|| (!fromTextNode && m_charInfo.isSpecialAttrChar(ch))))
- && m_elemContext.m_currentElemDepth > 0)
+ && m_elemContext.m_currentElemDepth > 0)
{
- writer.write("&#");
- writer.write(Integer.toString(ch));
- writer.write(';');
+ writeCharRef(writer, ch);
}
else
{
@@ -1727,6 +1694,45 @@
}
/**
+ * Writes out a character reference.
+ * @param writer the writer
+ * @param c the character
+ * @throws IOException
+ */
+ private void writeCharRef(Writer writer, char c) throws IOException,
SAXException {
+ if (m_cdataTagOpen)
+ closeCDATA();
+ writer.write("&#");
+ writer.write(Integer.toString(c));
+ writer.write(';');
+ }
+
+ /**
+ * Writes out a pair of surrogates as a character reference
+ * @param writer the writer
+ * @param high the high surrogate
+ * @param low the low surrogate
+ * @throws IOException
+ */
+ private int writeCharRef(Writer writer, char high, char low) throws
IOException, SAXException {
+ if (m_cdataTagOpen)
+ closeCDATA();
+ // Unicode code point formed from the high/low pair.
+ int codePoint = Encodings.toCodePoint(high, low);
+ writer.write("&#");
+ writer.write(Integer.toString(codePoint));
+ writer.write(';');
+ return codePoint;
+ }
+
+ private void throwIOE(char ch, char next) throws IOException {
+ throw new IOException(Utils.messages.createMessage(
+ MsgKey.ER_INVALID_UTF16_SURROGATE,
+ new Object[] {Integer.toHexString(ch) + " "
+ + Integer.toHexString(next)}));
+ }
+
+ /**
* Receive notification of the beginning of an element, although this is a
* SAX method additional namespace or attribute information can occur
before
* or after this call, that is associated with this element.
@@ -1962,7 +1968,7 @@
Writer writer,
String string,
String encoding)
- throws IOException
+ throws IOException, SAXException
{
final int len = string.length();
if (len > m_attrBuff.length)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xml/internal/serializer/ToTextStream.java
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xml/internal/serializer/ToTextStream.java
---
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xml/internal/serializer/ToTextStream.java
2019-04-18 04:46:15.000000000 +0200
+++
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xml/internal/serializer/ToTextStream.java
2019-07-17 23:16:06.000000000 +0200
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -35,6 +34,7 @@
* This class converts SAX or SAX-like calls to a
* serialized document for xsl:output method of "text".
* @xsl.usage internal
+ * @LastModified: Sept 2018
*/
public final class ToTextStream extends ToStream
{
@@ -296,23 +296,32 @@
} else if (m_encodingInfo.isInEncoding(c)) {
writer.write(c);
// one input char processed
- } else if (Encodings.isHighUTF16Surrogate(c)) {
+ } else if (Encodings.isHighUTF16Surrogate(c) ||
+ Encodings.isLowUTF16Surrogate(c)) {
final int codePoint = writeUTF16Surrogate(c, ch, i, end);
- if (codePoint != 0) {
- // I think we can just emit the message,
- // not crash and burn.
- final String integralValue = Integer.toString(codePoint);
- final String msg = Utils.messages.createMessage(
- MsgKey.ER_ILLEGAL_CHARACTER,
- new Object[] { integralValue, encoding });
-
- //Older behavior was to throw the message,
- //but newer gentler behavior is to write a message to
System.err
- //throw new SAXException(msg);
- System.err.println(msg);
-
+ if (codePoint >= 0) {
+ // move the index if the low surrogate is consumed
+ // as writeUTF16Surrogate has written the pair
+ if (Encodings.isHighUTF16Surrogate(c)) {
+ i++;
+ }
+
+ // printing to the console is not appropriate, but will
leave
+ // it as is for compatibility.
+ if (codePoint >0) {
+ // I think we can just emit the message,
+ // not crash and burn.
+ final String integralValue =
Integer.toString(codePoint);
+ final String msg = Utils.messages.createMessage(
+ MsgKey.ER_ILLEGAL_CHARACTER,
+ new Object[] { integralValue, encoding });
+
+ //Older behavior was to throw the message,
+ //but newer gentler behavior is to write a message to
System.err
+ //throw new SAXException(msg);
+ System.err.println(msg);
+ }
}
- i++; // two input chars processed
} else {
// Don't know what to do with this char, it is
// not in the encoding and not a high char in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xml/internal/utils/NodeVector.java
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xml/internal/utils/NodeVector.java
---
old/jaxp-7a977b82f34c/src/com/sun/org/apache/xml/internal/utils/NodeVector.java
2019-04-18 04:46:15.000000000 +0200
+++
new/jaxp-7f4569c121d6/src/com/sun/org/apache/xml/internal/utils/NodeVector.java
2019-07-17 23:16:06.000000000 +0200
@@ -670,9 +670,9 @@
/*
* Pick a pivot and move it out of the way
*/
- int pivot = a[(lo + hi) / 2];
-
- a[(lo + hi) / 2] = a[hi];
+ int mid = (lo + hi) >>> 1;
+ int pivot = a[mid];
+ a[mid] = a[hi];
a[hi] = pivot;
while (lo < hi)
++++++ jaxws.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaxws-752d9e54c69a/.hgtags
new/jaxws-1c6f4ebde697/.hgtags
--- old/jaxws-752d9e54c69a/.hgtags 2019-04-18 04:46:16.000000000 +0200
+++ new/jaxws-1c6f4ebde697/.hgtags 2019-07-17 23:16:07.000000000 +0200
@@ -1038,8 +1038,22 @@
81d8126f05e5290e3974d4f3ea7360481676a78c jdk8u202-b26
99fbc435f2faedf1dd68e80d679ebf4abd8c98c9 jdk8u202-ga
d5402443e9392243c6de6b6d7d7453364d7f9dc1 jdk8u212-b00
+5f9530ebac26be622a64638b669ba13030a6a2b2 jdk8u222-b00
5f9530ebac26be622a64638b669ba13030a6a2b2 jdk8u212-b01
b6ace99fbdc10bac6c84b0dbce5bfee6d13e2888 jdk8u212-b02
edd8659683b4aeca051e32f9a9da2c6c1f4c1313 jdk8u212-b03
f8ab1759ad91015f7caf41d7b515423fb8600c0f jdk8u212-b04
edd8659683b4aeca051e32f9a9da2c6c1f4c1313 jdk8u212-ga
+752d9e54c69a3f31c7792f0350b646d96f4ad7ba icedtea-3.12.0
+70d757a2a4e13a4af4bc5e6b77126c6d3a3d461e jdk8u222-b01
+b57a4deb3aca5d6b2d39e6fe6bbe83fdede74f7f jdk8u222-b02
+31929fd23ea7d37ace8ec4d2efb7bcf8fa72cce9 jdk8u222-b03
+6c1de4345dc782e20f14ec1e3cfbdb3a63c68c0e jdk8u222-b04
+bd5323b37905fc22dc5cddd32384ad9e46feca6e jdk8u222-b05
+dfe2ef52003ccd228f05d3d8e18f26eafda88ae1 jdk8u222-b06
+2fa997404a5c0ef884a6eb86ca3df2fbc3346fc0 jdk8u222-b07
+3a9307bd93d3ed04e7ddf94e46ae6fd349cd8060 jdk8u222-b08
+22b905fce1aa80ee5f4dd615f49a8562260c1dbf jdk8u222-b09
+3a4dd1917fc5a3b415b7cdaf1a0394e31b072be5 jdk8u222-b10
+3a4dd1917fc5a3b415b7cdaf1a0394e31b072be5 jdk8u222-ga
+4677dd9c02e9eb3bed07e6bca93417c55df5bd33 icedtea-3.13.0pre01
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaxws-752d9e54c69a/THIRD_PARTY_README
new/jaxws-1c6f4ebde697/THIRD_PARTY_README
--- old/jaxws-752d9e54c69a/THIRD_PARTY_README 2019-04-18 04:46:16.000000000
+0200
+++ new/jaxws-1c6f4ebde697/THIRD_PARTY_README 2019-07-17 23:16:07.000000000
+0200
@@ -1612,7 +1612,7 @@
-------------------------------------------------------------------------------
-%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3,
+%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3,
which may be included with JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE ---
@@ -1682,7 +1682,7 @@
--- begin of LICENSE ---
Mesa 3-D graphics library
- Version: 4.1
+ Version: 5.0
Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
@@ -2797,61 +2797,8 @@
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from the X Consortium.
-___________________________
-The files in motif/lib/Xm/util included this copyright:mkdirhier.man,
-xmkmf.man, chownxterm.c, makeg.man, mergelib.cpp, lndir.man, makestrs.man,
-checktree.c, lndir.c, makestrs.c
-Copyright (c) 1993, 1994 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealing in this Software without prior written authorization from the
-X Consortium.
-_____________________________
-Xmos_r.h:
-/*
-Copyright (c) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-*/
+--- end of LICENSE ---
_____________________________
Copyright notice for HPkeysym.h:
/*
@@ -2906,55 +2853,6 @@
performance, or use of this material.
*/
-_____________________________________
-Copyright notice in keysym2ucs.h:
-
-Copyright 1987, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
-
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-*/
--- end of LICENSE ---
@@ -3000,7 +2898,7 @@
Apache Jakarta BCEL 5.1
Apache Jakarta Regexp 1.4
Apache Santuario XML Security for Java 1.5.4
- Apache Xalan-Java 2.7.1
+ Apache Xalan-Java 2.7.2
Apache Xerces Java 2.10.0
Apache XML Resolver 1.1
++++++ 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.4126/jdk.tar.xz differ: char
26, line 1
++++++ langtools.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/langtools-fb494039358f/.hgtags
new/langtools-2008b12a91d1/.hgtags
--- old/langtools-fb494039358f/.hgtags 2019-04-18 04:46:19.000000000 +0200
+++ new/langtools-2008b12a91d1/.hgtags 2019-07-17 23:16:10.000000000 +0200
@@ -1045,8 +1045,22 @@
c0f526208190beea95ec99b06655603537c761f0 jdk8u202-b26
95f8837bfbdc0da195c6ab9a32b97921cc2dd292 jdk8u202-ga
075120a8b410485605fffd5bef20ab66ed97bef8 jdk8u212-b00
+f301c2612d6092ca64b0ba1807a07cf25941bc3b jdk8u222-b00
f301c2612d6092ca64b0ba1807a07cf25941bc3b jdk8u212-b01
59ab73ca14e84b4970ac1feb1ddb3f3d9a087d81 jdk8u212-b02
4c4c8a86bcb2130dca9581a9aad6a60c01bfeeb0 jdk8u212-b03
075e7154cddf75a861c657c6177797fdfbf36d3f jdk8u212-b04
4c4c8a86bcb2130dca9581a9aad6a60c01bfeeb0 jdk8u212-ga
+fb494039358f2a9c98da0e91b58a056506c6c42d icedtea-3.12.0
+1f6b4d9449772ea511e1772c3bdd840e0e550e8c jdk8u222-b01
+d91f70a5eb9d97d2ec52d3d63a512030b151250c jdk8u222-b02
+12045c5cae334679b31386ddb790c3b7394525ea jdk8u222-b03
+a5c129168bd3a65209f0b3e53d13b04a5134f07f jdk8u222-b04
+2ad39b194cc1b7fa1f368b044e86f43a2b6552b1 jdk8u222-b05
+563e06335c252222c825a1fd67425b99581dbac2 jdk8u222-b06
+1b641cb01496dfa3d13b7587e76b22d76bfe51c6 jdk8u222-b07
+e5ee6728508d72b987758116d9b0a23e4f3830c1 jdk8u222-b08
+6aa4f05982eb70dc746f84a152c4e5e0b4a7261e jdk8u222-b09
+32df4483e2e387a85688bad69c398dc4c7bc2cfa jdk8u222-b10
+32df4483e2e387a85688bad69c398dc4c7bc2cfa jdk8u222-ga
+78399e0f6ae409e0c2752271cadc73b8a5688f71 icedtea-3.13.0pre01
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/langtools-fb494039358f/THIRD_PARTY_README
new/langtools-2008b12a91d1/THIRD_PARTY_README
--- old/langtools-fb494039358f/THIRD_PARTY_README 2019-04-18
04:46:19.000000000 +0200
+++ new/langtools-2008b12a91d1/THIRD_PARTY_README 2019-07-17
23:16:10.000000000 +0200
@@ -1612,7 +1612,7 @@
-------------------------------------------------------------------------------
-%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3,
+%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3,
which may be included with JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE ---
@@ -1682,7 +1682,7 @@
--- begin of LICENSE ---
Mesa 3-D graphics library
- Version: 4.1
+ Version: 5.0
Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
@@ -2797,61 +2797,8 @@
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from the X Consortium.
-___________________________
-The files in motif/lib/Xm/util included this copyright:mkdirhier.man,
-xmkmf.man, chownxterm.c, makeg.man, mergelib.cpp, lndir.man, makestrs.man,
-checktree.c, lndir.c, makestrs.c
-Copyright (c) 1993, 1994 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealing in this Software without prior written authorization from the
-X Consortium.
-_____________________________
-Xmos_r.h:
-/*
-Copyright (c) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-*/
+--- end of LICENSE ---
_____________________________
Copyright notice for HPkeysym.h:
/*
@@ -2906,55 +2853,6 @@
performance, or use of this material.
*/
-_____________________________________
-Copyright notice in keysym2ucs.h:
-
-Copyright 1987, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
-
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-*/
--- end of LICENSE ---
@@ -3000,7 +2898,7 @@
Apache Jakarta BCEL 5.1
Apache Jakarta Regexp 1.4
Apache Santuario XML Security for Java 1.5.4
- Apache Xalan-Java 2.7.1
+ Apache Xalan-Java 2.7.2
Apache Xerces Java 2.10.0
Apache XML Resolver 1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/langtools-fb494039358f/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
new/langtools-2008b12a91d1/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
---
old/langtools-fb494039358f/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
2019-04-18 04:46:19.000000000 +0200
+++
new/langtools-2008b12a91d1/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
2019-07-17 23:16:10.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -350,6 +350,7 @@
log.error("proc.bad.config.file", sce.getLocalizedMessage());
throw new Abort(sce);
} catch (Throwable t) {
+ log.error("proc.bad.config.file", t.getLocalizedMessage());
throw new Abort(t);
}
}
@@ -360,7 +361,14 @@
} catch (ServiceConfigurationError sce) {
log.error("proc.bad.config.file", sce.getLocalizedMessage());
throw new Abort(sce);
+ } catch (UnsupportedClassVersionError ucve) {
+ log.error("proc.cant.load.class", ucve.getLocalizedMessage());
+ throw new Abort(ucve);
+ } catch (ClassFormatError cfe) {
+ log.error("proc.cant.load.class", cfe.getLocalizedMessage());
+ throw new Abort(cfe);
} catch (Throwable t) {
+ log.error("proc.bad.config.file", t.getLocalizedMessage());
throw new Abort(t);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/langtools-fb494039358f/src/share/classes/com/sun/tools/javac/resources/compiler.properties
new/langtools-2008b12a91d1/src/share/classes/com/sun/tools/javac/resources/compiler.properties
---
old/langtools-fb494039358f/src/share/classes/com/sun/tools/javac/resources/compiler.properties
2019-04-18 04:46:19.000000000 +0200
+++
new/langtools-2008b12a91d1/src/share/classes/com/sun/tools/javac/resources/compiler.properties
2019-07-17 23:16:10.000000000 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -869,6 +869,9 @@
compiler.err.proc.bad.config.file=\
Bad service configuration file, or exception thrown while constructing
Processor object: {0}
+compiler.err.proc.cant.load.class=\
+ Could not load processor class file due to ''{0}''.
+
compiler.err.proc.cant.create.loader=\
Could not create class loader for annotation processors: {0}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/langtools-fb494039358f/test/tools/javac/annotations/8218152/MalformedAnnotationProcessorTests.java
new/langtools-2008b12a91d1/test/tools/javac/annotations/8218152/MalformedAnnotationProcessorTests.java
---
old/langtools-fb494039358f/test/tools/javac/annotations/8218152/MalformedAnnotationProcessorTests.java
1970-01-01 01:00:00.000000000 +0100
+++
new/langtools-2008b12a91d1/test/tools/javac/annotations/8218152/MalformedAnnotationProcessorTests.java
2019-07-17 23:16:10.000000000 +0200
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8218152
+ * @summary A bad annotation processor class file should fail with an error
+ * @author Steven Groeger
+ *
+ * @library /tools/javac/lib
+ * @build ToolBox
+ * @run main MalformedAnnotationProcessorTests
+ */
+
+import java.io.*;
+import java.util.*;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import javax.annotation.processing.Processor;
+
+public class MalformedAnnotationProcessorTests {
+ public static void main(String... args) throws Exception {
+ new MalformedAnnotationProcessorTests().run();
+ }
+
+ void run() throws Exception {
+ testBadAnnotationProcessor(Paths.get("."));
+ testMissingAnnotationProcessor(Paths.get("."));
+ testWrongClassFileVersion(Paths.get("."));
+ }
+
+ public void testBadAnnotationProcessor(Path base) throws Exception {
+ Path apDir = base.resolve("annoprocessor");
+ ToolBox.writeFile(apDir.resolve("META-INF").resolve("services")
+ .resolve(Processor.class.getCanonicalName()),
"BadAnnoProcessor");
+ ToolBox.writeFile(apDir.resolve("BadAnnoProcessor.class"),
"badannoprocessor");
+
+ Path classes = base.resolve("classes");
+ Files.createDirectories(classes);
+
+ List<String> actualErrors = new ArrayList<>();
+ ToolBox.JavaToolArgs args = new ToolBox.JavaToolArgs();
+ args.setSources("package test; public class Test {}")
+ .appendArgs("-XDrawDiagnostics",
+ "-d", classes.toString(),
+ "-classpath", "",
+ "-processorpath", apDir.toString())
+ .set(ToolBox.Expect.FAIL)
+ .setErrOutput(actualErrors);
+ ToolBox.javac(args);
+
+ System.out.println(actualErrors.get(0));
+ if (!actualErrors.get(0).contains("-
compiler.err.proc.cant.load.class: " +
+ "Incompatible magic value")) {
+ throw new AssertionError("Unexpected errors reported: " +
actualErrors);
+ }
+ }
+
+ public void testMissingAnnotationProcessor(Path base) throws Exception {
+ Path apDir = base.resolve("annoprocessor");
+
ToolBox.writeFile(apDir.resolve("META-INF").resolve("services").resolve(Processor.class.getCanonicalName()),
+ "MissingAnnoProcessor");
+
+ Path classes = base.resolve("classes");
+ Files.createDirectories(classes);
+
+ List<String> actualErrors = new ArrayList<>();
+ ToolBox.JavaToolArgs args = new ToolBox.JavaToolArgs();
+ args.setSources("package test; public class Test {}")
+ .appendArgs("-XDrawDiagnostics",
+ "-d", classes.toString(),
+ "-classpath", "",
+ "-processorpath", apDir.toString())
+ .set(ToolBox.Expect.FAIL)
+ .setErrOutput(actualErrors);
+ ToolBox.javac(args);
+
+ if (!actualErrors.get(0).contains("-
compiler.err.proc.bad.config.file: " +
+ "javax.annotation.processing.Processor: Provider
MissingAnnoProcessor not found")) {
+ throw new AssertionError("Unexpected errors reported: " +
actualErrors);
+ }
+ }
+
+ public void testWrongClassFileVersion(Path base) throws Exception {
+ Path apDir = base.resolve("annoprocessor");
+
ToolBox.writeFile(apDir.resolve("META-INF").resolve("services").resolve(Processor.class.getCanonicalName()),
+ "WrongClassFileVersion");
+
+ ToolBox.JavaToolArgs args = new ToolBox.JavaToolArgs();
+ args.setSources("class WrongClassFileVersion {}")
+ .appendArgs("-d", apDir.toString())
+ .set(ToolBox.Expect.SUCCESS);
+ ToolBox.javac(args);
+
+ increaseMajor(apDir.resolve("WrongClassFileVersion.class"), 1);
+
+ Path classes = base.resolve("classes");
+ Files.createDirectories(classes);
+
+ List<String> actualErrors = new ArrayList<>();
+ args = new ToolBox.JavaToolArgs();
+ args.setSources("package test; public class Test {}")
+ .appendArgs("-XDrawDiagnostics",
+ "-d", classes.toString(),
+ "-classpath", "",
+ "-processorpath", apDir.toString())
+ .set(ToolBox.Expect.FAIL)
+ .setErrOutput(actualErrors);
+ ToolBox.javac(args);
+
+ if (!actualErrors.get(0).contains("-
compiler.err.proc.cant.load.class: " +
+ "WrongClassFileVersion has been compiled by a more recent
version")) {
+ throw new AssertionError("Unexpected errors reported: " +
actualErrors);
+ }
+ }
+
+ // Increase class file cfile's major version by delta
+ // (note: based on test/langtools/tools/javac/6330997/T6330997.java)
+ static void increaseMajor(Path cfile, int delta) {
+ try (RandomAccessFile cls =
+ new RandomAccessFile(cfile.toFile(), "rw");
+ FileChannel fc = cls.getChannel()) {
+ ByteBuffer rbuf = ByteBuffer.allocate(2);
+ fc.read(rbuf, 6);
+ ByteBuffer wbuf = ByteBuffer.allocate(2);
+ wbuf.putShort(0, (short)(rbuf.getShort(0) + delta));
+ fc.write(wbuf, 6);
+ fc.force(false);
+ } catch (Exception e){
+ throw new RuntimeException("Failed: unexpected exception");
+ }
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/langtools-fb494039358f/test/tools/javac/diags/examples.not-yet.txt
new/langtools-2008b12a91d1/test/tools/javac/diags/examples.not-yet.txt
--- old/langtools-fb494039358f/test/tools/javac/diags/examples.not-yet.txt
2019-04-18 04:46:19.000000000 +0200
+++ new/langtools-2008b12a91d1/test/tools/javac/diags/examples.not-yet.txt
2019-07-17 23:16:10.000000000 +0200
@@ -32,6 +32,7 @@
compiler.err.proc.no.service #
JavacProcessingEnvironment: no service loader available
compiler.err.proc.processor.bad.option.name # cannot happen?
masked by javac.err.invalid.A.key
compiler.err.proc.service.problem #
JavacProcessingEnvironment: catch Throwable from service loader
+compiler.err.proc.cant.load.class #
JavacProcessingEnvironment: cant load the class/jar file
compiler.err.signature.doesnt.match.intf # UNUSED
compiler.err.signature.doesnt.match.supertype # UNUSED
compiler.err.source.cant.overwrite.input.file
++++++ nashorn.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nashorn-93462e8b4f4f/.hgtags
new/nashorn-69b1da223d93/.hgtags
--- old/nashorn-93462e8b4f4f/.hgtags 2019-04-18 04:46:34.000000000 +0200
+++ new/nashorn-69b1da223d93/.hgtags 2019-07-17 23:16:12.000000000 +0200
@@ -1076,8 +1076,22 @@
513bdfdab61ccae75ceb3df1d5e656d32e65e1dc jdk8u202-b26
7aeae6eb62362bd676ed9f809d8fa1c12295a843 jdk8u202-ga
8949d12e49e32711a0fb4079e2da7eb4f9ee426b jdk8u212-b00
+203712f71207bc1ed45ef9c3f4c11d367699e2d0 jdk8u222-b00
203712f71207bc1ed45ef9c3f4c11d367699e2d0 jdk8u212-b01
8fa8a4821ec34b99c3dcfd5f6a67fba0813e7bbe jdk8u212-b02
f470f90fa4f757ea435ad48def6146f6a35bdee3 jdk8u212-b03
32c18a79003ad846811955f7348ea73061e91c40 jdk8u212-b04
f470f90fa4f757ea435ad48def6146f6a35bdee3 jdk8u212-ga
+93462e8b4f4f5832465e9df92e65da73209f1458 icedtea-3.12.0
+60065d9e17b0851add37f73c75189e98cdf22b35 jdk8u222-b01
+4e370d5e4c5661d0ce075154afe52ae3514eb0ef jdk8u222-b02
+e4becf2f38cea0539e7f12ba27e596e1d48e34b0 jdk8u222-b03
+990b6af1a5e7ab526804061a2c6b47d24c799b57 jdk8u222-b04
+22144dab9c5d489af564e1d3ffbadc293c8dc445 jdk8u222-b05
+8c7734737f76cbb888ddd78689cbe446b976a6b4 jdk8u222-b06
+2ce015266d7555da1b4dea46df7044d1c942180c jdk8u222-b07
+e18754960730dea198e73d07a17c79bc1c30e51f jdk8u222-b08
+6e564bba54d07236fbe0b3e756aca5c7df38a952 jdk8u222-b09
+0a5ba9e191cf8978fd3c66a53ea41b2bbdeec10b jdk8u222-b10
+0a5ba9e191cf8978fd3c66a53ea41b2bbdeec10b jdk8u222-ga
+a4ff0302c55df1b30913000462e84f4eab09289c icedtea-3.13.0pre01
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nashorn-93462e8b4f4f/THIRD_PARTY_README
new/nashorn-69b1da223d93/THIRD_PARTY_README
--- old/nashorn-93462e8b4f4f/THIRD_PARTY_README 2019-04-18 04:46:34.000000000
+0200
+++ new/nashorn-69b1da223d93/THIRD_PARTY_README 2019-07-17 23:16:12.000000000
+0200
@@ -1612,7 +1612,7 @@
-------------------------------------------------------------------------------
-%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3,
+%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3,
which may be included with JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE ---
@@ -1682,7 +1682,7 @@
--- begin of LICENSE ---
Mesa 3-D graphics library
- Version: 4.1
+ Version: 5.0
Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
@@ -2797,61 +2797,8 @@
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from the X Consortium.
-___________________________
-The files in motif/lib/Xm/util included this copyright:mkdirhier.man,
-xmkmf.man, chownxterm.c, makeg.man, mergelib.cpp, lndir.man, makestrs.man,
-checktree.c, lndir.c, makestrs.c
-Copyright (c) 1993, 1994 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealing in this Software without prior written authorization from the
-X Consortium.
-_____________________________
-Xmos_r.h:
-/*
-Copyright (c) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-*/
+--- end of LICENSE ---
_____________________________
Copyright notice for HPkeysym.h:
/*
@@ -2906,55 +2853,6 @@
performance, or use of this material.
*/
-_____________________________________
-Copyright notice in keysym2ucs.h:
-
-Copyright 1987, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
-
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-*/
--- end of LICENSE ---
@@ -3000,7 +2898,7 @@
Apache Jakarta BCEL 5.1
Apache Jakarta Regexp 1.4
Apache Santuario XML Security for Java 1.5.4
- Apache Xalan-Java 2.7.1
+ Apache Xalan-Java 2.7.2
Apache Xerces Java 2.10.0
Apache XML Resolver 1.1
++++++ openjdk.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icedtea8-forest-f0482b9b7f7b/.hgtags
new/icedtea8-forest-c8f86954855a/.hgtags
--- old/icedtea8-forest-f0482b9b7f7b/.hgtags 2019-04-18 04:46:13.000000000
+0200
+++ new/icedtea8-forest-c8f86954855a/.hgtags 2019-07-17 23:16:11.000000000
+0200
@@ -1007,8 +1007,22 @@
a8b6e38ee409be0fb8fc931a4762f9d04f2f2da0 jdk8u202-b26
0ea872ce75502739f90bacf092d471889673c757 jdk8u202-ga
3a2209a0e9c9192bc803a95fa72510a79847bf15 jdk8u212-b00
+5af73acc6b6c7097ce916c860fd85c45459ea19a jdk8u222-b00
5af73acc6b6c7097ce916c860fd85c45459ea19a jdk8u212-b01
7480582c7fdcfc86b5541a1887289a8416ef7f7d jdk8u212-b02
5218ef8ea6c355b5f3294a21675dfb6d372c02f4 jdk8u212-b03
d43cf567cf721406472abc52d12980a25b886577 jdk8u212-b04
5218ef8ea6c355b5f3294a21675dfb6d372c02f4 jdk8u212-ga
+f0482b9b7f7b489e69295fe19ae85bad7e17cb31 icedtea-3.12.0
+84adf64edebbcb31edf2e8ac20a3f601cdd80e1f jdk8u222-b01
+3a2c8d0a600d5cf404ed1783036b3fb5b0f9c53d jdk8u222-b02
+2618046271a463d595918d176ec50cce563448ba jdk8u222-b03
+4e53c50e441a3b4a2904d8895c50a77bf558b9d8 jdk8u222-b04
+8f29b4acc5d2ee4131b1f13d8c3e57be3dcc63a9 jdk8u222-b05
+f0f617923cebf0b6dfc1c4cd61467fea847b028d jdk8u222-b06
+f321c0bb9fb3124dc35c98d5114c1a8cf4b3d498 jdk8u222-b07
+945f4ae40e436792154bfa77336e1d466606ae00 jdk8u222-b08
+81dd104fa95943fe02bc013d36155b5f4d54210d jdk8u222-b09
+eeeabadc6bf04d70c2fb8e0492abbf30143d26f0 jdk8u222-b10
+eeeabadc6bf04d70c2fb8e0492abbf30143d26f0 jdk8u222-ga
+abf5011267aefc643c1c3d5603645bcee0e34084 icedtea-3.13.0pre01
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icedtea8-forest-f0482b9b7f7b/THIRD_PARTY_README
new/icedtea8-forest-c8f86954855a/THIRD_PARTY_README
--- old/icedtea8-forest-f0482b9b7f7b/THIRD_PARTY_README 2019-04-18
04:46:13.000000000 +0200
+++ new/icedtea8-forest-c8f86954855a/THIRD_PARTY_README 2019-07-17
23:16:11.000000000 +0200
@@ -1612,7 +1612,7 @@
-------------------------------------------------------------------------------
-%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3,
+%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3,
which may be included with JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE ---
@@ -1682,7 +1682,7 @@
--- begin of LICENSE ---
Mesa 3-D graphics library
- Version: 4.1
+ Version: 5.0
Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
@@ -2797,61 +2797,8 @@
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from the X Consortium.
-___________________________
-The files in motif/lib/Xm/util included this copyright:mkdirhier.man,
-xmkmf.man, chownxterm.c, makeg.man, mergelib.cpp, lndir.man, makestrs.man,
-checktree.c, lndir.c, makestrs.c
-Copyright (c) 1993, 1994 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealing in this Software without prior written authorization from the
-X Consortium.
-_____________________________
-Xmos_r.h:
-/*
-Copyright (c) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-*/
+--- end of LICENSE ---
_____________________________
Copyright notice for HPkeysym.h:
/*
@@ -2906,55 +2853,6 @@
performance, or use of this material.
*/
-_____________________________________
-Copyright notice in keysym2ucs.h:
-
-Copyright 1987, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
-
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-*/
--- end of LICENSE ---
@@ -3000,7 +2898,7 @@
Apache Jakarta BCEL 5.1
Apache Jakarta Regexp 1.4
Apache Santuario XML Security for Java 1.5.4
- Apache Xalan-Java 2.7.1
+ Apache Xalan-Java 2.7.2
Apache Xerces Java 2.10.0
Apache XML Resolver 1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/icedtea8-forest-f0482b9b7f7b/common/autoconf/flags.m4
new/icedtea8-forest-c8f86954855a/common/autoconf/flags.m4
--- old/icedtea8-forest-f0482b9b7f7b/common/autoconf/flags.m4 2019-04-18
04:46:13.000000000 +0200
+++ new/icedtea8-forest-c8f86954855a/common/autoconf/flags.m4 2019-07-17
23:16:11.000000000 +0200
@@ -467,6 +467,7 @@
# Later we will also have CFLAGS and LDFLAGS for the hotspot subrepo build.
#
+ FDLIBM_CFLAGS=""
# Setup compiler/platform specific flags to CFLAGS_JDK,
# CXXFLAGS_JDK and CCXXFLAGS_JDK (common to C and CXX?)
if test "x$TOOLCHAIN_TYPE" = xgcc; then
@@ -498,6 +499,37 @@
AC_SUBST([FP_CONTRACT_SUPPORTED])
TOOLCHAIN_CHECK_COMPILER_VERSION(6, FLAGS_SETUP_GCC6_COMPILER_FLAGS)
+
+ # Check that the compiler supports -ffp-contract=off flag
+ # Set FDLIBM_CFLAGS to -ffp-contract=off if it does.
+ # For GCC < 4.6, on x86, x86_64 and ppc check for
+ # -mno-fused-madd and -fno-strict-aliasing. If they exist,
+ # use them as a substitute for -ffp-contract=off.
+ #
+ # These flags are required for GCC-based builds of
+ # fdlibm with optimization without losing precision.
+ # Notably, -ffp-contract=off needs to be added for GCC >= 4.6,
+ # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6
+ COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
+ FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]COMPILER_FP_CONTRACT_OFF_FLAG
-Werror],
+ [], [COMPILER_FP_CONTRACT_OFF_FLAG=""])
+ if test "x$COMPILER_FP_CONTRACT_OFF_FLAG" = x; then
+ if test "$OPENJDK_TARGET_CPU_ARCH" = "x86" ||
+ test "$OPENJDK_TARGET_CPU_ARCH" = "x86_64" ||
+ test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then
+ M_NO_FUSED_ADD_FLAG="-mno-fused-madd"
+ FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]M_NO_FUSED_ADD_FLAG -Werror],
+ [], [M_NO_FUSED_ADD_FLAG=""])
+ NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing"
+ FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]NO_STRICT_ALIASING_FLAG
-Werror],
+ [], [NO_STRICT_ALIASING_FLAG=""])
+ if test "x$M_NO_FUSED_ADD_FLAG" != "x" && test
"x$NO_STRICT_ALIASING_FLAG" != "x"; then
+ FDLIBM_CFLAGS="$M_NO_FUSED_ADD_FLAG $NO_STRICT_ALIASING_FLAG"
+ fi
+ fi
+ else
+ FDLIBM_CFLAGS="$COMPILER_FP_CONTRACT_OFF_FLAG"
+ fi
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
CFLAGS_WARNINGS_ARE_ERRORS="-errtags -errwarn=%all"
CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS
-DBREAKPTS"
@@ -531,6 +563,7 @@
-D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB"
fi
fi
+ AC_SUBST(FDLIBM_CFLAGS)
###############################################################################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/icedtea8-forest-f0482b9b7f7b/common/autoconf/generated-configure.sh
new/icedtea8-forest-c8f86954855a/common/autoconf/generated-configure.sh
--- old/icedtea8-forest-f0482b9b7f7b/common/autoconf/generated-configure.sh
2019-04-18 04:46:13.000000000 +0200
+++ new/icedtea8-forest-c8f86954855a/common/autoconf/generated-configure.sh
2019-07-17 23:16:11.000000000 +0200
@@ -705,6 +705,7 @@
CFLAGS_JDKLIB
MACOSX_VERSION_MIN
CFLAGS_WARNINGS_ARE_ERRORS
+FDLIBM_CFLAGS
NO_LIFETIME_DSE_CFLAG
NO_DELETE_NULL_POINTER_CHECKS_CFLAG
FP_CONTRACT_SUPPORTED
@@ -4455,7 +4456,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency
checks:
-DATE_WHEN_GENERATED=1555470411
+DATE_WHEN_GENERATED=1563330036
###############################################################################
#
@@ -41830,6 +41831,7 @@
# Later we will also have CFLAGS and LDFLAGS for the hotspot subrepo build.
#
+ FDLIBM_CFLAGS=""
# Setup compiler/platform specific flags to CFLAGS_JDK,
# CXXFLAGS_JDK and CCXXFLAGS_JDK (common to C and CXX?)
if test "x$TOOLCHAIN_TYPE" = xgcc; then
@@ -42167,6 +42169,148 @@
:
fi
+
+ # Check that the compiler supports -ffp-contract=off flag
+ # Set FDLIBM_CFLAGS to -ffp-contract=off if it does.
+ # For GCC < 4.6, on x86, x86_64 and ppc check for
+ # -mno-fused-madd and -fno-strict-aliasing. If they exist,
+ # use them as a substitute for -ffp-contract=off.
+ #
+ # These flags are required for GCC-based builds of
+ # fdlibm with optimization without losing precision.
+ # Notably, -ffp-contract=off needs to be added for GCC >= 4.6,
+ # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6
+ COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler
supports \"$COMPILER_FP_CONTRACT_OFF_FLAG -Werror\"" >&5
+$as_echo_n "checking if the C++ compiler supports
\"$COMPILER_FP_CONTRACT_OFF_FLAG -Werror\"... " >&6; }
+ supports=yes
+
+ saved_cxxflags="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAG $COMPILER_FP_CONTRACT_OFF_FLAG -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
+ :
+ else
+ COMPILER_FP_CONTRACT_OFF_FLAG=""
+ fi
+
+ if test "x$COMPILER_FP_CONTRACT_OFF_FLAG" = x; then
+ if test "$OPENJDK_TARGET_CPU_ARCH" = "x86" ||
+ test "$OPENJDK_TARGET_CPU_ARCH" = "x86_64" ||
+ test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then
+ M_NO_FUSED_ADD_FLAG="-mno-fused-madd"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler
supports \"$M_NO_FUSED_ADD_FLAG -Werror\"" >&5
+$as_echo_n "checking if the C++ compiler supports \"$M_NO_FUSED_ADD_FLAG
-Werror\"... " >&6; }
+ supports=yes
+
+ saved_cxxflags="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAG $M_NO_FUSED_ADD_FLAG -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
+ :
+ else
+ M_NO_FUSED_ADD_FLAG=""
+ fi
+
+ NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler
supports \"$NO_STRICT_ALIASING_FLAG -Werror\"" >&5
+$as_echo_n "checking if the C++ compiler supports \"$NO_STRICT_ALIASING_FLAG
-Werror\"... " >&6; }
+ supports=yes
+
+ saved_cxxflags="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAG $NO_STRICT_ALIASING_FLAG -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
+ :
+ else
+ NO_STRICT_ALIASING_FLAG=""
+ fi
+
+ if test "x$M_NO_FUSED_ADD_FLAG" != "x" && test
"x$NO_STRICT_ALIASING_FLAG" != "x"; then
+ FDLIBM_CFLAGS="$M_NO_FUSED_ADD_FLAG $NO_STRICT_ALIASING_FLAG"
+ fi
+ fi
+ else
+ FDLIBM_CFLAGS="$COMPILER_FP_CONTRACT_OFF_FLAG"
+ fi
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
CFLAGS_WARNINGS_ARE_ERRORS="-errtags -errwarn=%all"
CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS
-DBREAKPTS"
@@ -42201,6 +42345,7 @@
fi
fi
+
###############################################################################
# Adjust flags according to debug level.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/icedtea8-forest-f0482b9b7f7b/common/autoconf/spec.gmk.in
new/icedtea8-forest-c8f86954855a/common/autoconf/spec.gmk.in
--- old/icedtea8-forest-f0482b9b7f7b/common/autoconf/spec.gmk.in
2019-04-18 04:46:13.000000000 +0200
+++ new/icedtea8-forest-c8f86954855a/common/autoconf/spec.gmk.in
2019-07-17 23:16:11.000000000 +0200
@@ -308,6 +308,7 @@
FREETYPE_LIBS:=@FREETYPE_LIBS@
FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@
FREETYPE_BUNDLE_LIB_PATH=@FREETYPE_BUNDLE_LIB_PATH@
+FONTCONFIG_CFLAGS:=@FONTCONFIG_CFLAGS@
CUPS_CFLAGS:=@CUPS_CFLAGS@
ALSA_LIBS:=@ALSA_LIBS@
ALSA_CFLAGS:=@ALSA_CFLAGS@
@@ -356,6 +357,7 @@
CC:=@FIXPATH@ @CCACHE@ @CC@
# CFLAGS used to compile the jdk native libraries (C-code)
+FDLIBM_CFLAGS:=@FDLIBM_CFLAGS@
CFLAGS_JDKLIB:=@CFLAGS_JDKLIB@
CXXFLAGS_JDKLIB:=@CXXFLAGS_JDKLIB@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icedtea8-forest-f0482b9b7f7b/make/Main.gmk
new/icedtea8-forest-c8f86954855a/make/Main.gmk
--- old/icedtea8-forest-f0482b9b7f7b/make/Main.gmk 2019-04-18
04:46:13.000000000 +0200
+++ new/icedtea8-forest-c8f86954855a/make/Main.gmk 2019-07-17
23:16:11.000000000 +0200
@@ -238,7 +238,7 @@
else
@$(ECHO) "Re-running configure using default settings"
endif
- @( cd $(OUTPUT_ROOT) && $(BASH) $(TOPDIR)/configure
"$(CONFIGURE_COMMAND_LINE)" )
+ @( cd $(OUTPUT_ROOT) && $(BASH) $(TOPDIR)/configure
$(CONFIGURE_COMMAND_LINE) )
.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images
install test docs
.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only
nashorn-only images-only overlay-images-only install-only test-only docs-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/icedtea8-forest-f0482b9b7f7b/make/common/MakeBase.gmk
new/icedtea8-forest-c8f86954855a/make/common/MakeBase.gmk
--- old/icedtea8-forest-f0482b9b7f7b/make/common/MakeBase.gmk 2019-04-18
04:46:13.000000000 +0200
+++ new/icedtea8-forest-c8f86954855a/make/common/MakeBase.gmk 2019-07-17
23:16:11.000000000 +0200
@@ -293,8 +293,8 @@
endef
-# The source tips can come from the Mercurial repository, or in the files
-# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same
+# The source ids can come from the Mercurial repository, or in the files
+# $(HGTIP_FILENAME) which contains the id but is also positioned in the same
# directory as the original $(HGDIR) directory.
# These should not be := assignments, only used from the root Makefile.
HG_VERSION = $(shell $(HG) version 2> /dev/null)
@@ -306,7 +306,7 @@
$(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \
2> /dev/null)))))
-# Emit the repo:tip pairs to $@
+# Emit the repo:id pairs to $@
define GetSourceTips
$(CD) $(SRC_ROOT) ; \
for i in $(REPO_LIST) IGNORE ; do \
@@ -314,7 +314,7 @@
continue; \
elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \
$(PRINTF) " %s:%s" \
- "$${i}" `$(HG) tip --repository $${i} --template
'{node|short}\n'` ; \
+ "$${i}" `$(HG) id -i --repository $${i}` ; \
elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \
$(PRINTF) " %s:%s" \
"$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \
@@ -325,7 +325,7 @@
# Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk
define CreateHgTip
- $(HG) tip --repository $1 --template '{node|short}\n' >
$1/$(HGTIP_FILENAME); \
+ $(HG) id -i --repository $1' > $1/$(HGTIP_FILENAME); \
$(ECHO) $1/$(HGTIP_FILENAME)
endef
