Mercurial > hg > release > icedtea6-1.13
changeset 3280:f327eb39d25c
Update to b41.
2016-12-31 Andrew John Hughes <gnu.andrew@redhat.com>
Update to b41 tarball.
* Makefile.am:
(OPENJDK_DATE): Bump to b41 creation date;
31st of December, 2016.
(OPENJDK_SHA256SUM): Update for b41 tarball.
2016-12-30 Andrew John Hughes <gnu.andrew@member.fsf.org>
Update to b41.
* patches/openjdk/7180907-jarsigner_sha-256.patch,
* patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch,
* patches/openjdk/8049480-jarsigner_openjdk_9.patch,
* patches/openjdk/8078628-pr3152-zero_pch_failure.patch,
* patches/openjdk/8169448-pr3205-pch_failure.patch:
Removed; upstreamed.
* Makefile.am:
(ICEDTEA_PATCHES): Remove upstreamed patches.
* NEWS: Updated.
* patches/hotspot/hs23/zero_fixes.patch:
Remove methodHandles.hpp fragment applied in 8078628/PR3152.
* patches/nomotif-6706121.patch,
* patches/windows-awt.patch: Regenerated.
2016-08-25 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(OPENJDK_VERSION): Bump to next release, b41.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Tue, 03 Jan 2017 06:59:13 +0000 |
| parents | 336dc5eedcea |
| children | 708def457419 |
| files | ChangeLog Makefile.am NEWS patches/hotspot/hs23/zero_fixes.patch patches/nomotif-6706121.patch patches/openjdk/7180907-jarsigner_sha-256.patch patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch patches/openjdk/8049480-jarsigner_openjdk_9.patch patches/openjdk/8078628-pr3152-zero_pch_failure.patch patches/openjdk/8169448-pr3205-pch_failure.patch patches/windows-awt.patch |
| diffstat | 11 files changed, 342 insertions(+), 685 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jan 03 05:55:47 2017 +0000 +++ b/ChangeLog Tue Jan 03 06:59:13 2017 +0000 @@ -1,3 +1,33 @@ +2016-12-31 Andrew John Hughes <gnu.andrew@redhat.com> + + Update to b41 tarball. + * Makefile.am: + (OPENJDK_DATE): Bump to b41 creation date; + 31st of December, 2016. + (OPENJDK_SHA256SUM): Update for b41 tarball. + +2016-12-30 Andrew John Hughes <gnu.andrew@member.fsf.org> + + Update to b41. + * patches/openjdk/7180907-jarsigner_sha-256.patch, + * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch, + * patches/openjdk/8049480-jarsigner_openjdk_9.patch, + * patches/openjdk/8078628-pr3152-zero_pch_failure.patch, + * patches/openjdk/8169448-pr3205-pch_failure.patch: + Removed; upstreamed. + * Makefile.am: + (ICEDTEA_PATCHES): Remove upstreamed patches. + * NEWS: Updated. + * patches/hotspot/hs23/zero_fixes.patch: + Remove methodHandles.hpp fragment applied in 8078628/PR3152. + * patches/nomotif-6706121.patch, + * patches/windows-awt.patch: Regenerated. + +2016-08-25 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b41. + 2016-12-29 Andrew John Hughes <gnu.andrew@member.fsf.org> PR3213: Disable ARM32 JIT by default
--- a/Makefile.am Tue Jan 03 05:55:47 2017 +0000 +++ b/Makefile.am Tue Jan 03 06:59:13 2017 +0000 @@ -1,8 +1,8 @@ # Dependencies -OPENJDK_DATE = 22_aug_2016 -OPENJDK_SHA256SUM = 70ac61635032e77cecf935b53b22a9545d5d0a7f55ad6a15dca9b84a2be993be -OPENJDK_VERSION = b40 +OPENJDK_DATE = 31_dec_2016 +OPENJDK_SHA256SUM = 5edda7255b887e84110b409915d7c82cbef9ffe2e4010d3cd3c7f1d0844c386c +OPENJDK_VERSION = b41 OPENJDK_URL = https://java.net/downloads/openjdk6/ CACAO_VERSION = 68fe50ac34ec @@ -568,11 +568,8 @@ patches/shark_fixes_from_8003868.patch \ patches/8003992_support_6.patch \ patches/shark-drop_compile_method_arg_following_7083786.patch \ - patches/openjdk/7180907-jarsigner_sha-256.patch \ - patches/openjdk/8049480-jarsigner_openjdk_9.patch \ patches/pr1904-icedtea_and_distro_versioning.patch \ patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch \ - patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch \ patches/pr2070-type_punning_warnings.patch \ patches/pr2082-s390_type_fixes.patch \ patches/pr2096-4096-bit_dh.patch \ @@ -624,8 +621,6 @@ patches/openjdk/6260348-pr3068.patch \ patches/openjdk/6961123-pr2975.patch \ patches/pr2800-missing_resources.patch \ - patches/openjdk/8169448-pr3205-pch_failure.patch \ - patches/openjdk/8078628-pr3152-zero_pch_failure.patch \ patches/pr3213-conditional_arm32jit.patch if WITH_RHINO
--- a/NEWS Tue Jan 03 05:55:47 2017 +0000 +++ b/NEWS Tue Jan 03 06:59:13 2017 +0000 @@ -14,11 +14,186 @@ New in release 1.13.13 (2016-10-XX): +* Security fixes + - S8151921: Improved page resolution + - S8155968: Update command line options + - S8155973, CVE-2016-5542: Tighten jar checks + - S8157176: Improved classfile parsing + - S8157739, CVE-2016-5554: Classloader Consistency Checking + - S8157749: Improve handling of DNS error replies + - S8157753: Audio replay enhancement + - S8158302: Handle contextual glyph substitutions + - S8158993, CVE-2016-5568: Service Menu services + - S8159495: Fix index offsets + - S8159503: Amend Annotation Actions + - S8159511: Stack map validation + - S8159515: Improve indy validation + - S8159519, CVE-2016-5573: Reformat JDWP messages + - S8160090: Better signature handling in pack200 + - S8160094: Improve pack200 layout + - S8160591, CVE-2016-5582: Improve internal array handling + - S8160838, CVE-2016-5597: Better HTTP service +* Import of OpenJDK6 b41 + - S4787377: VK_STOP key on Solaris generates wrong Key Code + - S4947220: (process)Runtime.exec() cannot invoke applications with unicode parameters(win) + - S5036807: Pressing action keys "STOP/AGAIN/COMPOSE" generates keycode of F11/F12 keys. + - S5099725: AWT doesn't seem to handle MappingNotify events under X11. + - S5100701: Toolkit.getLockingKeyState() does not work on XToolkit, but works on Motif + - S6324292: keytool -help is unhelpful + - S6464022: Memory leak in JOptionPane.createDialog + - S6501385: ColorChooser demo - two elemets have same mnemonic in it locale, GTK L&F + - S6535697: keytool can be more flexible on format of PEM-encoded X.509 certificates + - S6561126: keytool should use larger default keysize for keypairs + - S6566218: l10n of 6476932 + - S6606396: Notepad and Stylepad demos don't run in Japanese locale. + - S6608456: need API to define RepaintManager per components hierarchy + - S6624200: Regression test fails: test/closed/javax/swing/JMenuItem/4654927/bug4654927.java + - S6675400: "Details" in English has to be "Details" in German + - S6680988: KeyEvent is still missing VK values for many keyboards + - S6683775: Painting artifacts is seen when panel is made setOpaque(false) for a translucent window + - S6693507: There are unnecessary compilation warnings in the com.sun.java.swing.plaf.motif package + - S6709758: keytool default cert fingerprint algorithm should be SHA1, not MD5 + - S6711676: Numpad keys trigger more than one KeyEvent. + - S6719382: Printing of AWT components on windows is not working + - S6726866: Repainting artifacts when resizing or dragging JInternalFrames in non-opaque toplevel + - S6727661: Code improvement and warnings removing from the swing/plaf packages + - S6727662: Code improvement and warnings removing from swing packages + - S6794764: Translucent windows are completely repainted on every paint event, on Windows + - S6796710: Html content in JEditorPane is overlapping on swing components while resizing the application. [TEST FRAMEWORK ONLY] + - S6802846: jarsigner needs enhanced cert validation(options) + - S6867657: Many JSN tests do not run under cygwin + - S6870812: enhance security tools to use ECC algorithms + - S6871299: Shift+Tab no longer generates a KEY_TYPED event; used to with JRE 1.5 + - S6871847: AlgorithmId.get("SHA256withECDSA") not available + - S6882559: new JEditorPane("text/plain","") fails for null context class loader + - S6894719: (launcher)The option -no-jre-restrict-search is expected when -jre-no-restrict-search is documented. + - S6901170: HttpCookie parsing of version and max-age mis-handled + - S6911129: These tests do not work with CYGWIN: java/lang + - S6922482: keytool's help on -file always shows 'output file' + - S6923681: Jarsigner crashes during timestamping + - S6939248: Jarsigner can't extract Extended Key Usage from Timestamp Reply correctly + - S6959252: convert the anonymous arrays to named arrays in Java List Resource files + - S6969683: Generify ResolverConfiguration codes + - S6980510: Fix for 6959252 broke JConsole mnemonic keys + - S6982840: sun/security/tools/jarsigner/emptymanifest.sh fails + - S6987827: security/util/Resources.java needs improvement + - S6988163: sun.security.util.Resources dup and a keytool doc typo + - S7004168: jarsigner -verify checks for KeyUsage codesigning ext on all certs instead of just signing cert + - S7013850: Please change the mnemonic assignment system to avoid translation issue + - S7017818: NLS: JConsoleResources.java cannot be handled by translation team + - S7019937: Translatability bug - Remove Unused String - String ID , read end of file + - S7019938: Translatability bug - Remove Unused String - String ID can not specify Principal with a + - S7019940: Translatability bug - Remove unused string - String ID: provided null name + - S7019942: Translatability bug - String ID: trustedCertEntry, + - S7019945: Translatability bug - Translatability issue - String ID: * has NOT been verified! In order to veri + - S7019947: Translatability bug - Translatability issue - String ID: * The integrity of the information stored i + - S7019949: Translatability bug - Translatability issue - String ID: * you must provide your keystore password. + - S7020531: test: java/security/cert/CertificateFactory/openssl/OpenSSLCert.java file not closed after run + - S7021693: [ja, zh_CN] jconsole throws exception and fail to start in ja and zh_CN locales + - S7022005: [ja,zh_CN] javadoc, part of navigation bar in generated html are not translated. + - S7024118: possible hardcoded mnemonic for JFileChooser metal and motif l&f + - S7025267: NLS: t13y fix for 7021689 [ja] Notepad demo throws NPE + - S7028447: security-related resources Chinese translation errors + - S7028490: better suggestion for jarsigner when TSA is not accessible + - S7030174: Jarsigner should accept TSACert with an HTTPS id-ad-timeStamping SIA + - S7032018: The file list in JFileChooser does not have an accessible name + - S7032436: When running with the Nimbus look and feel, the JFileChooser does not display mnemonics + - S7034259: [all] incorrect mnemonic keys in JCP automatic update advanced settings dialog. + - S7034940: message drop 2 translation integration + - S7035843: [zh_CN, ja] JConsole mnemonic keys don't work + - S7038803: [CCJK] Incorrect mnemonic key (0) is displayed on cancel button on messagedialog of JOptionPane + - S7038807: [CCJK] OK button on message dialog of JOptionpane is not translated + - S7040228: [zh_TW] extra (C) on cancel button on File Chooser dialog + - S7040257: [pt_BR,fr] Print dialog has duplicate mnemonic key. + - S7042323: [sv, de, es, it] Print dialog has duplicate mnemonic key + - S7042475: [ja,zh_CN] extra mnemonic key in jconsole + - S7043548: message drop 3 translation integration + - S7045132: sun.security.util.Resources_pt_BR.java translation error + - S7045184: GTK L&F doesn't have hotkeys in jdk7 b141, while b139 has. + - S7062969: java -help still shows http://java.sun.com/javase/reference + - S7090158: Networking Libraries don't build with javac -Werror + - S7090832: Some locale info are not localized for some languages. + - S7093156: NLS Please change the mnemonic assignment system to avoid translation issue (Swing files) + - S7102686: Restructure timestamp code so that jars and modules can more easily share the same code + - S7109085: Test use hotkeys not intended for Mac + - S7116786: RFE: Detailed information on VerifyErrors + - S7124171: 7u4 l10n message update related to Mac OS X port + - S7125055: ContentHandler.getContent API changed in error + - S7132247: java/rmi/registry/readTest/readTest.sh failing with Cygwin + - S7142339: PKCS7.java is needlessly creating SHA1PRNG SecureRandom instances when timestamping is not done + - S7145375: 7u4 l10n message update related to langtools + - S7145960: sun/security/mscapi/ShortRSAKey1024.sh failing on windows + - S7146099: NLS: [de,es,it,ko,pt_BR]launcher_**.properties, double backslash issue. + - S7149012: jarsigner needs not warn about cert expiration if the jar has a TSA timestamp + - S7158712: Synth Property "ComboBox.popupInsets" is ignored + - S7169226: NLS: Please change the mnemonic assignment system for windows and motif properties + - S7174970: NLS [ccjk] Extra mnemonic keys at standard filechooserdialog (open and save) in metal L&F + - S7175367: NLS: 7u6 message drop10 integration + - S7176894: back out LocaleNames_xx.properties files from 7u6 message drop10 + - S7178145: Change constMethodOop::_exception_table to optionally inlined u2 table. + - S7181632: nsk classLoad001_14 failure and CompileTheWorld crash after 7178145. + - S7182226: NLS: jdk7u6 message drop20 integration + - S7183203: ShortRSAKeynnn.sh tests intermittent failure + - S7187051: ShortRSAKeynnn.sh tests should do cleanup before start test + - S7194449: String resources for Key Tool and Policy Tool should be in their respective packages + - S8000626: Implement dead key detection for KeyEvent on Linux + - S8003890: corelibs test scripts should pass TESTVMOPTS + - S8008764: 7uX l10n resource file translation update + - S8009168: accessibility.properties syntax issue + - S8009636: JARSigner including TimeStamp PolicyID (TSAPolicyID) as defined in RFC3161 + - S8010297: Missing isLoggable() checks in logging code + - S8010782: clean up source files containing carriage return characters + - S8014048: Online user guide of jconsole points incorrect link + - S8014431: cleanup warnings indicated by the -Wunused-value compiler option on linux + - S8015265: revise the fix for 8007037 + - S8016579: (process) IOException thrown by ProcessBuilder.start() method is incorrectly encoded + - S8019541: 7u40 l10n resource file translation update + - S8020708: NLS mnemonics missing in SwingSet2/JInternalFrame demo + - S8023338: Update jarsigner to encourage timestamping + - S8024302: Clarify jar verifications + - S8024756: method grouping tabs are not selectable + - S8026741: jdk8 l10n resource file translation update 5 + - S8027787: 7u51 l10n resource file translation update 1 + - S8030698: Several GUI labels in jconsole need correction + - S8030878: JConsole issues meaningless message if SSL connection fails + - S8035988: 7u60 l10n resource file translation update 1 + - S8038837: Add support to jarsigner for specifying timestamp hash algorithm + - S8048147: Privilege tests with JAAS Subject.doAs + - S8048357: PKCS basic tests + - S8049171: Additional tests for jarsigner's warnings + - S8055176: 7u71 l10n resource file translation update + - S8057530: (process) Runtime.exec throws garbled message in jp locale + - S8059177: jdk8u40 l10n resource file translation update 1 + - S8065609: 7u76 l10n resource file translation update + - S8076486: [TESTBUG] javax/security/auth/Subject/doAs/NestedActions.java fails if extra VM options are given + - S8077953: [TEST_BUG] com/sun/management/OperatingSystemMXBean/TestTotalSwap.java Compilation failed after JDK-8077387 + - S8078628, PR3152: Zero build fails with pre-compiled headers disabled + - S8080628: No mnemonics on Open and Save buttons in JFileChooser + - S8083601: jdk8u60 l10n resource file translation update 2 + - S8140530: Creating a VolatileImage with size 0,0 results in no longer working g2d.drawString + - S8142926: OutputAnalyzer's shouldXXX() calls return this + - S8143134: L10n resource file translation update + - S8147077: IllegalArgumentException thrown by api/java_awt/Component/FlipBufferStrategy/indexTGF_General + - S8148127: IllegalArgumentException thrown by JCK test api/java_awt/Component/FlipBufferStrategy/indexTGF_General in opengl pipeline + - S8150611: Security problem on sun.misc.resources.Messages* + - S8157077: 8u101 L10n resource file updates + - S8157653: [Parfait] Uninitialised variable in awt_Font.cpp + - S8158734: JEditorPane.createEditorKitForContentType throws NPE after 6882559 + - S8159684: (tz) Support tzdata2016f + - S8162411: Service Menu services 2 + - S8162419: closed/com/oracle/jfr/runtime/TestVMInfoEvent.sh failing after JDK-8155968 + - S8162511: 8u111 L10n resource file updates + - S8162792: Remove constraint DSA keySize < 1024 from jdk.jar.disabledAlgorithms in jdk8 + - S8164452: 8u111 L10n resource file update - msgdrop 20 + - S8165816: jarsigner -verify shows jar unsigned if it was signed with a weak algorithm + - S8166381: Back out changes to the java.security file to not disable MD5 + - S8169448, PR3205: OpenJDK 6 fails to build without pre-compiled headers + - S8171415: Remove Java 7 features from testlibrary + - S8171954: Add stubs for sun.security.tools.KeyTool and sun.security.tools.JarSigner + - S8172159: Remove @Override annotation on interfaces added by b41 updates * Bug fixes - - PR3152: Zero build fails with pch disabled - PR3174: systemtap: type definition 'symbolOopDesc' not found - PR3175: invalid zip timestamp handling leads to error updating JAR files - - PR3205: Builds fails with pch disabled - PR3213: Disable ARM32 JIT by default New in release 1.13.12 (2016-08-24):
--- a/patches/hotspot/hs23/zero_fixes.patch Tue Jan 03 05:55:47 2017 +0000 +++ b/patches/hotspot/hs23/zero_fixes.patch Tue Jan 03 06:59:13 2017 +0000 @@ -1,14 +1,6 @@ diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp --- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2016-05-03 20:18:13.388935986 +0100 +++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2016-05-03 20:19:21.099818351 +0100 -@@ -36,6 +36,7 @@ - #include "oops/oop.inline.hpp" - #include "prims/jvmtiExport.hpp" - #include "prims/jvmtiThreadState.hpp" -+#include "prims/methodHandles.hpp" - #include "runtime/arguments.hpp" - #include "runtime/deoptimization.hpp" - #include "runtime/frame.inline.hpp" @@ -65,6 +66,13 @@ CALL_VM_NOCHECK_NOFIX(func) \ fixup_after_potential_safepoint()
--- a/patches/nomotif-6706121.patch Tue Jan 03 05:55:47 2017 +0000 +++ b/patches/nomotif-6706121.patch Tue Jan 03 06:59:13 2017 +0000 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/sun/awt/FILES_c_unix.gmk openjdk/jdk/make/sun/awt/FILES_c_unix.gmk ---- openjdk.orig/jdk/make/sun/awt/FILES_c_unix.gmk 2014-04-08 05:27:03.554876623 +0100 -+++ openjdk/jdk/make/sun/awt/FILES_c_unix.gmk 2014-04-10 02:56:51.238477367 +0100 +--- openjdk.orig/jdk/make/sun/awt/FILES_c_unix.gmk 2016-12-30 04:30:26.223129286 +0000 ++++ openjdk/jdk/make/sun/awt/FILES_c_unix.gmk 2016-12-30 05:19:14.154848190 +0000 @@ -142,59 +142,59 @@ # These files rely on motif to be built, and should not be included # in a headless build. @@ -115,8 +115,8 @@ # These files are required to be built, with or without motif. Some of diff -Nru openjdk.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk/jdk/make/sun/awt/FILES_export_unix.gmk ---- openjdk.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2014-04-08 06:21:07.378317552 +0100 -+++ openjdk/jdk/make/sun/awt/FILES_export_unix.gmk 2014-04-10 02:56:51.238477367 +0100 +--- openjdk.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2016-12-30 04:57:02.876718650 +0000 ++++ openjdk/jdk/make/sun/awt/FILES_export_unix.gmk 2016-12-30 05:19:14.154848190 +0000 @@ -60,48 +60,15 @@ sun/awt/image/DataBufferNative.java \ \ @@ -174,7 +174,7 @@ sun/awt/motif/MToolkitThreadBlockedHandler.java \ sun/java2d/opengl/OGLBlitLoops.java \ sun/java2d/opengl/OGLContext.java \ -@@ -220,6 +186,5 @@ +@@ -221,6 +187,5 @@ java/awt/event/NativeLibLoader.java \ java/awt/peer/ComponentPeer.java \ java/awt/dnd/DnDConstants.java \ @@ -183,8 +183,8 @@ + sun/awt/CausedFocusEvent.java diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers openjdk/jdk/make/sun/awt/mapfile-mawt-vers ---- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers 2014-04-08 13:33:31.866665689 +0100 -+++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2014-04-10 02:56:51.242477427 +0100 +--- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers 2016-12-30 04:30:26.243128954 +0000 ++++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2016-12-30 05:19:14.154848190 +0000 @@ -31,7 +31,7 @@ global: JNI_OnLoad; @@ -717,8 +717,8 @@ Java_sun_awt_motif_MToolkitThreadBlockedHandler_exit; Java_sun_awt_X11GraphicsConfig_init; diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux openjdk/jdk/make/sun/awt/mapfile-vers-linux ---- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux 2014-04-08 13:33:31.870665747 +0100 -+++ openjdk/jdk/make/sun/awt/mapfile-vers-linux 2014-04-10 02:56:51.246477485 +0100 +--- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux 2016-12-30 04:30:26.247128889 +0000 ++++ openjdk/jdk/make/sun/awt/mapfile-vers-linux 2016-12-30 05:19:14.154848190 +0000 @@ -169,7 +169,7 @@ GrPrim_Sg2dGetPixel; GrPrim_Sg2dGetLCDTextContrast; @@ -1240,8 +1240,8 @@ awt_lock; awt_Lock; diff -Nru openjdk.orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk ---- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2014-04-08 05:27:03.574876919 +0100 -+++ openjdk/jdk/make/sun/awt/mawt.gmk 2014-04-10 02:56:51.246477485 +0100 +--- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2016-12-30 04:30:26.247128889 +0000 ++++ openjdk/jdk/make/sun/awt/mawt.gmk 2016-12-30 05:19:14.154848190 +0000 @@ -28,14 +28,6 @@ # INIT += $(LIB_LOCATION) @@ -1395,8 +1395,8 @@ endif # !HEADLESS diff -Nru openjdk.orig/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile ---- openjdk.orig/jdk/make/sun/jawt/Makefile 2014-04-08 05:27:03.630877745 +0100 -+++ openjdk/jdk/make/sun/jawt/Makefile 2014-04-10 02:56:51.258477661 +0100 +--- openjdk.orig/jdk/make/sun/jawt/Makefile 2016-12-30 04:30:28.015099543 +0000 ++++ openjdk/jdk/make/sun/jawt/Makefile 2016-12-30 05:19:14.158848125 +0000 @@ -99,7 +99,6 @@ # Other extra flags needed for compiling. # @@ -1406,7 +1406,7 @@ -I$(SHARE_SRC)/native/$(PKGDIR)/image \ -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \ diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MButtonPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MButtonPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MButtonPeer.java 2014-04-08 05:27:04.974897587 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MButtonPeer.java 2016-12-30 04:30:59.394578717 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MButtonPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -/* @@ -1507,7 +1507,7 @@ - -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCanvasPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MCanvasPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCanvasPeer.java 2014-04-08 05:27:04.974897587 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCanvasPeer.java 2016-12-30 04:30:59.402578585 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MCanvasPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,113 +0,0 @@ -/* @@ -1624,7 +1624,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCheckboxMenuItemPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MCheckboxMenuItemPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCheckboxMenuItemPeer.java 2014-04-08 05:27:04.974897587 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCheckboxMenuItemPeer.java 2016-12-30 04:30:59.414578385 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MCheckboxMenuItemPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,93 +0,0 @@ -/* @@ -1721,7 +1721,7 @@ - } // action() -} // class MCheckboxMenuItemPeer diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java 2014-04-08 05:27:04.974897587 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java 2016-12-30 04:30:59.426578186 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,187 +0,0 @@ -/* @@ -1912,7 +1912,7 @@ - -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MChoicePeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MChoicePeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MChoicePeer.java 2014-04-08 05:27:04.974897587 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MChoicePeer.java 2016-12-30 04:30:59.434578054 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MChoicePeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,177 +0,0 @@ -/* @@ -2093,7 +2093,7 @@ - private native void freeNativeData(); -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MComponentPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MComponentPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MComponentPeer.java 2014-04-08 12:22:59.324041361 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MComponentPeer.java 2016-12-30 04:30:59.446577854 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MComponentPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,1184 +0,0 @@ -/* @@ -3281,7 +3281,7 @@ - -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCustomCursor.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MCustomCursor.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCustomCursor.java 2014-04-08 05:27:04.974897587 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MCustomCursor.java 2016-12-30 04:30:59.470577455 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MCustomCursor.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,68 +0,0 @@ -/* @@ -3353,7 +3353,7 @@ - private native static void cacheInit(); -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDataTransferer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MDataTransferer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDataTransferer.java 2014-04-08 05:27:04.974897587 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDataTransferer.java 2016-12-30 04:30:59.510576792 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MDataTransferer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,386 +0,0 @@ -/* @@ -3743,7 +3743,7 @@ - protected native String[] dragQueryFile(byte[] bytes); -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDialogPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MDialogPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDialogPeer.java 2014-04-08 05:27:04.974897587 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDialogPeer.java 2016-12-30 04:30:59.514576725 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MDialogPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,110 +0,0 @@ -/* @@ -3857,7 +3857,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDragSourceContextPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MDragSourceContextPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDragSourceContextPeer.java 2014-04-08 05:27:04.974897587 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDragSourceContextPeer.java 2016-12-30 04:30:59.550576128 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MDragSourceContextPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,120 +0,0 @@ -/* @@ -3981,7 +3981,7 @@ - -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDropTargetContextPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MDropTargetContextPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDropTargetContextPeer.java 2014-04-08 05:27:04.978897645 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MDropTargetContextPeer.java 2016-12-30 04:30:59.910570153 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MDropTargetContextPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,147 +0,0 @@ -/* @@ -4132,7 +4132,7 @@ - boolean localTx, boolean success, int dropAction); -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MEmbedCanvasPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MEmbedCanvasPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MEmbedCanvasPeer.java 2014-04-08 05:27:04.978897645 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MEmbedCanvasPeer.java 2016-12-30 04:30:59.914570087 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MEmbedCanvasPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,584 +0,0 @@ -/* @@ -4720,7 +4720,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MEmbeddedFrame.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MEmbeddedFrame.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MEmbeddedFrame.java 2014-04-08 05:27:04.978897645 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MEmbeddedFrame.java 2016-12-30 04:30:59.914570087 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MEmbeddedFrame.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,141 +0,0 @@ -/* @@ -4865,7 +4865,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MEmbeddedFramePeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MEmbeddedFramePeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MEmbeddedFramePeer.java 2014-04-08 05:27:04.978897645 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MEmbeddedFramePeer.java 2016-12-30 04:30:59.914570087 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MEmbeddedFramePeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,213 +0,0 @@ -/* @@ -5082,7 +5082,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MFileDialogPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MFileDialogPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MFileDialogPeer.java 2014-04-08 05:27:04.978897645 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MFileDialogPeer.java 2016-12-30 04:30:59.914570087 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MFileDialogPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,300 +0,0 @@ -/* @@ -5386,7 +5386,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MFramePeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MFramePeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MFramePeer.java 2014-04-08 05:27:04.978897645 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MFramePeer.java 2016-12-30 04:30:59.914570087 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MFramePeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,511 +0,0 @@ -/* @@ -5901,7 +5901,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MGlobalCursorManager.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MGlobalCursorManager.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MGlobalCursorManager.java 2014-04-08 05:27:04.978897645 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MGlobalCursorManager.java 2016-12-30 04:30:59.914570087 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MGlobalCursorManager.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,118 +0,0 @@ -/* @@ -6023,7 +6023,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MInputMethodControl.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MInputMethodControl.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MInputMethodControl.java 2014-04-08 05:27:04.978897645 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MInputMethodControl.java 2016-12-30 04:30:59.918570020 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MInputMethodControl.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ -/* @@ -6100,7 +6100,7 @@ - void removeInputMethod(MInputMethod inputMethod); -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MInputMethodDescriptor.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MInputMethodDescriptor.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MInputMethodDescriptor.java 2014-04-08 05:27:04.982897704 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MInputMethodDescriptor.java 2016-12-30 04:30:59.918570020 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MInputMethodDescriptor.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -/* @@ -6152,7 +6152,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MInputMethod.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MInputMethod.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MInputMethod.java 2014-04-08 05:27:04.978897645 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MInputMethod.java 2016-12-30 04:30:59.918570020 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MInputMethod.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,177 +0,0 @@ -/* @@ -6333,7 +6333,7 @@ - boolean value, boolean active); -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MLabelPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MLabelPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MLabelPeer.java 2014-04-08 05:27:04.982897704 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MLabelPeer.java 2016-12-30 04:30:59.918570020 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MLabelPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,104 +0,0 @@ -/* @@ -6441,7 +6441,7 @@ - -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MListPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MListPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MListPeer.java 2014-04-08 05:27:04.982897704 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MListPeer.java 2016-12-30 04:30:59.918570020 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MListPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,390 +0,0 @@ -/* @@ -6835,7 +6835,7 @@ - int wheelRotation); -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MMenuBarPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MMenuBarPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MMenuBarPeer.java 2014-04-08 05:27:04.982897704 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MMenuBarPeer.java 2016-12-30 04:30:59.918570020 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MMenuBarPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,192 +0,0 @@ -/* @@ -7031,7 +7031,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MMenuItemPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MMenuItemPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MMenuItemPeer.java 2014-04-08 05:27:04.982897704 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MMenuItemPeer.java 2016-12-30 04:30:59.918570020 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MMenuItemPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,190 +0,0 @@ -/* @@ -7225,7 +7225,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MMenuPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MMenuPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MMenuPeer.java 2014-04-08 05:27:04.982897704 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MMenuPeer.java 2016-12-30 04:30:59.918570020 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MMenuPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,83 +0,0 @@ -/* @@ -7312,7 +7312,7 @@ - native void pDispose(); -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MMouseDragGestureRecognizer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MMouseDragGestureRecognizer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MMouseDragGestureRecognizer.java 2014-04-08 05:27:04.982897704 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MMouseDragGestureRecognizer.java 2016-12-30 04:30:59.918570020 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MMouseDragGestureRecognizer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,233 +0,0 @@ -/* @@ -7549,7 +7549,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MPanelPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MPanelPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MPanelPeer.java 2014-04-08 05:27:04.982897704 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MPanelPeer.java 2016-12-30 04:30:59.918570020 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MPanelPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,201 +0,0 @@ -/* @@ -7754,7 +7754,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MPopupMenuPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MPopupMenuPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MPopupMenuPeer.java 2014-04-08 05:27:04.982897704 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MPopupMenuPeer.java 2016-12-30 04:30:59.922569954 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MPopupMenuPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,132 +0,0 @@ -/* @@ -7890,7 +7890,7 @@ - native void pDispose(); -} // class MPopupMenuPeer diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MRobotPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MRobotPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MRobotPeer.java 2014-04-08 05:27:04.982897704 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MRobotPeer.java 2016-12-30 04:30:59.922569954 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MRobotPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,96 +0,0 @@ -/* @@ -7990,7 +7990,7 @@ - private static native synchronized void getRGBPixelsImpl(X11GraphicsConfig xgc, int x, int y, int width, int height, int pixelArray[]); -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MScrollbarPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MScrollbarPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MScrollbarPeer.java 2014-04-08 05:27:04.986897763 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MScrollbarPeer.java 2016-12-30 04:30:59.922569954 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MScrollbarPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,187 +0,0 @@ -/* @@ -8181,7 +8181,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MScrollPanePeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MScrollPanePeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MScrollPanePeer.java 2014-04-08 05:27:04.982897704 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MScrollPanePeer.java 2016-12-30 04:30:59.922569954 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MScrollPanePeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,411 +0,0 @@ -/* @@ -8596,7 +8596,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MTextAreaPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MTextAreaPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MTextAreaPeer.java 2014-04-08 05:27:04.986897763 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MTextAreaPeer.java 2016-12-30 04:30:59.926569887 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MTextAreaPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,555 +0,0 @@ -/* @@ -9155,7 +9155,7 @@ - int pos; -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MTextFieldPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MTextFieldPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MTextFieldPeer.java 2014-04-08 05:27:04.986897763 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MTextFieldPeer.java 2016-12-30 04:30:59.926569887 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MTextFieldPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,356 +0,0 @@ -/* @@ -9515,8 +9515,8 @@ - -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MToolkit.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MToolkit.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MToolkit.java 2014-04-08 15:06:36.094162392 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MToolkit.java 2014-04-10 02:56:51.330478719 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MToolkit.java 2016-12-30 04:30:59.930569821 +0000 ++++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MToolkit.java 2016-12-30 05:19:14.174847862 +0000 @@ -60,12 +60,12 @@ import java.awt.dnd.InvalidDnDOperationException; import java.awt.dnd.peer.DragSourceContextPeer; @@ -9911,7 +9911,7 @@ static boolean useMotifDnD() { diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MWindowPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MWindowPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MWindowPeer.java 2014-04-08 16:38:59.712102235 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MWindowPeer.java 2016-12-30 04:57:03.012716417 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MWindowPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,625 +0,0 @@ -/* @@ -10530,7 +10530,7 @@ - } - - @Override -- public void updateWindow(BufferedImage backBuffer) { +- public void updateWindow() { - // no-op - } - @@ -10540,7 +10540,7 @@ - -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11Clipboard.java openjdk/jdk/src/solaris/classes/sun/awt/motif/X11Clipboard.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11Clipboard.java 2014-04-09 01:27:40.080656279 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11Clipboard.java 2016-12-30 04:30:59.962569290 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/X11Clipboard.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,151 +0,0 @@ -/* @@ -10695,7 +10695,7 @@ - -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11DragSourceContextPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/X11DragSourceContextPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11DragSourceContextPeer.java 2014-04-08 05:27:04.990897822 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11DragSourceContextPeer.java 2016-12-30 04:30:59.962569290 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/X11DragSourceContextPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,131 +0,0 @@ -/* @@ -10830,7 +10830,7 @@ - -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11DropTargetContextPeer.java openjdk/jdk/src/solaris/classes/sun/awt/motif/X11DropTargetContextPeer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11DropTargetContextPeer.java 2014-04-08 05:27:04.990897822 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11DropTargetContextPeer.java 2016-12-30 04:30:59.962569290 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/X11DropTargetContextPeer.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,167 +0,0 @@ -/* @@ -11001,7 +11001,7 @@ - private native Object getData(long nativeCtxt, long format); -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11SelectionHolder.java openjdk/jdk/src/solaris/classes/sun/awt/motif/X11SelectionHolder.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11SelectionHolder.java 2014-04-08 05:27:04.998897941 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11SelectionHolder.java 2016-12-30 04:31:00.070567498 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/X11SelectionHolder.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -/* @@ -11038,7 +11038,7 @@ - public void lostSelectionOwnership(); -} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11Selection.java openjdk/jdk/src/solaris/classes/sun/awt/motif/X11Selection.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11Selection.java 2014-04-08 05:27:04.998897941 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/X11Selection.java 2016-12-30 04:31:00.062567630 +0000 +++ openjdk/jdk/src/solaris/classes/sun/awt/motif/X11Selection.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,203 +0,0 @@ -/* @@ -11245,7 +11245,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Button.c openjdk/jdk/src/solaris/native/sun/awt/awt_Button.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Button.c 2014-04-08 05:27:03.426874734 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Button.c 2016-12-30 04:30:19.407242420 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_Button.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,276 +0,0 @@ -/* @@ -11525,7 +11525,7 @@ - AWT_FLUSH_UNLOCK (); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Canvas.c openjdk/jdk/src/solaris/native/sun/awt/awt_Canvas.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Canvas.c 2014-04-08 05:27:03.430874794 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Canvas.c 2016-12-30 04:30:19.423242154 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_Canvas.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,130 +0,0 @@ -/* @@ -11659,7 +11659,7 @@ - DASSERT(mCanvasIDs.setGCFromPeerMID); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Checkbox.c openjdk/jdk/src/solaris/native/sun/awt/awt_Checkbox.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Checkbox.c 2014-04-08 05:27:03.430874794 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Checkbox.c 2016-12-30 04:30:19.431242021 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_Checkbox.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,428 +0,0 @@ -/* @@ -12091,7 +12091,7 @@ - return dim; -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Choice12.c openjdk/jdk/src/solaris/native/sun/awt/awt_Choice12.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Choice12.c 2014-04-08 05:27:03.430874794 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Choice12.c 2016-12-30 04:30:19.439241889 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_Choice12.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,843 +0,0 @@ -/* @@ -12938,7 +12938,7 @@ - AWT_UNLOCK(); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Choice21.c openjdk/jdk/src/solaris/native/sun/awt/awt_Choice21.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Choice21.c 2014-04-08 05:27:03.430874794 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Choice21.c 2016-12-30 04:30:19.439241889 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_Choice21.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,764 +0,0 @@ -/* @@ -13706,7 +13706,7 @@ - AWT_UNLOCK(); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Component.c openjdk/jdk/src/solaris/native/sun/awt/awt_Component.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Component.c 2014-04-08 05:27:03.430874794 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Component.c 2016-12-30 04:30:19.439241889 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_Component.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1656 +0,0 @@ -/* @@ -15366,7 +15366,7 @@ - AWT_UNLOCK(); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Cursor.c openjdk/jdk/src/solaris/native/sun/awt/awt_Cursor.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Cursor.c 2014-04-08 05:27:03.430874794 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Cursor.c 2016-12-30 04:30:19.443241822 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_Cursor.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,216 +0,0 @@ -/* @@ -15586,7 +15586,7 @@ - return (*env)->NewLocalRef(env, curComp); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_DataTransferer.c openjdk/jdk/src/solaris/native/sun/awt/awt_DataTransferer.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_DataTransferer.c 2014-04-08 05:27:03.434874852 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_DataTransferer.c 2016-12-30 04:30:19.443241822 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_DataTransferer.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1068 +0,0 @@ -/* @@ -16658,7 +16658,7 @@ - AWT_NOTIFY_ALL(); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_DataTransferer.h openjdk/jdk/src/solaris/native/sun/awt/awt_DataTransferer.h ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_DataTransferer.h 2014-04-08 05:27:03.434874852 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_DataTransferer.h 2016-12-30 04:30:19.443241822 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_DataTransferer.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,275 +0,0 @@ -/* @@ -16937,7 +16937,7 @@ - -#endif /* AWT_DATATRANSFERER_H */ diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_dnd.c openjdk/jdk/src/solaris/native/sun/awt/awt_dnd.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_dnd.c 2014-04-08 05:27:03.454875147 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_dnd.c 2016-12-30 04:30:19.511240693 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_dnd.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,887 +0,0 @@ -/* @@ -17828,7 +17828,7 @@ - return ret; -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_dnd_ds.c openjdk/jdk/src/solaris/native/sun/awt/awt_dnd_ds.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_dnd_ds.c 2014-04-08 05:27:03.458875205 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_dnd_ds.c 2016-12-30 04:30:19.515240627 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_dnd_ds.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1796 +0,0 @@ -/* @@ -19628,7 +19628,7 @@ - CurrentTime); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_dnd_dt.c openjdk/jdk/src/solaris/native/sun/awt/awt_dnd_dt.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_dnd_dt.c 2014-04-08 05:27:03.458875205 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_dnd_dt.c 2016-12-30 04:30:19.515240627 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_dnd_dt.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,3700 +0,0 @@ -/* @@ -23332,7 +23332,7 @@ - return get_selection_data(env, selection, target, time_stamp); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_dnd.h openjdk/jdk/src/solaris/native/sun/awt/awt_dnd.h ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_dnd.h 2014-04-08 05:27:03.454875147 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_dnd.h 2016-12-30 04:30:19.511240693 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_dnd.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,242 +0,0 @@ -/* @@ -23578,8 +23578,8 @@ -void set_proxy_mode_source_window(Window window); -/******************************************************************************/ diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c openjdk/jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c 2014-04-08 05:27:03.434874852 +0100 -+++ openjdk/jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c 2014-04-10 02:56:51.366479247 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c 2016-12-30 04:30:19.443241822 +0000 ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c 2016-12-30 05:19:14.194847534 +0000 @@ -29,7 +29,7 @@ #include "awt_p.h" @@ -23590,7 +23590,7 @@ #include "awt_Component.h" diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_FileDialog.c openjdk/jdk/src/solaris/native/sun/awt/awt_FileDialog.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_FileDialog.c 2014-04-08 05:27:03.434874852 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_FileDialog.c 2016-12-30 04:30:19.447241755 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_FileDialog.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,925 +0,0 @@ -/* @@ -24519,7 +24519,7 @@ - AWT_FLUSH_UNLOCK(); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_GlobalCursorManager.c openjdk/jdk/src/solaris/native/sun/awt/awt_GlobalCursorManager.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_GlobalCursorManager.c 2014-04-08 05:27:03.434874852 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_GlobalCursorManager.c 2016-12-30 04:30:19.447241755 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_GlobalCursorManager.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,127 +0,0 @@ -/* @@ -24650,7 +24650,7 @@ - return component; -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_KeyboardFocusManager.c openjdk/jdk/src/solaris/native/sun/awt/awt_KeyboardFocusManager.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_KeyboardFocusManager.c 2014-04-08 05:27:03.438874910 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_KeyboardFocusManager.c 2016-12-30 04:30:19.471241358 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_KeyboardFocusManager.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,175 +0,0 @@ -/* @@ -24829,7 +24829,7 @@ - AWT_UNLOCK(); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Label.c openjdk/jdk/src/solaris/native/sun/awt/awt_Label.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Label.c 2014-04-08 05:27:03.438874910 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Label.c 2016-12-30 04:30:19.471241358 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_Label.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,212 +0,0 @@ -/* @@ -25045,7 +25045,7 @@ - AWT_FLUSH_UNLOCK(); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_List.c openjdk/jdk/src/solaris/native/sun/awt/awt_List.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_List.c 2014-04-08 05:27:03.438874910 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_List.c 2016-12-30 04:30:19.471241358 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_List.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,600 +0,0 @@ -/* @@ -25649,7 +25649,7 @@ - AWT_UNLOCK(); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MenuBar.c openjdk/jdk/src/solaris/native/sun/awt/awt_MenuBar.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MenuBar.c 2014-04-08 05:27:03.442874969 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MenuBar.c 2016-12-30 04:30:19.475241290 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_MenuBar.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,198 +0,0 @@ -/* @@ -25851,7 +25851,7 @@ - AWT_UNLOCK(); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MenuBar.h openjdk/jdk/src/solaris/native/sun/awt/awt_MenuBar.h ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MenuBar.h 2014-04-08 05:27:03.442874969 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MenuBar.h 2016-12-30 04:30:19.487241092 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_MenuBar.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -/* @@ -25885,7 +25885,7 @@ - jfieldID graphicsConfig; -}; diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Menu.c openjdk/jdk/src/solaris/native/sun/awt/awt_Menu.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Menu.c 2014-04-08 05:27:03.442874969 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Menu.c 2016-12-30 04:30:19.475241290 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_Menu.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,407 +0,0 @@ -/* @@ -26296,7 +26296,7 @@ - AWT_UNLOCK(); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MenuComponent.c openjdk/jdk/src/solaris/native/sun/awt/awt_MenuComponent.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MenuComponent.c 2014-04-08 05:27:03.442874969 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MenuComponent.c 2016-12-30 04:30:19.487241092 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_MenuComponent.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -/* @@ -26348,7 +26348,7 @@ - env, cls, "getParent_NoClientCode", "()Ljava/awt/MenuContainer;"); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Menu.h openjdk/jdk/src/solaris/native/sun/awt/awt_Menu.h ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Menu.h 2014-04-08 05:27:03.442874969 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Menu.h 2016-12-30 04:30:19.475241290 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_Menu.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -/* @@ -26384,7 +26384,7 @@ - jfieldID isHelpMenu; -}; diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MenuItem.c openjdk/jdk/src/solaris/native/sun/awt/awt_MenuItem.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MenuItem.c 2014-04-08 05:27:03.446875029 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MenuItem.c 2016-12-30 04:30:19.491241025 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_MenuItem.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,654 +0,0 @@ -/* @@ -27042,7 +27042,7 @@ - return ((state) ? JNI_TRUE : JNI_FALSE); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_motif12.c openjdk/jdk/src/solaris/native/sun/awt/awt_motif12.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_motif12.c 2014-04-08 05:27:03.462875264 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_motif12.c 2016-12-30 04:30:19.519240560 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_motif12.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,435 +0,0 @@ -/* @@ -27481,7 +27481,7 @@ - xmDragContextClassRec.drag_class.start = (XmDragStartProc)CheckedDragStart; -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_motif21.c openjdk/jdk/src/solaris/native/sun/awt/awt_motif21.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_motif21.c 2014-04-08 05:27:03.462875264 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_motif21.c 2016-12-30 04:30:19.519240560 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_motif21.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,234 +0,0 @@ -/* @@ -27719,7 +27719,7 @@ - (XtPointer)w); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_motif.c openjdk/jdk/src/solaris/native/sun/awt/awt_motif.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_motif.c 2014-04-08 05:27:03.458875205 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_motif.c 2016-12-30 04:30:19.519240560 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_motif.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -/* @@ -27781,8 +27781,8 @@ - } -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MToolkit.c openjdk/jdk/src/solaris/native/sun/awt/awt_MToolkit.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2014-04-08 05:27:03.442874969 +0100 -+++ openjdk/jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2014-04-10 02:56:51.382479482 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2016-12-30 04:30:19.475241290 +0000 ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2016-12-30 05:19:14.198847467 +0000 @@ -48,7 +48,7 @@ /* JNI field and method ids */ @@ -27793,8 +27793,8 @@ #include "awt_TopLevel.h" #include "canvas.h" diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_p.h openjdk/jdk/src/solaris/native/sun/awt/awt_p.h ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_p.h 2014-04-08 13:33:32.074668722 +0100 -+++ openjdk/jdk/src/solaris/native/sun/awt/awt_p.h 2014-04-10 02:56:51.386479541 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_p.h 2016-12-30 04:30:19.519240560 +0000 ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_p.h 2016-12-30 05:19:14.202847401 +0000 @@ -79,7 +79,7 @@ #ifndef XAWT @@ -27805,7 +27805,7 @@ #ifndef HEADLESS diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_PopupMenu.c openjdk/jdk/src/solaris/native/sun/awt/awt_PopupMenu.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_PopupMenu.c 2014-04-08 05:27:03.446875029 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_PopupMenu.c 2016-12-30 04:30:19.491241025 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_PopupMenu.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,491 +0,0 @@ -/* @@ -28300,8 +28300,8 @@ - AWT_UNLOCK(); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Robot.c openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Robot.c 2014-04-10 02:28:17.828675796 +0100 -+++ openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c 2014-04-10 02:56:51.398479716 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Robot.c 2016-12-30 04:30:19.495240959 +0000 ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c 2016-12-30 05:19:14.202847401 +0000 @@ -205,14 +205,8 @@ /*********************************************************************************************/ @@ -28382,7 +28382,7 @@ jint wheelAmt) { /* Mouse wheel is implemented as a button press of button 4 and 5, so it */ diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Scrollbar.c openjdk/jdk/src/solaris/native/sun/awt/awt_Scrollbar.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Scrollbar.c 2014-04-08 05:27:03.450875088 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Scrollbar.c 2016-12-30 04:30:19.495240959 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_Scrollbar.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,440 +0,0 @@ -/* @@ -28826,7 +28826,7 @@ - AWT_FLUSH_UNLOCK(); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_ScrollPane.c openjdk/jdk/src/solaris/native/sun/awt/awt_ScrollPane.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_ScrollPane.c 2014-04-08 05:27:03.446875029 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_ScrollPane.c 2016-12-30 04:30:19.495240959 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_ScrollPane.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,927 +0,0 @@ -/* @@ -29757,7 +29757,7 @@ - (*env)->CallVoidMethod(env, adjustable, setTypedValueMID, value, type); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Selection.c openjdk/jdk/src/solaris/native/sun/awt/awt_Selection.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Selection.c 2014-04-08 05:27:03.450875088 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_Selection.c 2016-12-30 04:30:19.495240959 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_Selection.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,508 +0,0 @@ -/* @@ -30269,7 +30269,7 @@ - return get_selection_data(env, selectionAtom, format, time_stamp); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TextArea.c openjdk/jdk/src/solaris/native/sun/awt/awt_TextArea.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TextArea.c 2014-04-08 05:27:03.450875088 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TextArea.c 2016-12-30 04:30:19.495240959 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_TextArea.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1003 +0,0 @@ -/* @@ -31276,7 +31276,7 @@ -} -*/ diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TextArea.h openjdk/jdk/src/solaris/native/sun/awt/awt_TextArea.h ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TextArea.h 2014-04-08 05:27:03.450875088 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TextArea.h 2016-12-30 04:30:19.499240893 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_TextArea.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -/* @@ -31316,7 +31316,7 @@ - jfieldID firstChangeSkipped; -}; diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TextField.c openjdk/jdk/src/solaris/native/sun/awt/awt_TextField.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TextField.c 2014-04-08 05:27:03.450875088 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TextField.c 2016-12-30 04:30:19.499240893 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_TextField.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,989 +0,0 @@ -/* @@ -32309,7 +32309,7 @@ -} -*/ diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TextField.h openjdk/jdk/src/solaris/native/sun/awt/awt_TextField.h ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TextField.h 2014-04-08 05:27:03.450875088 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TextField.h 2016-12-30 04:30:19.499240893 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_TextField.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -/* @@ -32349,7 +32349,7 @@ - jfieldID firstChangeSkipped; -}; diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TopLevel.c openjdk/jdk/src/solaris/native/sun/awt/awt_TopLevel.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TopLevel.c 2014-04-08 05:27:03.454875147 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_TopLevel.c 2016-12-30 04:30:19.507240759 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_TopLevel.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,5095 +0,0 @@ -/* @@ -37448,7 +37448,7 @@ -{ -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_xembed.c openjdk/jdk/src/solaris/native/sun/awt/awt_xembed.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_xembed.c 2014-04-08 05:27:03.466875324 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_xembed.c 2016-12-30 04:30:19.615238967 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_xembed.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,430 +0,0 @@ -/* @@ -37882,7 +37882,7 @@ - sendMessage(data->embedder, (direction == JNI_TRUE)?XEMBED_FOCUS_NEXT:XEMBED_FOCUS_PREV); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_XmDnD.c openjdk/jdk/src/solaris/native/sun/awt/awt_XmDnD.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_XmDnD.c 2014-04-08 05:27:03.454875147 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_XmDnD.c 2016-12-30 04:30:19.511240693 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_XmDnD.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,2282 +0,0 @@ -/* @@ -40168,7 +40168,7 @@ - awt_cleanupConvertDataContext(env, MOTIF_DROP_ATOM); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_XmDnD.h openjdk/jdk/src/solaris/native/sun/awt/awt_XmDnD.h ---- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_XmDnD.h 2014-04-08 05:27:03.454875147 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_XmDnD.h 2016-12-30 04:30:19.511240693 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_XmDnD.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -/* @@ -40213,7 +40213,7 @@ - uint32_t dsCnt; -} DropSiteInfo; diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/canvas.c openjdk/jdk/src/solaris/native/sun/awt/canvas.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/canvas.c 2014-04-08 05:27:03.466875324 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/canvas.c 2016-12-30 04:30:19.619238902 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/canvas.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,3227 +0,0 @@ -/* @@ -43444,7 +43444,7 @@ - (*env)->PopLocalFrame(env, 0); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/cursor.c openjdk/jdk/src/solaris/native/sun/awt/cursor.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/cursor.c 2014-04-08 05:27:03.470875384 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/cursor.c 2016-12-30 04:30:19.619238902 +0000 +++ openjdk/jdk/src/solaris/native/sun/awt/cursor.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,132 +0,0 @@ -/* @@ -43580,8 +43580,8 @@ - AWT_FLUSH_UNLOCK(); -} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/initIDs.c openjdk/jdk/src/solaris/native/sun/awt/initIDs.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/initIDs.c 2014-04-08 05:27:03.474875443 +0100 -+++ openjdk/jdk/src/solaris/native/sun/awt/initIDs.c 2014-04-10 02:56:51.418480011 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/initIDs.c 2016-12-30 04:30:19.919233921 +0000 ++++ openjdk/jdk/src/solaris/native/sun/awt/initIDs.c 2016-12-30 05:19:14.210847271 +0000 @@ -26,7 +26,7 @@ #include "java_awt_Color.h" #include "java_awt_Dimension.h" @@ -43592,8 +43592,8 @@ #include "java_awt_event_MouseEvent.h" #include "java_awt_Rectangle.h" diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/multi_font.c openjdk/jdk/src/solaris/native/sun/awt/multi_font.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/multi_font.c 2014-04-08 05:27:03.554876623 +0100 -+++ openjdk/jdk/src/solaris/native/sun/awt/multi_font.c 2014-04-10 02:56:51.426480128 +0100 +--- openjdk.orig/jdk/src/solaris/native/sun/awt/multi_font.c 2016-12-30 04:30:20.475224692 +0000 ++++ openjdk/jdk/src/solaris/native/sun/awt/multi_font.c 2016-12-30 05:19:14.214847204 +0000 @@ -52,8 +52,8 @@ extern XFontStruct *loadFont(Display *, char *, int32_t);
--- a/patches/openjdk/7180907-jarsigner_sha-256.patch Tue Jan 03 05:55:47 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,142 +0,0 @@ -# HG changeset patch -# User weijun -# Date 1412803649 -3600 -# Wed Oct 08 22:27:29 2014 +0100 -# Node ID ef55e24d58e0ccf31cced3ec5718c7de7ae160ae -# Parent 869b3b5d079f0c828b56ac3261491d29ed4eae86 -7180907: Jarsigner -verify fails if rsa file used sha-256 with authenticated attributes -Reviewed-by: xuelei, vinnie - -diff -r 869b3b5d079f -r ef55e24d58e0 src/share/classes/sun/security/pkcs/SignerInfo.java ---- openjdk/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java Wed Oct 08 22:20:38 2014 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java Wed Oct 08 22:27:29 2014 +0100 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1996, 2012, 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 -@@ -273,6 +273,24 @@ - return certList; - } - -+ // Copied from com.sun.crypto.provider.OAEPParameters. -+ private static String convertToStandardName(String internalName) { -+ if (internalName.equals("SHA")) { -+ return "SHA-1"; -+ } else if (internalName.equals("SHA224")) { -+ return "SHA-224"; -+ } else if (internalName.equals("SHA256")) { -+ return "SHA-256"; -+ } else if (internalName.equals("SHA384")) { -+ return "SHA-384"; -+ } else if (internalName.equals("SHA512")) { -+ return "SHA-512"; -+ } else { -+ return internalName; -+ } -+ } -+ -+ - /* Returns null if verify fails, this signerInfo if - verify succeeds. */ - SignerInfo verify(PKCS7 block, byte[] data) -@@ -313,7 +331,8 @@ - if (messageDigest == null) // fail if there is no message digest - return null; - -- MessageDigest md = MessageDigest.getInstance(digestAlgname); -+ MessageDigest md = MessageDigest.getInstance( -+ convertToStandardName(digestAlgname)); - byte[] computedMessageDigest = md.digest(data); - - if (messageDigest.length != computedMessageDigest.length) -diff -r 869b3b5d079f -r ef55e24d58e0 test/sun/security/x509/AlgorithmId/NonStandardNames.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/test/sun/security/x509/AlgorithmId/NonStandardNames.java Wed Oct 08 22:27:29 2014 +0100 -@@ -0,0 +1,84 @@ -+/* -+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+/* -+ * @test -+ * @bug 7180907 -+ * @summary Jarsigner -verify fails if rsa file used sha-256 with authenticated attributes -+ */ -+ -+import java.security.MessageDigest; -+import java.security.Signature; -+import java.security.cert.X509Certificate; -+import sun.security.pkcs.ContentInfo; -+import sun.security.pkcs.PKCS7; -+import sun.security.pkcs.PKCS9Attribute; -+import sun.security.pkcs.PKCS9Attributes; -+import sun.security.pkcs.SignerInfo; -+import sun.security.x509.CertAndKeyGen; -+import sun.security.x509.AlgorithmId; -+import sun.security.x509.X500Name; -+ -+public class NonStandardNames { -+ -+ public static void main(String[] args) throws Exception { -+ -+ byte[] data = "Hello".getBytes(); -+ X500Name n = new X500Name("cn=Me"); -+ -+ CertAndKeyGen cakg = new CertAndKeyGen("RSA", "SHA256withRSA"); -+ cakg.generate(1024); -+ X509Certificate cert = cakg.getSelfCertificate(n, 1000); -+ -+ MessageDigest md = MessageDigest.getInstance("SHA-256"); -+ PKCS9Attributes authed = new PKCS9Attributes(new PKCS9Attribute[]{ -+ new PKCS9Attribute(PKCS9Attribute.CONTENT_TYPE_OID, ContentInfo.DATA_OID), -+ new PKCS9Attribute(PKCS9Attribute.MESSAGE_DIGEST_OID, md.digest(data)), -+ }); -+ -+ Signature s = Signature.getInstance("SHA256withRSA"); -+ s.initSign(cakg.getPrivateKey()); -+ s.update(authed.getDerEncoding()); -+ byte[] sig = s.sign(); -+ -+ SignerInfo signerInfo = new SignerInfo( -+ n, -+ cert.getSerialNumber(), -+ AlgorithmId.get("SHA-256"), -+ authed, -+ AlgorithmId.get("SHA256withRSA"), -+ sig, -+ null -+ ); -+ -+ PKCS7 pkcs7 = new PKCS7( -+ new AlgorithmId[] {signerInfo.getDigestAlgorithmId()}, -+ new ContentInfo(data), -+ new X509Certificate[] {cert}, -+ new SignerInfo[] {signerInfo}); -+ -+ if (pkcs7.verify(signerInfo, data) == null) { -+ throw new Exception("Not verified"); -+ } -+ } -+}
--- a/patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch Tue Jan 03 05:55:47 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# HG changeset patch -# User valeriep -# Date 1361905960 28800 -# Tue Feb 26 11:12:40 2013 -0800 -# Node ID 0af95754ffc5d63e2eeb472e3e87e8d8b7ed3048 -# Parent f94c09f6a10e9ba492b8ad2fc6fe0900bca4374f -8000897, PR2173, RH1155012: VM crash in CompileBroker -Summary: Fixed to use the corresponding digest length when generating output. -Reviewed-by: mullan - -diff -r f94c09f6a10e -r 0af95754ffc5 src/share/classes/sun/security/provider/SHA2.java ---- openjdk/jdk/src/share/classes/sun/security/provider/SHA2.java Thu Oct 16 17:30:05 2014 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/provider/SHA2.java Tue Feb 26 11:12:40 2013 -0800 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2013, 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 -@@ -101,7 +101,7 @@ - i2bBig4((int)bitsProcessed, buffer, 60); - implCompress(buffer, 0); - -- i2bBig(state, 0, out, ofs, 32); -+ i2bBig(state, 0, out, ofs, engineGetDigestLength()); - } - - /**
--- a/patches/openjdk/8049480-jarsigner_openjdk_9.patch Tue Jan 03 05:55:47 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,295 +0,0 @@ -# HG changeset patch -# User weijun -# Date 1412804569 -3600 -# Wed Oct 08 22:42:49 2014 +0100 -# Node ID 2adb6892881f4e3b359026854562b2ac70c63bef -# Parent ef55e24d58e0ccf31cced3ec5718c7de7ae160ae -8049480: Current versions of Java can't verify jars signed and timestamped with Java 9 -Reviewed-by: xuelei, mullan - -diff -r ef55e24d58e0 -r 2adb6892881f src/share/classes/com/sun/crypto/provider/OAEPParameters.java ---- openjdk/jdk/src/share/classes/com/sun/crypto/provider/OAEPParameters.java Wed Oct 08 22:27:29 2014 +0100 -+++ openjdk/jdk/src/share/classes/com/sun/crypto/provider/OAEPParameters.java Wed Oct 08 22:42:49 2014 +0100 -@@ -106,20 +106,6 @@ - } - } - -- private static String convertToStandardName(String internalName) { -- if (internalName.equals("SHA")) { -- return "SHA-1"; -- } else if (internalName.equals("SHA256")) { -- return "SHA-256"; -- } else if (internalName.equals("SHA384")) { -- return "SHA-384"; -- } else if (internalName.equals("SHA512")) { -- return "SHA-512"; -- } else { -- return internalName; -- } -- } -- - protected void engineInit(byte[] encoded) - throws IOException { - DerInputStream der = new DerInputStream(encoded); -@@ -131,7 +117,7 @@ - DerValue data = datum[i]; - if (data.isContextSpecific((byte) 0x00)) { - // hash algid -- mdName = convertToStandardName(AlgorithmId.parse -+ mdName = AlgorithmId.getStandardDigestName(AlgorithmId.parse - (data.data.getDerValue()).getName()); - } else if (data.isContextSpecific((byte) 0x01)) { - // mgf algid -@@ -140,7 +126,8 @@ - throw new IOException("Only MGF1 mgf is supported"); - } - AlgorithmId params = AlgorithmId.parse(new DerValue(val.getEncodedParams())); -- String mgfDigestName = convertToStandardName(params.getName()); -+ String mgfDigestName = AlgorithmId.getStandardDigestName( -+ params.getName()); - if (mgfDigestName.equals("SHA-1")) { - mgfSpec = MGF1ParameterSpec.SHA1; - } else if (mgfDigestName.equals("SHA-224")) { -diff -r ef55e24d58e0 -r 2adb6892881f src/share/classes/sun/security/pkcs/SignerInfo.java ---- openjdk/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java Wed Oct 08 22:27:29 2014 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java Wed Oct 08 22:42:49 2014 +0100 -@@ -273,24 +273,6 @@ - return certList; - } - -- // Copied from com.sun.crypto.provider.OAEPParameters. -- private static String convertToStandardName(String internalName) { -- if (internalName.equals("SHA")) { -- return "SHA-1"; -- } else if (internalName.equals("SHA224")) { -- return "SHA-224"; -- } else if (internalName.equals("SHA256")) { -- return "SHA-256"; -- } else if (internalName.equals("SHA384")) { -- return "SHA-384"; -- } else if (internalName.equals("SHA512")) { -- return "SHA-512"; -- } else { -- return internalName; -- } -- } -- -- - /* Returns null if verify fails, this signerInfo if - verify succeeds. */ - SignerInfo verify(PKCS7 block, byte[] data) -@@ -332,7 +314,7 @@ - return null; - - MessageDigest md = MessageDigest.getInstance( -- convertToStandardName(digestAlgname)); -+ AlgorithmId.getStandardDigestName(digestAlgname)); - byte[] computedMessageDigest = md.digest(data); - - if (messageDigest.length != computedMessageDigest.length) -diff -r ef55e24d58e0 -r 2adb6892881f src/share/classes/sun/security/util/SignatureFileVerifier.java ---- openjdk/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java Wed Oct 08 22:27:29 2014 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java Wed Oct 08 22:42:49 2014 +0100 -@@ -41,6 +41,7 @@ - import sun.misc.BASE64Decoder; - - import sun.security.jca.Providers; -+import sun.security.x509.AlgorithmId; - - public class SignatureFileVerifier { - -@@ -611,7 +612,8 @@ - throws NoSuchAlgorithmException, SignatureException { - - MessageDigest md = -- MessageDigest.getInstance(token.getHashAlgorithm().getName()); -+ MessageDigest.getInstance(AlgorithmId.getStandardDigestName( -+ token.getHashAlgorithm().getName())); - - if (!Arrays.equals(token.getHashedMessage(), md.digest(signature))) { - throw new SignatureException("Signature timestamp (#" + -diff -r ef55e24d58e0 -r 2adb6892881f src/share/classes/sun/security/x509/AlgorithmId.java ---- openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java Wed Oct 08 22:27:29 2014 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java Wed Oct 08 22:42:49 2014 +0100 -@@ -891,4 +891,21 @@ - nameTable.put(pbeWithSHA1AndDESede_oid, "PBEWithSHA1AndDESede"); - nameTable.put(pbeWithSHA1AndRC2_40_oid, "PBEWithSHA1AndRC2_40"); - } -+ -+ // Copied from com.sun.crypto.provider.OAEPParameters.convertToStandardName() -+ public static String getStandardDigestName(String internalName) { -+ if (internalName.equals("SHA")) { -+ return "SHA-1"; -+ } else if (internalName.equals("SHA224")) { -+ return "SHA-224"; -+ } else if (internalName.equals("SHA256")) { -+ return "SHA-256"; -+ } else if (internalName.equals("SHA384")) { -+ return "SHA-384"; -+ } else if (internalName.equals("SHA512")) { -+ return "SHA-512"; -+ } else { -+ return internalName; -+ } -+ } - } -diff -r ef55e24d58e0 -r 2adb6892881f test/sun/security/tools/jarsigner/TimestampAlg.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/test/sun/security/tools/jarsigner/TimestampAlg.java Wed Oct 08 22:42:49 2014 +0100 -@@ -0,0 +1,156 @@ -+/* -+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+/** -+ * @test -+ * @bug 8049480 -+ * @summary Current versions of Java can't verify jars signed and timestamped with Java 9 -+ */ -+ -+import java.io.InputStream; -+import java.nio.file.Files; -+import java.nio.file.Paths; -+import java.util.jar.JarEntry; -+import java.util.jar.JarFile; -+ -+public class TimestampAlg { -+ -+ public static void main(String[] args) throws Exception { -+ // This is a very simple jar file signed by JDK 9 with a timestamp -+ // using the SHA-256 message digest algorithm. -+ String var = -+ "504b0304140008080800c28ee844000000000000000000000000140000004d45" + -+ "54412d494e462f4d414e49464553542e4d4615cd4d0b82301c80f1fb60df61c7" + -+ "42666a9928749846f4aa8924745cf9d716b6c59c48df3ebd3e87df73e152d4d0" + -+ "195a82ee849211716d07a344033750d1f83785d076e830b8be1fb80e15d28096" + -+ "bca535ef4c058fbe21b34cf3670b2451faab3437a333c708a3947f20220ca362" + -+ "cfa8e7afe95634e32b22af821df2d6786d5ff637cf3abfe3f05e4190a42779b5" + -+ "76470532cbd56a798105db4cd01f504b07082c3740c69c000000a6000000504b" + -+ "0304140008080800c28ee8440000000000000000000000000f0000004d455441" + -+ "2d494e462f4f4c442e534675cf416f823018c6f13b09dfa1c7ed50575014493c" + -+ "80bae8a6a091383db6f082955a595b86ecd34fb3db92dd9ed32fff67c74b494d" + -+ "a300ef41697e9501727ac4b6768b10bbde10cf7809dae03595bcf81d5ce2d018" + -+ "c5596340072872bdecd02554f17c70f16fc730cfb4a8c6b0ad934fdfb6d0e854" + -+ "fbb794ecd52eeecbe5e45f394071bd9ef30c34131f87a3e956c561efb0938e56" + -+ "b7573d5c6cd3599bbe2ddd28acfafe9d992aa006721c758fe2718fe0b6753c6f" + -+ "e410cca50125a9c005d52607d694e82951341380a657555f1535f7a3cfb6655b" + -+ "31bd4080c2bf55016a98a8f2512948f7e5968dfbbe495fcca6383bdfe753a467" + -+ "90ca41a297861544cd270fe807504b0708521a35550201000048010000504b03" + -+ "04140008080800c28ee844000000000000000000000000100000004d4554412d" + -+ "494e462f4f4c442e52534185947b38d37d1fc7fdb61923530eb39e688622a77e" + -+ "5b666ab9939c9544c831ee39d42c9511e576d8c8b9876745b5743b5414268718" + -+ "b969548e95d61c2224b47423a648393d73dd5d4fe5b9afe7f9f3f3b9deefeff5" + -+ "bd3e9ff7e7053210ba708476bc55fc6719400292c340a8800cc4460800e06441" + -+ "1938c23bde0af083c22080b81828fd5d08e430200f4006a41664003772a01000" + -+ "028145a66e3cba6af9a601a44516246e1d2805873ac1a0f2d093545f70b3920c" + -+ "ce00248246e04ec20e02e8262a09200e6ff0adfc2f3d0350fbf149d12fa00c40" + -+ "564cd497823000406cb4ef6571fdec06c95a370fde860e89425861e16e0b19a1" + -+ "4c6c4f52d6102dd3a6bf45e740d9a0bed342ee5e832885fa1a979dc7e6161253" + -+ "4c2cda0362e5ec02ae440e44e80c56bffc4ab4f349f3b1f6bddae8c2979fca4b" + -+ "5e7e46ac2fa529481dd8d750a26dcd7d74deb8dde7fc70c072465af0a1e359af" + -+ "4cf4b1aaa14fc4238cee096ca3133575d52179a7e7da8990f6ed5da71ca84c37" + -+ "2d3117c356b1ac2cdde3c8600ead44f8878b2f8f10831f4d5d590a28d95b316c" + -+ "cf456277a83533e12ea42a14c8fc05da6b2483b74ab7c4e70a2dd60f417d2f97" + -+ "3359bb233e3d6b5ab60202e7bd7b4fd7f228febd1f0403b0c62f4190b69264bf" + -+ "72426589ab516d00040a880137b0200654114d4d050943c11490e82d88b38ecd" + -+ "26a42c027cd749ffe67955e7d9357b81aece4e877d49ee62b8afeed7a755fa9e" + -+ "786d6edc5d7e5ae3603e5d6e39d0cbc74300c35eb354282842a183159763c67a" + -+ "35b0b1ac1929e7b8ad510da5aa454d5eb3034cf11d27f594326384873f7c8949" + -+ "1a7f4a3cfccb892faf873c621292bd597072cdcd732d1ee7490e611ec28c90f9" + -+ "81bbd71ef0e4b50c4e93869c9af8c9d3d154169bbf8dff7aa706ebac1f6d2589" + -+ "8078532a9867e31d7f576365bc0c6c132fb7719b58d88ebcf438715768aea361" + -+ "f7017f614acfaf465e6d794b84e317b2937d66a8f5cea13666d541cce02705a8" + -+ "cef2d6d2f69b96ac88fec9998228a7c1d96d09c315b29797ecda02250dc7383a" + -+ "6f2bf75b0f17d48c07afa48c640d3478dd3ad18963c0712003ae27ca3a885a9b" + -+ "bcef71fef1027e8e228c01885dede0446717674996f8f413f59a5c3f91a001c0" + -+ "b632f78891424ce58a58df39727a6cc492ea4c94d5f23f6ad1276561d6eb057f" + -+ "befab3e5baff5dec50224a891fb49c29ab6cd6cab3f7731d097fc3d65e949b33" + -+ "b7a578f0b379e47a98c0a91b5fb0ce685952a78afc5cfa0e373df4a035c15132" + -+ "bb62a6387ad8caaadab680b8a169805e49b69e5ad8409de9b7079b6def2af45a" + -+ "dada5e7cdee4b5359892d1803dfc765dd18849fd0bf44b64866ed654fc117ea6" + -+ "5e6b1922eff99b73f0c77257e994d307defc9a29cedd1ac7be68a626d6edf96e" + -+ "c692bdf22ee792369dd535a0dfa7d711396996f692895df223eaaa5f47414f45" + -+ "b2c3b39d65772575c5cf4a437319b00990011b834b7f1b0c623d048963c07a44" + -+ "4dfe4f60813d12b5b87f0b16ea0f6e0096e30973075d454238d411260ee2d6a8" + -+ "61aa68a6bb3119ab837aaa39abd612eab39f9da4665c977e0cff019201a19384" + -+ "d3222b5a160ffe07340620c10d220998e65d3431411e13916b4e44ae191143fa" + -+ "be91cb1605ff6d2db96470d220e2af3c40f6ed5d032ee2cfe022bafd240fa1fd" + -+ "5f6e3567dd9071543e381b57bdd80cb1575a376abcc947495167e61e6e32a1ae" + -+ "93d416c8bc197b6bda347e6bcc6553839ed0a78d7ac28d57f2f7f8cd857d14e4" + -+ "497caa1cd34e1829aa7574aa3984ad39934e765598bdf0356c31a8f5c4a316d6" + -+ "c6beedf3add584c5769a6901a7836d3b32e3a03c58c739a6969e0260a002f463" + -+ "2773e84174c7faa41086e0d5d0ceaefc4df5a443d4e8af8a462dd67181ce11be" + -+ "a6ef64ce907252a0d0e6f03ef467e6763c244c48574856017d294607d3f87d5b" + -+ "0eb9eba2c60dc6c70dddfb837914babf172574ef99a4bb1e361353de4d95c576" + -+ "c494e1e9bce62d4fd08ad5e731691d1895636525bb79d76b2f1ce07d1604aa95" + -+ "8d9dfc8b5b6ee01110b3ca2d75181a44c528300ede3c612715c04d7baf786a18" + -+ "87b5f95861180fa256055b006005b67aa0923a70405c5c022af903f0187b3458" + -+ "748cc0bdfeac15adcb7029a17883d0f5ef80573caa61574bb66747bc61aae3ca" + -+ "0c3fe8bcd223d54fd7f5a2270843f9559a99f76aff45d965ba91374fa05a706f" + -+ "479416999389d4e29eb74a1984a30face935fd2118a580a3cd5a6567c2e21e92" + -+ "bb358c54822aaa049a8f47712889ee4507ae4ffd150ba50f444f99701c49fa97" + -+ "72edc44e69cfcda9cffc9f75c49fdb6b28b9699a2567289979dfd42664626232" + -+ "75b682be2baf3856623e37bb47c15e3e8e084771e4f3e7b53265efbc48e616cd" + -+ "ed18c4a546de3f5bd793857c9c7a99615161b7cdcca53fa1d4c119a33bb150a4" + -+ "6e4996450724eed76ae3d2dbc02f147228353241beba27e585a3dd556b8e5c2e" + -+ "5f4a3328fd214663223ec27d4fb134873a85630026a204ee5e059ee29a807f3f" + -+ "82ffcd3b2437cc1bf95a6813dec5195b38cd227002c6f5f53dcd1212f7182038" + -+ "9877b7ddf1ff2c0c65993b9524d3b41eca82ded2b951471c871b741fddd9fdc7" + -+ "70a79bb91c3d91f3a9aa8f880ec22099418c65654a7e3a25c4d8925e98e1e390" + -+ "1437e8767c9debf521e5c93ad5026ab8e5ef9696983ba6d0335e17de6ba65747" + -+ "91a0fb6ecdf20bde55874082a7f19b4332ddbba24d4eb98a9b0e55e4294f37be" + -+ "edd62a3e3ebccf8ded49f3a029fa76becf3389a386d2d62faca4f85cbb643489" + -+ "2e2abfd66dbe727f4fe28d8f8d551e0f8f4c8eda346c66d1bc6fa7a68eabdfb7" + -+ "0d0a34e65910bba73413ad8680dfaa473753ae9e2fd032d8f6cc66d19c57e679" + -+ "7fcc33cce8df504b0708267c480f1b08000030090000504b0304140008080800" + -+ "b78ee844000000000000000000000000090004004d4554412d494e462ffeca00" + -+ "000300504b0708000000000200000000000000504b0304140008080800b78ee8" + -+ "440000000000000000000000000100000041f3cb2fc9c8cc4be70200504b0708" + -+ "3c0a34d30a00000008000000504b01021400140008080800c28ee8442c3740c6" + -+ "9c000000a60000001400000000000000000000000000000000004d4554412d49" + -+ "4e462f4d414e49464553542e4d46504b01021400140008080800c28ee844521a" + -+ "355502010000480100000f00000000000000000000000000de0000004d455441" + -+ "2d494e462f4f4c442e5346504b01021400140008080800c28ee844267c480f1b" + -+ "0800003009000010000000000000000000000000001d0200004d4554412d494e" + -+ "462f4f4c442e525341504b01021400140008080800b78ee84400000000020000" + -+ "00000000000900040000000000000000000000760a00004d4554412d494e462f" + -+ "feca0000504b01021400140008080800b78ee8443c0a34d30a00000008000000" + -+ "0100000000000000000000000000b30a000041504b0506000000000500050027" + -+ "010000ec0a00000000"; -+ byte[] data = new byte[var.length()/2]; -+ for (int i=0; i<data.length; i++) { -+ data[i] = Integer.valueOf(var.substring(2*i,2*i+2), 16).byteValue(); -+ } -+ Files.write(Paths.get("x.jar"), data); -+ -+ try (JarFile jf = new JarFile("x.jar")) { -+ JarEntry je = jf.getJarEntry("A"); -+ try (InputStream is = jf.getInputStream(je)) { -+ is.read(new byte[10]); -+ } -+ if (je.getCertificates().length != 1) { -+ throw new Exception(); -+ } -+ } -+ } -+}
--- a/patches/openjdk/8078628-pr3152-zero_pch_failure.patch Tue Jan 03 05:55:47 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1482709933 0 -# Sun Dec 25 23:52:13 2016 +0000 -# Node ID 1ae05a34e052d1672b4a7894ddf5fc2f662eb861 -# Parent 598f4f521889aadf7abccaf0634e9cd0d8b75599 -8078628: Zero build fails with pre-compiled headers disabled -Summary: Add missing includes to make Zero builds without pre-compiled headers work -Reviewed-by: omajid - -diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/entry_zero.hpp openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/entry_zero.hpp 2016-08-22 15:02:02.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp 2016-12-26 02:36:46.775167402 +0000 -@@ -1,6 +1,6 @@ - /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. -- * Copyright 2008, 2009, 2010 Red Hat, Inc. -+ * Copyright 2016 Red Hat, Inc. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -26,6 +26,8 @@ - #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP - #define CPU_ZERO_VM_ENTRY_ZERO_HPP - -+#include "interpreter/cppInterpreter.hpp" -+ - class ZeroEntry { - public: - ZeroEntry() { -diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp 2016-08-22 15:02:03.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp 2016-12-26 02:36:46.775167402 +0000 -@@ -1,6 +1,6 @@ - /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. -- * Copyright 2008 Red Hat, Inc. -+ * Copyright 2016 Red Hat, Inc. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -25,6 +25,7 @@ - - #include "precompiled.hpp" - #include "assembler_zero.inline.hpp" -+#include "entry_zero.hpp" - #include "memory/resourceArea.hpp" - #include "nativeInst_zero.hpp" - #include "oops/oop.inline.hpp"
--- a/patches/openjdk/8169448-pr3205-pch_failure.patch Tue Jan 03 05:55:47 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1478656400 0 -# Wed Nov 09 01:53:20 2016 +0000 -# Node ID bbe3dc5410163bc7fb2dfbe5eb6969bbf71edc6d -# Parent 1943edc6f06aa1f026b4e6fa9ccc8b2d60243ca7 -8169448: OpenJDK 6 fails to build without pre-compiled headers -Summary: psPromotionManager.hpp is missing an import for psOldGen -Reviewed-by: omajid - -diff --git a/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp b/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp ---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp -@@ -25,6 +25,7 @@ - #ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_HPP - #define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_HPP - -+#include "gc_implementation/parallelScavenge/psOldGen.hpp" - #include "gc_implementation/parallelScavenge/psPromotionLAB.hpp" - #include "memory/allocation.hpp" - #include "utilities/taskqueue.hpp"
--- a/patches/windows-awt.patch Tue Jan 03 05:55:47 2017 +0000 +++ b/patches/windows-awt.patch Tue Jan 03 06:59:13 2017 +0000 @@ -1,8 +1,7 @@ -diff --git a/jdk/src/windows/native/sun/windows/awt_Component.cpp b/jdk/src/windows/native/sun/windows/awt_Component.cpp -index 7490b4e..660efe7 100644 ---- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Component.cpp -+++ openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp -@@ -218,6 +218,10 @@ static UINT lastShiftKeyPressed = 0; // init to safe value +diff -Nru openjdk.orig/jdk/src/windows/native/sun/windows/awt_Component.cpp openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp +--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Component.cpp 2017-01-03 06:00:54.997946001 +0000 ++++ openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp 2017-01-03 06:01:41.137192462 +0000 +@@ -226,6 +226,10 @@ // Added by waleed to initialize the RTL Flags BOOL AwtComponent::sm_rtl = PRIMARYLANGID(GetInputLanguage()) == LANG_ARABIC || PRIMARYLANGID(GetInputLanguage()) == LANG_HEBREW; @@ -13,22 +12,25 @@ BOOL AwtComponent::sm_rtlReadingOrder = PRIMARYLANGID(GetInputLanguage()) == LANG_ARABIC; -diff --git a/jdk/src/windows/native/sun/windows/awt_Component.h b/jdk/src/windows/native/sun/windows/awt_Component.h -index ac60aec..3d02235 100644 ---- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Component.h -+++ openjdk/jdk/src/windows/native/sun/windows/awt_Component.h -@@ -423,6 +423,10 @@ public: - /* Functions for MouseWheel support on Windows95 - * These should only be called if running on 95 +diff -Nru openjdk.orig/jdk/src/windows/native/sun/windows/awt_Component.h openjdk/jdk/src/windows/native/sun/windows/awt_Component.h +--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Component.h 2016-12-30 04:57:02.000000000 +0000 ++++ openjdk/jdk/src/windows/native/sun/windows/awt_Component.h 2017-01-03 06:02:39.296242449 +0000 +@@ -419,6 +419,14 @@ + * List. All other Components return FALSE. */ + virtual BOOL InheritsNativeMouseWheelBehavior(); ++ ++ /* Functions for MouseWheel support on Windows95 ++ * These should only be called if running on 95 ++ */ + static void Wheel95Init(); + INLINE static UINT Wheel95GetMsg() {return sm_95WheelMessage;} + static UINT Wheel95GetScrLines(); -+ ++ /* Determines whether the component is obscured by another window */ // Called on Toolkit thread -@@ -718,6 +722,10 @@ protected: +@@ -715,6 +723,10 @@ virtual void SetDragCapture(UINT flags); virtual void ReleaseDragCapture(UINT flags); @@ -36,14 +38,13 @@ + static UINT sm_95WheelMessage; + static UINT sm_95WheelSupport; + - //These functions are overridden in AwtWindow to handle non-opaque windows. virtual void FillBackground(HDC hMemoryDC, SIZE &size); virtual void FillAlpha(void *bitmapBits, SIZE &size, BYTE alpha); -diff --git a/jdk/src/windows/native/sun/windows/awt_MMStub.h b/jdk/src/windows/native/sun/windows/awt_MMStub.h -index 802899b..18afeeb 100644 ---- openjdk.orig/jdk/src/windows/native/sun/windows/awt_MMStub.h -+++ openjdk/jdk/src/windows/native/sun/windows/awt_MMStub.h -@@ -74,6 +74,12 @@ extern "C" { + +diff -Nru openjdk.orig/jdk/src/windows/native/sun/windows/awt_MMStub.h openjdk/jdk/src/windows/native/sun/windows/awt_MMStub.h +--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_MMStub.h 2016-12-30 04:30:30.000000000 +0000 ++++ openjdk/jdk/src/windows/native/sun/windows/awt_MMStub.h 2017-01-03 06:03:08.111771686 +0000 +@@ -84,6 +84,12 @@ #define DEV_STR_LEN 128 @@ -54,9 +55,9 @@ + + // Datatypes - typedef HANDLE MHND; typedef BOOL (CALLBACK* MON_ENUM_CALLBACK_PROC)(MHND,HDC,LPRECT,LPARAM); -@@ -105,6 +111,15 @@ typedef struct tagDISPLAY_DEVICE + +@@ -114,6 +120,15 @@ WCHAR deviceKey[128]; } _DISPLAY_DEVICE, *P_DISPLAY_DEVICE; @@ -72,7 +73,7 @@ /* Basic API's */ BOOL WINAPI _enumDisplayMonitors(HDC,LPCRECT,MON_ENUM_CALLBACK_PROC,LPARAM); BOOL WINAPI _enumDisplayDevices (LPVOID,int,P_DISPLAY_DEVICE,DWORD); -@@ -122,6 +137,10 @@ HDC WINAPI _makeDCFromMonitor (MHND); +@@ -131,6 +146,10 @@ HWND WINAPI _createWindowOM (MHND,LPCTSTR,LPCTSTR,DWORD,int,int,int, int,HWND,HMENU,HANDLE,LPVOID);