commit java-1_8_0-openjdk for openSUSE:Factory

Hello community, here is the log from the commit of package java-1_8_0-openjdk for openSUSE:Factory checked in at 2020-11-02 09:38:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_8_0-openjdk" Mon Nov 2 09:38:02 2020 rev:74 rq:844535 version:1.8.0.272 Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes 2020-07-30 15:45:53.153837729 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new.3463/java-1_8_0-openjdk.changes 2020-11-02 09:38:15.853487341 +0100 @@ -1,0 +2,929 @@ +Wed Oct 28 09:47:16 UTC 2020 - Fridrich Strba <fstrba@suse.com> + +- Update to version jdk8u272 (icedtea 3.17.0) (July 2020 CPU, + bsc#1174157, and October 2020 CPU, bsc#1177943) + * New features + + JDK-8245468: Add TLSv1.3 implementation classes from 11.0.7 + + PR3796: Allow the number of curves supported to be specified + * Security fixes + + JDK-8028431, CVE-2020-14579: NullPointerException in + DerValue.equals(DerValue) + + JDK-8028591, CVE-2020-14578: NegativeArraySizeException in + sun.security.util.DerInputStream.getUnalignedBitString() + + JDK-8230613: Better ASCII conversions + + JDK-8231800: Better listing of arrays + + JDK-8232014: Expand DTD support + + JDK-8233255: Better Swing Buttons + + JDK-8233624: Enhance JNI linkage + + JDK-8234032: Improve basic calendar services + + JDK-8234042: Better factory production of certificates + + JDK-8234418: Better parsing with CertificateFactory + + JDK-8234836: Improve serialization handling + + JDK-8236191: Enhance OID processing + + JDK-8236196: Improve string pooling + + JDK-8236862, CVE-2020-14779: Enhance support of Proxy class + + JDK-8237117, CVE-2020-14556: Better ForkJoinPool behavior + + JDK-8237592, CVE-2020-14577: Enhance certificate verification + + JDK-8237990, CVE-2020-14781: Enhanced LDAP contexts + + JDK-8237995, CVE-2020-14782: Enhance certificate processing + + JDK-8238002, CVE-2020-14581: Better matrix operations + + JDK-8238804: Enhance key handling process + + JDK-8238842: AIOOBE in GIFImageReader.initializeStringTable + + JDK-8238843: Enhanced font handing + + JDK-8238920, CVE-2020-14583: Better Buffer support + + JDK-8238925: Enhance WAV file playback + + JDK-8240119, CVE-2020-14593: Less Affine Transformations + + JDK-8240124: Better VM Interning + + JDK-8240482: Improved WAV file playback + + JDK-8241114, CVE-2020-14792: Better range handling + + JDK-8241379: Update JCEKS support + + JDK-8241522: Manifest improved jar headers redux + + JDK-8242136, CVE-2020-14621: Better XML namespace handling + + JDK-8242680, CVE-2020-14796: Improved URI Support + + JDK-8242685, CVE-2020-14797: Better Path Validation + + JDK-8242695, CVE-2020-14798: Enhanced buffer support + + JDK-8243302: Advanced class supports + + JDK-8244136, CVE-2020-14803: Improved Buffer supports + + JDK-8244479: Further constrain certificates + + JDK-8244955: Additional Fix for JDK-8240124 + + JDK-8245407: Enhance zoning of times + + JDK-8245412: Better class definitions + + JDK-8245417: Improve certificate chain handling + + JDK-8248574: Improve jpeg processing + + JDK-8249927: Specify limits of jdk.serialProxyInterfaceLimit + + JDK-8253019: Enhanced JPEG decoding + * Import of OpenJDK 8 u262 build 01 + + JDK-4949105: Access Bridge lacks html tags parsing + + JDK-8003209: JFR events for network utilization + + JDK-8030680: 292 cleanup from default method code assessment + + JDK-8035633: TEST_BUG: java/net/NetworkInterface/Equals.java + and some tests failed on windows intermittently + + JDK-8041626: Shutdown tracing event + + JDK-8141056: Erroneous assignment in HeapRegionSet.cpp + + JDK-8149338: JVM Crash caused by Marlin renderer not handling + NaN coordinates + + JDK-8151582: (ch) test java/nio/channels/ + /AsyncCloseAndInterrupt.java failing due to "Connection + succeeded" + + JDK-8165675: Trace event for thread park has incorrect unit + for timeout + + JDK-8176182: 4 security tests are not run + + JDK-8178910: Problemlist sample tests + + JDK-8183925: Decouple crash protection from watcher thread + + JDK-8191393: Random crashes during cfree+0x1c + + JDK-8195817: JFR.stop should require name of recording + + JDK-8195818: JFR.start should increase autogenerated name by + one + + JDK-8195819: Remove recording=x from jcmd JFR.check output + + JDK-8199712: Flight Recorder + + JDK-8202578: Revisit location for class unload events + + JDK-8202835: jfr/event/os/TestSystemProcess.java fails on + missing events + + JDK-8203287: Zero fails to build after JDK-8199712 (Flight + Recorder) + + JDK-8203346: JFR: Inconsistent signature of + jfr_add_string_constant + + JDK-8203664: JFR start failure after AppCDS archive created + with JFR StartFlightRecording + + JDK-8203921: JFR thread sampling is missing fixes from + JDK-8194552 + + JDK-8203929: Limit amount of data for JFR.dump + + JDK-8205516: JFR tool + + JDK-8207392: [PPC64] Implement JFR profiling + + JDK-8207829: FlightRecorderMXBeanImpl is leaking the first + classloader which calls it + + JDK-8209960: -Xlog:jfr* doesn't work with the JFR + + JDK-8210024: JFR calls virtual is_Java_thread from ~Thread() + + JDK-8210776: Upgrade X Window System 6.8.2 to the latest XWD + 1.0.7 + + JDK-8211239: Build fails without JFR: empty JFR events + signatures mismatch + + JDK-8212232: Wrong metadata for the configuration of the + cutoff for old object sample events + + JDK-8213015: Inconsistent settings between JFR.configure and + -XX:FlightRecorderOptions + + JDK-8213421: Line number information for execution samples + always 0 + + JDK-8213617: JFR should record the PID of the recorded process + + JDK-8213734: SAXParser.parse(File, ..) does not close + resources when Exception occurs. + + JDK-8213914: [TESTBUG] Several JFR VM events are not covered + by tests + + JDK-8213917: [TESTBUG] Shutdown JFR event is not covered by + test + + JDK-8213966: The ZGC JFR events should be marked as + experimental + + JDK-8214542: JFR: Old Object Sample event slow on a deep heap + in debug builds + + JDK-8214750: Unnecessary <p> tags in jfr classes + + JDK-8214896: JFR Tool left files behind + + JDK-8214906: [TESTBUG] jfr/event/sampling/TestNative.java + fails with UnsatisfiedLinkError + + JDK-8214925: JFR tool fails to execute + + JDK-8215175: Inconsistencies in JFR event metadata + + JDK-8215237: jdk.jfr.Recording javadoc does not compile + + JDK-8215284: Reduce noise induced by periodic task + getFileSize() + + JDK-8215355: Object monitor deadlock with no threads holding + the monitor (using jemalloc 5.1) + + JDK-8215362: JFR GTest JfrTestNetworkUtilization fails + + JDK-8215771: The jfr tool should pretty print reference chains + + JDK-8216064: -XX:StartFlightRecording:settings= doesn't work + properly + + JDK-8216486: Possibility of integer overflow in + JfrThreadSampler::run() + + JDK-8216528: test/jdk/java/rmi/transport/ + /runtimeThreadInheritanceLeak/ + /RuntimeThreadInheritanceLeak.java failing with Xcomp + + JDK-8216559: [JFR] Native libraries not correctly parsed from + /proc/self/maps + + JDK-8216578: Remove unused/obsolete method in JFR code + + JDK-8216995: Clean up JFR command line processing + + JDK-8217744: [TESTBUG] JFR TestShutdownEvent fails on some + systems due to process surviving SIGINT + + JDK-8217748: [TESTBUG] Exclude TestSig test case from JFR + TestShutdownEvent + + JDK-8218935: Make jfr strncpy uses GCC 8.x friendly + + JDK-8223147: JFR Backport + + JDK-8223689: Add JFR Thread Sampling Support + + JDK-8223690: Add JFR BiasedLock Event Support + + JDK-8223691: Add JFR G1 Region Type Change Event Support + + JDK-8223692: Add JFR G1 Heap Summary Event Support + + JDK-8224172: assert(jfr_is_event_enabled(id)) failed: + invariant + + JDK-8224475: JTextPane does not show images in HTML rendering + + JDK-8226253: JAWS reports wrong number of radio buttons when + buttons are hidden. + + JDK-8226779: [TESTBUG] Test JFR API from Java agent + + JDK-8226892: ActionListeners on JRadioButtons don't get + notified when selection is changed with arrow keys + + JDK-8227011: Starting a JFR recording in response to JVMTI + VMInit and / or Java agent premain corrupts memory + + JDK-8227605: Kitchensink fails "assert((((klass)->trace_id() + & (JfrTraceIdEpoch::leakp_in_use_this_epoch_bit())) != 0)) + failed: invariant" + + JDK-8229366: JFR backport allows unchecked writing to memory + + JDK-8229401: Fix JFR code cache test failures + + JDK-8229708: JFR backport code does not initialize + + JDK-8229873: 8229401 broke jdk8u-jfr-incubator + + JDK-8230448: [test] JFRSecurityTestSuite.java is failing on + Windows + + JDK-8230707: JFR related tests are failing + + JDK-8230782: Robot.createScreenCapture() fails if + "awt.robot.gtk" is set to false + + JDK-8230856: Java_java_net_NetworkInterface_getByName0 on + unix misses ReleaseStringUTFChars in early return + + JDK-8230947: TestLookForUntestedEvents.java is failing after + JDK-8230707 + + JDK-8231995: two jtreg tests failed after 8229366 is fixed + + JDK-8233623: Add classpath exception to copyright in + EventHandlerProxyCreator.java file + + JDK-8236002: CSR for JFR backport suggests not leaving out + the package-info + + JDK-8236008: Some backup files were accidentally left in the + hotspot tree + + JDK-8236074: Missed package-info + + JDK-8236174: Should update javadoc since tags + + JDK-8238076: Fix OpenJDK 7 Bootstrap Broken by JFR Backport + + JDK-8238452: Keytool generates wrong expiration date if + validity is set to 2050/01/01 + + JDK-8238555: Allow Initialization of SunPKCS11 with NSS when + there are external FIPS modules in the NSSDB + + JDK-8238589: Necessary code cleanup in JFR for JDK8u + + JDK-8238590: Enable JFR by default during compilation in 8u + + JDK-8239055: Wrong implementation of VMState.hasListener + + JDK-8239476: JDK-8238589 broke windows build by moving + OrderedPair + + JDK-8239479: minimal1 and zero builds are failing ++++ 732 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.3463/java-1_8_0-openjdk.changes Old: ---- icedtea-3.16.0.tar.xz New: ---- JDK_1_8_0-8208602.patch icedtea-3.17.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_8_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.zxWFvO/_old 2020-11-02 09:38:23.637494811 +0100 +++ /var/tmp/diff_new_pack.zxWFvO/_new 2020-11-02 09:38:23.641494815 +0100 @@ -18,7 +18,7 @@ %{!?aarch64:%global aarch64 aarch64 arm64 armv8} %global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64} %{arm} -%global icedtea_version 3.16.0 +%global icedtea_version 3.17.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 252 -%global buildver 09 +%global updatever 272 +%global buildver 10 # Standard JPackage directories and symbolic links. %global sdklnk java-%{javaver}-openjdk %global archname %{sdklnk} @@ -194,6 +194,7 @@ Patch1001: java-1_8_0-openjdk-suse-desktop-files.patch Patch1002: icedtea-3.8.0-s390.patch Patch2001: disable-doclint-by-default.patch +Patch2002: JDK_1_8_0-8208602.patch BuildRequires: alsa-lib-devel BuildRequires: autoconf @@ -466,6 +467,7 @@ %endif %if %{with zero} --enable-zero \ + --disable-jfr \ %endif %if 0%{?suse_version} <= 1110 --disable-system-gio \ @@ -525,6 +527,7 @@ %endif patch -p0 -i %{PATCH2001} +patch -p0 -i %{PATCH2002} (cd openjdk/common/autoconf bash ./autogen.sh @@ -1041,6 +1044,9 @@ %dir %{_jvmdir}/%{jredir}/lib/ext %dir %{_jvmdir}/%{jredir}/lib/images %dir %{_jvmdir}/%{jredir}/lib/images/cursors +%if %{without zero} +%dir %{_jvmdir}/%{jredir}/lib/jfr +%endif %dir %{_jvmdir}/%{jredir}/lib/management %dir %{_jvmdir}/%{jredir}/lib/security %dir %{_jvmdir}/%{jredir}/lib/security/policy ++++++ JDK_1_8_0-8208602.patch ++++++ # HG changeset patch # User weijun # Date 1533101708 -28800 # Node ID 9d92ff04a29c12a5d47f2ca4e772f7716bfdb8ff # Parent b6e0bfe4a6ec5d8d9d9476c05627dfb47f2263e1 8208602: Cannot read PEM X.509 cert if there is whitespace after the header or footer Reviewed-by: xuelei diff -r b6e0bfe4a6ec -r 9d92ff04a29c src/java.base/share/classes/sun/security/provider/X509Factory.java --- openjdk/jdk/src/share/classes/sun/security/provider/X509Factory.java Wed Aug 01 01:40:44 2018 -0400 +++ openjdk/jdk/src/share/classes/sun/security/provider/X509Factory.java Wed Aug 01 13:35:08 2018 +0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2018, 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 @@ -635,7 +635,8 @@ if (next != '\r') footer.append((char)next); } - checkHeaderFooter(header.toString(), footer.toString()); + checkHeaderFooter(header.toString().replaceFirst("\\s++$", ""), + footer.toString().replaceFirst("\\s++$", "")); return Pem.decode(new String(data, 0, pos)); } diff -r b6e0bfe4a6ec -r 9d92ff04a29c test/jdk/sun/security/provider/X509Factory/BadPem.java --- openjdk/jdk/test/sun/security/provider/X509Factory/BadPem.java Wed Aug 01 01:40:44 2018 -0400 +++ openjdk/jdk/test/sun/security/provider/X509Factory/BadPem.java Wed Aug 01 13:35:08 2018 +0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2018, 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 @@ -23,14 +23,13 @@ /* * @test - * @bug 8074935 - * @summary jdk8 keytool doesn't validate pem files for RFC 1421 correctness, as jdk7 did + * @bug 8074935 8208602 + * @summary X.509 cert PEM format read */ import java.io.ByteArrayOutputStream; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.PrintStream; import java.security.KeyStore; import java.security.cert.CertificateException; import java.util.Arrays; @@ -49,10 +48,12 @@ String pass = "passphrase"; String alias = "dummy"; + CertificateFactory cf = CertificateFactory.getInstance("X.509"); KeyStore keyStore = KeyStore.getInstance("JKS"); keyStore.load(new FileInputStream(ks), pass.toCharArray()); byte[] cert = keyStore.getCertificate(alias).getEncoded(); + // 8074935 ByteArrayOutputStream bout = new ByteArrayOutputStream(); PrintStream pout = new PrintStream(bout); byte[] CRLF = new byte[] {'\r', '\n'}; @@ -64,14 +65,20 @@ } pout.println(X509Factory.END_CERT); - CertificateFactory cf = CertificateFactory.getInstance("X.509"); - try { cf.generateCertificate(new ByteArrayInputStream(bout.toByteArray())); throw new Exception("Should fail"); } catch (CertificateException e) { // Good } + + // 8208602 + bout.reset(); + pout.println(X509Factory.BEGIN_CERT + " "); + pout.println(Base64.getMimeEncoder().encodeToString(cert)); + pout.println(X509Factory.END_CERT + " "); + + cf.generateCertificate(new ByteArrayInputStream(bout.toByteArray())); } } ++++++ 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.3463/aarch32.tar.xz differ: char 26, line 1 ++++++ corba.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-ea3169880d70/.hgtags new/corba-29969b96b06f/.hgtags --- old/corba-ea3169880d70/.hgtags 2020-04-22 00:47:15.000000000 +0200 +++ new/corba-29969b96b06f/.hgtags 2020-10-27 07:33:35.000000000 +0100 @@ -1135,8 +1135,39 @@ e612032f8f28daa0a41df1fd69ca4c94f64280ff jdk8u252-b03 4eb5558f0f4fc6602ed0d01df95aeae1e77364c6 jdk8u252-b04 b2c092b72c7c6a6fdcf99acb9feb31b807b24772 jdk8u252-b05 +b2c092b72c7c6a6fdcf99acb9feb31b807b24772 jdk8u262-b00 ff8c2e73d641368a30508a038c4cf57391ef076a jdk8u252-b06 ee99eeee44ad1b13088f8c70711668f0cdee7821 jdk8u252-b07 63738d15bb7f5e30917754acd19c52a77265bcdb jdk8u252-b08 9340b3be1b4792e1bca8b83f35c83baec2b358ec jdk8u252-b09 9340b3be1b4792e1bca8b83f35c83baec2b358ec jdk8u252-ga +ea3169880d702b059778aaae997300abe788db21 icedtea-3.16.0 +ea3169880d702b059778aaae997300abe788db21 icedtea-3.17.0pre00 +e1696465ea341bb68a92a4647b9da3180c8e5d9a icedtea-3.17.0pre01 +644b5985f127344c4fe826a020ef198845c7ebc1 jdk8u262-b01 +43f43d9419963857bacdc70bd735632617be840b jdk8u262-b02 +541794915ecb1043b1f68f74778d44155610cdbf jdk8u262-b03 +1d0763331a525db2b7281159d1325be53e17e898 jdk8u262-b04 +61a6c87db285a79da7f90ac95916a591e95ba359 jdk8u262-b05 +61a6c87db285a79da7f90ac95916a591e95ba359 jdk8u272-b00 +c4db66b4dcf7da619465874f9b87d7a3840fb239 jdk8u262-b06 +7709711670b4f2994499684c4b4356e224764af9 jdk8u262-b07 +839f2cd2a1817734a3aa39e5ce2980f0873722a9 jdk8u262-b08 +ad521427e273fe14ea5d0cf6d1dc62c81148fd8b jdk8u262-b09 +2c87084c0b09c598674425475895bbf3da52e385 jdk8u262-b10 +2c87084c0b09c598674425475895bbf3da52e385 jdk8u262-ga +2c87084c0b09c598674425475895bbf3da52e385 jdk8u265-b00 +985114dd4afc7fef23145fa33c7bbb835c1dfc3a jdk8u265-b01 +985114dd4afc7fef23145fa33c7bbb835c1dfc3a jdk8u265-ga +c962b0325d3e46a3168d592d9be0d008db74d3a6 jdk8u272-b01 +a702bd3d9db12178cfdd95e862659fe2e8d43e30 jdk8u272-b02 +eea7b1a818e9ed1019ebfeb15c4cbc82542c58ea jdk8u272-b03 +8aafb146a99e013e197a27641bf1b7f3319133b0 icedtea-3.17.0pre02 +33e9ed39edb721cb28fb9892adba8215429a210e jdk8u272-b04 +dd27c46e8310ffde17f8f902d9d331b971facce2 jdk8u272-b05 +f4d4a3f880dab178d630b042be93528d6b2e8227 jdk8u272-b06 +2d2435272dddfcebdbb52b6217f51794a42016c2 jdk8u272-b07 +d652c48a90eb54c3d8ac7fd2d6bc98af2d6ca5f9 jdk8u272-b08 +244b07da2440e58627c8efea6c2095e6fde6fd10 jdk8u272-b09 +75460f3d14244842fa557130b7d573dafa0b55f0 jdk8u272-b10 +75460f3d14244842fa557130b7d573dafa0b55f0 jdk8u272-ga diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-ea3169880d70/THIRD_PARTY_README new/corba-29969b96b06f/THIRD_PARTY_README --- old/corba-ea3169880d70/THIRD_PARTY_README 2020-04-22 00:47:15.000000000 +0200 +++ new/corba-29969b96b06f/THIRD_PARTY_README 2020-10-27 07:33:35.000000000 +0100 @@ -1643,7 +1643,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, +%% This notice is provided with respect to GIFLIB 5.2.1 & libungif 4.1.3, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -2240,7 +2240,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite v1.8.24, +%% This notice is provided with respect to PC/SC Lite v1.8.26, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- @@ -2898,23 +2898,21 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to X Window System 6.8.2, which may be +%% This notice is provided with respect to xwd v1.0.7, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. +xwd utility + --- begin of LICENSE --- -This is the copyright for the files in src/solaris/native/sun/awt: list.h, -multiVis.h, wsutils.h, list.c, multiVis.c -Copyright (c) 1994 Hewlett-Packard Co. -Copyright (c) 1996 X Consortium - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Copyright 1994 Hewlett-Packard Co. +Copyright 1996, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -2922,15 +2920,15 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Except as contained in this notice, the name of the X Consortium shall +Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization -from the X Consortium. +from The Open Group. --- end of LICENSE --- _____________________________ @@ -3030,8 +3028,7 @@ Apache Commons Math 3.2 Apache Derby 10.11.1.2 Apache Jakarta BCEL 5.1 - Apache Jakarta Regexp 1.4 - Apache Santuario XML Security for Java 1.5.4 + Apache Santuario XML Security for Java 2.1.1 Apache Xalan-Java 2.7.2 Apache Xerces Java 2.10.0 Apache XML Resolver 1.1 @@ -3245,3 +3242,41 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token +Interface v2.40, which may be included with JRE 8, JDK 8, and OpenJDK 8. + +--- begin of LICENSE --- + +Copyright (c) OASIS Open 2016. All Rights Reserved. + +All capitalized terms in the following text have the meanings assigned to them +in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The +full Policy may be found at the OASIS website: +[http://www.oasis-open.org/policies-guidelines/ipr] + +This document and translations of it may be copied and furnished to others, and +derivative works that comment on or otherwise explain it or assist in its +implementation may be prepared, copied, published, and distributed, in whole or +in part, without restriction of any kind, provided that the above copyright +notice and this section are included on all such copies and derivative works. +However, this document itself may not be modified in any way, including by +removing the copyright notice or references to OASIS, except as needed for the +purpose of developing any document or deliverable produced by an OASIS +Technical Committee (in which case the rules applicable to copyrights, as set +forth in the OASIS IPR Policy, must be followed) or as required to translate it +into languages other than English. + +The limited permissions granted above are perpetual and will not be revoked by +OASIS or its successors or assigns. + +This document and the information contained herein is provided on an "AS IS" +basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT +INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR +FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR +ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE +OF THIS DOCUMENT OR ANY PART THEREOF. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- ++++++ 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.3463/hotspot.tar.xz differ: char 26, line 1 ++++++ icedtea-3.16.0.tar.xz -> icedtea-3.17.0.tar.xz ++++++ ++++ 14807 lines of diff (skipped) ++++++ java-atk-wrapper-security.patch ++++++ --- /var/tmp/diff_new_pack.zxWFvO/_old 2020-11-02 09:38:24.593495729 +0100 +++ /var/tmp/diff_new_pack.zxWFvO/_new 2020-11-02 09:38:24.593495729 +0100 @@ -1,22 +1,22 @@ --- openjdk/jdk/src/share/lib/security/java.security-linux 2014-07-15 23:08:27.000000000 +0200 +++ openjdk/jdk/src/share/lib/security/java.security-linux 2014-07-18 09:04:45.127566697 +0200 @@ -227,7 +227,9 @@ - jdk.nashorn.internal.,\ - jdk.nashorn.tools.,\ - jdk.xml.internal.,\ -- com.sun.activation.registries. -+ com.sun.activation.registries.,\ + com.sun.activation.registries.,\ + jdk.jfr.events.,\ + jdk.jfr.internal.,\ +- jdk.management.jfr.internal. ++ jdk.management.jfr.internal.\ + org.GNOME.Accessibility.,\ + org.GNOME.Bonobo. # # List of comma-separated packages that start with or equal this string -@@ -277,7 +279,9 @@ - jdk.nashorn.internal.,\ - jdk.nashorn.tools.,\ - jdk.xml.internal.,\ -- com.sun.activation.registries. -+ com.sun.activation.registries.,\ +@@ -280,7 +282,9 @@ + com.sun.activation.registries.,\ + jdk.jfr.events.,\ + jdk.jfr.internal.,\ +- jdk.management.jfr.internal. ++ jdk.management.jfr.internal.\ + org.GNOME.Accessibility.,\ + org.GNOME.Bonobo. ++++++ jaxp.tar.xz ++++++ ++++ 5848 lines of diff (skipped) ++++++ jaxws.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-e5d96dc9988a/.hgtags new/jaxws-02744f3ceba7/.hgtags --- old/jaxws-e5d96dc9988a/.hgtags 2020-04-22 00:47:19.000000000 +0200 +++ new/jaxws-02744f3ceba7/.hgtags 2020-10-27 07:33:35.000000000 +0100 @@ -1093,8 +1093,39 @@ 08cb9430f84f4fea71345a3be9408542d410f0da jdk8u252-b03 966e128812aff4c0a4aa4aed7e0ec61dbb8c7953 jdk8u252-b04 fac54385ffea4540bc79826ffed5b6d20d821ae5 jdk8u252-b05 +fac54385ffea4540bc79826ffed5b6d20d821ae5 jdk8u262-b00 121cf3b001d9906c3ad92e690122a30dc39f2405 jdk8u252-b06 e86a511a486e55c8492cffab649b70be870147fc jdk8u252-b07 7e334946a044980685486099ac74a366752e73d1 jdk8u252-b08 b012193ff452cb51182f5f5c60ccbed0da6e3ef8 jdk8u252-b09 b012193ff452cb51182f5f5c60ccbed0da6e3ef8 jdk8u252-ga +e5d96dc9988ab3867833d7bc9fd3150b03bea96a icedtea-3.16.0 +e5d96dc9988ab3867833d7bc9fd3150b03bea96a icedtea-3.17.0pre00 +accca84b727dad6e4525ee58169c41524269a2cd icedtea-3.17.0pre01 +c8d9ee34785849b4c71f788190b9e4e43f447311 jdk8u262-b01 +ed881d547a807b49615df3f51fdcc0075309fc40 jdk8u262-b02 +a708c11c582dce75a6b134e4dfb6f3f3aa05ef8d jdk8u262-b03 +caa13cd34f715d6db597adca78732b94f3728bae jdk8u262-b04 +96946cef7eade1693fe6dbd2e6001f36defb0295 jdk8u262-b05 +96946cef7eade1693fe6dbd2e6001f36defb0295 jdk8u272-b00 +0e54ba3037a2a8d5c93d8909aeaa75f9e55bf82a jdk8u262-b06 +494c863af128b32c7462e49c32ce3a422033e4d2 jdk8u262-b07 +cb41a9e2bafd0e332c5906dde9840816dc279b9c jdk8u262-b08 +cd7ed8c648058a8fa01242d73e9754f455559c3e jdk8u262-b09 +7347ed2df76baff282a0a890724fb66e84291b0e jdk8u262-b10 +7347ed2df76baff282a0a890724fb66e84291b0e jdk8u262-ga +7347ed2df76baff282a0a890724fb66e84291b0e jdk8u265-b00 +94d6ff459027c2bda81ac79b6e0286c2f23c8146 jdk8u265-b01 +94d6ff459027c2bda81ac79b6e0286c2f23c8146 jdk8u265-ga +38d13ac335fe2f1f2d9c8dd6607fc3973824a4e7 jdk8u272-b01 +7aeb5d972262795d232457bc11ca543643c54af3 jdk8u272-b02 +c87827b363e75a6eee6c34b93f070ce06765d0cf jdk8u272-b03 +a86aa3e2a7c8f0647f501c80f3934653866ccdf2 icedtea-3.17.0pre02 +d73f32c769de27245978704020f57e829a02cf5c jdk8u272-b04 +5c3121f1439935cba32ca85366e925ac7090448c jdk8u272-b05 +eb8412f04a3e99bf562c7aca947b862fc13957ef jdk8u272-b06 +52516d7a2504137a3100b39824e0d3915b7451db jdk8u272-b07 +1c99ddb9d546b756533a4af78222cd07de996fa6 jdk8u272-b08 +d416f2a0773a0e53a60ed165827d7d5313941cb2 jdk8u272-b09 +1dc430818e0cb46c536c4c7b72be2d7f395156b0 jdk8u272-b10 +1dc430818e0cb46c536c4c7b72be2d7f395156b0 jdk8u272-ga diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-e5d96dc9988a/THIRD_PARTY_README new/jaxws-02744f3ceba7/THIRD_PARTY_README --- old/jaxws-e5d96dc9988a/THIRD_PARTY_README 2020-04-22 00:47:19.000000000 +0200 +++ new/jaxws-02744f3ceba7/THIRD_PARTY_README 2020-10-27 07:33:35.000000000 +0100 @@ -1643,7 +1643,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, +%% This notice is provided with respect to GIFLIB 5.2.1 & libungif 4.1.3, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -2240,7 +2240,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite v1.8.24, +%% This notice is provided with respect to PC/SC Lite v1.8.26, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- @@ -2898,23 +2898,21 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to X Window System 6.8.2, which may be +%% This notice is provided with respect to xwd v1.0.7, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. +xwd utility + --- begin of LICENSE --- -This is the copyright for the files in src/solaris/native/sun/awt: list.h, -multiVis.h, wsutils.h, list.c, multiVis.c -Copyright (c) 1994 Hewlett-Packard Co. -Copyright (c) 1996 X Consortium - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Copyright 1994 Hewlett-Packard Co. +Copyright 1996, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -2922,15 +2920,15 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Except as contained in this notice, the name of the X Consortium shall +Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization -from the X Consortium. +from The Open Group. --- end of LICENSE --- _____________________________ @@ -3030,8 +3028,7 @@ Apache Commons Math 3.2 Apache Derby 10.11.1.2 Apache Jakarta BCEL 5.1 - Apache Jakarta Regexp 1.4 - Apache Santuario XML Security for Java 1.5.4 + Apache Santuario XML Security for Java 2.1.1 Apache Xalan-Java 2.7.2 Apache Xerces Java 2.10.0 Apache XML Resolver 1.1 @@ -3245,3 +3242,41 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token +Interface v2.40, which may be included with JRE 8, JDK 8, and OpenJDK 8. + +--- begin of LICENSE --- + +Copyright (c) OASIS Open 2016. All Rights Reserved. + +All capitalized terms in the following text have the meanings assigned to them +in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The +full Policy may be found at the OASIS website: +[http://www.oasis-open.org/policies-guidelines/ipr] + +This document and translations of it may be copied and furnished to others, and +derivative works that comment on or otherwise explain it or assist in its +implementation may be prepared, copied, published, and distributed, in whole or +in part, without restriction of any kind, provided that the above copyright +notice and this section are included on all such copies and derivative works. +However, this document itself may not be modified in any way, including by +removing the copyright notice or references to OASIS, except as needed for the +purpose of developing any document or deliverable produced by an OASIS +Technical Committee (in which case the rules applicable to copyrights, as set +forth in the OASIS IPR Policy, must be followed) or as required to translate it +into languages other than English. + +The limited permissions granted above are perpetual and will not be revoked by +OASIS or its successors or assigns. + +This document and the information contained herein is provided on an "AS IS" +basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT +INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR +FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR +ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE +OF THIS DOCUMENT OR ANY PART THEREOF. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- ++++++ 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.3463/jdk.tar.xz differ: char 26, line 1 ++++++ langtools.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-e47d37e5fe0b/.hgtags new/langtools-83b7a751f44f/.hgtags --- old/langtools-e47d37e5fe0b/.hgtags 2020-04-22 00:47:23.000000000 +0200 +++ new/langtools-83b7a751f44f/.hgtags 2020-10-27 07:33:35.000000000 +0100 @@ -1100,8 +1100,39 @@ 665990488f3d9dbaef06f04e0383bfecf2d0e031 jdk8u252-b03 549e692228104960d813458d274aa5ec7bf8d125 jdk8u252-b04 4d4304fcc0cc49e1b4257fb9dce8b96e2da9dcbe jdk8u252-b05 +4d4304fcc0cc49e1b4257fb9dce8b96e2da9dcbe jdk8u262-b00 4010269cf4965f6e6efc402b6d3f5e1dc8957a9e jdk8u252-b06 8ce7c29ca85c77147edd0123d3393fabd351685e jdk8u252-b07 c56eceecec71d0b7f8af742ba33b50a3128de58f jdk8u252-b08 01036da3155c1ff6f5a92eab0b8be842148258f3 jdk8u252-b09 01036da3155c1ff6f5a92eab0b8be842148258f3 jdk8u252-ga +e47d37e5fe0b5e2292eed6ffbda1359786b0adcf icedtea-3.16.0 +e47d37e5fe0b5e2292eed6ffbda1359786b0adcf icedtea-3.17.0pre00 +ad7ffc1bb8e1183cf1cc7b764c620c02ab60d69e icedtea-3.17.0pre01 +05fc0d4d4fbe10508ed18e2f64f42ca16a71306f jdk8u262-b01 +910ec7999bd5c01dc979ea99604d5122e465ad34 jdk8u262-b02 +6df22f7cfdf1154526a79982cb99fbd7684b0bbd jdk8u262-b03 +094173db293ac68326b38333a3570bdb0d407b43 jdk8u262-b04 +07fc22e7080d7440c5e8bea06dc36548bcb065b2 jdk8u262-b05 +07fc22e7080d7440c5e8bea06dc36548bcb065b2 jdk8u272-b00 +26690d83c12ed384b919f7c67b70d2000f999bdf jdk8u262-b06 +774e6c9b92965430835ea842724348c39692c542 jdk8u262-b07 +ac5fce89162167996468e6466abe5cfcc8185bde jdk8u262-b08 +747fe2026aa872ee5444e6c24653d054b1aef58c jdk8u262-b09 +fd4d3f8b2c2de81cac967f56ec69f82a7c6b0e9d jdk8u262-b10 +fd4d3f8b2c2de81cac967f56ec69f82a7c6b0e9d jdk8u262-ga +fd4d3f8b2c2de81cac967f56ec69f82a7c6b0e9d jdk8u265-b00 +e0342245812afc794e3537380c7025683424d07e jdk8u265-b01 +e0342245812afc794e3537380c7025683424d07e jdk8u265-ga +a51cd1abb0c93552857885b1ba53592c786714d2 jdk8u272-b01 +54f67143c9566104641b6c69ce33f541d0f5f350 jdk8u272-b02 +4e02b68de4582b99db1331852cb731914a47adba jdk8u272-b03 +4ea625a4e1562077914fc6b5084646aec90b8635 icedtea-3.17.0pre02 +a317abfcbd909b1c094e250afb0cb618e363e938 jdk8u272-b04 +f1fa9a70296a0ce38c6e315fb3ee107aa32f6b42 jdk8u272-b05 +b974f43a589fa0ca7be9d0a62673929229a2a4e7 jdk8u272-b06 +a56fbe019ae89f55aae083d29b24f83290affe5d jdk8u272-b07 +462446582ece03a945b8d6b7714ac3c19f07ff25 jdk8u272-b08 +acab1eb3dc4c828f87500709d05ea2293baed60c jdk8u272-b09 +68a2632bf926ed13c20af12d3c5d1b3e79f3acb9 jdk8u272-b10 +68a2632bf926ed13c20af12d3c5d1b3e79f3acb9 jdk8u272-ga diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-e47d37e5fe0b/THIRD_PARTY_README new/langtools-83b7a751f44f/THIRD_PARTY_README --- old/langtools-e47d37e5fe0b/THIRD_PARTY_README 2020-04-22 00:47:23.000000000 +0200 +++ new/langtools-83b7a751f44f/THIRD_PARTY_README 2020-10-27 07:33:35.000000000 +0100 @@ -1643,7 +1643,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, +%% This notice is provided with respect to GIFLIB 5.2.1 & libungif 4.1.3, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -2240,7 +2240,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite v1.8.24, +%% This notice is provided with respect to PC/SC Lite v1.8.26, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- @@ -2898,23 +2898,21 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to X Window System 6.8.2, which may be +%% This notice is provided with respect to xwd v1.0.7, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. +xwd utility + --- begin of LICENSE --- -This is the copyright for the files in src/solaris/native/sun/awt: list.h, -multiVis.h, wsutils.h, list.c, multiVis.c -Copyright (c) 1994 Hewlett-Packard Co. -Copyright (c) 1996 X Consortium - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Copyright 1994 Hewlett-Packard Co. +Copyright 1996, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -2922,15 +2920,15 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Except as contained in this notice, the name of the X Consortium shall +Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization -from the X Consortium. +from The Open Group. --- end of LICENSE --- _____________________________ @@ -3030,8 +3028,7 @@ Apache Commons Math 3.2 Apache Derby 10.11.1.2 Apache Jakarta BCEL 5.1 - Apache Jakarta Regexp 1.4 - Apache Santuario XML Security for Java 1.5.4 + Apache Santuario XML Security for Java 2.1.1 Apache Xalan-Java 2.7.2 Apache Xerces Java 2.10.0 Apache XML Resolver 1.1 @@ -3245,3 +3242,41 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token +Interface v2.40, which may be included with JRE 8, JDK 8, and OpenJDK 8. + +--- begin of LICENSE --- + +Copyright (c) OASIS Open 2016. All Rights Reserved. + +All capitalized terms in the following text have the meanings assigned to them +in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The +full Policy may be found at the OASIS website: +[http://www.oasis-open.org/policies-guidelines/ipr] + +This document and translations of it may be copied and furnished to others, and +derivative works that comment on or otherwise explain it or assist in its +implementation may be prepared, copied, published, and distributed, in whole or +in part, without restriction of any kind, provided that the above copyright +notice and this section are included on all such copies and derivative works. +However, this document itself may not be modified in any way, including by +removing the copyright notice or references to OASIS, except as needed for the +purpose of developing any document or deliverable produced by an OASIS +Technical Committee (in which case the rules applicable to copyrights, as set +forth in the OASIS IPR Policy, must be followed) or as required to translate it +into languages other than English. + +The limited permissions granted above are perpetual and will not be revoked by +OASIS or its successors or assigns. + +This document and the information contained herein is provided on an "AS IS" +basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT +INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR +FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR +ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE +OF THIS DOCUMENT OR ANY PART THEREOF. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-e47d37e5fe0b/src/share/classes/com/sun/tools/javac/resources/legacy.properties new/langtools-83b7a751f44f/src/share/classes/com/sun/tools/javac/resources/legacy.properties --- old/langtools-e47d37e5fe0b/src/share/classes/com/sun/tools/javac/resources/legacy.properties 2020-04-22 00:47:23.000000000 +0200 +++ new/langtools-83b7a751f44f/src/share/classes/com/sun/tools/javac/resources/legacy.properties 2020-10-27 07:33:35.000000000 +0100 @@ -143,6 +143,7 @@ com.sun.jndi.ldap.ext = tiger legacy com.sun.jndi.ldap.pool = tiger legacy com.sun.jndi.ldap.sasl = tiger legacy +com.sun.jndi.ldap.spi = tiger legacy com.sun.jndi.rmi.registry = tiger legacy com.sun.jndi.toolkit.corba = tiger legacy com.sun.jndi.toolkit.ctx = tiger legacy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-e47d37e5fe0b/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java new/langtools-83b7a751f44f/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java --- old/langtools-e47d37e5fe0b/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java 2020-04-22 00:47:23.000000000 +0200 +++ new/langtools-83b7a751f44f/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java 2020-10-27 07:33:35.000000000 +0100 @@ -500,6 +500,7 @@ "org.w3c.dom.css", "org.w3c.dom.events", "org.w3c.dom.views", + "com.sun.jndi.ldap.spi", "com.sun.management", "com.sun.security.auth", "com.sun.security.auth.callback", ++++++ nashorn.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nashorn-1d70dcb4ab53/.hgtags new/nashorn-347f82a7813a/.hgtags --- old/nashorn-1d70dcb4ab53/.hgtags 2020-04-22 00:47:25.000000000 +0200 +++ new/nashorn-347f82a7813a/.hgtags 2020-10-27 07:33:37.000000000 +0100 @@ -1131,8 +1131,39 @@ 91381cf36ea49a3e08b10971160f714a6bf71dfd jdk8u252-b03 e767af0b6500d829977e23cfb3fe19f28a4e9f88 jdk8u252-b04 7fd34fff5c4418b869b96c6f3c1f9fd632590a5b jdk8u252-b05 +7fd34fff5c4418b869b96c6f3c1f9fd632590a5b jdk8u262-b00 b988f627520c45015f0b91d2ee35e69531300770 jdk8u252-b06 0666ec7fe2b45353dc0e09c1f6f386bdf763eeb4 jdk8u252-b07 95d61d0f326bbfaddc2cbd29e67b12c00041caaa jdk8u252-b08 2f5ad880fd3372eb5c2e5ac5ee82c705a1b6ac07 jdk8u252-b09 2f5ad880fd3372eb5c2e5ac5ee82c705a1b6ac07 jdk8u252-ga +1d70dcb4ab539aa8f0e3e49c1c6b97d9ff286eaf icedtea-3.16.0 +1d70dcb4ab539aa8f0e3e49c1c6b97d9ff286eaf icedtea-3.17.0pre00 +36e295162ff1baa0b709d4d5880449f758558342 icedtea-3.17.0pre01 +0a00f1ccd7e96bcd7eb102b510fc1e639e0c554b jdk8u262-b01 +60239ecaefa22c4f415c3170fe93065f344bf15b jdk8u262-b02 +0b39fe441888452aa6a7aabef856c23e8cabf9ff jdk8u262-b03 +eef87c0da03ebb76368edb3195c1c5924edda265 jdk8u262-b04 +e2a7c53cfa4d3c689bb819cf7ed6bb766a62baa9 jdk8u262-b05 +e2a7c53cfa4d3c689bb819cf7ed6bb766a62baa9 jdk8u272-b00 +f6630163b3a2b7a136db8b78049f78aa491aaf69 jdk8u262-b06 +e085d9bd4f6596c5633359d16d9bfc39ecfb1b72 jdk8u262-b07 +18103a6d9d495506b71068e6886d436f98bb165c jdk8u262-b08 +7348b67e1dd4786e9cd4c0472ca2802f36a2573f jdk8u262-b09 +15fcd98e96ac6bd631816fc78c3fa271f164ca6c jdk8u262-b10 +15fcd98e96ac6bd631816fc78c3fa271f164ca6c jdk8u262-ga +15fcd98e96ac6bd631816fc78c3fa271f164ca6c jdk8u265-b00 +124d863b2b5d0496d3f626f3426652871c950909 jdk8u265-b01 +124d863b2b5d0496d3f626f3426652871c950909 jdk8u265-ga +ab242949177cbfcd698b3c9792d308f32ebec67f jdk8u272-b01 +cf78b728ecca3ddd206a7bdbd9deb74eca80cf40 jdk8u272-b02 +1409bb48eea8631fffab1a9d2903cf9f68aeb124 jdk8u272-b03 +3c07ff843d55b75574a4902f1a59d501a36daf35 icedtea-3.17.0pre02 +d90c85ae0004869d8f6c980d20e44ff513ff743e jdk8u272-b04 +5e0be06a9cf23ac7a73e056f23505dcc1639709f jdk8u272-b05 +f819244537cf8958f82c1c3c1fd32bbd89e956db jdk8u272-b06 +7ee1ab38e286ab80a05fdfbe15e9694ae55d9d7f jdk8u272-b07 +7b821bf9d092a5ab6d8bbb63590cd45e86738170 jdk8u272-b08 +384ba0e962c88a2d84bdb590847a6db91286c2fb jdk8u272-b09 +65ff5c46b9ac976ababa9361872112d35318fdf4 jdk8u272-b10 +65ff5c46b9ac976ababa9361872112d35318fdf4 jdk8u272-ga diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nashorn-1d70dcb4ab53/THIRD_PARTY_README new/nashorn-347f82a7813a/THIRD_PARTY_README --- old/nashorn-1d70dcb4ab53/THIRD_PARTY_README 2020-04-22 00:47:25.000000000 +0200 +++ new/nashorn-347f82a7813a/THIRD_PARTY_README 2020-10-27 07:33:37.000000000 +0100 @@ -1643,7 +1643,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, +%% This notice is provided with respect to GIFLIB 5.2.1 & libungif 4.1.3, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -2240,7 +2240,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite v1.8.24, +%% This notice is provided with respect to PC/SC Lite v1.8.26, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- @@ -2898,23 +2898,21 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to X Window System 6.8.2, which may be +%% This notice is provided with respect to xwd v1.0.7, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. +xwd utility + --- begin of LICENSE --- -This is the copyright for the files in src/solaris/native/sun/awt: list.h, -multiVis.h, wsutils.h, list.c, multiVis.c -Copyright (c) 1994 Hewlett-Packard Co. -Copyright (c) 1996 X Consortium - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Copyright 1994 Hewlett-Packard Co. +Copyright 1996, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -2922,15 +2920,15 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Except as contained in this notice, the name of the X Consortium shall +Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization -from the X Consortium. +from The Open Group. --- end of LICENSE --- _____________________________ @@ -3030,8 +3028,7 @@ Apache Commons Math 3.2 Apache Derby 10.11.1.2 Apache Jakarta BCEL 5.1 - Apache Jakarta Regexp 1.4 - Apache Santuario XML Security for Java 1.5.4 + Apache Santuario XML Security for Java 2.1.1 Apache Xalan-Java 2.7.2 Apache Xerces Java 2.10.0 Apache XML Resolver 1.1 @@ -3245,3 +3242,41 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token +Interface v2.40, which may be included with JRE 8, JDK 8, and OpenJDK 8. + +--- begin of LICENSE --- + +Copyright (c) OASIS Open 2016. All Rights Reserved. + +All capitalized terms in the following text have the meanings assigned to them +in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The +full Policy may be found at the OASIS website: +[http://www.oasis-open.org/policies-guidelines/ipr] + +This document and translations of it may be copied and furnished to others, and +derivative works that comment on or otherwise explain it or assist in its +implementation may be prepared, copied, published, and distributed, in whole or +in part, without restriction of any kind, provided that the above copyright +notice and this section are included on all such copies and derivative works. +However, this document itself may not be modified in any way, including by +removing the copyright notice or references to OASIS, except as needed for the +purpose of developing any document or deliverable produced by an OASIS +Technical Committee (in which case the rules applicable to copyrights, as set +forth in the OASIS IPR Policy, must be followed) or as required to translate it +into languages other than English. + +The limited permissions granted above are perpetual and will not be revoked by +OASIS or its successors or assigns. + +This document and the information contained herein is provided on an "AS IS" +basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT +INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR +FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR +ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE +OF THIS DOCUMENT OR ANY PART THEREOF. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nashorn-1d70dcb4ab53/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java new/nashorn-347f82a7813a/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java --- old/nashorn-1d70dcb4ab53/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java 2020-04-22 00:47:25.000000000 +0200 +++ new/nashorn-347f82a7813a/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java 2020-10-27 07:33:37.000000000 +0100 @@ -396,7 +396,8 @@ */ public static MemoryLayoutSpecification getEffectiveMemoryLayoutSpecification() { final String vmName = System.getProperty("java.vm.name"); - if (vmName == null || !vmName.startsWith("Java HotSpot(TM) ")) { + if (vmName == null + || (!vmName.startsWith("OpenJDK ") && !vmName.startsWith("Java HotSpot(TM) "))) { throw new UnsupportedOperationException( "ObjectSizeCalculator only supported on HotSpot VM"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nashorn-1d70dcb4ab53/src/jdk/nashorn/tools/Shell.java new/nashorn-347f82a7813a/src/jdk/nashorn/tools/Shell.java --- old/nashorn-1d70dcb4ab53/src/jdk/nashorn/tools/Shell.java 2020-04-22 00:47:25.000000000 +0200 +++ new/nashorn-347f82a7813a/src/jdk/nashorn/tools/Shell.java 2020-10-27 07:33:37.000000000 +0100 @@ -288,7 +288,7 @@ } catch (IOException ioe) { // ignore } - if (l.startsWith("#!")) { + if (l != null && l.startsWith("#!")) { shebangFilePos = i; } // We're only checking the first non-option argument. If it's not a shebang file, we're in normal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nashorn-1d70dcb4ab53/test/script/nosecurity/JDK-8193137.js new/nashorn-347f82a7813a/test/script/nosecurity/JDK-8193137.js --- old/nashorn-1d70dcb4ab53/test/script/nosecurity/JDK-8193137.js 1970-01-01 01:00:00.000000000 +0100 +++ new/nashorn-347f82a7813a/test/script/nosecurity/JDK-8193137.js 2020-10-27 07:33:37.000000000 +0100 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +/** + * JDK-8193137 : Nashorn crashes when given an empty script file. + * + * @test + * @option -scripting + * @run + */ + +if (typeof fail != 'function') { + fail = print; +} + +var System = java.lang.System; +var File = java.io.File; +var javahome = System.getProperty("java.home"); +var nashornJar = new File(System.getProperty("nashorn.jar")); +if (! nashornJar.isAbsolute()) { + nashornJar = new File(".", nashornJar); +} + +// we want to use nashorn.jar passed and not the one that comes with JRE +var jjsCmd = javahome + "/../bin/jjs"; +jjsCmd = jjsCmd.toString().replace(/\//g, File.separator); +if (! new File(jjsCmd).isFile()) { + jjsCmd = javahome + "/bin/jjs"; + jjsCmd = jjsCmd.toString().replace(/\//g, File.separator); +} + +$ENV.PWD=System.getProperty("user.dir") + +var emptyFile = new File($ENV.PWD+File.separator+"empty.js"); +emptyFile.createNewFile(); +emptyFile.deleteOnExit(); + +$EXEC(jjsCmd + " empty.js"); +if($ERR != "") + fail("jjs fails with empty script file"); ++++++ openjdk.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-bca1f7228ce8/.hgignore new/icedtea8-forest-a612a04781bd/.hgignore --- old/icedtea8-forest-bca1f7228ce8/.hgignore 2020-04-22 00:47:13.000000000 +0200 +++ new/icedtea8-forest-a612a04781bd/.hgignore 2020-10-27 07:33:34.000000000 +0100 @@ -5,3 +5,5 @@ ^.hgtip ^.bridge2 .DS_Store +# Default ignored files +.idea/workspace.xml \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-bca1f7228ce8/.hgtags new/icedtea8-forest-a612a04781bd/.hgtags --- old/icedtea8-forest-bca1f7228ce8/.hgtags 2020-04-22 00:47:13.000000000 +0200 +++ new/icedtea8-forest-a612a04781bd/.hgtags 2020-10-27 07:33:34.000000000 +0100 @@ -1062,8 +1062,39 @@ 9fb3e77d22d6a616c33ae6feac9a847764968bc3 jdk8u252-b03 6383ac7b39e4d10c1fa6bf174855bc259dd9cb22 jdk8u252-b04 62c9a2725c6cbfcbd4c2d47c3751dbdecc2610ad jdk8u252-b05 +62c9a2725c6cbfcbd4c2d47c3751dbdecc2610ad jdk8u262-b00 bb464170d34478503661419d2f2864af7553d696 jdk8u252-b06 746815de8b5b0c661aa6a1fa9476be758cc51e17 jdk8u252-b07 72a6d93679e5bee5d5192234b8421024233cf616 jdk8u252-b08 343c4ea489d5d3b058c5e00339868e4f66c4995a jdk8u252-b09 343c4ea489d5d3b058c5e00339868e4f66c4995a jdk8u252-ga +bca1f7228ce8cf8b6fad5a278c1427c1763f1551 icedtea-3.16.0 +bca1f7228ce8cf8b6fad5a278c1427c1763f1551 icedtea-3.17.0pre00 +224893ede003ce1b059662471a1df462300dcd0e icedtea-3.17.0pre01 +3cf8935494d6ac06c3ecb495bf356fde94060496 jdk8u262-b01 +041cb274be1207a991e05b041f57a800e8132cff jdk8u262-b02 +908e7985b3393370a417db1254ab4585ea954b2f jdk8u262-b03 +e1a42471eb39cb9340608238cd67b1938f73632e jdk8u262-b04 +ecb485e1572c2f4964a943704fa6a79f8d5ee34c jdk8u262-b05 +ecb485e1572c2f4964a943704fa6a79f8d5ee34c jdk8u272-b00 +2f973e405849e5e5fbe1b95ad1f37dc19cd046bc jdk8u262-b06 +4f5c1e68c85ec157a86505613e1aec3f4528957b jdk8u262-b07 +59b2de0b2c60f7ae444a43c76fc96260351172a3 jdk8u262-b08 +2bab25ddc567a2fe5038cb49cf5586dfb4c32ff2 jdk8u262-b09 +94d3d8c74ed6df79b04a2fa64454f67d8729c8d8 jdk8u262-b10 +94d3d8c74ed6df79b04a2fa64454f67d8729c8d8 jdk8u262-ga +94d3d8c74ed6df79b04a2fa64454f67d8729c8d8 jdk8u265-b00 +6cc620acc6841a193a76ea2510381d5189e7ee74 jdk8u265-b01 +6cc620acc6841a193a76ea2510381d5189e7ee74 jdk8u265-ga +1bda51d3d528f884afe13b4a810390e3aa2464a8 jdk8u272-b01 +1059e4b7426a1ab9c52ce9aa55daf11d97b13607 jdk8u272-b02 +fbad06cacb73f4ca1701c789f7c1bc3f5c6f08c9 jdk8u272-b03 +aedccd51873f083dda0b571d24076142b9312d91 icedtea-3.17.0pre02 +a0dd128191fdce8034be8bd4c7a1f47ee2426e6d jdk8u272-b04 +afbc213b114cfc20b07318d4c1b2550211e77682 jdk8u272-b05 +e68b51b4e55a792c78f6f043738e75755571d92d jdk8u272-b06 +fec6ed779ae6ebe1cd2b3a97963026b3104f8ded jdk8u272-b07 +34c6baf214648afedf83625ed18a2650ed280c36 jdk8u272-b08 +7f60c2d9823ea2928db8eee582fbc736bd8d962c jdk8u272-b09 +6464ce0569e764ec2c6533f6bf4ca1725a618bdf jdk8u272-b10 +6464ce0569e764ec2c6533f6bf4ca1725a618bdf jdk8u272-ga diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-bca1f7228ce8/THIRD_PARTY_README new/icedtea8-forest-a612a04781bd/THIRD_PARTY_README --- old/icedtea8-forest-bca1f7228ce8/THIRD_PARTY_README 2020-04-22 00:47:13.000000000 +0200 +++ new/icedtea8-forest-a612a04781bd/THIRD_PARTY_README 2020-10-27 07:33:34.000000000 +0100 @@ -1643,7 +1643,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, +%% This notice is provided with respect to GIFLIB 5.2.1 & libungif 4.1.3, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -2240,7 +2240,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite v1.8.24, +%% This notice is provided with respect to PC/SC Lite v1.8.26, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- @@ -2898,23 +2898,21 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to X Window System 6.8.2, which may be +%% This notice is provided with respect to xwd v1.0.7, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. +xwd utility + --- begin of LICENSE --- -This is the copyright for the files in src/solaris/native/sun/awt: list.h, -multiVis.h, wsutils.h, list.c, multiVis.c -Copyright (c) 1994 Hewlett-Packard Co. -Copyright (c) 1996 X Consortium - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Copyright 1994 Hewlett-Packard Co. +Copyright 1996, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -2922,15 +2920,15 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Except as contained in this notice, the name of the X Consortium shall +Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization -from the X Consortium. +from The Open Group. --- end of LICENSE --- _____________________________ @@ -3030,8 +3028,7 @@ Apache Commons Math 3.2 Apache Derby 10.11.1.2 Apache Jakarta BCEL 5.1 - Apache Jakarta Regexp 1.4 - Apache Santuario XML Security for Java 1.5.4 + Apache Santuario XML Security for Java 2.1.1 Apache Xalan-Java 2.7.2 Apache Xerces Java 2.10.0 Apache XML Resolver 1.1 @@ -3245,3 +3242,41 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token +Interface v2.40, which may be included with JRE 8, JDK 8, and OpenJDK 8. + +--- begin of LICENSE --- + +Copyright (c) OASIS Open 2016. All Rights Reserved. + +All capitalized terms in the following text have the meanings assigned to them +in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The +full Policy may be found at the OASIS website: +[http://www.oasis-open.org/policies-guidelines/ipr] + +This document and translations of it may be copied and furnished to others, and +derivative works that comment on or otherwise explain it or assist in its +implementation may be prepared, copied, published, and distributed, in whole or +in part, without restriction of any kind, provided that the above copyright +notice and this section are included on all such copies and derivative works. +However, this document itself may not be modified in any way, including by +removing the copyright notice or references to OASIS, except as needed for the +purpose of developing any document or deliverable produced by an OASIS +Technical Committee (in which case the rules applicable to copyrights, as set +forth in the OASIS IPR Policy, must be followed) or as required to translate it +into languages other than English. + +The limited permissions granted above are perpetual and will not be revoked by +OASIS or its successors or assigns. + +This document and the information contained herein is provided on an "AS IS" +basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT +INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR +FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR +ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE +OF THIS DOCUMENT OR ANY PART THEREOF. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-bca1f7228ce8/common/autoconf/generated-configure.sh new/icedtea8-forest-a612a04781bd/common/autoconf/generated-configure.sh --- old/icedtea8-forest-bca1f7228ce8/common/autoconf/generated-configure.sh 2020-04-22 00:47:13.000000000 +0200 +++ new/icedtea8-forest-a612a04781bd/common/autoconf/generated-configure.sh 2020-10-27 07:33:34.000000000 +0100 @@ -866,6 +866,7 @@ JDK_MINOR_VERSION JDK_MAJOR_VERSION USER_RELEASE_SUFFIX +ENABLE_JFR COMPRESS_JARS UNLIMITED_CRYPTO CACERTS_FILE @@ -1035,6 +1036,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -1082,6 +1084,7 @@ enable_hotspot_test_in_build with_cacerts_file enable_unlimited_crypto +enable_jfr with_milestone with_update_version with_user_release_suffix @@ -1111,8 +1114,8 @@ with_extra_cflags with_extra_cxxflags with_extra_ldflags -enable_warnings_as_errors with_extra_asflags +enable_warnings_as_errors enable_debug_symbols enable_zip_debug_info with_native_debug_symbols @@ -1298,6 +1301,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1550,6 +1554,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1687,7 +1700,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1840,6 +1853,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1888,6 +1902,7 @@ run the Queens test after Hotspot build [disabled] --enable-unlimited-crypto Enable unlimited crypto policy [disabled] + --disable-jfr Disable Java Flight Recorder support [enabled] --disable-warnings-as-errors consider native warnings to be an error [disabled] --disable-debug-symbols disable generation of debug symbols [enabled] @@ -3993,7 +4008,7 @@ # -# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2020, 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 @@ -4459,7 +4474,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1585090987 +DATE_WHEN_GENERATED=1592500545 ############################################################################### # @@ -19934,6 +19949,44 @@ + ############################################################################### + # + # Enable or disable JFR + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build JFR" >&5 +$as_echo_n "checking whether to build JFR... " >&6; } + # Check whether --enable-jfr was given. +if test "${enable_jfr+set}" = set; then : + enableval=$enable_jfr; +else + enable_jfr=auto +fi + + if test "x$enable_jfr" = "xno"; then + ENABLE_JFR=false + elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then + if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then + if test "x$enable_jfr" = "xyes"; then + as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5 + else + ENABLE_JFR=false + fi + elif test "x$OPENJDK_TARGET_OS" = xaix; then + if test "x$enable_jfr" = "xyes"; then + as_fn_error $? "AIX does not support JFR" "$LINENO" 5 + else + ENABLE_JFR=false + fi + else + ENABLE_JFR=true + fi + else + as_fn_error $? "--enable-jfr must be set to either yes or no" "$LINENO" 5 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_JFR" >&5 +$as_echo "$ENABLE_JFR" >&6; } + + # Source the version numbers . $AUTOCONF_DIR/version-numbers @@ -28131,7 +28184,7 @@ COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ $SED -e 's/ *Copyright .*//'` COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ - $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'` + $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'` elif test "x$TOOLCHAIN_TYPE" = xclang; then # clang --version output typically looks like # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) @@ -29872,7 +29925,7 @@ COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ $SED -e 's/ *Copyright .*//'` COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ - $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'` + $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'` elif test "x$TOOLCHAIN_TYPE" = xclang; then # clang --version output typically looks like # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-bca1f7228ce8/common/autoconf/jdk-options.m4 new/icedtea8-forest-a612a04781bd/common/autoconf/jdk-options.m4 --- old/icedtea8-forest-bca1f7228ce8/common/autoconf/jdk-options.m4 2020-04-22 00:47:13.000000000 +0200 +++ new/icedtea8-forest-a612a04781bd/common/autoconf/jdk-options.m4 2020-10-27 07:33:34.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2020, 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 @@ -458,6 +458,38 @@ COMPRESS_JARS=false AC_SUBST(COMPRESS_JARS) + + ############################################################################### + # + # Enable or disable JFR + # + AC_MSG_CHECKING([whether to build JFR]) + AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr], + [Disable Java Flight Recorder support @<:@enabled@:>@])],, + [enable_jfr=auto]) + if test "x$enable_jfr" = "xno"; then + ENABLE_JFR=false + elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then + if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then + if test "x$enable_jfr" = "xyes"; then + AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build]) + else + ENABLE_JFR=false + fi + elif test "x$OPENJDK_TARGET_OS" = xaix; then + if test "x$enable_jfr" = "xyes"; then + AC_MSG_ERROR([AIX does not support JFR]) + else + ENABLE_JFR=false + fi + else + ENABLE_JFR=true + fi + else + AC_MSG_ERROR([--enable-jfr must be set to either yes or no]) + fi + AC_MSG_RESULT([$ENABLE_JFR]) + AC_SUBST(ENABLE_JFR) ]) ############################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-bca1f7228ce8/common/autoconf/toolchain.m4 new/icedtea8-forest-a612a04781bd/common/autoconf/toolchain.m4 --- old/icedtea8-forest-bca1f7228ce8/common/autoconf/toolchain.m4 2020-04-22 00:47:13.000000000 +0200 +++ new/icedtea8-forest-a612a04781bd/common/autoconf/toolchain.m4 2020-10-27 07:33:34.000000000 +0100 @@ -433,7 +433,7 @@ COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ $SED -e 's/ *Copyright .*//'` COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ - $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\) .*$/\1/'` + $SED -e 's/^.* \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\) .*$/\1/'` elif test "x$TOOLCHAIN_TYPE" = xclang; then # clang --version output typically looks like # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-bca1f7228ce8/common/bin/compare_exceptions.sh.incl new/icedtea8-forest-a612a04781bd/common/bin/compare_exceptions.sh.incl --- old/icedtea8-forest-bca1f7228ce8/common/bin/compare_exceptions.sh.incl 2020-04-22 00:47:13.000000000 +0200 +++ new/icedtea8-forest-a612a04781bd/common/bin/compare_exceptions.sh.incl 2020-10-27 07:33:34.000000000 +0100 @@ -280,7 +280,6 @@ ./jre/lib/i386/libsplashscreen.so ./jre/lib/i386/libsunec.so ./jre/lib/i386/libsunwjdga.so -./jre/lib/i386/libt2k.so ./jre/lib/i386/libunpack.so ./jre/lib/i386/libverify.so ./jre/lib/i386/libzip.so @@ -433,7 +432,6 @@ ./jre/lib/amd64/libsplashscreen.so ./jre/lib/amd64/libsunec.so ./jre/lib/amd64/libsunwjdga.so -./jre/lib/amd64/libt2k.so ./jre/lib/amd64/libunpack.so ./jre/lib/amd64/libverify.so ./jre/lib/amd64/libzip.so @@ -587,7 +585,6 @@ ./jre/lib/sparc/libsplashscreen.so ./jre/lib/sparc/libsunec.so ./jre/lib/sparc/libsunwjdga.so -./jre/lib/sparc/libt2k.so ./jre/lib/sparc/libunpack.so ./jre/lib/sparc/libverify.so ./jre/lib/sparc/libzip.so @@ -741,7 +738,6 @@ ./jre/lib/sparcv9/libsplashscreen.so ./jre/lib/sparcv9/libsunec.so ./jre/lib/sparcv9/libsunwjdga.so -./jre/lib/sparcv9/libt2k.so ./jre/lib/sparcv9/libunpack.so ./jre/lib/sparcv9/libverify.so ./jre/lib/sparcv9/libzip.so diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-bca1f7228ce8/make/Javadoc.gmk new/icedtea8-forest-a612a04781bd/make/Javadoc.gmk --- old/icedtea8-forest-bca1f7228ce8/make/Javadoc.gmk 2020-04-22 00:47:13.000000000 +0200 +++ new/icedtea8-forest-a612a04781bd/make/Javadoc.gmk 2020-10-27 07:33:34.000000000 +0100 @@ -221,6 +221,11 @@ JRE_API_DOCSDIR = $(DOCSDIR)/jre/api PLATFORM_DOCSDIR = $(DOCSDIR)/platform +JAVADOC_ARCHIVE_NAME := jdk-$(FULL_VERSION)-docs.zip +JAVADOC_ARCHIVE_ASSEMBLY_DIR := $(DOCSTMPDIR)/docs-zip +JAVADOC_ARCHIVE_DIR := $(OUTPUT_ROOT)/bundles +JAVADOC_ARCHIVE := $(JAVADOC_ARCHIVE_DIR)/$(JAVADOC_ARCHIVE_NAME) + # The non-core api javadocs need to be able to access the root of the core # api directory, so for jdk/api or jre/api to get to the core api/ # directory we would use this: @@ -329,6 +334,37 @@ all: docs docs: coredocs otherdocs +# +# Optional target which bundles all generated javadocs into a zip +# archive. The dependency on docs is handled in Main.gmk. Incremental +# building of docs is currently broken so if you invoke docs-zip after +# docs, the docs are always rebuilt. +# + +docs-zip: $(JAVADOC_ARCHIVE) + +# +# Add the core docs as prerequisite to the archive to trigger a rebuild +# if the core docs were rebuilt. Ideally any doc rebuild should trigger +# this, but the way prerequisites are currently setup in this file, that +# is hard to achieve. +# + +$(JAVADOC_ARCHIVE): $(COREAPI_INDEX_FILE) + @$(ECHO) $(LOG_INFO) "Compressing javadoc to single $(JAVADOC_ARCHIVE_NAME)" + $(MKDIR) -p $(JAVADOC_ARCHIVE_DIR) + $(RM) -r $(JAVADOC_ARCHIVE_ASSEMBLY_DIR) + $(MKDIR) -p $(JAVADOC_ARCHIVE_ASSEMBLY_DIR) + all_roots=`$(FIND) $(DOCSDIR) | $(GREP) index.html | grep -v old/doclet `; \ + pushd $(JAVADOC_ARCHIVE_ASSEMBLY_DIR); \ + for index_file in $${all_roots} ; do \ + target_dir=`dirname $${index_file}`; \ + name=`$(ECHO) $${target_dir} | $(SED) "s;/spec;;" | $(SED) "s;.*/;;"`; \ + $(LN) -s $${target_dir} $${name}; \ + done; \ + $(ZIP) -q -r $(JAVADOC_ARCHIVE) * ; \ + popd ; + ################################################################# # Production Targets -- USE THESE TARGETS WHEN: # a) You're generating docs outside of release engineering's @@ -1372,4 +1408,4 @@ ############################################################# .PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \ - sanitycheckcoredocs $(ALL_OTHER_TARGETS) + sanitycheckcoredocs $(ALL_OTHER_TARGETS) docs-zip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-bca1f7228ce8/make/Main.gmk new/icedtea8-forest-a612a04781bd/make/Main.gmk --- old/icedtea8-forest-bca1f7228ce8/make/Main.gmk 2020-04-22 00:47:13.000000000 +0200 +++ new/icedtea8-forest-a612a04781bd/make/Main.gmk 2020-10-27 07:33:34.000000000 +0100 @@ -161,6 +161,12 @@ @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs) @$(call TargetExit) +docs-zip: docs docs-zip-only +docs-zip-only: start-make + @$(call TargetEnter) + @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-zip) + @$(call TargetExit) + sign-jars: jdk sign-jars-only sign-jars-only: start-make @$(call TargetEnter) @@ -235,6 +241,8 @@ clean-docs: $(call CleanComponent,docs) $(call CleanComponent,docstemp) +clean-docs-zip: + $(call CleanComponent,bundles/jdk-*-docs.zip) clean-test: $(call CleanComponent,testoutput) @@ -246,10 +254,10 @@ endif @( cd $(OUTPUT_ROOT) && $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE) ) -.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs -.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only +.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs docs-zip +.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only docs-zip-only .PHONY: default all clean dist-clean bootcycle-images start-make -.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build +.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-docs-zip clean-test clean-overlay-images clean-bootcycle-build .PHONY: profiles profiles-only include $(root_dir)/make/Jprt.gmk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-bca1f7228ce8/make/common/JavaCompilation.gmk new/icedtea8-forest-a612a04781bd/make/common/JavaCompilation.gmk --- old/icedtea8-forest-bca1f7228ce8/make/common/JavaCompilation.gmk 2020-04-22 00:47:13.000000000 +0200 +++ new/icedtea8-forest-a612a04781bd/make/common/JavaCompilation.gmk 2020-10-27 07:33:34.000000000 +0100 @@ -222,7 +222,7 @@ $$($1_GREP_EXCLUDE_OUTPUT) $$(if $$($1_MANIFEST), \ $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ - -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \ + -e "s#@@COMPANY_NAME@@#$$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \ , \ $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE)) $$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))