/hg/icedtea6-hg: Update to build against July 2016 security fixe...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Aug 25 23:46:04 UTC 2016
changeset 8b26ecee3670 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8b26ecee3670
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Aug 17 02:53:46 2016 +0100
Update to build against July 2016 security fixes (b40).
Upstream changes:
- S4893408: JPEGReader throws IllegalArgException when setting the destination to BYTE_GRAY
- S6496269: Many warnings generated from com/sun/java/util/jar/pack/*.cpp when compiled on Linux
- S6522789: [zh_CN] translation of "enclosing class" in doclet is incorrect
- S6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
- S6579775: l10n update after 6212566
- S6600143: Remove another 450 unnecessary casts
- S6611629: Avoid hardcoded cygwin paths for memory detection
- S6631559: Registration of ImageIO plugins should not cause loading of jpeg.dlli and cmm.dll
- S6690018: RSAClientKeyExchange NullPointerException
- S6714842: CertPathBuilder returns incorrect CertPath for BasicConstraints in builderParams
- S6726309: Compiler warnings in nio code
- S6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles
- S6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
- S6752638: java.awt.GraphicsEnvironment.preferLocaleFonts() throws NPE on Linux
- S6755847: (launcher) will trigger assertions in debug build
- S6791502: IIOException "Invalid icc profile" on jpeg after update from JDK5 to JDK6
- S6793818: JpegImageReader is too greedy creating color profiles
- S6799141: Build with --hash-style=both so that binaries can work on SuSE 10
- S6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
- S6852744: PIT b61: PKI test suite fails because self signed certificates are being rejected
- S6864028: Update the java launcher to use the new entry point JVM_FindClassFromBootLoader
- S6875904: Java 7 message synchronization 1
- S6882437: CertPath/X509CertPathDiscovery/Test fails on jdk7/pit/b62
- S6888127: java.util.jar.Pack200.Packer Memory Leak
- S6888215: memory leak in jpeg plugin
- S6888925: SunMSCAPI's Cipher can't use RSA public keys obtained from other sources.
- S6889552: Sun provider should not require LDAP CertStore to be present
- S6941936: Broken pipe error of test case DNSIdentities.java
- S6951599: Rename package of security tools for modularization
- S6953295: Move few sun.security.{util, x509, pkcs} classes used by keytool/jarsigner to another package
- S6958026: Problem with PKCS12 keystore
- S6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches)
- S6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build
- S6989774: imageio compiler warnings in native code
- S6990106: FindBugs scan - Malicious code vulnerability Warnings in com.sun.java.util.jar.pack.*
- S6994413: JDK_GetVersionInfo0 only expects a two digit build number
- S7000225: Sanity check on sane-alsa-headers is broken
- S7000752: Duplicate entry in RowSetResourceBundles.properties
- S7001094: Can't initialize SunPKCS11 more times than PKCS11 driver maxSessionCount
- S7003227: (pack200) intermittent failures compiling pack200
- S7004706: l10n of 7000752 Duplicate entry in RowSetResourceBundles.properties
- S7006704: (pack200) add missing file for 6990106
- S7011497: Improve trust anchor searching method during cert path validation
- S7017734: jdk7 message drop 1 translation integration
- S7023416: (pack200) fix parfait issues
- S7029680: fix test/sun/misc/Version/Version.java build parsing
- S7038175: Expired PKITS certificates causing CertPathBuilder and CertPathValidator regression test failures
- S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber
- S7050826: Hebrew characters are not rendered on OEL 5.6
- S7055363: jdk_security3 test target cleanup
- S7060849: Eliminate pack200 build warnings
- S7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
- S7069870: Parts of the JDK erroneously rely on generic array initializers with diamond
- S7081817: test/sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java failing
- S7092825: javax.crypto.Cipher.Transform.patternCache is synchronizedMap and became scalability bottleneck.
- S7105780: Add SSLSocket client/SSLEngine server to templates directory
- S7107613: scalability blocker in javax.crypto.CryptoPermissions
- S7107616: scalability blocker in javax.crypto.JceSecurityManager
- S7109274: Restrict the use of certificates with RSA keys less than 1024 bits
- S7129083: CookieManager does not store cookies if url is read before setting cookie manager
- S7152582: PKCS11 tests should use the NSS libraries available in the OS
- S7166955: (pack200) JNI_GetCreatedJavaVMs needs additional checking
- S7196855: autotest.sh fails on ubuntu because libsoftokn.so not found
- S7200682: TEST_BUG: keytool/autotest.sh still has problems with libsoftokn.so
- S8002306: (se) Selector.open fails if invoked with thread interrupt status set [win]
- S8009634: TEST_BUG: sun/misc/Version/Version.java handle 2 digit minor in VM version
- S8010166: TEST_BUG: fix for 8009634 overlooks possible version strings (sun/misc/Version/Version.java)
- S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout
- S8019341: Update CookieHttpsClientTest to use the newer framework.
- S8022228: Intermittent test failures in sun/security/ssl/javax/net/ssl/NewAPIs
- S8022594: Potential deadlock in <clinit> of sun.nio.ch.Util/IOUtil
- S8023546: sun/security/mscapi/ShortRSAKey1024.sh fails intermittently
- S8026794: Test tools/pack200/TimeStamp.java fails while opening golden.jar.native.IST on linux-ppc(v2)
- S8027026: Change keytool -genkeypair to use -keyalg RSA
- S8029177: [Parfait] warnings from b117 for jdk.src.share.native.com.sun.java.util.jar: JNI exception pending
- S8029646: [pack200] should support the new zip64 format.
- S8036612: [parfait] JNI exception pending in jdk/src/windows/native/sun/security/mscapi/security.cpp
- S8037557: test SessionCacheSizeTests.java timeout
- S8074839: Resolve disabled warnings for libunpack and the unpack200 binary
- S8079410: Hotspot version to share the same update and build version from JDK
- S8079718: IIOP Input Stream Hooking
- S8130735: javax.swing.TimerQueue: timer fires late when another timer starts
- S8139436: sun.security.mscapi.KeyStore might load incomplete data
- S8140344: add support for 3 digit update release numbers
- S8144313: Test SessionTimeOutTests can be timeout
- S8145017: Add support for 3 digit hotspot minor version numbers
- S8145446: Perfect pipe placement
- S8146387: Test SSLSession/SessionCacheSizeTests socket accept timed out
- S8146669: Test SessionTimeOutTests fails intermittently
- S8146993: Several javax/management/remote/mandatory regression tests fail after JDK-8138811
- S8147771: Construction of static protection domains under Javax custom policy
- S8147857: [TEST] RMIConnector logs attribute names incorrectly
- S8148872: Complete name checking
- S8149962: Better delineation of XML processing
- S8150752: Share Class Data
- S8151841: Build needs additional flags to compile with GCC 6
- S8151876: (tz) Support tzdata2016d
- S8151925: Font reference improvements
- S8152479: Coded byte streams
- S8155981: Bolster bytecode verification
- S8161262: Fix jdk build with gcc 4.1.2: -fno-strict-overflow not known.
- S8162344: The API changes made by CR 7064075 need to be reverted
- S8162818: Sync src/share/native/com/sun/media code with OpenJDK 7
- S8162828: Sync imageioJPEG.c with initial OpenJDK 7 version
- S8163022: Remove @Override annotation on interfaces added by 2016/04 security fixes
- S8164181: Remove @Override annotation on interfaces added by 2016/07 security fixes
ChangeLog:
2016-08-16 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/imageiojpeg_sync.patch,
* patches/openjdk/4893408-jpegreader_byte_gray.patch,
* patches/openjdk/6563752-ss12_support.patch,
* patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch,
* patches/openjdk/6729772-opt_cleanup.patch,
* patches/openjdk/6791502-invalid_icc_profile.patch,
* patches/openjdk/6793818-jpegimagereader_too_greedy.patch,
* patches/openjdk/6799141-split_out_versions.patch,
* patches/openjdk/6816311-compiler_name.patch,
* patches/openjdk/6888215-jpeg_memory_leak.patch,
* patches/openjdk/6974017-minorver_for_solaris.patch,
* patches/openjdk/6980281-majorver_for_solaris.patch,
* patches/openjdk/6989774-imageio_compiler_warnings.patch,
* patches/openjdk/7000225-bad_tabs.patch,
* patches/openjdk/7038711-fix_no-clobber_usage.patch,
* patches/parisc.patch:
Removed as applied upstream.
* Makefile.am:
(ICEDTEA_PATCHES): Remove deleted patches.
* NEWS: Updated with b40 changes. Correct
1.13.11 release notes to mention b39, not b38.
* patches/arch.patch:
Drop hunk in jdk/make/common/shared/Compiler-gcc.gmk
as compiler versions are no longer specified by
architecture on GNU/Linux, following 6799141.
* patches/ecj/override.patch:
Remove sections included in upstream 8163022.
* patches/linker-libs-order.patch:
Drop ALSA chunk in make/common/shared/Sanity.gmk
as version is now obtained from header file
following 6799141.
* patches/openjdk/7025066-embedded_build.patch:
Regenerated.
* patches/openjdk/7199862-pr2198-ensure_cache_connection_still_alive.patch:
Remove cast from context as it no longer exists
following 6600143.
diffstat:
ChangeLog | 39 +
Makefile.am | 16 -
NEWS | 91 +-
patches/arch.patch | 99 +-
patches/ecj/override.patch | 543 +----
patches/imageiojpeg_sync.patch | 217 --
patches/linker-libs-order.patch | 18 +-
patches/openjdk/4893408-jpegreader_byte_gray.patch | 747 --------
patches/openjdk/6563752-ss12_support.patch | 173 -
patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch | 562 ------
patches/openjdk/6729772-opt_cleanup.patch | 708 -------
patches/openjdk/6791502-invalid_icc_profile.patch | 269 ---
patches/openjdk/6793818-jpegimagereader_too_greedy.patch | 228 --
patches/openjdk/6799141-split_out_versions.patch | 891 ----------
patches/openjdk/6816311-compiler_name.patch | 212 --
patches/openjdk/6888215-jpeg_memory_leak.patch | 56 -
patches/openjdk/6974017-minorver_for_solaris.patch | 24 -
patches/openjdk/6980281-majorver_for_solaris.patch | 66 -
patches/openjdk/6989774-imageio_compiler_warnings.patch | 519 -----
patches/openjdk/7000225-bad_tabs.patch | 48 -
patches/openjdk/7025066-embedded_build.patch | 50 +-
patches/openjdk/7038711-fix_no-clobber_usage.patch | 125 -
patches/openjdk/7199862-pr2198-ensure_cache_connection_still_alive.patch | 2 +-
patches/parisc.patch | 14 -
24 files changed, 325 insertions(+), 5392 deletions(-)
diffs (truncated from 6085 to 500 lines):
diff -r d247f1787f04 -r 8b26ecee3670 ChangeLog
--- a/ChangeLog Tue Aug 16 03:15:54 2016 +0100
+++ b/ChangeLog Wed Aug 17 02:53:46 2016 +0100
@@ -1,3 +1,42 @@
+2016-08-16 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/imageiojpeg_sync.patch,
+ * patches/openjdk/4893408-jpegreader_byte_gray.patch,
+ * patches/openjdk/6563752-ss12_support.patch,
+ * patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch,
+ * patches/openjdk/6729772-opt_cleanup.patch,
+ * patches/openjdk/6791502-invalid_icc_profile.patch,
+ * patches/openjdk/6793818-jpegimagereader_too_greedy.patch,
+ * patches/openjdk/6799141-split_out_versions.patch,
+ * patches/openjdk/6816311-compiler_name.patch,
+ * patches/openjdk/6888215-jpeg_memory_leak.patch,
+ * patches/openjdk/6974017-minorver_for_solaris.patch,
+ * patches/openjdk/6980281-majorver_for_solaris.patch,
+ * patches/openjdk/6989774-imageio_compiler_warnings.patch,
+ * patches/openjdk/7000225-bad_tabs.patch,
+ * patches/openjdk/7038711-fix_no-clobber_usage.patch,
+ * patches/parisc.patch:
+ Removed as applied upstream.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove deleted patches.
+ * NEWS: Updated with b40 changes. Correct
+ 1.13.11 release notes to mention b39, not b38.
+ * patches/arch.patch:
+ Drop hunk in jdk/make/common/shared/Compiler-gcc.gmk
+ as compiler versions are no longer specified by
+ architecture on GNU/Linux, following 6799141.
+ * patches/ecj/override.patch:
+ Remove sections included in upstream 8163022.
+ * patches/linker-libs-order.patch:
+ Drop ALSA chunk in make/common/shared/Sanity.gmk
+ as version is now obtained from header file
+ following 6799141.
+ * patches/openjdk/7025066-embedded_build.patch:
+ Regenerated.
+ * patches/openjdk/7199862-pr2198-ensure_cache_connection_still_alive.patch:
+ Remove cast from context as it no longer exists
+ following 6600143.
+
2016-08-15 Andrew John Hughes <gnu.andrew at redhat.com>
PR3143: Fix typo in --with-openjdk-src-dir
diff -r d247f1787f04 -r 8b26ecee3670 Makefile.am
--- a/Makefile.am Tue Aug 16 03:15:54 2016 +0100
+++ b/Makefile.am Wed Aug 17 02:53:46 2016 +0100
@@ -335,12 +335,6 @@
$(UPSTREAMED_PATCHES) \
patches/openjdk/6733501-icedtea_lcms_test.patch \
$(LCMS_PATCHES) \
- patches/openjdk/6791502-invalid_icc_profile.patch \
- patches/openjdk/6793818-jpegimagereader_too_greedy.patch \
- patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch \
- patches/openjdk/4893408-jpegreader_byte_gray.patch \
- patches/openjdk/6888215-jpeg_memory_leak.patch \
- patches/openjdk/6989774-imageio_compiler_warnings.patch \
patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch \
patches/openjdk/6989760-native_warnings.patch \
patches/openjdk/7013519-integer_overflows.patch \
@@ -376,7 +370,6 @@
patches/network-unreachable.patch \
patches/dnd-filelists.patch \
patches/explicit-target-arch.patch \
- patches/parisc.patch \
patches/policy-evaluation.patch \
patches/openjdk/6959123-libpng_14.patch \
patches/applet_hole.patch \
@@ -532,17 +525,8 @@
patches/print_lsb_release.patch \
patches/alternative_krb5_cache.patch \
patches/alternative_krb5_cache_fixup.patch \
- patches/imageiojpeg_sync.patch \
patches/openjdk/8005194-scale_memory_leak.patch \
- patches/openjdk/6563752-ss12_support.patch \
- patches/openjdk/6729772-opt_cleanup.patch \
- patches/openjdk/6799141-split_out_versions.patch \
patches/freetypeversion.patch \
- patches/openjdk/6816311-compiler_name.patch \
- patches/openjdk/6974017-minorver_for_solaris.patch \
- patches/openjdk/6980281-majorver_for_solaris.patch \
- patches/openjdk/7000225-bad_tabs.patch \
- patches/openjdk/7038711-fix_no-clobber_usage.patch \
patches/disable-cc-incompatible-sanity-checks.patch \
patches/rh995488-rhel_tz_fix.patch \
patches/hotspot/hs23/remove_jsr292_tests.patch \
diff -r d247f1787f04 -r 8b26ecee3670 NEWS
--- a/NEWS Tue Aug 16 03:15:54 2016 +0100
+++ b/NEWS Wed Aug 17 02:53:46 2016 +0100
@@ -18,6 +18,95 @@
- PR1372: Provide option to build without debugging
- PR2083: Add support for building Zero on AArch64
- PR3112: Provide option to disable SystemTap tests
+* Security fixes
+ - S8079718, CVE-2016-3458: IIOP Input Stream Hooking
+ - S8145446, CVE-2016-3485: Perfect pipe placement (Windows only)
+ - S8147771: Construction of static protection domains under Javax custom policy
+ - S8148872, CVE-2016-3500: Complete name checking
+ - S8149962, CVE-2016-3508: Better delineation of XML processing
+ - S8150752: Share Class Data
+ - S8151925: Font reference improvements
+ - S8152479, CVE-2016-3550: Coded byte streams
+ - S8155981, CVE-2016-3606: Bolster bytecode verification
+* Import of OpenJDK6 b40
+ - S6496269: Many warnings generated from com/sun/java/util/jar/pack/*.cpp when compiled on Linux
+ - S6522789: [zh_CN] translation of "enclosing class" in doclet is incorrect
+ - S6579775: l10n update after 6212566
+ - S6600143: Remove another 450 unnecessary casts
+ - S6611629: Avoid hardcoded cygwin paths for memory detection
+ - S6690018: RSAClientKeyExchange NullPointerException
+ - S6714842: CertPathBuilder returns incorrect CertPath for BasicConstraints in builderParams
+ - S6726309: Compiler warnings in nio code
+ - S6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles
+ - S6755847: (launcher) will trigger assertions in debug build
+ - S6864028: Update the java launcher to use the new entry point JVM_FindClassFromBootLoader
+ - S6875904: Java 7 message synchronization 1
+ - S6882437: CertPath/X509CertPathDiscovery/Test fails on jdk7/pit/b62
+ - S6888127: java.util.jar.Pack200.Packer Memory Leak
+ - S6888925: SunMSCAPI's Cipher can't use RSA public keys obtained from other sources.
+ - S6889552: Sun provider should not require LDAP CertStore to be present
+ - S6951599: Rename package of security tools for modularization
+ - S6953295: Move few sun.security.{util, x509, pkcs} classes used by keytool/jarsigner to another package
+ - S6958026: Problem with PKCS12 keystore
+ - S6990106: FindBugs scan - Malicious code vulnerability Warnings in com.sun.java.util.jar.pack.*
+ - S6994413: JDK_GetVersionInfo0 only expects a two digit build number
+ - S7000752: Duplicate entry in RowSetResourceBundles.properties
+ - S7001094: Can't initialize SunPKCS11 more times than PKCS11 driver maxSessionCount
+ - S7003227: (pack200) intermittent failures compiling pack200
+ - S7004706: l10n of 7000752 Duplicate entry in RowSetResourceBundles.properties
+ - S7006704: (pack200) add missing file for 6990106
+ - S7011497: Improve trust anchor searching method during cert path validation
+ - S7017734: jdk7 message drop 1 translation integration
+ - S7023416: (pack200) fix parfait issues
+ - S7029680: fix test/sun/misc/Version/Version.java build parsing
+ - S7038175: Expired PKITS certificates causing CertPathBuilder and CertPathValidator regression test failures
+ - S7055363: jdk_security3 test target cleanup
+ - S7060849: Eliminate pack200 build warnings
+ - S7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
+ - S7081817: test/sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java failing
+ - S7092825: javax.crypto.Cipher.Transform.patternCache is synchronizedMap and became scalability bottleneck.
+ - S7105780: Add SSLSocket client/SSLEngine server to templates directory
+ - S7107613: scalability blocker in javax.crypto.CryptoPermissions
+ - S7107616: scalability blocker in javax.crypto.JceSecurityManager
+ - S7109274: Restrict the use of certificates with RSA keys less than 1024 bits
+ - S7129083: CookieManager does not store cookies if url is read before setting cookie manager
+ - S7152582: PKCS11 tests should use the NSS libraries available in the OS
+ - S7166955: (pack200) JNI_GetCreatedJavaVMs needs additional checking
+ - S7196855: autotest.sh fails on ubuntu because libsoftokn.so not found
+ - S7200682: TEST_BUG: keytool/autotest.sh still has problems with libsoftokn.so
+ - S8002306: (se) Selector.open fails if invoked with thread interrupt status set [win]
+ - S8009634: TEST_BUG: sun/misc/Version/Version.java handle 2 digit minor in VM version
+ - S8010166: TEST_BUG: fix for 8009634 overlooks possible version strings (sun/misc/Version/Version.java)
+ - S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout
+ - S8019341: Update CookieHttpsClientTest to use the newer framework.
+ - S8022228: Intermittent test failures in sun/security/ssl/javax/net/ssl/NewAPIs
+ - S8022594: Potential deadlock in <clinit> of sun.nio.ch.Util/IOUtil
+ - S8023546: sun/security/mscapi/ShortRSAKey1024.sh fails intermittently
+ - S8026794: Test tools/pack200/TimeStamp.java fails while opening golden.jar.native.IST on linux-ppc(v2)
+ - S8027026: Change keytool -genkeypair to use -keyalg RSA
+ - S8029177: [Parfait] warnings from b117 for jdk.src.share.native.com.sun.java.util.jar: JNI exception pending
+ - S8029646: [pack200] should support the new zip64 format.
+ - S8036612: [parfait] JNI exception pending in jdk/src/windows/native/sun/security/mscapi/security.cpp
+ - S8037557: test SessionCacheSizeTests.java timeout
+ - S8074839: Resolve disabled warnings for libunpack and the unpack200 binary
+ - S8079410: Hotspot version to share the same update and build version from JDK
+ - S8130735: javax.swing.TimerQueue: timer fires late when another timer starts
+ - S8139436: sun.security.mscapi.KeyStore might load incomplete data
+ - S8140344: add support for 3 digit update release numbers
+ - S8144313: Test SessionTimeOutTests can be timeout
+ - S8145017: Add support for 3 digit hotspot minor version numbers
+ - S8146387: Test SSLSession/SessionCacheSizeTests socket accept timed out
+ - S8146669: Test SessionTimeOutTests fails intermittently
+ - S8146993: Several javax/management/remote/mandatory regression tests fail after JDK-8138811
+ - S8147857: [TEST] RMIConnector logs attribute names incorrectly
+ - S8151841, PR3099: Build needs additional flags to compile with GCC 6
+ - S8151876: (tz) Support tzdata2016d
+ - S8161262: Fix jdk build with gcc 4.1.2: -fno-strict-overflow not known.
+ - S8162344: The API changes made by CR 7064075 need to be reverted
+ - S8162818: Sync src/share/native/com/sun/media code with OpenJDK 7
+ - S8162828: Sync imageioJPEG.c with initial OpenJDK 7 version
+ - S8163022, PR2954: Remove @Override annotation on interfaces added by 2016/04 security fixes
+ - S8164181: Remove @Override annotation on interfaces added by 2016/07 security fixes
* Backports
- S2178143, PR2959: JVM crashes if the number of bound CPUs changed during runtime
- S6260348, PR3068: GTK+ L&F JTextComponent not respecting desktop caret blink rate
@@ -62,7 +151,7 @@
- S8144430, CVE-2016-3427: Improve JMX connections
- S8146494: Better ligature substitution
- S8146498: Better device table adjustments
-* Import of OpenJDK6 b38
+* Import of OpenJDK6 b39
- S4459600: java -jar fails to run Main-Class if classname followed by whitespace.
- S6378099: RFE: Use libfontconfig to create/synthesise a fontconfig.properties
- S6452854: Provide a flag to print the java configuration
diff -r d247f1787f04 -r 8b26ecee3670 patches/arch.patch
--- a/patches/arch.patch Tue Aug 16 03:15:54 2016 +0100
+++ b/patches/arch.patch Wed Aug 17 02:53:46 2016 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
---- openjdk.orig/corba/make/common/Defs-linux.gmk 2010-05-26 09:31:18.000000000 +0100
-+++ openjdk/corba/make/common/Defs-linux.gmk 2015-03-31 16:43:11.850271287 +0100
+--- openjdk.orig/corba/make/common/Defs-linux.gmk 2016-08-16 02:49:01.293544691 +0100
++++ openjdk/corba/make/common/Defs-linux.gmk 2016-08-16 04:55:35.484931454 +0100
@@ -92,9 +92,19 @@
# We need this frame pointer to make it easy to walk the stacks.
# This should be the default on X86, but ia64 and amd64 may not have this
@@ -22,8 +22,8 @@
LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
diff -Nru openjdk.orig/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk
---- openjdk.orig/corba/make/common/shared/Platform.gmk 2015-03-31 15:23:48.410803372 +0100
-+++ openjdk/corba/make/common/shared/Platform.gmk 2015-03-31 16:43:11.850271287 +0100
+--- openjdk.orig/corba/make/common/shared/Platform.gmk 2016-08-16 04:54:04.406422421 +0100
++++ openjdk/corba/make/common/shared/Platform.gmk 2016-08-16 04:55:35.484931454 +0100
@@ -220,9 +220,40 @@
else
# i586 is 32-bit, amd64 is 64-bit
@@ -67,9 +67,9 @@
endif
endif
diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2015-02-05 18:49:58.372812460 +0000
-+++ openjdk/jdk/make/common/Defs-linux.gmk 2015-03-31 16:45:47.396086418 +0100
-@@ -102,10 +102,19 @@
+--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2016-08-16 03:20:55.637983077 +0100
++++ openjdk/jdk/make/common/Defs-linux.gmk 2016-08-16 04:55:35.484931454 +0100
+@@ -106,10 +106,19 @@
# We need this frame pointer to make it easy to walk the stacks.
# This should be the default on X86, but ia64 and amd64 may not have this
# as the default.
@@ -90,81 +90,10 @@
CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
-diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2015-03-31 15:23:48.254801559 +0100
-+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2015-03-31 16:51:56.332405289 +0100
-@@ -70,28 +70,56 @@
- else
- CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
- endif
-- ifneq ("$(findstring sparc,$(ARCH))", "")
-- # sparc or sparcv9
-- REQUIRED_CC_VER = 4.0
-- REQUIRED_GCC_VER = 4.0.*
-- else
-- ifeq ($(ARCH_DATA_MODEL), 32)
-+ ifeq ($(ARCH), alpha)
-+ # alpha
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
-+ endif
-+ ifeq ($(ARCH), amd64)
-+ # amd64
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
-+ endif
-+ ifeq ($(ARCH), arm)
-+ # arm
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
-+ endif
-+ ifeq ($(ARCH), i586)
- # i586
- REQUIRED_CC_VER = 3.2
- REQUIRED_GCC_VER = 3.2.1*
- REQUIRED_GCC_VER_INT = 3.2.1-7a
-- else
-- ifeq ($(ARCH), amd64)
-- # amd64
-- REQUIRED_CC_VER = 3.2
-- REQUIRED_GCC_VER = 3.2.*
- endif
- ifeq ($(ARCH), ia64)
- # ia64
- REQUIRED_CC_VER = 3.2
- REQUIRED_GCC_VER = 2.9[56789].*
- endif
-+ ifneq ("$(findstring m68k,$(ARCH))", "")
-+ # m68k
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
-+ endif
-+ ifneq ("$(findstring mips,$(ARCH))", "")
-+ # mips
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
-+ endif
-+ ifneq ("$(findstring ppc,$(ARCH))", "")
-+ # ppc or ppc64
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
- endif
-+ ifneq ("$(findstring s390,$(ARCH))", "")
-+ # s390 or s390x
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
-+ endif
-+ ifneq ("$(findstring sparc,$(ARCH))", "")
-+ # sparc or sparcv9
-+ REQUIRED_CC_VER = 4.0
-+ REQUIRED_GCC_VER = 4.0.*
- endif
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -shared
diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
---- openjdk.orig/jdk/make/common/shared/Platform.gmk 2015-03-31 15:23:48.410803372 +0100
-+++ openjdk/jdk/make/common/shared/Platform.gmk 2015-03-31 16:43:11.850271287 +0100
-@@ -222,9 +222,40 @@
+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2016-08-16 04:54:04.406422421 +0100
++++ openjdk/jdk/make/common/shared/Platform.gmk 2016-08-16 04:55:35.484931454 +0100
+@@ -193,9 +193,40 @@
else
# i586 is 32-bit, amd64 is 64-bit
ifndef ARCH_DATA_MODEL
@@ -207,8 +136,8 @@
endif
endif
diff -Nru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk
---- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2013-08-21 20:32:57.524222927 +0100
-+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2015-03-31 16:44:39.367291058 +0100
+--- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2016-08-16 02:49:25.677142687 +0100
++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2016-08-16 04:55:35.484931454 +0100
@@ -58,10 +58,54 @@
ifeq ($(ZERO_BUILD), true)
CPPFLAGS += -DX_ARCH=X_ZERO
@@ -276,8 +205,8 @@
diff -Nru openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
---- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2013-08-21 20:32:57.952229855 +0100
-+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2015-03-31 16:43:11.850271287 +0100
+--- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2016-08-16 02:49:38.708927851 +0100
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2016-08-16 04:55:35.484931454 +0100
@@ -33,12 +33,21 @@
#define X_LINUX 3
diff -r d247f1787f04 -r 8b26ecee3670 patches/ecj/override.patch
--- a/patches/ecj/override.patch Tue Aug 16 03:15:54 2016 +0100
+++ b/patches/ecj/override.patch Wed Aug 17 02:53:46 2016 +0100
@@ -1,6 +1,127 @@
+diff -Nru openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java
+--- openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java 2016-08-16 02:49:10.269396706 +0100
++++ openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java 2016-08-16 05:30:32.814484518 +0100
+@@ -50,17 +50,14 @@
+ }
+
+ // size of the chunk given by the parser
+- @Override
+ public int size() {
+ return len;
+ }
+
+- @Override
+ public byte[] read() {
+ return data;
+ }
+
+- @Override
+ public long writeTo(DataFile file) {
+ return file.writeTo(data, 0, len);
+ }
+@@ -70,7 +67,6 @@
+ * @param buf
+ * @return
+ */
+- @Override
+ public Data createNext(DataHead dataHead, ByteBuffer buf) {
+ if (!config.isOnlyMemory() && dataHead.inMemory >= config.memoryThreshold) {
+ try {
+diff -Nru openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java
+--- openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java 2016-08-16 02:49:10.909386153 +0100
++++ openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java 2016-08-16 05:30:32.814484518 +0100
+@@ -644,7 +644,6 @@
+
+ return AccessController.doPrivileged(
+ new PrivilegedAction<T>() {
+- @Override
+ public T run() {
+ Object proxy = Proxy.newProxyInstance(portInterface.getClassLoader(),
+ new Class[]{portInterface, WSBindingProvider.class, Closeable.class}, pis);
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java
+--- openjdk-ecj.orig/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java 2016-08-16 02:49:55.380653021 +0100
++++ openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java 2016-08-16 05:30:32.814484518 +0100
+@@ -485,7 +485,6 @@
+ Receiver. Therefore, subclasses should not override this method.
+ Instead, they should implement implSend().
+ */
+- @Override
+ public final synchronized void send(final MidiMessage message,
+ final long timeStamp) {
+ if (!open) {
+@@ -501,7 +500,6 @@
+ * Therefore, subclasses that override this method must call
+ * 'super.close()'.
+ */
+- @Override
+ public final void close() {
+ open = false;
+ synchronized (AbstractMidiDevice.this.traRecLock) {
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java openjdk-ecj/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2016-08-16 02:49:24.297165438 +0100
++++ openjdk-ecj/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2016-08-16 05:30:32.814484518 +0100
+@@ -1044,7 +1044,6 @@
+
+ targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+- @Override
+ public Class<?> run() {
+ try {
+ ReflectUtil.checkPackageAccess(className);
+@@ -1118,7 +1117,6 @@
+
+ javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Void>() {
+
+- @Override
+ public Void run() {
+ for (int i = 0; i < sig.length; i++) {
+ if (tracing) {
+@@ -1207,7 +1205,6 @@
+ final String className = opClassName;
+ targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+- @Override
+ public Class<?> run() {
+ try {
+ ReflectUtil.checkPackageAccess(className);
+@@ -1243,7 +1240,6 @@
+ AccessControlContext stack = AccessController.getContext();
+ Object rslt = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Object>() {
+
+- @Override
+ public Object run() {
+ try {
+ ReflectUtil.checkPackageAccess(method.getDeclaringClass());
+@@ -1680,7 +1676,6 @@
+
+ Class c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+- @Override
+ public Class<?> run() {
+ try {
+ ReflectUtil.checkPackageAccess(respType);
+@@ -2858,7 +2853,6 @@
+
+ Class c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+- @Override
+ public Class<?> run() {
+ try {
+ ReflectUtil.checkPackageAccess(className);
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java 2016-08-16 02:49:24.501162074 +0100
++++ openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java 2016-08-16 05:30:32.814484518 +0100
+@@ -175,7 +175,6 @@
+ this.defaultContextClassLoader =
+ AccessController.doPrivileged(
+ new PrivilegedAction<ClassLoader>() {
+- @Override
+ public ClassLoader run() {
+ return new CombinedClassLoader(Thread.currentThread().getContextClassLoader(),
+ dcl);
diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
---- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java 2011-01-07 21:32:58.000000000 +0000
-+++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java 2012-06-13 17:39:06.613931192 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java 2016-08-16 02:49:31.009054787 +0100
++++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java 2016-08-16 05:30:32.810484583 +0100
@@ -200,7 +200,6 @@
super.uninstallListeners();
}
@@ -122,8 +243,8 @@
}
diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
---- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java 2012-06-13 17:24:23.771126209 +0100
-+++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java 2012-06-13 17:39:06.625931390 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java 2016-08-16 02:49:31.017054654 +0100
++++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java 2016-08-16 05:30:32.810484583 +0100
@@ -839,7 +839,6 @@
tk.addPropertyChangeListener(key, this);
}
@@ -149,8 +270,8 @@
String propertyName = evt.getPropertyName();
Object newValue = evt.getNewValue();
diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
---- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java 2011-01-07 21:32:58.000000000 +0000
-+++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java 2012-06-13 17:39:06.625931390 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java 2016-08-16 02:49:31.189051818 +0100
++++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java 2016-08-16 05:30:32.814484518 +0100
@@ -154,7 +154,6 @@
tree.addPropertyChangeListener(this);
}
@@ -160,9 +281,9 @@
return getContext(c, getComponentState(c));
}
diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java openjdk-ecj/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java
---- openjdk-ecj.orig/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java 2011-01-07 21:33:02.000000000 +0000
-+++ openjdk-ecj/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java 2012-06-13 17:39:06.625931390 +0100
More information about the distro-pkg-dev
mailing list