Hello community, here is the log from the commit of package java-1_8_0-openjdk for openSUSE:Factory checked in at 2019-11-18 20:06:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_8_0-openjdk" Mon Nov 18 20:06:56 2019 rev:67 rq:748968 version:1.8.0.232 Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes 2019-10-28 16:46:20.760699322 +0100 +++ /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new.26869/java-1_8_0-openjdk.changes 2019-11-18 20:07:03.461693338 +0100 @@ -1,0 +2,258 @@ +Fri Nov 15 09:08:43 UTC 2019 - Fridrich Strba <[email protected]> + +- Update to version jdk8u232 (icedtea 3.14.0) (October 2019 CPU, + bsc#1154212) + * Security fixes + + S8167646: Better invalid FilePermission + + S8213429, CVE-2019-2933: Windows file handling redux + + S8218573, CVE-2019-2945: Better socket support + + S8218877: Help transform transformers + + S8220186: Improve use of font temporary files + + S8220302, CVE-2019-2949: Better Kerberos ccache handling + + S8221497: Optional Panes in Swing + + S8221858, CVE-2019-2958: Build Better Processes + + S8222684, CVE-2019-2964: Better support for patterns + + S8222690, CVE-2019-2962: Better Glyph Images + + S8223163: Better pattern recognition + + S8223505, CVE-2019-2973: Better pattern compilation + + S8223518, CVE-2019-2975: Unexpected exception in jjs + + S8223892, CVE-2019-2978: Improved handling of jar files + + S8224025: Fix for JDK-8220302 is not complete + + S8224532, CVE-2019-2981: Better Path supports + + S8224915, CVE-2019-2983: Better serial attributes + + S8225286, CVE-2019-2987: Better rendering of native glyphs + + S8225292, CVE-2019-2988: Better Graphics2D drawing + + S8225298, CVE-2019-2989: Improve TLS connection support + + S8225597, CVE-2019-2992: Enhance font glyph mapping + + S8226765, CVE-2019-2999: Commentary on Javadoc comments + + S8227129: Better ligature for subtables + + S8227601: Better collection of references + + S8228825, CVE-2019-2894, bsc#1152856: Enhance ECDSA operations + * Import of OpenJDK 8 u232 build 01 + + S6913047: Long term memory leak when using PKCS11 and JCE + exceeds 32 bit process address space + + S6946830: javax.crypto.Cipher.doFinal behavior differs + depending on platform + + S6996807: FieldReflectorKey hash code computation can be + improved + + S8030993: Check jdk/src/share/native/common/jni_util.c for + JNI pending exceptions + + S8075136: Unnecessary sign extension for byte array access + + S8075544: Add tiered testing definitions to the jdk repo + + S8075573: Add jdk_other and jdk_svc to jdk tier 2 test + definition + + S8151486: Class.forName causes memory leak + + S8152856: Xcode 7.3 -Wshift-negative-value compile failure on + Mac OS X + + S8168417: Pending exceptions in + java.base/windows/native/libnio + + S8170494: JNI exception pending in PlainDatagramSocketImpl.c + + S8185900: hotspot build failed with gcc version Red Hat + 4.4.7-3 + + S8185979: PPC64: Implement SHA2 intrinsic + + S8197930: JNI exception pending in initializeEncoding of + jni_util.c + + S8202353: os::readdir should use readdir instead of readdir_r + + S8205587: Implicit function declaration in jni_util.c + + S8210761: libjsig is being compiled without optimization + + S8214002: Cannot use italic font style if the font has + embedded bitmap + + S8218721: C1's CEE optimization produces safepoint poll with + invalid debug information + + S8218854: FontMetrics.getMaxAdvance may be less than the + maximum FontMetrics.charWidth + + S8219807: C2 crash in IfNode::up_one_dom(Node*, bool) + + S8221304: Problem list + java/awt/FontMetrics/MaxAdvanceIsMax.java + + S8223219: Backport of JDK-8199552 to OpenJDK 8 leads to + duplicate -fstack-protector flags, overriding + --with-extra-cflags + + S8225636: SA can't handle prelinked libraries + + S8226392: Launcher should not enable legacy stdio streams on + GNU/Linux (glibc) + + S8226870: OpenJDK 8u JRE contains clhsdb and hsdb launchers + + S8226928: [TESTBUG] + test/java/net/NetworkInterface/IPv4Only.java fails + intermittently on AIX + + S8227018: CompletableFuture should not call + Runtime.availableProcessors on fast path + + S8228405: Incorrect format strings in + PhaseIdealLoop::rc_predicate + * Import of OpenJDK 8 u232 build 02 + + S8075546: Add tiered testing definitions to the langtools repo + + S8202252: (aio) Closed AsynchronousSocketChannel keeps + completion handler alive + + S8216597: SIGBUS in + Java_sun_security_pkcs11_wrapper_PKCS11_getNativeKeyInfo after + JDK-6913047 + + S8220513: Wrapper Key may get deleted when closing sessions + in SunPKCS11 crypto provider + + S8222737: [TESTBUG] Allow for tier 1 like testing in OpenJDK + 8u + + S8224580: Matcher can cause oop field/array element to be + reloaded + + S8226543: Reduce GC pressure during message digest + calculations in password-based encryption + * Import of OpenJDK 8 u232 build 03 + + S8213561: ZipFile/MultiThreadedReadTest.java timed out in + tier1 + + S8217785: Padding + ParallelTaskTerminator::_offered_termination variable + * Import of OpenJDK 8 u232 build 04 + + S8188868: PPC64: Support AES intrinsics on Big Endian + * Import of OpenJDK 8 u232 build 05 + + S8080157: assert(allocates2(pc)) failed: not in CodeBuffer + memory + + S8087128: C2: Disallow definition split on MachCopySpill nodes + + S8139965: Hang seen when using + com.sun.jndi.ldap.search.replyQueueSize + + S8147502: Digest is incorrectly truncated for ECDSA + signatures when the bit length of n is less than the field + size + + S8147611: G1 - Missing memory barrier in + start_cset_region_for_worker + + S8151066: assert(0 <= i && i < length()) failed: index out of + bounds + + S8155951: VM crash in + nsk/jvmti/RedefineClasses/StressRedefine: assert failed: + Corrupted constant pool + + S8202948: C2: assert(init_offset >= 0) failed: positive + offset from object start + + S8203324: Use out of scope in getMacOSXLocale of + java_props_macosx.c:120 + + S8206879: Currency decimal marker incorrect for Peru + + S8211232: GraphKit::make_runtime_call() sometimes attaches + wrong memory state to call + + S8214687: Optimize Collections.nCopies().hashCode() and + equals() + + S8214702: Wrong text position for whitespaced string in + printing Swing text + + S8215130: Fix errors in LittleCMS 2.9 reported by GCC 8 + + S8215265: C2: range check elimination may allow illegal out + of bound access + + S8217359: C2 compiler triggers SIGSEGV after transformation + in ConvI2LNode::Ideal + + S8217731: Font rendering and glyph spacing changed from jdk-8 + to jdk-11 + + S8217896: Make better use of LCPUs when building on AIX + + S8218201: Failures when vmIntrinsics::_getClass is not inlined + + S8218280: LineNumberReader throws "Mark invalid" exception if + CRLF straddles buffer. + + S8218780: Update MUSCLE PCSC-Lite header files + + S8219517: assert(false) failed: infinite loop in + PhaseIterGVN::optimize + + S8220072: GCC 8.3 reports errors in java.base + + S8222980: Upgrade IANA Language Subtag Registry to Version + 2019-04-03 + + S8223177: Data race on JvmtiEnvBase::_tag_map in + double-checked locking + + S8223227: Rename acquire_tag_map() to tag_map_acquire() in + jvmtiEnvBase + + S8225423: GTK L&F: JSplitPane: There is no divider shown + + S8226798: JVM crash in + klassItable::initialize_itable_for_interface(int, + InstanceKlass*, bool, Thread*) + + S8226964: [Yaru] GTK L&F: There is no difference between menu + selected and de-selected + + S8228440: TestAESCiphers tests fail with "access denied" + trying to access ArrayUtil + * Import of OpenJDK 8 u232 build 06 + + S8178870: instrumentation.retransformClasses cause coredump + + S8216965: crash in freetypeScaler.c CopyBW2Grey8 + + S8217676: Upgrade libpng to 1.6.37 + + S8222108: Reduce minRefreshTime for updating remote printer + list on Windows + * Import of OpenJDK 8 u232 build 08 + + S8225425: java.lang.UnsatisfiedLinkError: net.dll: Can't find + dependent libraries + + S8226607: Inconsistent info between pcsclite.md and MUSCLE + headers + + S8228469: (tz) Upgrade time-zone data to tzdata2019b + + S8230085: (fs) FileStore::isReadOnly is always true on macOS + Catalina + + S8231098: (tz) Upgrade time-zone data to tzdata2019c + + S8231463: Fix runtime/RedefineTests/RedefineDoubleDelete.java + test in 8u + * Shenandoah + + [backport] 8230425: Shenandoah forces +UseNUMAInterleaving + even after explicitly disabled + + Missing include precompiled.hpp in + shenandoahSynchronizerIterator.cpp + + Protect lir_shenandoah_wb with INCLUDE_ALL_GCS + + Prune unneeded (jccb|jmpb)_if_possible + + Revert parts of x86_64.ad to 8u upstream state + + Revert Shenandoah/JDK8-only changes relating to + MonitorInUseLists + + Revert Shenandoah-specific assert after JDK-8211926 landed + + S8228746: Revert incorrect StubRoutines::contains change + + S8231366: Shenandoah: Shenandoah String Dedup thread is not + properly initialized + * AArch64 port + + S8151775, PR3750: aarch64: add support for 8.1 LSE atomic + operations + + S8179954, PR3762: AArch64: C1 and C2 volatile accesses are + not sequentially consistent + + S8205421, PR3762: AARCH64: StubCodeMark should be placed + after alignment + + S8206163, PR3762: AArch64: incorrect code generation for ++++ 61 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.26869/java-1_8_0-openjdk.changes Old: ---- hotspot-aarch64.patch icedtea-3.13.0.tar.xz New: ---- icedtea-3.14.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_8_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.A5hRlG/_old 2019-11-18 20:07:07.105691508 +0100 +++ /var/tmp/diff_new_pack.A5hRlG/_new 2019-11-18 20:07:07.109691507 +0100 @@ -1,7 +1,7 @@ # # spec file for package java-1_8_0-openjdk # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{!?aarch64:%global aarch64 aarch64 arm64 armv8} %global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64} %{arm} -%global icedtea_version 3.13.0 +%global icedtea_version 3.14.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 222 -%global buildver 10 +%global updatever 232 +%global buildver 08 # Standard JPackage directories and symbolic links. %global sdklnk java-%{javaver}-openjdk %global archname %{sdklnk} @@ -162,9 +162,9 @@ Version: %{javaver}.%{updatever} Release: 0 Summary: OpenJDK 8 Runtime Environment -License: Apache-1.1 AND Apache-2.0 AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-with-classpath-exception AND LGPL-2.0-only AND MPL-1.0 AND MPL-1.1 AND SUSE-Public-Domain AND W3C +License: Apache-1.1 AND Apache-2.0 AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-only WITH Classpath-exception-2.0 AND LGPL-2.0-only AND MPL-1.0 AND MPL-1.1 AND SUSE-Public-Domain AND W3C Group: Development/Languages/Java -Url: http://openjdk.java.net/ +URL: http://openjdk.java.net/ Source0: http://icedtea.wildebeest.org/download/source/icedtea-%{icedtea_version}.tar.xz Source1: http://icedtea.wildebeest.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz Source2: http://icedtea.wildebeest.org/download/drops/icedtea8/%{icedtea_version}/openjdk.tar.xz @@ -190,8 +190,6 @@ # # Patch for PPC Patch103: ppc-zero-hotspot.patch -# Patch for aarch64 -Patch104: hotspot-aarch64.patch Patch1001: java-1_8_0-openjdk-suse-desktop-files.patch Patch1002: icedtea-3.8.0-s390.patch @@ -525,10 +523,6 @@ patch -p0 -i %{PATCH103} %endif -%ifarch aarch64 -patch -p0 -i %{PATCH104} -%endif - patch -p0 -i %{PATCH2001} (cd openjdk/common/autoconf ++++++ 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.26869/aarch32.tar.xz differ: char 27, line 1 ++++++ corba.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-24a4cc7d7de6/.hgtags new/corba-a37140ba122d/.hgtags --- old/corba-24a4cc7d7de6/.hgtags 2019-07-17 23:16:05.000000000 +0200 +++ new/corba-a37140ba122d/.hgtags 2019-10-23 16:34:21.000000000 +0200 @@ -1095,7 +1095,21 @@ 74bdd387f873523cae121fa48056fb662e289679 jdk8u222-b06 3abf299d26c40608af206c3b43c35b7ab2aade07 jdk8u222-b07 d8e58175603e92f46baa775c878cf346181cafed jdk8u222-b08 +5837b825d94bd4fbc1bff28099810e8bcb1e848a jdk8u232-b00 60d5ceb1043500475c41501de673b9582ef4d97b jdk8u222-b09 d44170c2cecec81b5f328d40529cb78bfd0bbb1c jdk8u222-b10 d44170c2cecec81b5f328d40529cb78bfd0bbb1c jdk8u222-ga 1c3cdc66dde5c9a853f7c21ce817f86f30c9aa62 icedtea-3.13.0pre01 +24a4cc7d7de6dc30fb72cdf536c9b27537cb7204 icedtea-3.13.0 +2c9e12886322c8d8a0175b021ca523ad8cf211c6 jdk8u232-b01 +24a4cc7d7de6dc30fb72cdf536c9b27537cb7204 icedtea-3.14.0pre00 +8603ad099188a4ac6316bd8988c5f9bfbbfd9cd5 icedtea-3.14.0pre01 +63cfd636200107b818480976973978448cf9a5ec jdk8u232-b02 +8ce5d3e4f0b417996d0d962a3f8195501853b222 jdk8u232-b03 +1447921be8023aec0684019e349a42e92f302fb7 jdk8u232-b04 +836e5e2e10a55e1ed49ee002dbe9d974a4b32859 jdk8u232-b05 +3fc52164727a38a74abceb9b9b84cd2396049c12 jdk8u232-b06 +af5f5e2e07bc12472ffb52951120e14e19690b1a jdk8u232-b07 +def9640e5d8213f650c128330161d9cdcd04d96b jdk8u232-b08 +3cdc7d41905a2808bb01c3503e119073e9df0898 jdk8u232-b09 +3cdc7d41905a2808bb01c3503e119073e9df0898 jdk8u232-ga diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-24a4cc7d7de6/THIRD_PARTY_README new/corba-a37140ba122d/THIRD_PARTY_README --- old/corba-24a4cc7d7de6/THIRD_PARTY_README 2019-07-17 23:16:05.000000000 +0200 +++ new/corba-a37140ba122d/THIRD_PARTY_README 2019-10-23 16:34:21.000000000 +0200 @@ -1470,60 +1470,90 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.6.35, which may be +%% This notice is provided with respect to libpng 1.6.37, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- -This copy of the libpng notices is provided for your convenience. In case of -any discrepancy between this copy and the notices in the file png.h that is -included in the libpng distribution, the latter shall prevail. +COPYRIGHT NOTICE, DISCLAIMER, and LICENSE +========================================= -COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: +PNG Reference Library License version 2 +--------------------------------------- -If you modify libpng you may insert additional notices immediately following -this sentence. + * Copyright (c) 1995-2019 The PNG Reference Library Authors. + * Copyright (c) 2018-2019 Cosmin Truta. + * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson. + * Copyright (c) 1996-1997 Andreas Dilger. + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. + +The software is supplied "as is", without warranty of any kind, +express or implied, including, without limitation, the warranties +of merchantability, fitness for a particular purpose, title, and +non-infringement. In no event shall the Copyright owners, or +anyone distributing the software, be liable for any damages or +other liability, whether in contract, tort or otherwise, arising +from, out of, or in connection with the software, or the use or +other dealings in the software, even if advised of the possibility +of such damage. + +Permission is hereby granted to use, copy, modify, and distribute +this software, or portions hereof, for any purpose, without fee, +subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you + must not claim that you wrote the original software. If you + use this software in a product, an acknowledgment in the product + documentation would be appreciated, but is not required. + + 2. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. -This code is released under the libpng license. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. -libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are + +PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35) +----------------------------------------------------------------------- + +libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: - Simon-Pierre Cadieux - Eric S. Raymond - Mans Rullgard - Cosmin Truta - Gilles Vollant - James Yu - Mandar Sahastrabuddhe - Google Inc. - Vadim Barkov + Simon-Pierre Cadieux + Eric S. Raymond + Mans Rullgard + Cosmin Truta + Gilles Vollant + James Yu + Mandar Sahastrabuddhe + Google Inc. + Vadim Barkov and with the following additions to the disclaimer: - There is no warranty against interference with your enjoyment of the - library or against infringement. There is no warranty that our - efforts or the library will fulfill any of your particular purposes - or needs. This library is provided with all faults, and the entire - risk of satisfactory quality, performance, accuracy, and effort is with - the user. + There is no warranty against interference with your enjoyment of + the library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is + with the user. Some files in the "contrib" directory and some configure-generated -files that are distributed with libpng have other copyright owners and +files that are distributed with libpng have other copyright owners, and are released under other open source licenses. libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from libpng-0.96, and are distributed according to the same disclaimer and -license as libpng-0.96, with the following individuals added to the list -of Contributing Authors: +license as libpng-0.96, with the following individuals added to the +list of Contributing Authors: - Tom Lane - Glenn Randers-Pehrson - Willem van Schaik + Tom Lane + Glenn Randers-Pehrson + Willem van Schaik libpng versions 0.89, June 1996, through 0.96, May 1997, are Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, @@ -1531,14 +1561,14 @@ libpng-0.88, with the following individuals added to the list of Contributing Authors: - John Bowler - Kevin Bracey - Sam Bushell - Magnus Holmgren - Greg Roelofs - Tom Tanner + John Bowler + Kevin Bracey + Sam Bushell + Magnus Holmgren + Greg Roelofs + Tom Tanner -Some files in the "scripts" directory have other copyright owners +Some files in the "scripts" directory have other copyright owners, but are released under this license. libpng versions 0.5, May 1995, through 0.88, January 1996, are @@ -1547,39 +1577,38 @@ For the purposes of this copyright and license, "Contributing Authors" is defined as the following set of individuals: - Andreas Dilger - Dave Martindale - Guy Eric Schalnat - Paul Schmidt - Tim Wegner - -The PNG Reference Library is supplied "AS IS". The Contributing Authors -and Group 42, Inc. disclaim all warranties, expressed or implied, -including, without limitation, the warranties of merchantability and of -fitness for any purpose. The Contributing Authors and Group 42, Inc. -assume no liability for direct, indirect, incidental, special, exemplary, -or consequential damages, which may result from the use of the PNG -Reference Library, even if advised of the possibility of such damage. + Andreas Dilger + Dave Martindale + Guy Eric Schalnat + Paul Schmidt + Tim Wegner + +The PNG Reference Library is supplied "AS IS". The Contributing +Authors and Group 42, Inc. disclaim all warranties, expressed or +implied, including, without limitation, the warranties of +merchantability and of fitness for any purpose. The Contributing +Authors and Group 42, Inc. assume no liability for direct, indirect, +incidental, special, exemplary, or consequential damages, which may +result from the use of the PNG Reference Library, even if advised of +the possibility of such damage. Permission is hereby granted to use, copy, modify, and distribute this source code, or portions hereof, for any purpose, without fee, subject to the following restrictions: - 1. The origin of this source code must not be misrepresented. - - 2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. + 1. The origin of this source code must not be misrepresented. - 3. This Copyright notice may not be removed or altered from any - source or altered source distribution. + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. -The Contributing Authors and Group 42, Inc. specifically permit, without -fee, and encourage the use of this source code as a component to -supporting the PNG file format in commercial products. If you use this -source code in a product, acknowledgment is not required but would be -appreciated. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. -END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE. +The Contributing Authors and Group 42, Inc. specifically permit, +without fee, and encourage the use of this source code as a component +to supporting the PNG file format in commercial products. If you use +this source code in a product, acknowledgment is not required but would +be appreciated. TRADEMARK: @@ -2101,13 +2130,13 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, +%% This notice is provided with respect to PC/SC Lite v1.8.24, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- -Copyright (c) 1999-2004 David Corcoran <[email protected]> -Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr> +Copyright (c) 1999-2003 David Corcoran <[email protected]> +Copyright (c) 2001-2011 Ludovic Rousseau <[email protected]> All rights reserved. Redistribution and use in source and binary forms, with or without @@ -2119,15 +2148,10 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by: - David Corcoran <[email protected]> - http://www.linuxnet.com (MUSCLE) -4. The name of the author may not be used to endorse or promote products +3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with +Changes to this license can be made only by the copyright author with explicit written consent. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ++++++ 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.26869/hotspot.tar.xz differ: char 26, line 1 ++++++ icedtea-3.13.0.tar.xz -> icedtea-3.14.0.tar.xz ++++++ ++++ 6615 lines of diff (skipped) ++++++ jaxp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-7f4569c121d6/.hgtags new/jaxp-9f2145980ba0/.hgtags --- old/jaxp-7f4569c121d6/.hgtags 2019-07-17 23:16:06.000000000 +0200 +++ new/jaxp-9f2145980ba0/.hgtags 2019-10-23 16:34:22.000000000 +0200 @@ -1059,7 +1059,21 @@ e18fe3687a512b39b08d7d8e288b06cfd7e18840 jdk8u222-b06 08cd0a82185d3aaa614d628977e1809d6b4879cf jdk8u222-b07 2b416473fe205b3abea19b8de53d948fbe4f67f1 jdk8u222-b08 +de624afa6e750486bc1ea3e59bf9fb7de24b1379 jdk8u232-b00 60d685ed9d5bb2eb4847d6e6e4237565fe40089b jdk8u222-b09 268ffbdb01e136ccd78a5f3f8c8aa2d58e71fcb5 jdk8u222-b10 268ffbdb01e136ccd78a5f3f8c8aa2d58e71fcb5 jdk8u222-ga 9862aa380ee4db1b3cfad412640d459c74462581 icedtea-3.13.0pre01 +7f4569c121d63e805e6ccd0efc32460e4dcf4a64 icedtea-3.13.0 +30e9e09bb15559b3f3a72f8ca745d946f5eeecf1 jdk8u232-b01 +7f4569c121d63e805e6ccd0efc32460e4dcf4a64 icedtea-3.14.0pre00 +a8bf97e97149de68eecea757cd0dfbf3cc7ab9b9 icedtea-3.14.0pre01 +ff1df33b41f49e09552078b3842fea69afc79fe2 jdk8u232-b02 +271cd29281ff780a5acd1feba5fba5066a5b4b16 jdk8u232-b03 +cf6d611731058013acb5d3c1d3d123640289cbf9 jdk8u232-b04 +2b9fdc450085129df45fff7c8d6604b6277b48c5 jdk8u232-b05 +be814fbd44e0803938cc6b6c600e4075ca3bdc9c jdk8u232-b06 +0a5bd84fd43f074e58bb00117183e59f5e8a0595 jdk8u232-b07 +764618a906e860888dc1fae5212d43be7abac4af jdk8u232-b08 +6f9c0c731ab72a0f6e4085a0db9594e891de5e4f jdk8u232-b09 +6f9c0c731ab72a0f6e4085a0db9594e891de5e4f jdk8u232-ga diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-7f4569c121d6/THIRD_PARTY_README new/jaxp-9f2145980ba0/THIRD_PARTY_README --- old/jaxp-7f4569c121d6/THIRD_PARTY_README 2019-07-17 23:16:06.000000000 +0200 +++ new/jaxp-9f2145980ba0/THIRD_PARTY_README 2019-10-23 16:34:22.000000000 +0200 @@ -1470,60 +1470,90 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.6.35, which may be +%% This notice is provided with respect to libpng 1.6.37, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- -This copy of the libpng notices is provided for your convenience. In case of -any discrepancy between this copy and the notices in the file png.h that is -included in the libpng distribution, the latter shall prevail. +COPYRIGHT NOTICE, DISCLAIMER, and LICENSE +========================================= -COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: +PNG Reference Library License version 2 +--------------------------------------- -If you modify libpng you may insert additional notices immediately following -this sentence. + * Copyright (c) 1995-2019 The PNG Reference Library Authors. + * Copyright (c) 2018-2019 Cosmin Truta. + * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson. + * Copyright (c) 1996-1997 Andreas Dilger. + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. + +The software is supplied "as is", without warranty of any kind, +express or implied, including, without limitation, the warranties +of merchantability, fitness for a particular purpose, title, and +non-infringement. In no event shall the Copyright owners, or +anyone distributing the software, be liable for any damages or +other liability, whether in contract, tort or otherwise, arising +from, out of, or in connection with the software, or the use or +other dealings in the software, even if advised of the possibility +of such damage. + +Permission is hereby granted to use, copy, modify, and distribute +this software, or portions hereof, for any purpose, without fee, +subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you + must not claim that you wrote the original software. If you + use this software in a product, an acknowledgment in the product + documentation would be appreciated, but is not required. + + 2. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. -This code is released under the libpng license. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. -libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are + +PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35) +----------------------------------------------------------------------- + +libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: - Simon-Pierre Cadieux - Eric S. Raymond - Mans Rullgard - Cosmin Truta - Gilles Vollant - James Yu - Mandar Sahastrabuddhe - Google Inc. - Vadim Barkov + Simon-Pierre Cadieux + Eric S. Raymond + Mans Rullgard + Cosmin Truta + Gilles Vollant + James Yu + Mandar Sahastrabuddhe + Google Inc. + Vadim Barkov and with the following additions to the disclaimer: - There is no warranty against interference with your enjoyment of the - library or against infringement. There is no warranty that our - efforts or the library will fulfill any of your particular purposes - or needs. This library is provided with all faults, and the entire - risk of satisfactory quality, performance, accuracy, and effort is with - the user. + There is no warranty against interference with your enjoyment of + the library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is + with the user. Some files in the "contrib" directory and some configure-generated -files that are distributed with libpng have other copyright owners and +files that are distributed with libpng have other copyright owners, and are released under other open source licenses. libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from libpng-0.96, and are distributed according to the same disclaimer and -license as libpng-0.96, with the following individuals added to the list -of Contributing Authors: +license as libpng-0.96, with the following individuals added to the +list of Contributing Authors: - Tom Lane - Glenn Randers-Pehrson - Willem van Schaik + Tom Lane + Glenn Randers-Pehrson + Willem van Schaik libpng versions 0.89, June 1996, through 0.96, May 1997, are Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, @@ -1531,14 +1561,14 @@ libpng-0.88, with the following individuals added to the list of Contributing Authors: - John Bowler - Kevin Bracey - Sam Bushell - Magnus Holmgren - Greg Roelofs - Tom Tanner + John Bowler + Kevin Bracey + Sam Bushell + Magnus Holmgren + Greg Roelofs + Tom Tanner -Some files in the "scripts" directory have other copyright owners +Some files in the "scripts" directory have other copyright owners, but are released under this license. libpng versions 0.5, May 1995, through 0.88, January 1996, are @@ -1547,39 +1577,38 @@ For the purposes of this copyright and license, "Contributing Authors" is defined as the following set of individuals: - Andreas Dilger - Dave Martindale - Guy Eric Schalnat - Paul Schmidt - Tim Wegner - -The PNG Reference Library is supplied "AS IS". The Contributing Authors -and Group 42, Inc. disclaim all warranties, expressed or implied, -including, without limitation, the warranties of merchantability and of -fitness for any purpose. The Contributing Authors and Group 42, Inc. -assume no liability for direct, indirect, incidental, special, exemplary, -or consequential damages, which may result from the use of the PNG -Reference Library, even if advised of the possibility of such damage. + Andreas Dilger + Dave Martindale + Guy Eric Schalnat + Paul Schmidt + Tim Wegner + +The PNG Reference Library is supplied "AS IS". The Contributing +Authors and Group 42, Inc. disclaim all warranties, expressed or +implied, including, without limitation, the warranties of +merchantability and of fitness for any purpose. The Contributing +Authors and Group 42, Inc. assume no liability for direct, indirect, +incidental, special, exemplary, or consequential damages, which may +result from the use of the PNG Reference Library, even if advised of +the possibility of such damage. Permission is hereby granted to use, copy, modify, and distribute this source code, or portions hereof, for any purpose, without fee, subject to the following restrictions: - 1. The origin of this source code must not be misrepresented. - - 2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. + 1. The origin of this source code must not be misrepresented. - 3. This Copyright notice may not be removed or altered from any - source or altered source distribution. + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. -The Contributing Authors and Group 42, Inc. specifically permit, without -fee, and encourage the use of this source code as a component to -supporting the PNG file format in commercial products. If you use this -source code in a product, acknowledgment is not required but would be -appreciated. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. -END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE. +The Contributing Authors and Group 42, Inc. specifically permit, +without fee, and encourage the use of this source code as a component +to supporting the PNG file format in commercial products. If you use +this source code in a product, acknowledgment is not required but would +be appreciated. TRADEMARK: @@ -2101,13 +2130,13 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, +%% This notice is provided with respect to PC/SC Lite v1.8.24, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- -Copyright (c) 1999-2004 David Corcoran <[email protected]> -Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr> +Copyright (c) 1999-2003 David Corcoran <[email protected]> +Copyright (c) 2001-2011 Ludovic Rousseau <[email protected]> All rights reserved. Redistribution and use in source and binary forms, with or without @@ -2119,15 +2148,10 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by: - David Corcoran <[email protected]> - http://www.linuxnet.com (MUSCLE) -4. The name of the author may not be used to endorse or promote products +3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with +Changes to this license can be made only by the copyright author with explicit written consent. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-7f4569c121d6/src/com/sun/org/apache/xpath/internal/XPath.java new/jaxp-9f2145980ba0/src/com/sun/org/apache/xpath/internal/XPath.java --- old/jaxp-7f4569c121d6/src/com/sun/org/apache/xpath/internal/XPath.java 2019-07-17 23:16:06.000000000 +0200 +++ new/jaxp-9f2145980ba0/src/com/sun/org/apache/xpath/internal/XPath.java 2019-10-23 16:34:22.000000000 +0200 @@ -3,7 +3,7 @@ * DO NOT REMOVE OR ALTER! */ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2019 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -181,10 +181,12 @@ else if (MATCH == type) parser.initMatchPattern(compiler, exprString, prefixResolver); else - throw new RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CANNOT_DEAL_XPATH_TYPE, new Object[]{Integer.toString(type)})); //"Can not deal with XPath type: " + type); + throw new RuntimeException(XSLMessages.createXPATHMessage( + XPATHErrorResources.ER_CANNOT_DEAL_XPATH_TYPE, + new Object[]{Integer.toString(type)})); // System.out.println("----------------"); - Expression expr = compiler.compile(0); + Expression expr = compiler.compileExpression(0); // System.out.println("expr: "+expr); this.setExpression(expr); @@ -236,7 +238,7 @@ //"Can not deal with XPath type: " + type); // System.out.println("----------------"); - Expression expr = compiler.compile(0); + Expression expr = compiler.compileExpression(0); // System.out.println("expr: "+expr); this.setExpression(expr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-7f4569c121d6/src/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java new/jaxp-9f2145980ba0/src/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java --- old/jaxp-7f4569c121d6/src/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java 2019-07-17 23:16:06.000000000 +0200 +++ new/jaxp-9f2145980ba0/src/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java 2019-10-23 16:34:22.000000000 +0200 @@ -3,7 +3,7 @@ * DO NOT REMOVE OR ALTER! */ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2019 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -75,7 +75,7 @@ m_mustHardReset = true; case OpCodes.OP_GROUP : case OpCodes.OP_VARIABLE : - m_expr = compiler.compile(opPos); + m_expr = compiler.compileExpression(opPos); m_expr.exprSetParent(this); //if((OpCodes.OP_FUNCTION == stepType) && (m_expr instanceof com.sun.org.apache.xalan.internal.templates.FuncKey)) if(m_expr instanceof com.sun.org.apache.xpath.internal.operations.Variable) @@ -85,7 +85,7 @@ } break; default : - m_expr = compiler.compile(opPos + 2); + m_expr = compiler.compileExpression(opPos + 2); m_expr.exprSetParent(this); } // if(m_expr instanceof WalkingIterator) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-7f4569c121d6/src/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java new/jaxp-9f2145980ba0/src/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java --- old/jaxp-7f4569c121d6/src/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java 2019-07-17 23:16:06.000000000 +0200 +++ new/jaxp-9f2145980ba0/src/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java 2019-10-23 16:34:22.000000000 +0200 @@ -3,7 +3,7 @@ * DO NOT REMOVE OR ALTER! */ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2019 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1007,10 +1007,10 @@ case OpCodes.OP_EXTFUNCTION : case OpCodes.OP_FUNCTION : case OpCodes.OP_GROUP : - expr = compiler.compile(opPos); + expr = compiler.compileExpression(opPos); break; default : - expr = compiler.compile(opPos + 2); + expr = compiler.compileExpression(opPos + 2); } axis = Axis.FILTEREDLIST; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-7f4569c121d6/src/com/sun/org/apache/xpath/internal/compiler/Compiler.java new/jaxp-9f2145980ba0/src/com/sun/org/apache/xpath/internal/compiler/Compiler.java --- old/jaxp-7f4569c121d6/src/com/sun/org/apache/xpath/internal/compiler/Compiler.java 2019-07-17 23:16:06.000000000 +0200 +++ new/jaxp-9f2145980ba0/src/com/sun/org/apache/xpath/internal/compiler/Compiler.java 2019-10-23 16:34:22.000000000 +0200 @@ -1,6 +1,5 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. */ /* * Copyright 1999-2004 The Apache Software Foundation. @@ -71,9 +70,12 @@ * of operation codes (op map) and then builds from that into an Expression * tree. * @xsl.usage advanced + * @LastModified: May 2019 */ public class Compiler extends OpMap { + // count the number of operations or calls to compileOperation + int countOp; /** * Construct a Compiler object with a specific ErrorListener and @@ -107,15 +109,40 @@ /** * Execute the XPath object from a given opcode position. + * + * Note that this method is added so that when StackOverflowError is caught + * the address space can be freed to this point allowing further activities + * such as reporting the error. + * * @param opPos The current position in the xpath.m_opMap array. * @return The result of the XPath. * * @throws TransformerException if there is a syntax or other error. * @xsl.usage advanced */ - public Expression compile(int opPos) throws TransformerException - { + public Expression compileExpression(int opPos) throws TransformerException + { + try { + countOp = 0; + return compile(opPos); + } catch (StackOverflowError sof) { + error(XPATHErrorResources.ER_COMPILATION_TOO_MANY_OPERATION, new Object[]{countOp}); + } + return null; + } + /** + * This method handles the actual compilation process. It is called from the + * compileExpression method as well as the subsequent processes. See the note + * for compileExpression. + * + * @param opPos The current position in the xpath.m_opMap array. + * @return The result of the XPath. + * + * @throws TransformerException if there is a syntax or other error. + */ + private Expression compile(int opPos) throws TransformerException + { int op = getOp(opPos); Expression expr = null; @@ -211,6 +238,7 @@ private Expression compileOperation(Operation operation, int opPos) throws TransformerException { + ++countOp; int leftPos = getFirstChildPos(opPos); int rightPos = getNextOpPos(leftPos); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-7f4569c121d6/src/com/sun/org/apache/xpath/internal/compiler/XPathParser.java new/jaxp-9f2145980ba0/src/com/sun/org/apache/xpath/internal/compiler/XPathParser.java --- old/jaxp-7f4569c121d6/src/com/sun/org/apache/xpath/internal/compiler/XPathParser.java 2019-07-17 23:16:06.000000000 +0200 +++ new/jaxp-9f2145980ba0/src/com/sun/org/apache/xpath/internal/compiler/XPathParser.java 2019-10-23 16:34:22.000000000 +0200 @@ -1,6 +1,5 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. */ /* * Copyright 1999-2004 The Apache Software Foundation. @@ -37,6 +36,7 @@ * Tokenizes and parses XPath expressions. This should really be named * XPathParserImpl, and may be renamed in the future. * @xsl.usage general + * @LastModified: May 2019 */ public class XPathParser { @@ -74,6 +74,9 @@ protected final static int FILTER_MATCH_PRIMARY = 1; protected final static int FILTER_MATCH_PREDICATES = 2; + // counts open predicates + private int countPredicate; + /** * The parser constructor. */ @@ -160,6 +163,9 @@ } else throw e; + } catch (StackOverflowError sof) { + error(XPATHErrorResources.ER_PREDICATE_TOO_MANY_OPEN, + new Object[]{m_token, m_queueMark, countPredicate}); } compiler.shrink(); @@ -193,7 +199,12 @@ m_ops.setOp(OpMap.MAPINDEX_LENGTH, 2); nextToken(); - Pattern(); + try { + Pattern(); + } catch (StackOverflowError sof) { + error(XPATHErrorResources.ER_PREDICATE_TOO_MANY_OPEN, + new Object[]{m_token, m_queueMark, countPredicate}); + } if (null != m_token) { @@ -789,7 +800,7 @@ */ protected void Expr() throws javax.xml.transform.TransformerException { - OrExpr(); + OrExpr(); } /** @@ -1931,11 +1942,12 @@ */ protected void Predicate() throws javax.xml.transform.TransformerException { - if (tokenIs('[')) { + countPredicate++; nextToken(); PredicateExpr(); + countPredicate--; consumeExpected(']'); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-7f4569c121d6/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java new/jaxp-9f2145980ba0/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java --- old/jaxp-7f4569c121d6/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java 2019-07-17 23:16:06.000000000 +0200 +++ new/jaxp-9f2145980ba0/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java 2019-10-23 16:34:22.000000000 +0200 @@ -1,6 +1,5 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. */ /* * Copyright 1999-2005 The Apache Software Foundation. @@ -30,6 +29,7 @@ * Also you need to update the count of messages(MAX_CODE)or * the count of warnings(MAX_WARNING) [ Information purpose only] * @xsl.usage advanced + * @LastModified: May 2019 */ public class XPATHErrorResources extends ListResourceBundle { @@ -147,6 +147,10 @@ "ER_FOUND_COMMA_BUT_NO_FOLLOWING_ARG"; public static final String ER_PREDICATE_ILLEGAL_SYNTAX = "ER_PREDICATE_ILLEGAL_SYNTAX"; + public static final String ER_PREDICATE_TOO_MANY_OPEN = + "ER_PREDICATE_TOO_MANY_OPEN"; + public static final String ER_COMPILATION_TOO_MANY_OPERATION = + "ER_COMPILATION_TOO_MANY_OPERATION"; public static final String ER_ILLEGAL_AXIS_NAME = "ER_ILLEGAL_AXIS_NAME"; public static final String ER_UNKNOWN_NODETYPE = "ER_UNKNOWN_NODETYPE"; public static final String ER_PATTERN_LITERAL_NEEDS_BE_QUOTED = @@ -458,6 +462,12 @@ { ER_PREDICATE_ILLEGAL_SYNTAX, "'..[predicate]' or '.[predicate]' is illegal syntax. Use 'self::node()[predicate]' instead."}, + { ER_PREDICATE_TOO_MANY_OPEN, + "Stack overflow while parsing {0} at {1}. Too many open predicates({2})."}, + + { ER_COMPILATION_TOO_MANY_OPERATION, + "Stack overflow while compiling the expression. Too many operations({0})."}, + { ER_ILLEGAL_AXIS_NAME, "illegal axis name: {0}"}, ++++++ jaxws.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-1c6f4ebde697/.hgtags new/jaxws-af5760dceec0/.hgtags --- old/jaxws-1c6f4ebde697/.hgtags 2019-07-17 23:16:07.000000000 +0200 +++ new/jaxws-af5760dceec0/.hgtags 2019-10-23 16:34:25.000000000 +0200 @@ -1053,7 +1053,21 @@ dfe2ef52003ccd228f05d3d8e18f26eafda88ae1 jdk8u222-b06 2fa997404a5c0ef884a6eb86ca3df2fbc3346fc0 jdk8u222-b07 3a9307bd93d3ed04e7ddf94e46ae6fd349cd8060 jdk8u222-b08 +bd5323b37905fc22dc5cddd32384ad9e46feca6e jdk8u232-b00 22b905fce1aa80ee5f4dd615f49a8562260c1dbf jdk8u222-b09 3a4dd1917fc5a3b415b7cdaf1a0394e31b072be5 jdk8u222-b10 3a4dd1917fc5a3b415b7cdaf1a0394e31b072be5 jdk8u222-ga 4677dd9c02e9eb3bed07e6bca93417c55df5bd33 icedtea-3.13.0pre01 +1c6f4ebde697d1a3eb3508526a528daf74ad472b icedtea-3.13.0 +44958f6d06d72b8d18a0d17cc08f6449103afd5d jdk8u232-b01 +1c6f4ebde697d1a3eb3508526a528daf74ad472b icedtea-3.14.0pre00 +fb9f067e12184a2e8cbb7b72e561755cb49da31d icedtea-3.14.0pre01 +dc445b545ab7334ab00ad0e2790cc93ccb12e2e9 jdk8u232-b02 +28c25aedce2870fa12fc443560182b35091688d3 jdk8u232-b03 +d8ecedf2321baf12d62c992f7e92bdfb52f48631 jdk8u232-b04 +298981215ad0df664eebe5b44ce93c07c6d3e7c5 jdk8u232-b05 +7261667ae4ff188688bf91a35779ccc05ac1d0e2 jdk8u232-b06 +fb3b24b266a254727e88edaa3a7211a2de6c74db jdk8u232-b07 +65b391f0ed666750478e3fc887c6a6c383190d30 jdk8u232-b08 +5f799cd7fe51a1c0fab3c079f59b368853ba02c4 jdk8u232-b09 +5f799cd7fe51a1c0fab3c079f59b368853ba02c4 jdk8u232-ga diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-1c6f4ebde697/THIRD_PARTY_README new/jaxws-af5760dceec0/THIRD_PARTY_README --- old/jaxws-1c6f4ebde697/THIRD_PARTY_README 2019-07-17 23:16:07.000000000 +0200 +++ new/jaxws-af5760dceec0/THIRD_PARTY_README 2019-10-23 16:34:25.000000000 +0200 @@ -1470,60 +1470,90 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.6.35, which may be +%% This notice is provided with respect to libpng 1.6.37, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- -This copy of the libpng notices is provided for your convenience. In case of -any discrepancy between this copy and the notices in the file png.h that is -included in the libpng distribution, the latter shall prevail. +COPYRIGHT NOTICE, DISCLAIMER, and LICENSE +========================================= -COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: +PNG Reference Library License version 2 +--------------------------------------- -If you modify libpng you may insert additional notices immediately following -this sentence. + * Copyright (c) 1995-2019 The PNG Reference Library Authors. + * Copyright (c) 2018-2019 Cosmin Truta. + * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson. + * Copyright (c) 1996-1997 Andreas Dilger. + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. + +The software is supplied "as is", without warranty of any kind, +express or implied, including, without limitation, the warranties +of merchantability, fitness for a particular purpose, title, and +non-infringement. In no event shall the Copyright owners, or +anyone distributing the software, be liable for any damages or +other liability, whether in contract, tort or otherwise, arising +from, out of, or in connection with the software, or the use or +other dealings in the software, even if advised of the possibility +of such damage. + +Permission is hereby granted to use, copy, modify, and distribute +this software, or portions hereof, for any purpose, without fee, +subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you + must not claim that you wrote the original software. If you + use this software in a product, an acknowledgment in the product + documentation would be appreciated, but is not required. + + 2. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. -This code is released under the libpng license. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. -libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are + +PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35) +----------------------------------------------------------------------- + +libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: - Simon-Pierre Cadieux - Eric S. Raymond - Mans Rullgard - Cosmin Truta - Gilles Vollant - James Yu - Mandar Sahastrabuddhe - Google Inc. - Vadim Barkov + Simon-Pierre Cadieux + Eric S. Raymond + Mans Rullgard + Cosmin Truta + Gilles Vollant + James Yu + Mandar Sahastrabuddhe + Google Inc. + Vadim Barkov and with the following additions to the disclaimer: - There is no warranty against interference with your enjoyment of the - library or against infringement. There is no warranty that our - efforts or the library will fulfill any of your particular purposes - or needs. This library is provided with all faults, and the entire - risk of satisfactory quality, performance, accuracy, and effort is with - the user. + There is no warranty against interference with your enjoyment of + the library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is + with the user. Some files in the "contrib" directory and some configure-generated -files that are distributed with libpng have other copyright owners and +files that are distributed with libpng have other copyright owners, and are released under other open source licenses. libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from libpng-0.96, and are distributed according to the same disclaimer and -license as libpng-0.96, with the following individuals added to the list -of Contributing Authors: +license as libpng-0.96, with the following individuals added to the +list of Contributing Authors: - Tom Lane - Glenn Randers-Pehrson - Willem van Schaik + Tom Lane + Glenn Randers-Pehrson + Willem van Schaik libpng versions 0.89, June 1996, through 0.96, May 1997, are Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, @@ -1531,14 +1561,14 @@ libpng-0.88, with the following individuals added to the list of Contributing Authors: - John Bowler - Kevin Bracey - Sam Bushell - Magnus Holmgren - Greg Roelofs - Tom Tanner + John Bowler + Kevin Bracey + Sam Bushell + Magnus Holmgren + Greg Roelofs + Tom Tanner -Some files in the "scripts" directory have other copyright owners +Some files in the "scripts" directory have other copyright owners, but are released under this license. libpng versions 0.5, May 1995, through 0.88, January 1996, are @@ -1547,39 +1577,38 @@ For the purposes of this copyright and license, "Contributing Authors" is defined as the following set of individuals: - Andreas Dilger - Dave Martindale - Guy Eric Schalnat - Paul Schmidt - Tim Wegner - -The PNG Reference Library is supplied "AS IS". The Contributing Authors -and Group 42, Inc. disclaim all warranties, expressed or implied, -including, without limitation, the warranties of merchantability and of -fitness for any purpose. The Contributing Authors and Group 42, Inc. -assume no liability for direct, indirect, incidental, special, exemplary, -or consequential damages, which may result from the use of the PNG -Reference Library, even if advised of the possibility of such damage. + Andreas Dilger + Dave Martindale + Guy Eric Schalnat + Paul Schmidt + Tim Wegner + +The PNG Reference Library is supplied "AS IS". The Contributing +Authors and Group 42, Inc. disclaim all warranties, expressed or +implied, including, without limitation, the warranties of +merchantability and of fitness for any purpose. The Contributing +Authors and Group 42, Inc. assume no liability for direct, indirect, +incidental, special, exemplary, or consequential damages, which may +result from the use of the PNG Reference Library, even if advised of +the possibility of such damage. Permission is hereby granted to use, copy, modify, and distribute this source code, or portions hereof, for any purpose, without fee, subject to the following restrictions: - 1. The origin of this source code must not be misrepresented. - - 2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. + 1. The origin of this source code must not be misrepresented. - 3. This Copyright notice may not be removed or altered from any - source or altered source distribution. + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. -The Contributing Authors and Group 42, Inc. specifically permit, without -fee, and encourage the use of this source code as a component to -supporting the PNG file format in commercial products. If you use this -source code in a product, acknowledgment is not required but would be -appreciated. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. -END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE. +The Contributing Authors and Group 42, Inc. specifically permit, +without fee, and encourage the use of this source code as a component +to supporting the PNG file format in commercial products. If you use +this source code in a product, acknowledgment is not required but would +be appreciated. TRADEMARK: @@ -2101,13 +2130,13 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, +%% This notice is provided with respect to PC/SC Lite v1.8.24, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- -Copyright (c) 1999-2004 David Corcoran <[email protected]> -Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr> +Copyright (c) 1999-2003 David Corcoran <[email protected]> +Copyright (c) 2001-2011 Ludovic Rousseau <[email protected]> All rights reserved. Redistribution and use in source and binary forms, with or without @@ -2119,15 +2148,10 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by: - David Corcoran <[email protected]> - http://www.linuxnet.com (MUSCLE) -4. The name of the author may not be used to endorse or promote products +3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with +Changes to this license can be made only by the copyright author with explicit written consent. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ++++++ 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.26869/jdk.tar.xz differ: char 26, line 1 ++++++ langtools.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-2008b12a91d1/.hgtags new/langtools-ccec65feaaac/.hgtags --- old/langtools-2008b12a91d1/.hgtags 2019-07-17 23:16:10.000000000 +0200 +++ new/langtools-ccec65feaaac/.hgtags 2019-10-23 16:34:38.000000000 +0200 @@ -1060,7 +1060,21 @@ 563e06335c252222c825a1fd67425b99581dbac2 jdk8u222-b06 1b641cb01496dfa3d13b7587e76b22d76bfe51c6 jdk8u222-b07 e5ee6728508d72b987758116d9b0a23e4f3830c1 jdk8u222-b08 +2ad39b194cc1b7fa1f368b044e86f43a2b6552b1 jdk8u232-b00 6aa4f05982eb70dc746f84a152c4e5e0b4a7261e jdk8u222-b09 32df4483e2e387a85688bad69c398dc4c7bc2cfa jdk8u222-b10 32df4483e2e387a85688bad69c398dc4c7bc2cfa jdk8u222-ga 78399e0f6ae409e0c2752271cadc73b8a5688f71 icedtea-3.13.0pre01 +2008b12a91d1793332412b126bfbe5d92a13caeb icedtea-3.13.0 +d859443cacf81207f0879e9f21810b102afdb240 jdk8u232-b01 +2008b12a91d1793332412b126bfbe5d92a13caeb icedtea-3.14.0pre00 +69b271efa4fa1fd972945783f250e6dde10c8205 icedtea-3.14.0pre01 +19908109cb37637cebab5d6e9cc6c151836cbc27 jdk8u232-b02 +671c4ba50c6f4f9780d40de2549d91f15fcb88d1 jdk8u232-b03 +3de2732a8241c8c85a85942f7341ad48491976d9 jdk8u232-b04 +415c49110391d46dbb9be24154c2ad1b4157790a jdk8u232-b05 +dd568d0e5e10a0dfc05ace7f16bbac5ad6eddde5 jdk8u232-b06 +3b3a43588afb9fbdb1b95c475a11d3529a3d9cb5 jdk8u232-b07 +4bc16c3608302128648e92c80f3b396372471383 jdk8u232-b08 +735048c9f2d6835b76a436beffd29565f28a2a36 jdk8u232-b09 +735048c9f2d6835b76a436beffd29565f28a2a36 jdk8u232-ga diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-2008b12a91d1/THIRD_PARTY_README new/langtools-ccec65feaaac/THIRD_PARTY_README --- old/langtools-2008b12a91d1/THIRD_PARTY_README 2019-07-17 23:16:10.000000000 +0200 +++ new/langtools-ccec65feaaac/THIRD_PARTY_README 2019-10-23 16:34:38.000000000 +0200 @@ -1470,60 +1470,90 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.6.35, which may be +%% This notice is provided with respect to libpng 1.6.37, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- -This copy of the libpng notices is provided for your convenience. In case of -any discrepancy between this copy and the notices in the file png.h that is -included in the libpng distribution, the latter shall prevail. +COPYRIGHT NOTICE, DISCLAIMER, and LICENSE +========================================= -COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: +PNG Reference Library License version 2 +--------------------------------------- -If you modify libpng you may insert additional notices immediately following -this sentence. + * Copyright (c) 1995-2019 The PNG Reference Library Authors. + * Copyright (c) 2018-2019 Cosmin Truta. + * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson. + * Copyright (c) 1996-1997 Andreas Dilger. + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. + +The software is supplied "as is", without warranty of any kind, +express or implied, including, without limitation, the warranties +of merchantability, fitness for a particular purpose, title, and +non-infringement. In no event shall the Copyright owners, or +anyone distributing the software, be liable for any damages or +other liability, whether in contract, tort or otherwise, arising +from, out of, or in connection with the software, or the use or +other dealings in the software, even if advised of the possibility +of such damage. + +Permission is hereby granted to use, copy, modify, and distribute +this software, or portions hereof, for any purpose, without fee, +subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you + must not claim that you wrote the original software. If you + use this software in a product, an acknowledgment in the product + documentation would be appreciated, but is not required. + + 2. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. -This code is released under the libpng license. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. -libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are + +PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35) +----------------------------------------------------------------------- + +libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: - Simon-Pierre Cadieux - Eric S. Raymond - Mans Rullgard - Cosmin Truta - Gilles Vollant - James Yu - Mandar Sahastrabuddhe - Google Inc. - Vadim Barkov + Simon-Pierre Cadieux + Eric S. Raymond + Mans Rullgard + Cosmin Truta + Gilles Vollant + James Yu + Mandar Sahastrabuddhe + Google Inc. + Vadim Barkov and with the following additions to the disclaimer: - There is no warranty against interference with your enjoyment of the - library or against infringement. There is no warranty that our - efforts or the library will fulfill any of your particular purposes - or needs. This library is provided with all faults, and the entire - risk of satisfactory quality, performance, accuracy, and effort is with - the user. + There is no warranty against interference with your enjoyment of + the library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is + with the user. Some files in the "contrib" directory and some configure-generated -files that are distributed with libpng have other copyright owners and +files that are distributed with libpng have other copyright owners, and are released under other open source licenses. libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from libpng-0.96, and are distributed according to the same disclaimer and -license as libpng-0.96, with the following individuals added to the list -of Contributing Authors: +license as libpng-0.96, with the following individuals added to the +list of Contributing Authors: - Tom Lane - Glenn Randers-Pehrson - Willem van Schaik + Tom Lane + Glenn Randers-Pehrson + Willem van Schaik libpng versions 0.89, June 1996, through 0.96, May 1997, are Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, @@ -1531,14 +1561,14 @@ libpng-0.88, with the following individuals added to the list of Contributing Authors: - John Bowler - Kevin Bracey - Sam Bushell - Magnus Holmgren - Greg Roelofs - Tom Tanner + John Bowler + Kevin Bracey + Sam Bushell + Magnus Holmgren + Greg Roelofs + Tom Tanner -Some files in the "scripts" directory have other copyright owners +Some files in the "scripts" directory have other copyright owners, but are released under this license. libpng versions 0.5, May 1995, through 0.88, January 1996, are @@ -1547,39 +1577,38 @@ For the purposes of this copyright and license, "Contributing Authors" is defined as the following set of individuals: - Andreas Dilger - Dave Martindale - Guy Eric Schalnat - Paul Schmidt - Tim Wegner - -The PNG Reference Library is supplied "AS IS". The Contributing Authors -and Group 42, Inc. disclaim all warranties, expressed or implied, -including, without limitation, the warranties of merchantability and of -fitness for any purpose. The Contributing Authors and Group 42, Inc. -assume no liability for direct, indirect, incidental, special, exemplary, -or consequential damages, which may result from the use of the PNG -Reference Library, even if advised of the possibility of such damage. + Andreas Dilger + Dave Martindale + Guy Eric Schalnat + Paul Schmidt + Tim Wegner + +The PNG Reference Library is supplied "AS IS". The Contributing +Authors and Group 42, Inc. disclaim all warranties, expressed or +implied, including, without limitation, the warranties of +merchantability and of fitness for any purpose. The Contributing +Authors and Group 42, Inc. assume no liability for direct, indirect, +incidental, special, exemplary, or consequential damages, which may +result from the use of the PNG Reference Library, even if advised of +the possibility of such damage. Permission is hereby granted to use, copy, modify, and distribute this source code, or portions hereof, for any purpose, without fee, subject to the following restrictions: - 1. The origin of this source code must not be misrepresented. - - 2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. + 1. The origin of this source code must not be misrepresented. - 3. This Copyright notice may not be removed or altered from any - source or altered source distribution. + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. -The Contributing Authors and Group 42, Inc. specifically permit, without -fee, and encourage the use of this source code as a component to -supporting the PNG file format in commercial products. If you use this -source code in a product, acknowledgment is not required but would be -appreciated. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. -END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE. +The Contributing Authors and Group 42, Inc. specifically permit, +without fee, and encourage the use of this source code as a component +to supporting the PNG file format in commercial products. If you use +this source code in a product, acknowledgment is not required but would +be appreciated. TRADEMARK: @@ -2101,13 +2130,13 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, +%% This notice is provided with respect to PC/SC Lite v1.8.24, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- -Copyright (c) 1999-2004 David Corcoran <[email protected]> -Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr> +Copyright (c) 1999-2003 David Corcoran <[email protected]> +Copyright (c) 2001-2011 Ludovic Rousseau <[email protected]> All rights reserved. Redistribution and use in source and binary forms, with or without @@ -2119,15 +2148,10 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by: - David Corcoran <[email protected]> - http://www.linuxnet.com (MUSCLE) -4. The name of the author may not be used to endorse or promote products +3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with +Changes to this license can be made only by the copyright author with explicit written consent. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-2008b12a91d1/src/share/classes/com/sun/tools/javadoc/JavaScriptScanner.java new/langtools-ccec65feaaac/src/share/classes/com/sun/tools/javadoc/JavaScriptScanner.java --- old/langtools-2008b12a91d1/src/share/classes/com/sun/tools/javadoc/JavaScriptScanner.java 2019-07-17 23:16:10.000000000 +0200 +++ new/langtools-ccec65feaaac/src/share/classes/com/sun/tools/javadoc/JavaScriptScanner.java 2019-10-23 16:34:38.000000000 +0200 @@ -68,12 +68,10 @@ private boolean newline = true; Map<String, TagParser> tagParsers; - Set<String> eventAttrs; Set<String> uriAttrs; public JavaScriptScanner() { initTagParsers(); - initEventAttrs(); initURIAttrs(); } @@ -100,7 +98,11 @@ private void checkHtmlAttr(String name, String value) { String n = name.toLowerCase(Locale.ENGLISH); - if (eventAttrs.contains(n) + // https://www.w3.org/TR/html52/fullindex.html#attributes-table + // See https://www.w3.org/TR/html52/webappapis.html#events-event-handlers + // An event handler has a name, which always starts with "on" and is followed by + // the name of the event for which it is intended. + if (n.startsWith("on") || uriAttrs.contains(n) && value != null && value.toLowerCase(Locale.ENGLISH).trim().startsWith("javascript:")) { reporter.report(); @@ -1060,34 +1062,6 @@ } - private void initEventAttrs() { - eventAttrs = new HashSet<>(Arrays.asList( - // See https://www.w3.org/TR/html-markup/global-attributes.html#common.attrs.event-handler - "onabort", "onblur", "oncanplay", "oncanplaythrough", - "onchange", "onclick", "oncontextmenu", "ondblclick", - "ondrag", "ondragend", "ondragenter", "ondragleave", - "ondragover", "ondragstart", "ondrop", "ondurationchange", - "onemptied", "onended", "onerror", "onfocus", "oninput", - "oninvalid", "onkeydown", "onkeypress", "onkeyup", - "onload", "onloadeddata", "onloadedmetadata", "onloadstart", - "onmousedown", "onmousemove", "onmouseout", "onmouseover", - "onmouseup", "onmousewheel", "onpause", "onplay", - "onplaying", "onprogress", "onratechange", "onreadystatechange", - "onreset", "onscroll", "onseeked", "onseeking", - "onselect", "onshow", "onstalled", "onsubmit", "onsuspend", - "ontimeupdate", "onvolumechange", "onwaiting", - - // See https://www.w3.org/TR/html4/sgml/dtd.html - // Most of the attributes that take a %Script are also defined as event handlers - // in HTML 5. The one exception is onunload. - // "onchange", "onclick", "ondblclick", "onfocus", - // "onkeydown", "onkeypress", "onkeyup", "onload", - // "onmousedown", "onmousemove", "onmouseout", "onmouseover", - // "onmouseup", "onreset", "onselect", "onsubmit", - "onunload" - )); - } - private void initURIAttrs() { uriAttrs = new HashSet<>(Arrays.asList( // See https://www.w3.org/TR/html4/sgml/dtd.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-2008b12a91d1/test/Makefile new/langtools-ccec65feaaac/test/Makefile --- old/langtools-2008b12a91d1/test/Makefile 2019-07-17 23:16:10.000000000 +0200 +++ new/langtools-ccec65feaaac/test/Makefile 2019-10-23 16:34:38.000000000 +0200 @@ -16,6 +16,44 @@ # JPRT may invoke this Makefile directly, as part of a langtools build, # or indirectly, via FOREST/test/Makefile, as part of a control build. + +# Utilities used +AWK = awk +CAT = cat +CD = cd +CHMOD = chmod +CP = cp +CUT = cut +DIRNAME = dirname +ECHO = echo +EGREP = egrep +EXPAND = expand +FIND = find +MKDIR = mkdir +PWD = pwd +SED = sed +SORT = sort +TEE = tee +UNAME = uname +UNIQ = uniq +WC = wc +ZIP = zip + +# Get OS name from uname (Cygwin inexplicably adds _NT-5.1) +UNAME_S := $(shell $(UNAME) -s | $(CUT) -f1 -d_) + +# Commands to run on paths to make mixed paths for java on windows +ifeq ($(UNAME_S), CYGWIN) + # Location of developer shared files + SLASH_JAVA = J: + GETMIXEDPATH = cygpath -m +else + # Location of developer shared files + SLASH_JAVA = /java + + GETMIXEDPATH=$(ECHO) +endif + # Get OS/ARCH specifics OSNAME = $(shell uname -s) ifeq ($(OSNAME), SunOS) @@ -183,7 +221,7 @@ endif # Default verbosity setting for jtreg -JTREG_VERBOSE = fail,error,nopass +JTREG_VERBOSE = fail,error,summary # Default verbosity setting for jck JCK_VERBOSE = non-pass @@ -218,14 +256,16 @@ # Root of all test results TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools -ABS_TEST_OUTPUT_DIR := \ - $(shell mkdir -p $(TEST_OUTPUT_DIR); \ - cd $(TEST_OUTPUT_DIR); \ - pwd $(CYGPATH)) +ifdef ALT_OUTPUTDIR + ABS_OUTPUTDIR := $(shell cd $(ALT_OUTPUTDIR) && pwd $(CYGPATH)) +else + ABS_OUTPUTDIR := $(shell mkdir -p $(TEST_OUTPUT_DIR); cd $(TEST_OUTPUT_DIR) && pwd $(CYGPATH)) +endif +ABS_TEST_OUTPUT_DIR := $(ABS_OUTPUTDIR)/testoutput/$(UNIQUE_DIR) # Subdirectories for different test runs -JTREG_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jtreg -JCK_COMPILER_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jck-compiler -JCK_RUNTIME_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jck-runtime-Xcompile +JTREG_OUTPUT_DIR = $(ABS_OUTPUTDIR)/jtreg +JCK_COMPILER_OUTPUT_DIR = $(ABS_OUTPUTDIR)/jck-compiler +JCK_RUNTIME_OUTPUT_DIR = $(ABS_OUTPUTDIR)/jck-runtime-Xcompile # Default make rule -- warning, may take a while all: $(JPRT_CLEAN) jtreg-tests jck-compiler-tests jck-runtime-tests $(JPRT_ARCHIVE_BUNDLE) all-summary @@ -240,6 +280,8 @@ jck-runtime: $(JPRT_CLEAN) jck-runtime-tests $(JPRT_ARCHIVE_BUNDLE) jck-runtime-summary @echo "Testing completed successfully" +tier1: jtreg-tests-tier1 + # for use with JPRT -testrule all: JTREG_TESTDIRS = . jtreg: JTREG_TESTDIRS = . @@ -305,7 +347,6 @@ # Check to make sure these directories exist check-jtreg: $(PRODUCT_HOME) $(JTREG) - # Run JCK-compiler tests # # JCK_HOME @@ -434,11 +475,105 @@ # Used to force a target rules to run FRC: +# +# Tier 1 langtools testing logic +# + +ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip + +# How to create the test bundle (pass or fail, we want to create this) +# Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed. +ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` \ + && $(CD) $(ABS_TEST_OUTPUT_DIR) \ + && $(CHMOD) -R a+r . \ + && $(ZIP) -q -r $(ARCHIVE_BUNDLE) . ) + +# important results files +SUMMARY_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport/text/summary.txt") +STATS_TXT_NAME = Stats.txt +STATS_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/$(STATS_TXT_NAME)") +RUNLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/runlist.txt") +PASSLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/passlist.txt") +FAILLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/faillist.txt") +EXITCODE = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/exitcode.txt") + +TESTEXIT = \ + if [ ! -s $(EXITCODE) ] ; then \ + $(ECHO) "ERROR: EXITCODE file not filled in."; \ + $(ECHO) "1" > $(EXITCODE); \ + fi ; \ + testExitCode=`$(CAT) $(EXITCODE)`; \ + $(ECHO) "EXIT CODE: $${testExitCode}"; \ + exit $${testExitCode} + +BUNDLE_UP_AND_EXIT = \ +( \ + jtregExitCode=$$? && \ + _summary="$(SUMMARY_TXT)"; \ + $(RM) -f $(STATS_TXT) $(RUNLIST) $(PASSLIST) $(FAILLIST) $(EXITCODE); \ + $(ECHO) "$${jtregExitCode}" > $(EXITCODE); \ + if [ -r "$${_summary}" ] ; then \ + $(ECHO) "Summary: $(UNIQUE_DIR)" > $(STATS_TXT); \ + $(EXPAND) $${_summary} | $(EGREP) -v ' Not run\.' > $(RUNLIST); \ + $(EGREP) ' Passed\.' $(RUNLIST) \ + | $(EGREP) -v ' Error\.' \ + | $(EGREP) -v ' Failed\.' > $(PASSLIST); \ + ( $(EGREP) ' Failed\.' $(RUNLIST); \ + $(EGREP) ' Error\.' $(RUNLIST); \ + $(EGREP) -v ' Passed\.' $(RUNLIST) ) \ + | $(SORT) | $(UNIQ) > $(FAILLIST); \ + if [ $${jtregExitCode} != 0 -o -s $(FAILLIST) ] ; then \ + $(EXPAND) $(FAILLIST) \ + | $(CUT) -d' ' -f1 \ + | $(SED) -e 's@^@FAILED: @' >> $(STATS_TXT); \ + if [ $${jtregExitCode} = 0 ] ; then \ + jtregExitCode=1; \ + fi; \ + fi; \ + runc="`$(CAT) $(RUNLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ + passc="`$(CAT) $(PASSLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ + failc="`$(CAT) $(FAILLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ + exclc="FIXME CODETOOLS-7900176"; \ + $(ECHO) "TEST STATS: name=$(UNIQUE_DIR) run=$${runc} pass=$${passc} fail=$${failc}" \ + >> $(STATS_TXT); \ + else \ + $(ECHO) "Missing file: $${_summary}" >> $(STATS_TXT); \ + fi; \ + if [ -f $(STATS_TXT) ] ; then \ + $(CAT) $(STATS_TXT); \ + fi; \ + $(ZIP_UP_RESULTS) ; \ + $(TESTEXIT) \ +) + +prep-tier1: + @$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR) + +# Run tier1 jtreg +jtreg-tests-tier1: check-jtreg prep-tier1 FRC + ( \ + ( JT_HOME=$(shell $(GETMIXEDPATH) "$(JT_HOME)"); \ + export JT_HOME; \ + $(shell $(GETMIXEDPATH) "$(JTREG)") \ + -J-Xmx512m \ + -vmoption:-Xmx768m \ + -a -ignore:quiet $(if $(JTREG_VERBOSE),-v:$(JTREG_VERBOSE)) \ + -r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport") \ + -w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTwork") \ + -jdk:$(shell $(GETMIXEDPATH) "$(TESTJAVA)") \ + $(JAVA_ARGS:%=-vmoption:%) \ + $(JTREG_OPTIONS) \ + :langtools_tier1 \ + ) ; \ + $(BUNDLE_UP_AND_EXIT) \ + ) 2>&1 | $(TEE) $(ABS_TEST_OUTPUT_DIR)/output.txt ; $(TESTEXIT) + # Phony targets (e.g. these are not filenames) .PHONY: all clean \ jtreg javac javadoc javah javap jdeps jtreg-tests jtreg-summary check-jtreg \ jck-compiler jck-compiler-tests jck-compiler-summary \ - jck-runtime jck-runtime-tests jck-runtime-summary check-jck + jck-runtime jck-runtime-tests jck-runtime-summary check-jck prep-tier1 \ + jtreg-tests-tier1 tier1 # No use of suffix rules .SUFFIXES: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-2008b12a91d1/test/ProblemList.txt new/langtools-ccec65feaaac/test/ProblemList.txt --- old/langtools-2008b12a91d1/test/ProblemList.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/langtools-ccec65feaaac/test/ProblemList.txt 2019-10-23 16:34:38.000000000 +0200 @@ -0,0 +1,26 @@ +########################################################################### +# +# Copyright (c) 2015, 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. +# +########################################################################### + +# No langtools tests are on the problem list. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-2008b12a91d1/test/TEST.ROOT new/langtools-ccec65feaaac/test/TEST.ROOT --- old/langtools-2008b12a91d1/test/TEST.ROOT 2019-07-17 23:16:10.000000000 +0200 +++ new/langtools-ccec65feaaac/test/TEST.ROOT 2019-10-23 16:34:38.000000000 +0200 @@ -1,6 +1,18 @@ # This file identifies the root of the test-suite hierarchy. # It also contains test-suite configuration information. -# DO NOT EDIT without first contacting [email protected]. -# The list of keywords supported in the entire test suite -keys=2d dnd i18n +# The list of keywords supported in the entire test suite. The +# "intermittent" keyword marks tests known to fail intermittently. +# The "randomness" keyword marks tests using randomness with test +# cases differing from run to run. (A test using a fixed random seed +# would not count as "randomness" by this definition.) Extra care +# should be taken to handle test failures of intermittent or +# randomness tests. + +keys=intermittent randomness + +# Group definitions +groups=TEST.groups + +# Tests using jtreg 4.1 b11 features +requiredVersion=4.1 b11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-2008b12a91d1/test/TEST.groups new/langtools-ccec65feaaac/test/TEST.groups --- old/langtools-2008b12a91d1/test/TEST.groups 1970-01-01 01:00:00.000000000 +0100 +++ new/langtools-ccec65feaaac/test/TEST.groups 2019-10-23 16:34:38.000000000 +0200 @@ -0,0 +1,32 @@ +# Copyright (c) 2015, 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. +# + +# Tiered testing definitions + +# All langtools tests are tier 1 +langtools_tier1 = \ + tools \ + com \ + lib + +# No langtools tests are tier 2 +langtools_tier2 = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-2008b12a91d1/test/tools/javadoc/TestScriptInComment.java new/langtools-ccec65feaaac/test/tools/javadoc/TestScriptInComment.java --- old/langtools-2008b12a91d1/test/tools/javadoc/TestScriptInComment.java 2019-07-17 23:16:10.000000000 +0200 +++ new/langtools-ccec65feaaac/test/tools/javadoc/TestScriptInComment.java 2019-10-23 16:34:38.000000000 +0200 @@ -25,7 +25,7 @@ /** * @test - * @bug 8138725 + * @bug 8138725 8226765 * @summary test --allow-script-in-comments * @run main TestScriptInComment */ @@ -65,6 +65,10 @@ WS("< script >#ALERT</script>", false, "-Xdoclint:none"), // script tag with invalid white space SA("<script src=\"file\"> #ALERT </script>", true), // script tag with an attribute ON("<a onclick='#ALERT'>x</a>", true), // event handler attribute + OME("<img alt='1' onmouseenter='#ALERT'>", true), // onmouseenter event handler attribute + OML("<img alt='1' onmouseleave='#ALERT'>", true), // onmouseleave event handler attribute + OFI("<a href='#' onfocusin='#ALERT'>x</a>", true), // onfocusin event handler attribute + OBE("<a onbogusevent='#ALERT'>x</a>", true), // bogus/future event handler attribute URI("<a href='javascript:#ALERT'>x</a>", true); // javadcript URI /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-2008b12a91d1/test/tools/javadoc/api/basic/GetTask_DocletClassTest.java new/langtools-ccec65feaaac/test/tools/javadoc/api/basic/GetTask_DocletClassTest.java --- old/langtools-2008b12a91d1/test/tools/javadoc/api/basic/GetTask_DocletClassTest.java 2019-07-17 23:16:10.000000000 +0200 +++ new/langtools-ccec65feaaac/test/tools/javadoc/api/basic/GetTask_DocletClassTest.java 2019-10-23 16:34:38.000000000 +0200 @@ -27,6 +27,7 @@ * @summary javadoc should have a javax.tools.Tool service provider * @build APITest * @run main GetTask_DocletClassTest + * @key randomness */ import com.sun.javadoc.DocErrorReporter; ++++++ nashorn.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nashorn-69b1da223d93/.hgtags new/nashorn-13722b4babad/.hgtags --- old/nashorn-69b1da223d93/.hgtags 2019-07-17 23:16:12.000000000 +0200 +++ new/nashorn-13722b4babad/.hgtags 2019-10-23 16:35:07.000000000 +0200 @@ -1091,7 +1091,21 @@ 8c7734737f76cbb888ddd78689cbe446b976a6b4 jdk8u222-b06 2ce015266d7555da1b4dea46df7044d1c942180c jdk8u222-b07 e18754960730dea198e73d07a17c79bc1c30e51f jdk8u222-b08 +22144dab9c5d489af564e1d3ffbadc293c8dc445 jdk8u232-b00 6e564bba54d07236fbe0b3e756aca5c7df38a952 jdk8u222-b09 0a5ba9e191cf8978fd3c66a53ea41b2bbdeec10b jdk8u222-b10 0a5ba9e191cf8978fd3c66a53ea41b2bbdeec10b jdk8u222-ga a4ff0302c55df1b30913000462e84f4eab09289c icedtea-3.13.0pre01 +69b1da223d933654595b0401b6970291434f6ec4 icedtea-3.13.0 +3f4a6f52aac044b60e980e979a37333277e16646 jdk8u232-b01 +69b1da223d933654595b0401b6970291434f6ec4 icedtea-3.14.0pre00 +349bdbf4733bb02d3a78efcee06abc7f5af36afa icedtea-3.14.0pre01 +908754951075417e36c730b6cbd5f4a3cf6ea611 jdk8u232-b02 +7979e4a31f24adbcf19c9f8f23ac147be5dd4d12 jdk8u232-b03 +41756665474f7bc4ffc591c23887678eb2490ea6 jdk8u232-b04 +52afbdfa7852542f5aa3021336ed7b7069c42997 jdk8u232-b05 +d9dd9b7ce13f7b6ff0124c47106cadf5499e7554 jdk8u232-b06 +0f61e27241b57c8ed5cd9b4d0324ac0d3b0daf13 jdk8u232-b07 +9fc2e50a5c2f98fce148bbe35e43fc17395e3afc jdk8u232-b08 +fba077f48da23f914f13b11718464a547215b7f6 jdk8u232-b09 +fba077f48da23f914f13b11718464a547215b7f6 jdk8u232-ga diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nashorn-69b1da223d93/THIRD_PARTY_README new/nashorn-13722b4babad/THIRD_PARTY_README --- old/nashorn-69b1da223d93/THIRD_PARTY_README 2019-07-17 23:16:12.000000000 +0200 +++ new/nashorn-13722b4babad/THIRD_PARTY_README 2019-10-23 16:35:07.000000000 +0200 @@ -1470,60 +1470,90 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.6.35, which may be +%% This notice is provided with respect to libpng 1.6.37, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- -This copy of the libpng notices is provided for your convenience. In case of -any discrepancy between this copy and the notices in the file png.h that is -included in the libpng distribution, the latter shall prevail. +COPYRIGHT NOTICE, DISCLAIMER, and LICENSE +========================================= -COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: +PNG Reference Library License version 2 +--------------------------------------- -If you modify libpng you may insert additional notices immediately following -this sentence. + * Copyright (c) 1995-2019 The PNG Reference Library Authors. + * Copyright (c) 2018-2019 Cosmin Truta. + * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson. + * Copyright (c) 1996-1997 Andreas Dilger. + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. + +The software is supplied "as is", without warranty of any kind, +express or implied, including, without limitation, the warranties +of merchantability, fitness for a particular purpose, title, and +non-infringement. In no event shall the Copyright owners, or +anyone distributing the software, be liable for any damages or +other liability, whether in contract, tort or otherwise, arising +from, out of, or in connection with the software, or the use or +other dealings in the software, even if advised of the possibility +of such damage. + +Permission is hereby granted to use, copy, modify, and distribute +this software, or portions hereof, for any purpose, without fee, +subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you + must not claim that you wrote the original software. If you + use this software in a product, an acknowledgment in the product + documentation would be appreciated, but is not required. + + 2. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. -This code is released under the libpng license. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. -libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are + +PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35) +----------------------------------------------------------------------- + +libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: - Simon-Pierre Cadieux - Eric S. Raymond - Mans Rullgard - Cosmin Truta - Gilles Vollant - James Yu - Mandar Sahastrabuddhe - Google Inc. - Vadim Barkov + Simon-Pierre Cadieux + Eric S. Raymond + Mans Rullgard + Cosmin Truta + Gilles Vollant + James Yu + Mandar Sahastrabuddhe + Google Inc. + Vadim Barkov and with the following additions to the disclaimer: - There is no warranty against interference with your enjoyment of the - library or against infringement. There is no warranty that our - efforts or the library will fulfill any of your particular purposes - or needs. This library is provided with all faults, and the entire - risk of satisfactory quality, performance, accuracy, and effort is with - the user. + There is no warranty against interference with your enjoyment of + the library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is + with the user. Some files in the "contrib" directory and some configure-generated -files that are distributed with libpng have other copyright owners and +files that are distributed with libpng have other copyright owners, and are released under other open source licenses. libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from libpng-0.96, and are distributed according to the same disclaimer and -license as libpng-0.96, with the following individuals added to the list -of Contributing Authors: +license as libpng-0.96, with the following individuals added to the +list of Contributing Authors: - Tom Lane - Glenn Randers-Pehrson - Willem van Schaik + Tom Lane + Glenn Randers-Pehrson + Willem van Schaik libpng versions 0.89, June 1996, through 0.96, May 1997, are Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, @@ -1531,14 +1561,14 @@ libpng-0.88, with the following individuals added to the list of Contributing Authors: - John Bowler - Kevin Bracey - Sam Bushell - Magnus Holmgren - Greg Roelofs - Tom Tanner + John Bowler + Kevin Bracey + Sam Bushell + Magnus Holmgren + Greg Roelofs + Tom Tanner -Some files in the "scripts" directory have other copyright owners +Some files in the "scripts" directory have other copyright owners, but are released under this license. libpng versions 0.5, May 1995, through 0.88, January 1996, are @@ -1547,39 +1577,38 @@ For the purposes of this copyright and license, "Contributing Authors" is defined as the following set of individuals: - Andreas Dilger - Dave Martindale - Guy Eric Schalnat - Paul Schmidt - Tim Wegner - -The PNG Reference Library is supplied "AS IS". The Contributing Authors -and Group 42, Inc. disclaim all warranties, expressed or implied, -including, without limitation, the warranties of merchantability and of -fitness for any purpose. The Contributing Authors and Group 42, Inc. -assume no liability for direct, indirect, incidental, special, exemplary, -or consequential damages, which may result from the use of the PNG -Reference Library, even if advised of the possibility of such damage. + Andreas Dilger + Dave Martindale + Guy Eric Schalnat + Paul Schmidt + Tim Wegner + +The PNG Reference Library is supplied "AS IS". The Contributing +Authors and Group 42, Inc. disclaim all warranties, expressed or +implied, including, without limitation, the warranties of +merchantability and of fitness for any purpose. The Contributing +Authors and Group 42, Inc. assume no liability for direct, indirect, +incidental, special, exemplary, or consequential damages, which may +result from the use of the PNG Reference Library, even if advised of +the possibility of such damage. Permission is hereby granted to use, copy, modify, and distribute this source code, or portions hereof, for any purpose, without fee, subject to the following restrictions: - 1. The origin of this source code must not be misrepresented. - - 2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. + 1. The origin of this source code must not be misrepresented. - 3. This Copyright notice may not be removed or altered from any - source or altered source distribution. + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. -The Contributing Authors and Group 42, Inc. specifically permit, without -fee, and encourage the use of this source code as a component to -supporting the PNG file format in commercial products. If you use this -source code in a product, acknowledgment is not required but would be -appreciated. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. -END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE. +The Contributing Authors and Group 42, Inc. specifically permit, +without fee, and encourage the use of this source code as a component +to supporting the PNG file format in commercial products. If you use +this source code in a product, acknowledgment is not required but would +be appreciated. TRADEMARK: @@ -2101,13 +2130,13 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, +%% This notice is provided with respect to PC/SC Lite v1.8.24, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- -Copyright (c) 1999-2004 David Corcoran <[email protected]> -Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr> +Copyright (c) 1999-2003 David Corcoran <[email protected]> +Copyright (c) 2001-2011 Ludovic Rousseau <[email protected]> All rights reserved. Redistribution and use in source and binary forms, with or without @@ -2119,15 +2148,10 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by: - David Corcoran <[email protected]> - http://www.linuxnet.com (MUSCLE) -4. The name of the author may not be used to endorse or promote products +3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with +Changes to this license can be made only by the copyright author with explicit written consent. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nashorn-69b1da223d93/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java new/nashorn-13722b4babad/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java --- old/nashorn-69b1da223d93/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java 2019-07-17 23:16:12.000000000 +0200 +++ new/nashorn-13722b4babad/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java 2019-10-23 16:35:07.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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 @@ -82,6 +82,8 @@ } } catch (final PatternSyntaxException e2) { throwParserException("syntax", e2.getMessage()); + } catch (StackOverflowError e3) { + throw new RuntimeException(e3); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nashorn-69b1da223d93/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java new/nashorn-13722b4babad/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java --- old/nashorn-69b1da223d93/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java 2019-07-17 23:16:12.000000000 +0200 +++ new/nashorn-13722b4babad/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java 2019-10-23 16:35:07.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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 @@ -82,6 +82,8 @@ } } catch (final PatternSyntaxException | JOniException e2) { throwParserException("syntax", e2.getMessage()); + } catch (StackOverflowError e3) { + throw new RuntimeException(e3); } } ++++++ openjdk.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-c8f86954855a/.hgtags new/icedtea8-forest-454c6cbb8073/.hgtags --- old/icedtea8-forest-c8f86954855a/.hgtags 2019-07-17 23:16:11.000000000 +0200 +++ new/icedtea8-forest-454c6cbb8073/.hgtags 2019-10-23 16:34:18.000000000 +0200 @@ -1022,7 +1022,21 @@ f0f617923cebf0b6dfc1c4cd61467fea847b028d jdk8u222-b06 f321c0bb9fb3124dc35c98d5114c1a8cf4b3d498 jdk8u222-b07 945f4ae40e436792154bfa77336e1d466606ae00 jdk8u222-b08 +8f29b4acc5d2ee4131b1f13d8c3e57be3dcc63a9 jdk8u232-b00 81dd104fa95943fe02bc013d36155b5f4d54210d jdk8u222-b09 eeeabadc6bf04d70c2fb8e0492abbf30143d26f0 jdk8u222-b10 eeeabadc6bf04d70c2fb8e0492abbf30143d26f0 jdk8u222-ga abf5011267aefc643c1c3d5603645bcee0e34084 icedtea-3.13.0pre01 +c8f86954855a988dafd6fdc422a4962f3ebb9494 icedtea-3.13.0 +ef88239d3d16c5b6817e44c4aba0749620fc79ff jdk8u232-b01 +c8f86954855a988dafd6fdc422a4962f3ebb9494 icedtea-3.14.0pre00 +d1cf93b54a4796f13d90f5e87ca4e0cabcfa3710 icedtea-3.14.0pre01 +ef851705e3e17fd968b9c8d2fd4bc04be34f0c5c jdk8u232-b02 +c5ca527b0afdafb0072f5e0810de13ec326e4b57 jdk8u232-b03 +9611ccdff5fe10bb27e5aa34cde295562d13a29b jdk8u232-b04 +2cd484c5b7f8463f5db0a73da92199255c212810 jdk8u232-b05 +aa1559aa1f70d79e8bd4f3de9ab9a48fe1c0cc78 jdk8u232-b06 +54af8189b95d47ea2cf8bdc9d90fb02d46a1fd38 jdk8u232-b07 +7aea873d47e1d93c7ef4902e758417e5afc19d9c jdk8u232-b08 +6b9f309807a227d32bfcad2ab36cdbccd71d38ca jdk8u232-b09 +6b9f309807a227d32bfcad2ab36cdbccd71d38ca jdk8u232-ga diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-c8f86954855a/Makefile new/icedtea8-forest-454c6cbb8073/Makefile --- old/icedtea8-forest-c8f86954855a/Makefile 2019-07-17 23:16:11.000000000 +0200 +++ new/icedtea8-forest-454c6cbb8073/Makefile 2019-10-23 16:34:18.000000000 +0200 @@ -101,7 +101,7 @@ $(info . # generated by configure) $(info . make dist-clean # Remove all files, including configuration) $(info . make help # Give some help on using make) - $(info . make test # Run tests, default is all tests (see TEST below)) + $(info . make test # Run tests, default is "jdk_core langtools_jtreg" (see TEST below)) $(info ) $(info Targets for specific components) $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test)) @@ -125,6 +125,8 @@ $(info ) $(info . make test TEST=<test> # Only run the given test or tests, e.g.) $(info . # make test TEST="jdk_lang jdk_net") + $(info . # or) + $(info . # make test TEST="tier1") $(info ) .PHONY: help diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-c8f86954855a/THIRD_PARTY_README new/icedtea8-forest-454c6cbb8073/THIRD_PARTY_README --- old/icedtea8-forest-c8f86954855a/THIRD_PARTY_README 2019-07-17 23:16:11.000000000 +0200 +++ new/icedtea8-forest-454c6cbb8073/THIRD_PARTY_README 2019-10-23 16:34:18.000000000 +0200 @@ -1470,60 +1470,90 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.6.35, which may be +%% This notice is provided with respect to libpng 1.6.37, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- -This copy of the libpng notices is provided for your convenience. In case of -any discrepancy between this copy and the notices in the file png.h that is -included in the libpng distribution, the latter shall prevail. +COPYRIGHT NOTICE, DISCLAIMER, and LICENSE +========================================= -COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: +PNG Reference Library License version 2 +--------------------------------------- -If you modify libpng you may insert additional notices immediately following -this sentence. + * Copyright (c) 1995-2019 The PNG Reference Library Authors. + * Copyright (c) 2018-2019 Cosmin Truta. + * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson. + * Copyright (c) 1996-1997 Andreas Dilger. + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. + +The software is supplied "as is", without warranty of any kind, +express or implied, including, without limitation, the warranties +of merchantability, fitness for a particular purpose, title, and +non-infringement. In no event shall the Copyright owners, or +anyone distributing the software, be liable for any damages or +other liability, whether in contract, tort or otherwise, arising +from, out of, or in connection with the software, or the use or +other dealings in the software, even if advised of the possibility +of such damage. + +Permission is hereby granted to use, copy, modify, and distribute +this software, or portions hereof, for any purpose, without fee, +subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you + must not claim that you wrote the original software. If you + use this software in a product, an acknowledgment in the product + documentation would be appreciated, but is not required. + + 2. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. -This code is released under the libpng license. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. -libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are + +PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35) +----------------------------------------------------------------------- + +libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: - Simon-Pierre Cadieux - Eric S. Raymond - Mans Rullgard - Cosmin Truta - Gilles Vollant - James Yu - Mandar Sahastrabuddhe - Google Inc. - Vadim Barkov + Simon-Pierre Cadieux + Eric S. Raymond + Mans Rullgard + Cosmin Truta + Gilles Vollant + James Yu + Mandar Sahastrabuddhe + Google Inc. + Vadim Barkov and with the following additions to the disclaimer: - There is no warranty against interference with your enjoyment of the - library or against infringement. There is no warranty that our - efforts or the library will fulfill any of your particular purposes - or needs. This library is provided with all faults, and the entire - risk of satisfactory quality, performance, accuracy, and effort is with - the user. + There is no warranty against interference with your enjoyment of + the library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is + with the user. Some files in the "contrib" directory and some configure-generated -files that are distributed with libpng have other copyright owners and +files that are distributed with libpng have other copyright owners, and are released under other open source licenses. libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from libpng-0.96, and are distributed according to the same disclaimer and -license as libpng-0.96, with the following individuals added to the list -of Contributing Authors: +license as libpng-0.96, with the following individuals added to the +list of Contributing Authors: - Tom Lane - Glenn Randers-Pehrson - Willem van Schaik + Tom Lane + Glenn Randers-Pehrson + Willem van Schaik libpng versions 0.89, June 1996, through 0.96, May 1997, are Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, @@ -1531,14 +1561,14 @@ libpng-0.88, with the following individuals added to the list of Contributing Authors: - John Bowler - Kevin Bracey - Sam Bushell - Magnus Holmgren - Greg Roelofs - Tom Tanner + John Bowler + Kevin Bracey + Sam Bushell + Magnus Holmgren + Greg Roelofs + Tom Tanner -Some files in the "scripts" directory have other copyright owners +Some files in the "scripts" directory have other copyright owners, but are released under this license. libpng versions 0.5, May 1995, through 0.88, January 1996, are @@ -1547,39 +1577,38 @@ For the purposes of this copyright and license, "Contributing Authors" is defined as the following set of individuals: - Andreas Dilger - Dave Martindale - Guy Eric Schalnat - Paul Schmidt - Tim Wegner - -The PNG Reference Library is supplied "AS IS". The Contributing Authors -and Group 42, Inc. disclaim all warranties, expressed or implied, -including, without limitation, the warranties of merchantability and of -fitness for any purpose. The Contributing Authors and Group 42, Inc. -assume no liability for direct, indirect, incidental, special, exemplary, -or consequential damages, which may result from the use of the PNG -Reference Library, even if advised of the possibility of such damage. + Andreas Dilger + Dave Martindale + Guy Eric Schalnat + Paul Schmidt + Tim Wegner + +The PNG Reference Library is supplied "AS IS". The Contributing +Authors and Group 42, Inc. disclaim all warranties, expressed or +implied, including, without limitation, the warranties of +merchantability and of fitness for any purpose. The Contributing +Authors and Group 42, Inc. assume no liability for direct, indirect, +incidental, special, exemplary, or consequential damages, which may +result from the use of the PNG Reference Library, even if advised of +the possibility of such damage. Permission is hereby granted to use, copy, modify, and distribute this source code, or portions hereof, for any purpose, without fee, subject to the following restrictions: - 1. The origin of this source code must not be misrepresented. - - 2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. + 1. The origin of this source code must not be misrepresented. - 3. This Copyright notice may not be removed or altered from any - source or altered source distribution. + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. -The Contributing Authors and Group 42, Inc. specifically permit, without -fee, and encourage the use of this source code as a component to -supporting the PNG file format in commercial products. If you use this -source code in a product, acknowledgment is not required but would be -appreciated. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. -END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE. +The Contributing Authors and Group 42, Inc. specifically permit, +without fee, and encourage the use of this source code as a component +to supporting the PNG file format in commercial products. If you use +this source code in a product, acknowledgment is not required but would +be appreciated. TRADEMARK: @@ -2101,13 +2130,13 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, +%% This notice is provided with respect to PC/SC Lite v1.8.24, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- -Copyright (c) 1999-2004 David Corcoran <[email protected]> -Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr> +Copyright (c) 1999-2003 David Corcoran <[email protected]> +Copyright (c) 2001-2011 Ludovic Rousseau <[email protected]> All rights reserved. Redistribution and use in source and binary forms, with or without @@ -2119,15 +2148,10 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by: - David Corcoran <[email protected]> - http://www.linuxnet.com (MUSCLE) -4. The name of the author may not be used to endorse or promote products +3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with +Changes to this license can be made only by the copyright author with explicit written consent. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-c8f86954855a/common/autoconf/build-performance.m4 new/icedtea8-forest-454c6cbb8073/common/autoconf/build-performance.m4 --- old/icedtea8-forest-c8f86954855a/common/autoconf/build-performance.m4 2019-07-17 23:16:11.000000000 +0200 +++ new/icedtea8-forest-454c6cbb8073/common/autoconf/build-performance.m4 2019-10-23 16:34:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 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 @@ -42,8 +42,11 @@ NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` FOUND_CORES=yes elif test "x$OPENJDK_BUILD_OS" = xaix ; then - NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'` - FOUND_CORES=yes + NUM_LCPU=`lparstat -m 2> /dev/null | $GREP -o "lcpu=[[0-9]]*" | $CUT -d "=" -f 2` + if test -n "$NUM_LCPU"; then + NUM_CORES=$NUM_LCPU + FOUND_CORES=yes + fi elif test -n "$NUMBER_OF_PROCESSORS"; then # On windows, look in the env NUM_CORES=$NUMBER_OF_PROCESSORS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-c8f86954855a/common/autoconf/flags.m4 new/icedtea8-forest-454c6cbb8073/common/autoconf/flags.m4 --- old/icedtea8-forest-c8f86954855a/common/autoconf/flags.m4 2019-07-17 23:16:11.000000000 +0200 +++ new/icedtea8-forest-454c6cbb8073/common/autoconf/flags.m4 2019-10-23 16:34:18.000000000 +0200 @@ -388,16 +388,8 @@ CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" elif test "x$TOOLCHAIN_TYPE" = xgcc; then - case $OPENJDK_TARGET_CPU_ARCH in - x86 ) - LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" - LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" - ;; - x86_64 ) - LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" - LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" - ;; - esac + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" if test "x$OPENJDK_TARGET_OS" != xmacosx; then LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" @@ -474,7 +466,7 @@ # these options are used for both C and C++ compiles CFLAGS_WARNINGS_ARE_ERRORS="-Werror" CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \ - -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" + -pipe -fstack-protector -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" case $OPENJDK_TARGET_CPU_ARCH in arm ) # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing @@ -483,10 +475,6 @@ ppc ) # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing ;; - x86 ) - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector" - CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector" - ;; * ) CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer" CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-c8f86954855a/common/autoconf/generated-configure.sh new/icedtea8-forest-454c6cbb8073/common/autoconf/generated-configure.sh --- old/icedtea8-forest-c8f86954855a/common/autoconf/generated-configure.sh 2019-07-17 23:16:11.000000000 +0200 +++ new/icedtea8-forest-454c6cbb8073/common/autoconf/generated-configure.sh 2019-10-23 16:34:18.000000000 +0200 @@ -3728,7 +3728,7 @@ # -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 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 @@ -4456,7 +4456,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1563330036 +DATE_WHEN_GENERATED=1565358475 ############################################################################### # @@ -41609,16 +41609,8 @@ CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" elif test "x$TOOLCHAIN_TYPE" = xgcc; then - case $OPENJDK_TARGET_CPU_ARCH in - x86 ) - LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" - LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" - ;; - x86_64 ) - LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" - LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" - ;; - esac + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" if test "x$OPENJDK_TARGET_OS" != xmacosx; then LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" @@ -41838,7 +41830,7 @@ # these options are used for both C and C++ compiles CFLAGS_WARNINGS_ARE_ERRORS="-Werror" CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \ - -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" + -pipe -fstack-protector -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" case $OPENJDK_TARGET_CPU_ARCH in arm ) # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing @@ -41847,10 +41839,6 @@ ppc ) # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing ;; - x86 ) - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector" - CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector" - ;; * ) CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer" CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" @@ -53152,8 +53140,11 @@ NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print $5}'` FOUND_CORES=yes elif test "x$OPENJDK_BUILD_OS" = xaix ; then - NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print $4 }'` - FOUND_CORES=yes + NUM_LCPU=`lparstat -m 2> /dev/null | $GREP -o "lcpu=[0-9]*" | $CUT -d "=" -f 2` + if test -n "$NUM_LCPU"; then + NUM_CORES=$NUM_LCPU + FOUND_CORES=yes + fi elif test -n "$NUMBER_OF_PROCESSORS"; then # On windows, look in the env NUM_CORES=$NUMBER_OF_PROCESSORS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-c8f86954855a/make/Main.gmk new/icedtea8-forest-454c6cbb8073/make/Main.gmk --- old/icedtea8-forest-c8f86954855a/make/Main.gmk 2019-07-17 23:16:11.000000000 +0200 +++ new/icedtea8-forest-454c6cbb8073/make/Main.gmk 2019-10-23 16:34:18.000000000 +0200 @@ -172,11 +172,17 @@ @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image @($(CD) $(SRC_ROOT) && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images) +# If the tests produced a $(TEST)_exitcode.txt file, use the number in that +# file for the exit code of the "make test" invocation. test: images test-only test-only: start-make @$(call TargetEnter) @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true @$(call TargetExit) + @(if [ -r $(OUTPUT_ROOT)/testoutput/$(TEST)_exitcode.txt ]; then \ + EXIT=$$($(CAT) $(OUTPUT_ROOT)/testoutput/$(TEST)_exitcode.txt); \ + exit $${EXIT}; \ + fi) # Stores the tips for each repository. This file is be used when constructing the jdk image and can be # used to track the exact sources used to build that image. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-c8f86954855a/test/Makefile new/icedtea8-forest-454c6cbb8073/test/Makefile --- old/icedtea8-forest-c8f86954855a/test/Makefile 2019-07-17 23:16:11.000000000 +0200 +++ new/icedtea8-forest-454c6cbb8073/test/Makefile 2019-10-23 16:34:18.000000000 +0200 @@ -50,6 +50,22 @@ fi endef +# Macro to print a summary for a given test subdirectory +define SUBDIR_SUMMARY # subdirectory to print summary +if [ -d $1 ] ; then \ + if [ -r $1/Stats.txt ] ; then \ + cat $1/Stats.txt; \ + echo ""; \ + else \ + echo "ERROR: File does not exist: $1/Stats.txt"; \ + exit 1; \ + fi; \ +else \ + echo "WARNING: Expected directory does not exist: $1"; \ + echo " Test summary might be incorrect."; \ +fi +endef + # Default test target (core) default: jdk_core langtools_jtreg @@ -58,7 +74,7 @@ # Test targets langtools_% : - @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) + @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) UNIQUE_DIR="$@" TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) jdk_% core_%s svc_%: @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@) @@ -66,6 +82,35 @@ hotspot_%: @$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), TEST="$@" $@) +# Variables for tier1 testing +TIER1_TESTOUTPUT="$(ALT_OUTPUTDIR)/testoutput" +TIER1_STATUS_FILE="$(TIER1_TESTOUTPUT)/tier1_exitcode.txt" + +# Note: Test failures are handled via summary_tier1 as the +# tier1 targets are never aborted even if tests fail. +tier1: prep_tier1 jdk_tier1 langtools_tier1 hotspot_tier1 summary_tier1 + +prep_tier1: + @rm -rf $(TIER1_STATUS_FILE) + +# This relies on jdk_tier1, langtools_tier1, hotspot_tier1 producing +# Stats.txt (summary) and exitcode.txt files. +summary_tier1: + @(EXIT_VAL=0; \ + echo ""; \ + echo "-------------- Test Summary ------------"; \ + echo ""; \ + for test_dir in $$(find "$(ALT_OUTPUTDIR)" -type d -name \*_tier1); do \ + $(call SUBDIR_SUMMARY, $${test_dir}); \ + EXIT_VAL=$$(expr $${EXIT_VAL} + $$(cat $${test_dir}/exitcode.txt)); \ + done; \ + echo $${EXIT_VAL} > $(TIER1_STATUS_FILE); \ + echo "For details see:"; \ + echo $(TIER1_TESTOUTPUT); \ + echo ""; \ + echo "-------------- Test Summary ------------"; \ + echo "") + # # jtreg_tests # @@ -95,6 +140,6 @@ ################################################################ # Phony targets (e.g. these are not filenames) -.PHONY: all clean +.PHONY: all clean summary_tier1 prep_tier1 ################################################################
