/hg/release/icedtea7-forest-2.6/jdk: 42 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Oct 14 04:40:37 UTC 2015
changeset 198896739ded in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=198896739ded
author: andrew
date: Fri Jul 03 23:57:37 2015 +0100
8133966: Allow OpenJDK to build on PaX-enabled kernels
Reviewed-by: aph
changeset f01c6c8f3ba5 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=f01c6c8f3ba5
author: ksrini
date: Sat Jul 04 00:03:58 2015 +0100
8073773: Presume path preparedness
Reviewed-by: darcy, dholmes, ahgross
changeset 8b1325d83338 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=8b1325d83338
author: mullan
date: Mon Jul 06 11:59:55 2015 +0100
8073894: Getting to the root of certificate chains
Reviewed-by: weijun, igerasim, ahgross
changeset 7a705ae59e27 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=7a705ae59e27
author: prr
date: Tue Mar 10 14:54:33 2015 -0700
8074098: 2D_Font/Bug8067699 test fails with SIGBUS crash on Solaris Sparc
Reviewed-by: bae, mschoene
changeset c4008928235a in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=c4008928235a
author: aefimov
date: Fri Apr 10 01:11:19 2015 +0300
8074297: substring in XSLT returns wrong character if string contains supplementary chars
8076290: JCK test api/xsl/conf/string/string17 starts failing after JDK-8074297
Reviewed-by: joehw
changeset 1ca5dca17c5d in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=1ca5dca17c5d
author: vadim
date: Tue Apr 07 14:33:53 2015 +0300
8074330: Set font anchors more solidly
Reviewed-by: prr, srl, mschoene
changeset 1fe354591840 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=1fe354591840
author: vadim
date: Tue Apr 07 14:33:49 2015 +0300
8074335: Substitute for substitution formats
Reviewed-by: prr, srl, mschoene
changeset ac6778706ec0 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=ac6778706ec0
author: valeriep
date: Mon Jul 06 13:02:53 2015 +0100
8074865: General crypto resilience changes
Reviewed-by: mullan, xuelei
changeset 3af704f39128 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=3af704f39128
author: vadim
date: Tue Apr 07 14:33:57 2015 +0300
8074871: Adjust device table handling
Reviewed-by: prr, srl, mschoene
changeset 8c9d6ea1bcfd in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=8c9d6ea1bcfd
author: igerasim
date: Wed Apr 22 00:24:58 2015 +0300
8075378: JNDI DnsClient Exception Handling
Reviewed-by: vinnie
changeset 2eb606426280 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=2eb606426280
author: vinnie
date: Mon Jul 06 15:53:08 2015 +0100
8075374: Responding to OCSP responses
Reviewed-by: mullan
changeset 1146ef7828bb in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=1146ef7828bb
author: weijun
date: Wed Apr 22 23:27:30 2015 +0800
8075575: com/sun/security/auth/login/ConfigFile/InconsistentError.java failed in certain env.
8075576: com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.java failed in certain env.
Reviewed-by: xuelei
changeset 2b35fe5229be in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=2b35fe5229be
author: aefimov
date: Mon Jul 06 16:07:51 2015 +0100
8075667: (tz) Support tzdata2015b
Reviewed-by: okutsu
changeset 4f028479c666 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=4f028479c666
author: robm
date: Tue Apr 21 20:58:31 2015 +0100
8075738: Better multi-JVM sharing
Reviewed-by: michaelm
changeset 1ea911b8a36e in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=1ea911b8a36e
author: igerasim
date: Wed Apr 22 23:29:47 2015 +0300
8075833: Straighter Elliptic Curves
Reviewed-by: mullan
changeset 27d53436ba6b in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=27d53436ba6b
author: sjiang
date: Mon Jul 06 19:54:15 2015 +0100
8075853: Proxy for MBean proxies
Reviewed-by: dfuchs, ahgross, bmoloden
changeset 36cb0cb58b7b in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=36cb0cb58b7b
author: igerasim
date: Mon Jul 06 20:06:03 2015 +0100
8076328: Enforce key exchange constraints
Reviewed-by: wetmore, ahgross, asmotrak, xuelei
changeset b560cd166335 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=b560cd166335
author: jbachorik
date: Fri Apr 10 16:08:13 2015 +0200
8076397: Better MBean connections
Reviewed-by: dfuchs, ahgross
changeset 7c48e877192f in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=7c48e877192f
author: coffeys
date: Tue May 12 17:22:22 2015 +0100
8076409: Reinforce RMI framework
Reviewed-by: smarks
changeset fa171c4da078 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=fa171c4da078
author: vadim
date: Thu Apr 16 11:27:23 2015 +0300
8077520: Morph tables into improved form
Reviewed-by: prr, srl, mschoene
changeset b93d9f7611f0 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=b93d9f7611f0
author: aefimov
date: Mon Jul 06 21:56:19 2015 +0100
8077685: (tz) Support tzdata2015d
Reviewed-by: okutsu
changeset 253b772552f1 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=253b772552f1
author: vinnie
date: Mon Jul 06 21:57:49 2015 +0100
8078348: sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java fails with BindException
Reviewed-by: xuelei
changeset 2dd9c7c285ea in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=2dd9c7c285ea
author: weijun
date: Mon Jul 21 22:10:37 2014 +0800
8048194: GSSContext.acceptSecContext fails when a supported mech is not initiator preferred
Reviewed-by: mullan
changeset 038d982d8ee5 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=038d982d8ee5
author: igerasim
date: Tue May 05 20:04:16 2015 +0300
8078439: SPNEGO auth fails if client proposes MS krb5 OID
Reviewed-by: valeriep
changeset 4b352e4f5d3f in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=4b352e4f5d3f
author: vinnie
date: Mon Jul 06 22:11:25 2015 +0100
8078562: Add modified dates
Reviewed-by: mullan
changeset 39ffcb122ede in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=39ffcb122ede
author: mfang
date: Mon Jul 06 22:21:08 2015 +0100
8080318: jdk7u85 l10n resource file translation update
Reviewed-by: yhuang
changeset 7f9b3e1c96b2 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=7f9b3e1c96b2
author: jbachorik
date: Wed Oct 30 14:50:46 2013 +0100
8027058: sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh Failed to initialize connector
Summary: Dynamically discover the first available port instead of hard-coding one
Reviewed-by: sla, chegar, dfuchs
changeset 60776ad0cf22 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=60776ad0cf22
author: asmotrak
date: Tue Jun 02 13:49:09 2015 +0300
8081386: Test sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh test has RC4 dependencies
Reviewed-by: coffeys
changeset bf2e9b824179 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=bf2e9b824179
author: asaha
date: Wed Jun 03 20:23:19 2015 -0700
8081775: two lib/testlibrary tests are failing with "Error. failed to clean up files after test" with jtreg 4.1 b12
Reviewed-by: amlu
changeset a4521bae2693 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a4521bae2693
author: andrew
date: Tue Jul 07 14:28:43 2015 +0100
8133970: Only apply PaX-marking when needed by a running PaX kernel
Reviewed-by: aph
changeset 4f02eca4b7e4 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=4f02eca4b7e4
author: andrew
date: Wed Jul 08 21:51:30 2015 +0100
Added tag jdk7u85-b00 for changeset a4521bae2693
changeset 1cb18f1a402c in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=1cb18f1a402c
author: andrew
date: Thu Jul 09 11:44:04 2015 +0100
8133990: Revert introduction of lambda expression in sun.lwawt.macosx.LWCToolkit
Reviewed-by: aph
changeset 47954a92adb0 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=47954a92adb0
author: omajid
date: Sat Jul 11 16:19:35 2015 +0100
8133991: Fix mistake in 8075374 backport
Reviewed-by: andrew
changeset 5c6bd5d2d602 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=5c6bd5d2d602
author: andrew
date: Sat Jul 11 16:20:24 2015 +0100
Added tag jdk7u85-b01 for changeset 47954a92adb0
changeset 24aa1fb94814 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=24aa1fb94814
author: andrew
date: Mon Jul 13 18:51:44 2015 +0100
8133993: [TEST_BUG] Make CipherInputStreamExceptions compile on OpenJDK 7
Summary: OpenJDK 7 lacks GCM encryption so tests should be removed
Reviewed-by: aph
changeset f26dc1cb7deb in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=f26dc1cb7deb
author: andrew
date: Wed Aug 19 20:15:08 2015 +0100
8133968: Revert 8014464 on OpenJDK 7
Summary: No longer need to ignore bug IDs
Reviewed-by: omajid
changeset 334ea703b2f0 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=334ea703b2f0
author: andrew
date: Sat Aug 22 01:24:45 2015 +0100
8134248: Fix recently backported tests to work with OpenJDK 7u
Reviewed-by: martin
changeset 3bf99e4002e2 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=3bf99e4002e2
author: akasko
date: Thu Aug 27 18:05:51 2015 +0100
8134610: Mac OS X build fails after July 2015 CPU
Summary: Fix directory path in Mac OS makefiles
Reviewed-by: andrew
changeset 66eea0d72776 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=66eea0d72776
author: omajid
date: Thu Aug 27 13:32:14 2015 -0400
8134618: test/javax/xml/jaxp/transform/8062923/XslSubstringTest.java has bad license header
Summary: Use the version from jdk8u instead
Reviewed-by: andrew
changeset e228aaace9c9 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=e228aaace9c9
author: andrew
date: Thu Aug 27 23:31:55 2015 +0100
Added tag jdk7u85-b02 for changeset 66eea0d72776
changeset c752c714866e in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=c752c714866e
author: andrew
date: Wed Oct 14 05:35:36 2015 +0100
Merge jdk7u85-b02
changeset 23413abdf066 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=23413abdf066
author: andrew
date: Wed Oct 14 05:37:46 2015 +0100
Bump to icedtea-2.6.2pre01
diffstat:
.hgtags | 45 +
.jcheck/conf | 2 -
make/com/sun/java/pack/Makefile | 7 +-
make/com/sun/java/pack/mapfile-vers | 7 +-
make/com/sun/java/pack/mapfile-vers-unpack200 | 7 +-
make/com/sun/jmx/Makefile | 12 +-
make/com/sun/nio/Makefile | 7 +-
make/com/sun/nio/sctp/Makefile | 17 +-
make/com/sun/security/auth/module/Makefile | 6 +-
make/com/sun/tools/attach/Exportedfiles.gmk | 5 +
make/com/sun/tools/attach/FILES_c.gmk | 5 +
make/com/sun/tools/attach/FILES_java.gmk | 9 +-
make/common/Defs-aix.gmk | 391 +
make/common/Defs-embedded.gmk | 4 +-
make/common/Defs-linux.gmk | 62 +-
make/common/Defs-macosx.gmk | 5 +
make/common/Defs.gmk | 32 +-
make/common/Demo.gmk | 2 +-
make/common/Library.gmk | 42 +-
make/common/Program.gmk | 107 +-
make/common/Release.gmk | 32 +-
make/common/shared/Compiler-gcc.gmk | 76 +-
make/common/shared/Compiler-xlc_r.gmk | 37 +
make/common/shared/Defs-aix.gmk | 167 +
make/common/shared/Defs-java.gmk | 23 +-
make/common/shared/Defs-utils.gmk | 4 +
make/common/shared/Defs-versions.gmk | 7 +-
make/common/shared/Defs.gmk | 2 +-
make/common/shared/Platform.gmk | 33 +-
make/common/shared/Sanity.gmk | 8 +
make/docs/Makefile | 6 +-
make/java/fdlibm/Makefile | 7 +
make/java/instrument/Makefile | 6 +-
make/java/java/Makefile | 7 +
make/java/jli/Makefile | 31 +-
make/java/main/java/mapfile-aarch64 | 39 +
make/java/main/java/mapfile-ppc64 | 43 +
make/java/management/Makefile | 6 +
make/java/net/FILES_c.gmk | 11 +
make/java/net/Makefile | 30 +-
make/java/nio/Makefile | 263 +-
make/java/npt/Makefile | 2 +-
make/java/security/Makefile | 12 +-
make/java/sun_nio/Makefile | 2 +-
make/java/version/Makefile | 5 +
make/javax/crypto/Makefile | 74 +-
make/javax/sound/SoundDefs.gmk | 72 +-
make/jdk_generic_profile.sh | 319 +-
make/jpda/transport/socket/Makefile | 2 +-
make/mkdemo/jvmti/waiters/Makefile | 4 +
make/sun/Makefile | 2 +-
make/sun/awt/FILES_c_unix.gmk | 10 +
make/sun/awt/Makefile | 29 +-
make/sun/awt/mawt.gmk | 42 +-
make/sun/cmm/lcms/FILES_c_unix.gmk | 7 +-
make/sun/cmm/lcms/Makefile | 8 +-
make/sun/font/Makefile | 29 +-
make/sun/gtk/FILES_c_unix.gmk | 41 +
make/sun/gtk/FILES_export_unix.gmk | 31 +
make/sun/gtk/Makefile | 84 +
make/sun/gtk/mapfile-vers | 72 +
make/sun/javazic/tzdata/VERSION | 2 +-
make/sun/javazic/tzdata/africa | 67 +-
make/sun/javazic/tzdata/antarctica | 51 +-
make/sun/javazic/tzdata/asia | 35 +-
make/sun/javazic/tzdata/australasia | 27 +-
make/sun/javazic/tzdata/backward | 1 +
make/sun/javazic/tzdata/europe | 4 +-
make/sun/javazic/tzdata/northamerica | 198 +-
make/sun/javazic/tzdata/southamerica | 170 +-
make/sun/jawt/Makefile | 11 +
make/sun/jpeg/FILES_c.gmk | 6 +-
make/sun/jpeg/Makefile | 11 +-
make/sun/lwawt/FILES_c_macosx.gmk | 6 +
make/sun/lwawt/FILES_export_macosx.gmk | 2 +-
make/sun/lwawt/Makefile | 7 +-
make/sun/native2ascii/Makefile | 2 +-
make/sun/net/FILES_java.gmk | 229 +-
make/sun/nio/cs/Makefile | 4 +-
make/sun/security/Makefile | 11 +-
make/sun/security/ec/Makefile | 30 +-
make/sun/security/ec/mapfile-vers | 2 +
make/sun/security/jgss/wrapper/Makefile | 2 +-
make/sun/security/krb5/Makefile | 8 +-
make/sun/security/krb5/internal/ccache/Makefile | 49 +
make/sun/security/mscapi/Makefile | 2 +-
make/sun/security/pkcs11/Makefile | 6 +-
make/sun/security/pkcs11/mapfile-vers | 4 +-
make/sun/security/smartcardio/Makefile | 17 +-
make/sun/splashscreen/FILES_c.gmk | 84 +-
make/sun/splashscreen/Makefile | 37 +-
make/sun/xawt/FILES_c_unix.gmk | 25 +-
make/sun/xawt/FILES_export_unix.gmk | 3 +-
make/sun/xawt/Makefile | 71 +-
make/sun/xawt/mapfile-vers | 37 -
make/tools/Makefile | 9 +
make/tools/freetypecheck/Makefile | 21 +-
make/tools/generate_nimbus/Makefile | 1 +
make/tools/sharing/classlist.aix | 2406 ++++++
make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java | 22 +-
make/tools/src/build/tools/compileproperties/CompileProperties.java | 9 +-
make/tools/src/build/tools/dirdiff/DirDiff.java | 4 +-
make/tools/src/build/tools/dtdbuilder/DTDBuilder.java | 34 +-
make/tools/src/build/tools/dtdbuilder/DTDInputStream.java | 6 +-
make/tools/src/build/tools/dtdbuilder/DTDParser.java | 44 +-
make/tools/src/build/tools/dtdbuilder/PublicMapping.java | 6 +-
make/tools/src/build/tools/generatebreakiteratordata/CharSet.java | 16 +-
make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java | 8 +-
make/tools/src/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java | 6 +-
make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java | 201 +-
make/tools/src/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java | 6 +-
make/tools/src/build/tools/generatecharacter/GenerateCharacter.java | 4 +-
make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java | 147 +-
make/tools/src/build/tools/generatecharacter/UnicodeSpec.java | 22 +-
make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 4 +-
make/tools/src/build/tools/hasher/Hasher.java | 38 +-
make/tools/src/build/tools/jarsplit/JarSplit.java | 5 +-
make/tools/src/build/tools/javazic/Gen.java | 14 +-
make/tools/src/build/tools/javazic/GenDoc.java | 16 +-
make/tools/src/build/tools/javazic/Main.java | 3 +-
make/tools/src/build/tools/javazic/Simple.java | 23 +-
make/tools/src/build/tools/javazic/Time.java | 10 +-
make/tools/src/build/tools/javazic/Zoneinfo.java | 18 +-
make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java | 7 +-
make/tools/src/build/tools/jdwpgen/AbstractGroupNode.java | 7 +-
make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java | 14 +-
make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java | 26 +-
make/tools/src/build/tools/jdwpgen/AltNode.java | 4 +-
make/tools/src/build/tools/jdwpgen/CommandSetNode.java | 11 +-
make/tools/src/build/tools/jdwpgen/ConstantSetNode.java | 9 +-
make/tools/src/build/tools/jdwpgen/ErrorSetNode.java | 9 +-
make/tools/src/build/tools/jdwpgen/Node.java | 25 +-
make/tools/src/build/tools/jdwpgen/OutNode.java | 14 +-
make/tools/src/build/tools/jdwpgen/RootNode.java | 10 +-
make/tools/src/build/tools/jdwpgen/SelectNode.java | 10 +-
make/tools/src/build/tools/makeclasslist/MakeClasslist.java | 15 +-
make/tools/src/build/tools/stripproperties/StripProperties.java | 4 +-
src/bsd/doc/man/jhat.1 | 4 +-
src/linux/doc/man/jhat.1 | 4 +-
src/macosx/bin/java_md_macosx.c | 6 +-
src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java | 15 +-
src/share/bin/java.c | 8 +-
src/share/bin/wildcard.c | 5 +
src/share/classes/com/sun/crypto/provider/AESCipher.java | 113 +-
src/share/classes/com/sun/crypto/provider/AESCrypt.java | 6 +-
src/share/classes/com/sun/crypto/provider/AESWrapCipher.java | 36 +-
src/share/classes/com/sun/crypto/provider/CipherCore.java | 2 +-
src/share/classes/com/sun/crypto/provider/DESKey.java | 5 +-
src/share/classes/com/sun/crypto/provider/DESedeKey.java | 5 +-
src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java | 18 +-
src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java | 11 +-
src/share/classes/com/sun/crypto/provider/HmacCore.java | 159 +-
src/share/classes/com/sun/crypto/provider/HmacMD5.java | 92 +-
src/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java | 81 +-
src/share/classes/com/sun/crypto/provider/HmacSHA1.java | 92 +-
src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java | 63 +-
src/share/classes/com/sun/crypto/provider/OAEPParameters.java | 4 +-
src/share/classes/com/sun/crypto/provider/PBEKey.java | 5 +-
src/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java | 7 +-
src/share/classes/com/sun/crypto/provider/SunJCE.java | 95 +-
src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java | 21 +-
src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 2 +-
src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 2 +-
src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java | 3 +-
src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java | 10 +-
src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java | 5 +-
src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java | 2 +
src/share/classes/com/sun/jndi/dns/DnsClient.java | 207 +-
src/share/classes/com/sun/jndi/dns/DnsContextFactory.java | 2 +-
src/share/classes/com/sun/jndi/ldap/LdapURL.java | 64 +-
src/share/classes/com/sun/naming/internal/ResourceManager.java | 42 +-
src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java | 2 +-
src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java | 8 +-
src/share/classes/com/sun/script/javascript/RhinoTopLevel.java | 2 +-
src/share/classes/java/awt/color/ICC_Profile.java | 4 +-
src/share/classes/java/io/InputStream.java | 2 +-
src/share/classes/java/net/SocksSocketImpl.java | 4 +-
src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java | 25 +-
src/share/classes/java/security/Identity.java | 4 +-
src/share/classes/java/security/MessageDigest.java | 6 +-
src/share/classes/java/security/Policy.java | 1 -
src/share/classes/java/security/Signature.java | 4 +-
src/share/classes/java/security/cert/X509CRLSelector.java | 8 +-
src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java | 16 +-
src/share/classes/java/security/spec/MGF1ParameterSpec.java | 3 +-
src/share/classes/java/security/spec/PSSParameterSpec.java | 3 +-
src/share/classes/javax/crypto/Cipher.java | 172 +-
src/share/classes/javax/crypto/spec/SecretKeySpec.java | 5 +-
src/share/classes/javax/management/MBeanServerInvocationHandler.java | 13 +
src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java | 34 +-
src/share/classes/javax/swing/JComponent.java | 13 +-
src/share/classes/javax/swing/JDialog.java | 3 +-
src/share/classes/javax/swing/JEditorPane.java | 11 +-
src/share/classes/javax/swing/JFrame.java | 10 +-
src/share/classes/javax/swing/JInternalFrame.java | 6 +-
src/share/classes/javax/swing/JPopupMenu.java | 8 +-
src/share/classes/javax/swing/MenuSelectionManager.java | 3 +-
src/share/classes/javax/swing/PopupFactory.java | 14 +-
src/share/classes/javax/swing/SwingUtilities.java | 3 +-
src/share/classes/javax/swing/SwingWorker.java | 2 +-
src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java | 6 +-
src/share/classes/javax/swing/plaf/basic/BasicListUI.java | 5 +-
src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java | 16 +-
src/share/classes/javax/swing/plaf/basic/BasicTableUI.java | 8 +-
src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java | 3 +-
src/share/classes/javax/swing/plaf/synth/ImagePainter.java | 5 +-
src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java | 3 +-
src/share/classes/javax/swing/text/JTextComponent.java | 6 +-
src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java | 2 -
src/share/classes/sun/applet/AppletPanel.java | 10 +-
src/share/classes/sun/applet/AppletViewerPanel.java | 18 +-
src/share/classes/sun/awt/AWTAccessor.java | 4 +-
src/share/classes/sun/awt/image/JPEGImageDecoder.java | 2 +-
src/share/classes/sun/font/FreetypeFontScaler.java | 8 +-
src/share/classes/sun/java2d/cmm/lcms/LCMS.java | 2 +-
src/share/classes/sun/misc/SharedSecrets.java | 7 +-
src/share/classes/sun/misc/Version.java.template | 58 +-
src/share/classes/sun/nio/ch/FileChannelImpl.java | 3 +-
src/share/classes/sun/nio/ch/FileDispatcher.java | 12 +-
src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java | 3 +-
src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java | 2 +-
src/share/classes/sun/rmi/registry/RegistryImpl.java | 14 +
src/share/classes/sun/rmi/server/LoaderHandler.java | 2 +-
src/share/classes/sun/rmi/server/UnicastServerRef.java | 2 +-
src/share/classes/sun/security/ec/ECDSASignature.java | 10 +-
src/share/classes/sun/security/ec/SunEC.java | 19 +
src/share/classes/sun/security/ec/SunECEntries.java | 20 +-
src/share/classes/sun/security/jgss/GSSUtil.java | 5 +-
src/share/classes/sun/security/jgss/spnego/SpNegoContext.java | 52 +-
src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java | 90 +-
src/share/classes/sun/security/pkcs11/Config.java | 3 +
src/share/classes/sun/security/pkcs11/P11Cipher.java | 422 +-
src/share/classes/sun/security/pkcs11/P11Digest.java | 190 +-
src/share/classes/sun/security/pkcs11/P11Key.java | 4 +-
src/share/classes/sun/security/pkcs11/P11Mac.java | 9 +-
src/share/classes/sun/security/pkcs11/P11Signature.java | 10 +
src/share/classes/sun/security/pkcs11/P11Util.java | 2 +-
src/share/classes/sun/security/pkcs11/SunPKCS11.java | 95 +-
src/share/classes/sun/security/pkcs11/wrapper/Functions.java | 25 +-
src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java | 377 +-
src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java | 2 +-
src/share/classes/sun/security/provider/DSA.java | 790 +-
src/share/classes/sun/security/provider/DSAKeyPairGenerator.java | 92 +-
src/share/classes/sun/security/provider/DSAParameterGenerator.java | 269 +-
src/share/classes/sun/security/provider/DigestBase.java | 27 +-
src/share/classes/sun/security/provider/MD2.java | 21 +-
src/share/classes/sun/security/provider/MD4.java | 18 +-
src/share/classes/sun/security/provider/MD5.java | 18 +-
src/share/classes/sun/security/provider/ParameterCache.java | 166 +-
src/share/classes/sun/security/provider/SHA.java | 19 +-
src/share/classes/sun/security/provider/SHA2.java | 74 +-
src/share/classes/sun/security/provider/SHA5.java | 38 +-
src/share/classes/sun/security/provider/SunEntries.java | 46 +-
src/share/classes/sun/security/provider/certpath/OCSP.java | 18 +-
src/share/classes/sun/security/provider/certpath/OCSPResponse.java | 21 +-
src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java | 8 +-
src/share/classes/sun/security/rsa/RSASignature.java | 14 +-
src/share/classes/sun/security/rsa/SunRsaSignEntries.java | 8 +-
src/share/classes/sun/security/spec/DSAGenParameterSpec.java | 129 +
src/share/classes/sun/security/ssl/ClientHandshaker.java | 128 +-
src/share/classes/sun/security/ssl/DHCrypt.java | 25 +-
src/share/classes/sun/security/ssl/ECDHCrypt.java | 43 +-
src/share/classes/sun/security/ssl/HandshakeMessage.java | 4 +-
src/share/classes/sun/security/ssl/Handshaker.java | 4 +-
src/share/classes/sun/security/ssl/SSLEngineImpl.java | 11 +
src/share/classes/sun/security/ssl/ServerHandshaker.java | 238 +-
src/share/classes/sun/security/util/ObjectIdentifier.java | 2 +-
src/share/classes/sun/security/validator/SimpleValidator.java | 14 +-
src/share/classes/sun/security/x509/AlgorithmId.java | 49 +-
src/share/classes/sun/swing/DefaultLookup.java | 3 +-
src/share/classes/sun/swing/SwingUtilities2.java | 17 +-
src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider | 1 +
src/share/classes/sun/tools/jar/Main.java | 2 +-
src/share/classes/sun/tools/jar/resources/jar_de.properties | 4 +-
src/share/classes/sun/tools/jar/resources/jar_es.properties | 4 +-
src/share/classes/sun/tools/jar/resources/jar_fr.properties | 4 +-
src/share/classes/sun/tools/jar/resources/jar_ja.properties | 4 +-
src/share/classes/sun/tools/jar/resources/jar_ko.properties | 4 +-
src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties | 4 +-
src/share/classes/sun/tools/jar/resources/jar_sv.properties | 4 +-
src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties | 4 +-
src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties | 4 +-
src/share/classes/sun/tools/native2ascii/Main.java | 9 +-
src/share/classes/sun/util/calendar/ZoneInfoFile.java | 41 +-
src/share/classes/sun/util/resources/TimeZoneNames.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_de.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_es.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_fr.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_it.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_ja.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_ko.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_sv.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java | 8 +-
src/share/demo/jvmti/gctest/sample.makefile.txt | 6 +-
src/share/demo/jvmti/heapTracker/sample.makefile.txt | 19 +-
src/share/demo/jvmti/heapViewer/sample.makefile.txt | 5 +-
src/share/demo/jvmti/hprof/hprof_init.c | 2 +-
src/share/demo/jvmti/hprof/sample.makefile.txt | 6 +-
src/share/demo/jvmti/minst/sample.makefile.txt | 19 +-
src/share/demo/jvmti/mtrace/sample.makefile.txt | 20 +-
src/share/demo/jvmti/versionCheck/sample.makefile.txt | 6 +-
src/share/demo/jvmti/waiters/sample.makefile.txt | 8 +-
src/share/instrument/JarFacade.c | 4 +-
src/share/lib/security/java.security-linux | 8 +-
src/share/lib/security/java.security-macosx | 8 +-
src/share/lib/security/java.security-solaris | 8 +-
src/share/lib/security/java.security-windows | 8 +-
src/share/lib/security/nss.cfg.in | 5 +
src/share/lib/security/sunpkcs11-solaris.cfg | 14 +-
src/share/native/com/sun/java/util/jar/pack/jni.cpp | 6 +-
src/share/native/com/sun/java/util/jar/pack/unpack.cpp | 1 -
src/share/native/com/sun/media/sound/SoundDefs.h | 10 +
src/share/native/common/check_code.c | 35 +
src/share/native/java/net/net_util.c | 9 +
src/share/native/java/util/zip/Deflater.c | 6 +-
src/share/native/java/util/zip/Inflater.c | 2 +-
src/share/native/sun/awt/image/awt_ImageRep.c | 2 +-
src/share/native/sun/awt/image/jpeg/README | 385 -
src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 12 +-
src/share/native/sun/awt/image/jpeg/jcapimin.c | 284 -
src/share/native/sun/awt/image/jpeg/jcapistd.c | 165 -
src/share/native/sun/awt/image/jpeg/jccoefct.c | 453 -
src/share/native/sun/awt/image/jpeg/jccolor.c | 462 -
src/share/native/sun/awt/image/jpeg/jcdctmgr.c | 391 -
src/share/native/sun/awt/image/jpeg/jchuff.c | 913 --
src/share/native/sun/awt/image/jpeg/jchuff.h | 51 -
src/share/native/sun/awt/image/jpeg/jcinit.c | 76 -
src/share/native/sun/awt/image/jpeg/jcmainct.c | 297 -
src/share/native/sun/awt/image/jpeg/jcmarker.c | 682 -
src/share/native/sun/awt/image/jpeg/jcmaster.c | 594 -
src/share/native/sun/awt/image/jpeg/jcomapi.c | 110 -
src/share/native/sun/awt/image/jpeg/jconfig.h | 43 -
src/share/native/sun/awt/image/jpeg/jcparam.c | 614 -
src/share/native/sun/awt/image/jpeg/jcphuff.c | 837 --
src/share/native/sun/awt/image/jpeg/jcprepct.c | 358 -
src/share/native/sun/awt/image/jpeg/jcsample.c | 523 -
src/share/native/sun/awt/image/jpeg/jctrans.c | 392 -
src/share/native/sun/awt/image/jpeg/jdapimin.c | 399 -
src/share/native/sun/awt/image/jpeg/jdapistd.c | 279 -
src/share/native/sun/awt/image/jpeg/jdcoefct.c | 740 -
src/share/native/sun/awt/image/jpeg/jdcolor.c | 398 -
src/share/native/sun/awt/image/jpeg/jdct.h | 180 -
src/share/native/sun/awt/image/jpeg/jddctmgr.c | 273 -
src/share/native/sun/awt/image/jpeg/jdhuff.c | 655 -
src/share/native/sun/awt/image/jpeg/jdhuff.h | 205 -
src/share/native/sun/awt/image/jpeg/jdinput.c | 385 -
src/share/native/sun/awt/image/jpeg/jdmainct.c | 516 -
src/share/native/sun/awt/image/jpeg/jdmarker.c | 1390 ---
src/share/native/sun/awt/image/jpeg/jdmaster.c | 561 -
src/share/native/sun/awt/image/jpeg/jdmerge.c | 404 -
src/share/native/sun/awt/image/jpeg/jdphuff.c | 672 -
src/share/native/sun/awt/image/jpeg/jdpostct.c | 294 -
src/share/native/sun/awt/image/jpeg/jdsample.c | 482 -
src/share/native/sun/awt/image/jpeg/jdtrans.c | 147 -
src/share/native/sun/awt/image/jpeg/jerror.c | 272 -
src/share/native/sun/awt/image/jpeg/jerror.h | 295 -
src/share/native/sun/awt/image/jpeg/jfdctflt.c | 172 -
src/share/native/sun/awt/image/jpeg/jfdctfst.c | 228 -
src/share/native/sun/awt/image/jpeg/jfdctint.c | 287 -
src/share/native/sun/awt/image/jpeg/jidctflt.c | 246 -
src/share/native/sun/awt/image/jpeg/jidctfst.c | 372 -
src/share/native/sun/awt/image/jpeg/jidctint.c | 393 -
src/share/native/sun/awt/image/jpeg/jidctred.c | 402 -
src/share/native/sun/awt/image/jpeg/jinclude.h | 95 -
src/share/native/sun/awt/image/jpeg/jmemmgr.c | 1124 --
src/share/native/sun/awt/image/jpeg/jmemnobs.c | 113 -
src/share/native/sun/awt/image/jpeg/jmemsys.h | 202 -
src/share/native/sun/awt/image/jpeg/jmorecfg.h | 378 -
src/share/native/sun/awt/image/jpeg/jpeg-6b/README | 385 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapimin.c | 284 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapistd.c | 165 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jccoefct.c | 453 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jccolor.c | 462 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcdctmgr.c | 391 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.c | 913 ++
src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.h | 51 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcinit.c | 76 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmainct.c | 297 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmarker.c | 682 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmaster.c | 594 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcomapi.c | 110 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jconfig.h | 43 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcparam.c | 614 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcphuff.c | 837 ++
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcprepct.c | 358 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcsample.c | 523 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jctrans.c | 392 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapimin.c | 399 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapistd.c | 279 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcoefct.c | 740 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcolor.c | 398 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdct.h | 180 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jddctmgr.c | 273 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.c | 655 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.h | 205 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdinput.c | 385 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmainct.c | 516 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmarker.c | 1390 +++
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmaster.c | 561 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmerge.c | 404 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdphuff.c | 672 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdpostct.c | 294 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdsample.c | 482 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdtrans.c | 147 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.c | 272 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.h | 295 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctflt.c | 172 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctfst.c | 228 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctint.c | 287 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctflt.c | 246 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctfst.c | 372 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctint.c | 393 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctred.c | 402 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jinclude.h | 95 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemmgr.c | 1124 ++
src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemnobs.c | 113 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemsys.h | 202 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jmorecfg.h | 378 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jpegint.h | 396 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jpeglib.h | 1100 ++
src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant1.c | 860 ++
src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant2.c | 1314 +++
src/share/native/sun/awt/image/jpeg/jpeg-6b/jutils.c | 183 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jversion.h | 18 +
src/share/native/sun/awt/image/jpeg/jpegdecoder.c | 2 +-
src/share/native/sun/awt/image/jpeg/jpegint.h | 396 -
src/share/native/sun/awt/image/jpeg/jpeglib.h | 1100 --
src/share/native/sun/awt/image/jpeg/jquant1.c | 860 --
src/share/native/sun/awt/image/jpeg/jquant2.c | 1314 ---
src/share/native/sun/awt/image/jpeg/jutils.c | 183 -
src/share/native/sun/awt/image/jpeg/jversion.h | 18 -
src/share/native/sun/awt/medialib/mlib_sys.c | 2 +-
src/share/native/sun/awt/medialib/mlib_types.h | 7 +-
src/share/native/sun/awt/splashscreen/splashscreen_gif.c | 24 +-
src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c | 7 +-
src/share/native/sun/awt/splashscreen/splashscreen_png.c | 2 +-
src/share/native/sun/font/freetypeScaler.c | 231 +-
src/share/native/sun/font/layout/AnchorTables.cpp | 30 +-
src/share/native/sun/font/layout/Features.cpp | 2 +-
src/share/native/sun/font/layout/LETableReference.h | 18 +-
src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp | 8 +-
src/share/native/sun/font/layout/MorphTables.cpp | 8 +
src/share/native/sun/font/layout/MorphTables2.cpp | 8 +
src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp | 4 +-
src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h | 6 +-
src/share/native/sun/java2d/loops/TransformHelper.c | 11 +-
src/share/native/sun/java2d/opengl/OGLContext.c | 2 +
src/share/native/sun/java2d/opengl/OGLFuncs.h | 2 +-
src/share/native/sun/security/ec/ECC_JNI.cpp | 59 +-
src/share/native/sun/security/ec/ecc_impl.h | 298 +
src/share/native/sun/security/ec/impl/ec.c | 7 +-
src/share/native/sun/security/ec/impl/ecc_impl.h | 263 -
src/share/native/sun/security/ec/impl/ecdecode.c | 1 +
src/share/native/sun/security/ec/impl/mpi.c | 3 +-
src/share/native/sun/security/ec/impl/oid.c | 1 +
src/share/native/sun/security/ec/impl/secitem.c | 1 +
src/share/native/sun/security/jgss/wrapper/GSSLibStub.c | 49 +-
src/share/native/sun/security/jgss/wrapper/NativeUtil.c | 12 +
src/share/native/sun/security/pkcs11/wrapper/p11_convert.c | 38 +-
src/share/native/sun/security/pkcs11/wrapper/p11_digest.c | 4 +-
src/share/native/sun/security/pkcs11/wrapper/p11_dual.c | 8 +-
src/share/native/sun/security/pkcs11/wrapper/p11_general.c | 7 +-
src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c | 4 +-
src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c | 58 +-
src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c | 4 +-
src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c | 12 +-
src/share/native/sun/security/pkcs11/wrapper/p11_sign.c | 20 +-
src/share/native/sun/security/pkcs11/wrapper/p11_util.c | 86 +-
src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h | 9 +-
src/share/npt/npt.h | 8 +-
src/solaris/back/exec_md.c | 4 +-
src/solaris/bin/aarch64/jvm.cfg | 36 +
src/solaris/bin/java_md_solinux.c | 45 +-
src/solaris/bin/ppc64/jvm.cfg | 33 +
src/solaris/bin/ppc64le/jvm.cfg | 33 +
src/solaris/classes/java/lang/UNIXProcess.java.aix | 470 +
src/solaris/classes/sun/awt/UNIXToolkit.java | 6 +
src/solaris/classes/sun/awt/X11/XConstants.java | 5 +
src/solaris/classes/sun/awt/X11/XErrorHandler.java | 94 +
src/solaris/classes/sun/awt/X11/XFramePeer.java | 5 +
src/solaris/classes/sun/awt/X11/XNETProtocol.java | 29 +-
src/solaris/classes/sun/awt/X11/XWM.java | 26 +-
src/solaris/classes/sun/awt/X11/XWindowPeer.java | 2 +
src/solaris/classes/sun/awt/fontconfigs/aix.fontconfig.properties | 75 +
src/solaris/classes/sun/font/FcFontConfiguration.java | 2 +-
src/solaris/classes/sun/net/PortConfig.java | 7 +
src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java | 9 +
src/solaris/classes/sun/nio/ch/AixAsynchronousChannelProvider.java | 91 +
src/solaris/classes/sun/nio/ch/AixPollPort.java | 536 +
src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java | 2 +
src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java | 8 +-
src/solaris/classes/sun/nio/ch/Port.java | 8 +
src/solaris/classes/sun/nio/ch/SctpChannelImpl.java | 2 +-
src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java | 2 +-
src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java | 2 +-
src/solaris/classes/sun/nio/fs/AixFileStore.java | 106 +
src/solaris/classes/sun/nio/fs/AixFileSystem.java | 94 +
src/solaris/classes/sun/nio/fs/AixFileSystemProvider.java | 58 +
src/solaris/classes/sun/nio/fs/AixNativeDispatcher.java | 56 +
src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java | 2 +
src/solaris/classes/sun/nio/fs/UnixCopyFile.java | 8 +-
src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java | 6 +-
src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java | 4 +-
src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java | 4 +-
src/solaris/classes/sun/print/UnixPrintService.java | 73 +-
src/solaris/classes/sun/print/UnixPrintServiceLookup.java | 97 +-
src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java | 89 +-
src/solaris/classes/sun/tools/attach/AixAttachProvider.java | 88 +
src/solaris/classes/sun/tools/attach/AixVirtualMachine.java | 317 +
src/solaris/demo/jvmti/hprof/hprof_md.c | 87 +-
src/solaris/doc/sun/man/man1/jhat.1 | 4 +-
src/solaris/javavm/export/jni_md.h | 18 +-
src/solaris/native/com/sun/management/UnixOperatingSystem_md.c | 20 +-
src/solaris/native/com/sun/security/auth/module/Solaris.c | 17 +-
src/solaris/native/com/sun/security/auth/module/Unix.c | 102 +-
src/solaris/native/common/deps/cups_fp.c | 104 +
src/solaris/native/common/deps/cups_fp.h | 61 +
src/solaris/native/common/deps/fontconfig2/fontconfig/fontconfig.h | 302 +
src/solaris/native/common/deps/fontconfig2/fontconfig_fp.c | 208 +
src/solaris/native/common/deps/fontconfig2/fontconfig_fp.h | 161 +
src/solaris/native/common/deps/gconf2/gconf/gconf-client.h | 41 +
src/solaris/native/common/deps/gconf2/gconf_fp.c | 76 +
src/solaris/native/common/deps/gconf2/gconf_fp.h | 48 +
src/solaris/native/common/deps/glib2/gio/gio_typedefs.h | 61 +
src/solaris/native/common/deps/glib2/gio_fp.c | 183 +
src/solaris/native/common/deps/glib2/gio_fp.h | 69 +
src/solaris/native/common/deps/glib2/glib_fp.h | 70 +
src/solaris/native/common/deps/gtk2/gtk/gtk.h | 567 +
src/solaris/native/common/deps/gtk2/gtk_fp.c | 367 +
src/solaris/native/common/deps/gtk2/gtk_fp.h | 460 +
src/solaris/native/common/deps/gtk2/gtk_fp_check.c | 56 +
src/solaris/native/common/deps/gtk2/gtk_fp_check.h | 47 +
src/solaris/native/common/deps/syscalls_fp.c | 122 +
src/solaris/native/common/deps/syscalls_fp.h | 79 +
src/solaris/native/java/io/UnixFileSystem_md.c | 2 +-
src/solaris/native/java/lang/UNIXProcess_md.c | 8 +-
src/solaris/native/java/lang/java_props_md.c | 7 +-
src/solaris/native/java/net/Inet4AddressImpl.c | 55 +
src/solaris/native/java/net/NetworkInterface.c | 173 +-
src/solaris/native/java/net/PlainSocketImpl.c | 2 +-
src/solaris/native/java/net/linux_close.c | 59 +-
src/solaris/native/java/net/net_util_md.c | 80 +-
src/solaris/native/java/net/net_util_md.h | 13 +-
src/solaris/native/java/util/TimeZone_md.c | 70 +-
src/solaris/native/sun/awt/CUPSfuncs.c | 137 +-
src/solaris/native/sun/awt/awt_Font.c | 2 +-
src/solaris/native/sun/awt/awt_GTKToolkit.c | 229 +
src/solaris/native/sun/awt/awt_GraphicsEnv.c | 2 +-
src/solaris/native/sun/awt/awt_GraphicsEnv.h | 2 +-
src/solaris/native/sun/awt/awt_LoadLibrary.c | 65 +-
src/solaris/native/sun/awt/awt_UNIXToolkit.c | 200 +-
src/solaris/native/sun/awt/awt_xembed_server.c | 17 +-
src/solaris/native/sun/awt/fontconfig.h | 941 --
src/solaris/native/sun/awt/fontpath.c | 422 +-
src/solaris/native/sun/awt/gtk2_interface.c | 987 +-
src/solaris/native/sun/awt/gtk2_interface.h | 588 +-
src/solaris/native/sun/awt/gtk2_interface_check.c | 34 +
src/solaris/native/sun/awt/gtk2_interface_check.h | 42 +
src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c | 7 +
src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c | 68 +-
src/solaris/native/sun/awt/swing_GTKEngine.c | 76 +-
src/solaris/native/sun/awt/swing_GTKStyle.c | 20 +-
src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h | 2 +-
src/solaris/native/sun/java2d/x11/X11SurfaceData.c | 4 +-
src/solaris/native/sun/java2d/x11/XRBackendNative.c | 6 +-
src/solaris/native/sun/net/spi/DefaultProxySelector.c | 493 +-
src/solaris/native/sun/nio/ch/AixPollPort.c | 181 +
src/solaris/native/sun/nio/ch/DatagramChannelImpl.c | 2 +-
src/solaris/native/sun/nio/ch/EPollArrayWrapper.c | 1 -
src/solaris/native/sun/nio/ch/FileDispatcherImpl.c | 54 +-
src/solaris/native/sun/nio/ch/Net.c | 126 +-
src/solaris/native/sun/nio/ch/PollArrayWrapper.c | 51 +-
src/solaris/native/sun/nio/ch/Sctp.h | 25 +-
src/solaris/native/sun/nio/ch/SctpNet.c | 6 +-
src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c | 9 +
src/solaris/native/sun/nio/fs/AixNativeDispatcher.c | 224 +
src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c | 134 +-
src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c | 50 +-
src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c | 181 +-
src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c | 113 +
src/solaris/native/sun/security/pkcs11/j2secmod_md.c | 9 +-
src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h | 5 +
src/solaris/native/sun/security/smartcardio/pcsc_md.c | 7 +-
src/solaris/native/sun/security/smartcardio/pcsc_md.h | 40 +
src/solaris/native/sun/tools/attach/AixVirtualMachine.c | 283 +
src/solaris/native/sun/tools/attach/BsdVirtualMachine.c | 4 +
src/solaris/native/sun/xawt/awt_Desktop.c | 108 +-
src/windows/bin/java_md.c | 8 +-
src/windows/classes/sun/nio/ch/FileDispatcherImpl.java | 3 +-
src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java | 3 +-
src/windows/classes/sun/security/mscapi/RSASignature.java | 13 +-
src/windows/classes/sun/security/mscapi/SunMSCAPI.java | 20 +-
src/windows/native/sun/security/pkcs11/j2secmod_md.c | 4 +-
src/windows/native/sun/security/pkcs11/wrapper/p11_md.h | 4 +
test/com/oracle/security/ucrypto/TestAES.java | 118 +-
test/com/oracle/security/ucrypto/TestDigest.java | 24 +-
test/com/oracle/security/ucrypto/TestRSA.java | 276 +-
test/com/oracle/security/ucrypto/UcryptoTest.java | 28 +-
test/com/sun/corba/cachedSocket/7056731.sh | 2 +-
test/com/sun/crypto/provider/Cipher/RSA/TestOAEP.java | 16 +-
test/com/sun/crypto/provider/Cipher/RSA/TestOAEPParameterSpec.java | 3 +-
test/com/sun/crypto/provider/Cipher/RSA/TestOAEPWithParams.java | 6 +-
test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java | 13 +-
test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java | 38 +-
test/com/sun/crypto/provider/KeyGenerator/Test4628062.java | 68 +-
test/com/sun/crypto/provider/Mac/MacClone.java | 46 +-
test/com/sun/crypto/provider/Mac/MacKAT.java | 29 +-
test/com/sun/jdi/ImmutableResourceTest.sh | 2 +-
test/com/sun/jdi/JITDebug.sh | 2 +-
test/com/sun/jdi/ShellScaffold.sh | 4 +-
test/com/sun/jdi/Solaris32AndSolaris64Test.sh | 2 +-
test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh | 2 +-
test/com/sun/jndi/dns/IPv6NameserverPlatformParsingTest.java | 104 +
test/com/sun/jndi/ldap/LdapURLOptionalFields.java | 62 +
test/com/sun/security/auth/login/ConfigFile/InconsistentError.java | 1 +
test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.java | 1 +
test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java | 9 +
test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh | 8 +
test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh | 8 +
test/java/io/Serializable/evolution/RenamePackage/run.sh | 2 +-
test/java/io/Serializable/serialver/classpath/run.sh | 2 +-
test/java/io/Serializable/serialver/nested/run.sh | 2 +-
test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh | 3 +
test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh | 3 +
test/java/lang/StringCoding/CheckEncodings.sh | 2 +-
test/java/lang/annotation/loaderLeak/LoaderLeak.sh | 2 +-
test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh | 4 +
test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh | 2 +-
test/java/net/Authenticator/B4933582.sh | 2 +-
test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh | 2 +-
test/java/net/Socket/OldSocketImpl.sh | 2 +-
test/java/net/URL/B5086147.sh | 2 +-
test/java/net/URL/TestHttps.java | 34 +
test/java/net/URL/runconstructor.sh | 2 +-
test/java/net/URLClassLoader/B5077773.sh | 2 +-
test/java/net/URLClassLoader/sealing/checksealed.sh | 2 +-
test/java/net/URLConnection/6212146/test.sh | 2 +-
test/java/nio/MappedByteBuffer/Basic.java | 91 +-
test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so | Bin
test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so | Bin
test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so | Bin
test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so | Bin
test/java/nio/charset/coders/CheckSJISMappingProp.sh | 2 +-
test/java/nio/charset/spi/basic.sh | 4 +-
test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh | 2 +-
test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java | 9 +-
test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java | 9 +-
test/java/rmi/registry/readTest/readTest.sh | 2 +-
test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh | 4 +
test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh | 4 +
test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh | 4 +
test/java/security/Security/signedfirst/Dyn.sh | 4 +
test/java/security/Security/signedfirst/Static.sh | 4 +
test/java/util/Currency/PropertiesTest.sh | 2 +-
test/java/util/Locale/LocaleCategory.sh | 2 +-
test/java/util/Locale/data/deflocale.rhel5 | 3924 ----------
test/java/util/Locale/data/deflocale.rhel5.fmtasdefault | 3924 ----------
test/java/util/Locale/data/deflocale.sol10 | 1725 ----
test/java/util/Locale/data/deflocale.sol10.fmtasdefault | 1725 ----
test/java/util/Locale/data/deflocale.win7 | 1494 ---
test/java/util/Locale/data/deflocale.win7.fmtasdefault | 1494 ---
test/java/util/PluggableLocale/ExecTest.sh | 2 +-
test/java/util/ResourceBundle/Bug6299235Test.sh | 2 +-
test/java/util/ResourceBundle/Control/ExpirationTest.sh | 2 +-
test/java/util/ServiceLoader/basic.sh | 2 +-
test/java/util/prefs/CheckUserPrefsStorage.sh | 2 +-
test/javax/crypto/Cipher/CipherInputStreamExceptions.java | 195 +-
test/javax/crypto/SecretKeyFactory/FailOverTest.sh | 2 +-
test/javax/imageio/stream/StreamCloserLeak/run_test.sh | 8 +
test/javax/script/CommonSetup.sh | 2 +-
test/javax/security/auth/Subject/doAs/Test.sh | 5 +
test/javax/xml/jaxp/transform/8062923/XslSubstringTest.java | 81 +-
test/javax/xml/ws/8046817/GenerateEnumSchema.java | 9 +-
test/lib/security/java.policy/Ext_AllPolicy.sh | 2 +-
test/lib/testlibrary/AssertsTest.java | 1 -
test/lib/testlibrary/OutputAnalyzerReportingTest.java | 1 -
test/lib/testlibrary/OutputAnalyzerTest.java | 1 -
test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh | 2 +-
test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java | 97 +-
test/sun/management/jmxremote/bootstrap/linux-i586/launcher | Bin
test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in | 1 +
test/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in | 1 +
test/sun/management/jmxremote/bootstrap/solaris-i586/launcher | Bin
test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher | Bin
test/sun/management/windows/revokeall.exe | Bin
test/sun/misc/URLClassPath/ClassnameCharTest.sh | 2 +-
test/sun/net/InetAddress/nameservice/dns/cname.sh | 2 +-
test/sun/net/idn/nfscis.spp | Bin
test/sun/net/idn/nfscsi.spp | Bin
test/sun/net/idn/nfscss.spp | Bin
test/sun/net/idn/nfsmxp.spp | Bin
test/sun/net/idn/nfsmxs.spp | Bin
test/sun/net/www/MarkResetTest.sh | 2 +-
test/sun/net/www/http/HttpClient/RetryPost.sh | 2 +-
test/sun/net/www/protocol/file/DirPermissionDenied.sh | 1 +
test/sun/net/www/protocol/jar/B5105410.sh | 2 +-
test/sun/net/www/protocol/jar/jarbug/run.sh | 2 +-
test/sun/security/ec/TestEC.java | 5 +-
test/sun/security/jgss/spnego/MSOID.java | 76 +
test/sun/security/jgss/spnego/NotPreferredMech.java | 100 +
test/sun/security/jgss/spnego/msoid.txt | 27 +
test/sun/security/krb5/auto/MSOID2.java | 78 +
test/sun/security/krb5/runNameEquals.sh | 4 +
test/sun/security/mscapi/SignUsingNONEwithRSA.java | 8 +-
test/sun/security/mscapi/SignUsingSHA2withRSA.java | 6 +-
test/sun/security/pkcs11/MessageDigest/DigestKAT.java | 8 +-
test/sun/security/pkcs11/MessageDigest/TestCloning.java | 141 +
test/sun/security/pkcs11/Provider/ConfigQuotedString.sh | 6 +
test/sun/security/pkcs11/Provider/Login.sh | 6 +
test/sun/security/pkcs11/Signature/TestRSAKeyLength.java | 4 +-
test/sun/security/pkcs11/ec/TestCurves.java | 3 +-
test/sun/security/pkcs11/ec/TestECDH2.java | 127 +
test/sun/security/pkcs11/ec/TestECDSA2.java | 122 +
test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.chk | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.so | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libnspr4.so | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libnssckbi.so | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libplc4.so | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libplds4.so | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.chk | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so | Bin
test/sun/security/pkcs11/nss/lib/linux-i586/libnspr4.so | Bin
test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so | Bin
test/sun/security/pkcs11/nss/lib/linux-i586/libnssckbi.so | Bin
test/sun/security/pkcs11/nss/lib/linux-i586/libplc4.so | Bin
test/sun/security/pkcs11/nss/lib/linux-i586/libplds4.so | Bin
test/sun/security/pkcs11/nss/lib/linux-i586/libsoftokn3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-amd64/libnspr4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-amd64/libnssckbi.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-amd64/libplc4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-amd64/libplds4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-amd64/libsoftokn3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-i586/libfreebl3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-i586/libnspr4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-i586/libnssckbi.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-i586/libplc4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-i586/libplds4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-i586/libsoftokn3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.chk | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libnspr4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libnss3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libnssckbi.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libplc4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libplds4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.chk | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnspr4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnssckbi.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplc4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplds4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libsoftokn3.so | Bin
test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll | Bin
test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll | Bin
test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll | Bin
test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll | Bin
test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll | Bin
test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll | Bin
test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java | 3 +-
test/sun/security/pkcs11/rsa/TestSignatures.java | 3 +-
test/sun/security/pkcs11/sslecc/CipherTest.java | 4 +-
test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java | 5 +-
test/sun/security/pkcs11/sslecc/JSSEServer.java | 4 +-
test/sun/security/provider/DSA/TestAlgParameterGenerator.java | 117 +
test/sun/security/provider/DSA/TestDSA2.java | 96 +
test/sun/security/provider/DSA/TestKeyPairGenerator.java | 6 +-
test/sun/security/provider/MessageDigest/DigestKAT.java | 10 +-
test/sun/security/provider/MessageDigest/Offsets.java | 3 +-
test/sun/security/provider/MessageDigest/TestSHAClone.java | 6 +-
test/sun/security/provider/PolicyFile/getinstance/getinstance.sh | 4 +
test/sun/security/rsa/TestKeyPairGenerator.java | 5 +-
test/sun/security/rsa/TestSignatures.java | 5 +-
test/sun/security/ssl/com/sun/net/ssl/internal/ssl/DHKeyExchange/DHEKeySizing.java | 477 +
test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh | 2 +-
test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh | 2 +-
test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java | 13 +-
test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java | 5 +-
test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh | 2 +-
test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh | 2 +-
test/sun/security/tools/jarsigner/AlgOptions.sh | 2 +-
test/sun/security/tools/jarsigner/PercentSign.sh | 2 +-
test/sun/security/tools/jarsigner/diffend.sh | 2 +-
test/sun/security/tools/jarsigner/oldsig.sh | 2 +-
test/sun/security/tools/keytool/AltProviderPath.sh | 2 +-
test/sun/security/tools/keytool/CloneKeyAskPassword.sh | 4 +
test/sun/security/tools/keytool/NoExtNPE.sh | 4 +
test/sun/security/tools/keytool/SecretKeyKS.sh | 2 +-
test/sun/security/tools/keytool/StandardAlgName.sh | 2 +-
test/sun/security/tools/keytool/printssl.sh | 2 +-
test/sun/security/tools/keytool/resource.sh | 2 +-
test/sun/security/tools/keytool/standard.sh | 2 +-
test/sun/security/tools/policytool/Alias.sh | 2 +-
test/sun/security/tools/policytool/ChangeUI.sh | 2 +-
test/sun/security/tools/policytool/OpenPolicy.sh | 2 +-
test/sun/security/tools/policytool/SaveAs.sh | 2 +-
test/sun/security/tools/policytool/UpdatePermissions.sh | 2 +-
test/sun/security/tools/policytool/UsePolicy.sh | 2 +-
test/sun/security/tools/policytool/i18n.sh | 2 +-
test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh | 2 +-
test/tools/launcher/RunpathTest.java | 84 +
test/tools/pack200/MemoryAllocatorTest.java | 369 +
807 files changed, 45648 insertions(+), 46728 deletions(-)
diffs (truncated from 109773 to 500 lines):
diff -r 0654d3488c7a -r 23413abdf066 .hgtags
--- a/.hgtags Fri Jul 03 23:53:28 2015 +0100
+++ b/.hgtags Wed Oct 14 05:37:46 2015 +0100
@@ -50,6 +50,7 @@
f708138c9aca4b389872838fe6773872fce3609e jdk7-b73
eacb36e30327e7ae33baa068e82ddccbd91eaae2 jdk7-b74
8885b22565077236a927e824ef450742e434a230 jdk7-b75
+fb2ee5e96b171ae9db67274d87ffaba941e8bfa6 icedtea7-1.12
8fb602395be0f7d5af4e7e93b7df2d960faf9d17 jdk7-b76
e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77
1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78
@@ -63,6 +64,7 @@
eae6e9ab26064d9ba0e7665dd646a1fd2506fcc1 jdk7-b86
2cafbbe9825e911a6ca6c17d9a18eb1f0bf0873c jdk7-b87
b3c69282f6d3c90ec21056cd1ab70dc0c895b069 jdk7-b88
+2017795af50aebc00f500e58f708980b49bc7cd1 icedtea7-1.13
4a6abb7e224cc8d9a583c23c5782e4668739a119 jdk7-b89
7f90d0b9dbb7ab4c60d0b0233e4e77fb4fac597c jdk7-b90
08a31cab971fcad4695e913d0f3be7bde3a90747 jdk7-b91
@@ -111,6 +113,7 @@
554adcfb615e63e62af530b1c10fcf7813a75b26 jdk7-b134
d8ced728159fbb2caa8b6adb477fd8efdbbdf179 jdk7-b135
aa13e7702cd9d8aca9aa38f1227f966990866944 jdk7-b136
+1571aa7abe47a54510c62a5b59a8c343cdaf67cb icedtea-1.14
29296ea6529a418037ccce95903249665ef31c11 jdk7-b137
60d3d55dcc9c31a30ced9caa6ef5c0dcd7db031d jdk7-b138
d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139
@@ -123,6 +126,7 @@
539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01
f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147
+7ec1845521edfb1843cad3868217983727ece53d icedtea-2.0-branchpoint
2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02
a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03
b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04
@@ -141,6 +145,7 @@
79c8c4608f60e1f981b17ba4077dfcaa2ed67be4 jdk7u2-b12
fb2980d7c9439e3d62ab12f40506a2a2db2df0f4 jdk7u2-b13
24e42f1f9029f9f5a9b1481d523facaf09452e5b jdk7u2-b21
+a75913596199fbb8583f9d74021f54dc76f87b14 icedtea-2.1-branchpoint
e3790f3ce50aa4e2a1b03089ac0bcd48f9d1d2c2 jdk7u3-b02
7e8351342f0b22b694bd3c2db979643529f32e71 jdk7u3-b03
fc6b7b6ac837c9e867b073e13fc14e643f771028 jdk7u3-b04
@@ -157,6 +162,7 @@
6485e842d7f736b6ca3d7e4a7cdc5de6bbdd870c jdk7u4-b10
d568e85567ccfdd75f3f0c42aa0d75c440422827 jdk7u4-b11
16781e84dcdb5f82c287a3b5387dde9f8aaf74e0 jdk7u4-b12
+907555f6191a0cd84886b07c4c40bc6ce498b8b1 icedtea-2.2-branchpoint
c929e96aa059c8b79ab94d5b0b1a242ca53a5b32 jdk7u4-b13
09f612bac047b132bb9bf7d4aa8afe6ea4d5b938 jdk7u4-b14
9e15d1f3fa4b35b8c950323c76b9ed094d434b97 jdk7u5-b01
@@ -186,11 +192,15 @@
a2bd61800667c38d759a0e02a756063d47dbcdc0 jdk7u6-b10
18a1b4f0681ae6e748fc60162dd76e357de3304b jdk7u6-b11
76306dce87104d9f333db3371ca97c80cac9674a jdk7u6-b12
+35172a51cc7639a44fe06ffbd5be471e48b71a88 ppc-aix-port-b01
+3097457689ba2d41b1d692191c5ba2f2b30aff9e ppc-aix-port-b02
+3097457689ba2d41b1d692191c5ba2f2b30aff9e ppc-aix-port-b03
aa49fe7490963f0c53741fbca3a175e0fec93951 jdk7u6-b13
3ce621d9b988abcccd86b52a97ea39133006c245 jdk7u6-b14
e50c9a5f001c61f49e7e71b25b97ed4095d3557b jdk7u6-b15
966e21feb7f088e318a35b069c1a61ff6363e554 jdk7u6-b16
aa0ad405f70bc7a7af95fef109f114ceecf31232 jdk7u6-b17
+8ff5fca08814f1f0eeda40aaec6f2936076b7444 icedtea-2.3-branchpoint
4a6917092af80481c1fa5b9ec8ccae75411bb72c jdk7u6-b18
a263f787ced5bc7c14078ae552c82de6bd011611 jdk7u6-b19
09145b546a2b6ae1f44d5c8a7d2a37d48e4b39e2 jdk7u6-b20
@@ -258,11 +268,13 @@
cb81ee79a72d84f99b8e7d73b5ae73124b661fe7 jdk7u12-b07
b5e180ef18a0c823675bcd32edfbf2f5122d9722 jdk7u12-b08
2e7fe0208e9c928f2f539fecb6dc8a1401ecba9e jdk7u12-b09
+b171007921c3d01066848c88cbcb6a376df3f01c icedtea-2.4-branchpoint
e012aace90500a88f51ce83fcd27791f5dbf493f jdk7u14-b10
9eb82fb221f3b34a5df97e7db3c949fdb0b6fee0 jdk7u14-b11
ee3ab2ed2371dd72ad5a75ebb6b6b69071e29390 jdk7u14-b12
7c0d4bfd9d2c183ebf8566013af5111927b472f6 jdk7u14-b13
3982fc37bc256b07a710f25215e5525cfbefe2ed jdk7u14-b14
+739869c45976bb154908af5d145b7ed98c6a7d47 ppc-aix-port-b04
2eb3ac105b7fe7609a20c9986ecbccab71f1609f jdk7u14-b15
835448d525a10bb826f4f7ebe272fc410bdb0f5d jdk7u15-b01
0443fe2d8023111b52f4c8db32e038f4a5a9f373 jdk7u15-b02
@@ -365,6 +377,7 @@
c5ca4daec23b5e7f99ac8d684f5016ff8bfebbb0 jdk7u45-b18
4797f984f6c93c433aa797e9b2d8f904cf083f96 jdk7u45-b30
8c343a783777b8728cb819938f387db0acf7f3ac jdk7u45-b31
+db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00
402d54c7d8ce95f3945cc3d698e528e4adec7b9b jdk7u45-b33
34e8f9f26ae612ebac36357eecbe70ea20e0233c jdk7u45-b34
3dbb06a924cdf73d39b8543824ec88ae501ba5c6 jdk7u45-b35
@@ -414,8 +427,11 @@
db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00
def34c4a798678c424786a8f0d0508e90185958d jdk7u60-b01
ff67c89658525e8903fb870861ed3645befd6bc5 jdk7u60-b02
+7d5b758810c20af12c6576b7d570477712360744 icedtea-2.5pre01
+3162252ff26b4e6788b0c79405b035b535afa018 icedtea-2.5pre02
b1bcc999a8f1b4b4452b59c6636153bb0154cf5a jdk7u60-b03
efc8886310cbccb941f826acfad2ad51a2891be5 jdk7u60-b04
+9b6aff2241bf0d6fa9eab38a75a4eccdf9bb7335 icedtea-2.6pre01
4fb749a3110727d5334c69793578a3254a053bf5 jdk7u60-b05
46ca1ce7550f1463d60c3eacaf7b8cdc44b0c66e jdk7u60-b06
d5a2f60006e3c4243abeee0f623e5c3f79372fd8 jdk7u60-b07
@@ -425,7 +441,11 @@
c2bb87dae8a08eab6f4f336ce5a59865aa0214d6 jdk7u60-b11
1a90de8005e3de2475fd9355dcdb6f5e60bf89cc jdk7u60-b12
b06d4ed71ae0bc6e13f5a8437cb6388f17c66e84 jdk7u60-b13
+6f22501ca73cc21960cfe45a2684a0c902f46133 icedtea-2.6pre02
+068d2b78bd73fc2159a1c8a88dca3ca2841c4e16 icedtea-2.6pre03
b7fbd9b4febf8961091fdf451d3da477602a8f1d jdk7u60-b14
+b69f22ae0ef3ddc153d391ee30efd95e4417043c icedtea-2.6pre04
+605610f355ce3f9944fe33d9e5e66631843beb8d icedtea-2.6pre05
04882f9a073e8de153ec7ad32486569fd9a087ec jdk7u60-b15
41547583c3a035c3924ffedfa8704e58d69e5c50 jdk7u60-b16
e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b17
@@ -553,8 +573,20 @@
09f3004e9b123b457da8f314aec027a5f4c3977f jdk7u76-b31
efc8886310cbccb941f826acfad2ad51a2891be5 jdk7u80-b00
bc7f9d966c1df3748ef9c148eab25976cd065963 jdk7u80-b01
+0cc91db3a787da44e3775bdde4c3c222d3cd529f icedtea-2.6pre07
+21eee0ed9be97d4e283cdf626971281481e711f1 icedtea-2.6pre06
+9702c7936ed8da9befdc27d30b2cbf51718d810a icedtea-2.6pre08
2590a9c18fdba19086712bb91a28352e9239a2be jdk7u80-b02
+1ceeb31e72caa1b458194f7ae776cf4ec29731e7 icedtea-2.6pre09
+33a33bbea1ae3a7feef5f3216e85c56b708444f4 icedtea-2.6pre10
+8a445d1b5af50e8628b8b1367f734d4e5741d12a icedtea-2.6pre11
3796111298d5b013e46d5ce49f17c16fc3197be8 jdk7u80-b03
+3620a98d0295f2b5ba4483483e61bfc386e734c1 icedtea-2.6pre12
+13bd267f397d41749dcd08576a80f368cf3aaad7 icedtea-2.6pre13
+ccdc37cdfaa891e3c14174378a8e7a5871e8893b icedtea-2.6pre14
+6dd583aadca80b71e8c004d9f4f3deb1d779ccfb icedtea-2.6pre15
+2e8f3cd07f149eab799f60db51ff3629f6ab0664 icedtea-2.6pre16
+3ce28e98738c7f9bb238378a991d4708598058a2 icedtea-2.6pre17
54acd5cd04856e80a3c7d5d38ef9c7a44d1e215a jdk7u80-b04
45f30f5524d4eef7aa512e35d5399cc4d84af174 jdk7u79-b00
2879572fbbb7be4d44e2bcd815711590cc6538e9 jdk7u79-b01
@@ -572,6 +604,11 @@
da34e5f77e9e922844e7eb8d1e165d25245a8b40 jdk7u79-b30
ea77b684d424c40f983d1aff2c9f4ef6a9c572b0 jdk7u79-b15
d4bd8bd71ca7233c806357bd39514dcaeebaa0ee jdk7u80-b05
+19a30444897fca52d823d63f6e2fbbfac74e8b34 icedtea-2.6pre18
+29fdd3e4a4321604f113df9573b9d4d215cf1b1d icedtea-2.6pre19
+95e2e973f2708306632792991502a86907a8e2ca icedtea-2.6pre20
+533e9029af3503d09a95b70abb4c21ca3fc9ac89 icedtea-2.6pre21
+d17bcae64927f33e6e7e0e6132c62a7bf523dbc3 icedtea-2.6pre22
f33e6ea5f4832468dd86a8d48ef50479ce91111e jdk7u80-b06
feb04280659bf05b567dc725ff53e2a2077bdbb7 jdk7u80-b07
f1334857fa99e6472870986b6071f9405c29ced4 jdk7u80-b08
@@ -584,3 +621,11 @@
75fb0553cc146fb238df4e93dbe90791435e84f9 jdk7u80-b30
daa5092b07a75c17356bb438adba03f83f94ef17 jdk7u80-b15
a942e0b5247772ea326705c717c5cd0ad1572aaa jdk7u80-b32
+ec336c81a5455ef96a20cff4716603e7f6ca01ad icedtea-2.6pre23
+444d55ffed65907640aad374ce84e7a01ba8dbe7 icedtea-2.6pre24
+2db5e90a399beb96d82086d2d961894246d0bfe5 icedtea-2.6.0
+ec192fcd997198899cc376b0afad2c53893dedad jdk7u85-b00
+fc2855d592b09fe16d0d47a24d09466f776dcb54 jdk7u85-b01
+2db5e90a399beb96d82086d2d961894246d0bfe5 icedtea-2.6-branchpoint
+61d3e001dee639fddfed46879c81bf3ac518e445 icedtea-2.6.1
+66eea0d727761bfbee10784baa6941f118bc06d1 jdk7u85-b02
diff -r 0654d3488c7a -r 23413abdf066 .jcheck/conf
--- a/.jcheck/conf Fri Jul 03 23:53:28 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=ignore
diff -r 0654d3488c7a -r 23413abdf066 make/com/sun/java/pack/Makefile
--- a/make/com/sun/java/pack/Makefile Fri Jul 03 23:53:28 2015 +0100
+++ b/make/com/sun/java/pack/Makefile Wed Oct 14 05:37:46 2015 +0100
@@ -75,7 +75,7 @@
OTHER_CXXFLAGS += $(ZINCLUDE)
LDDFLAGS += $(ZIPOBJS)
else
- LDDFLAGS += $(ZLIB_LIBS)
+ OTHER_LDLIBS += $(ZLIB_LIBS)
OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB
endif
else
@@ -99,8 +99,7 @@
RES = $(OBJDIR)/$(PGRM).res
else
LDOUTPUT = -o #Have a space
- LDDFLAGS += -lc
- OTHER_LDLIBS += $(LIBCXX)
+ OTHER_LDLIBS += -lc $(LIBCXX)
# setup the list of libraries to link in...
ifeq ($(PLATFORM), linux)
ifeq ("$(CC_VER_MAJOR)", "3")
@@ -157,7 +156,7 @@
$(prep-target)
$(RM) $(TEMPDIR)/mapfile-vers
$(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers
- $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
+ $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
ifdef MT
$(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
endif
diff -r 0654d3488c7a -r 23413abdf066 make/com/sun/java/pack/mapfile-vers
--- a/make/com/sun/java/pack/mapfile-vers Fri Jul 03 23:53:28 2015 +0100
+++ b/make/com/sun/java/pack/mapfile-vers Wed Oct 14 05:37:46 2015 +0100
@@ -26,7 +26,12 @@
# Define library interface.
-SUNWprivate_1.1 {
+# On older SuSE releases the linker will complain about:
+# Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable
+# So we better completely omit the version for now.
+#
+
+{
global:
Java_com_sun_java_util_jar_pack_NativeUnpack_finish;
Java_com_sun_java_util_jar_pack_NativeUnpack_getNextFile;
diff -r 0654d3488c7a -r 23413abdf066 make/com/sun/java/pack/mapfile-vers-unpack200
--- a/make/com/sun/java/pack/mapfile-vers-unpack200 Fri Jul 03 23:53:28 2015 +0100
+++ b/make/com/sun/java/pack/mapfile-vers-unpack200 Wed Oct 14 05:37:46 2015 +0100
@@ -25,7 +25,12 @@
# Define library interface.
-SUNWprivate_1.1 {
+# On older SuSE releases the linker will complain about:
+# Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable
+# So we better completely omit the version for now.
+#
+
+{
local:
*;
};
diff -r 0654d3488c7a -r 23413abdf066 make/com/sun/jmx/Makefile
--- a/make/com/sun/jmx/Makefile Fri Jul 03 23:53:28 2015 +0100
+++ b/make/com/sun/jmx/Makefile Wed Oct 14 05:37:46 2015 +0100
@@ -114,13 +114,21 @@
endif
ifeq ($(CROSS_COMPILE_ARCH),)
-RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+RMIC_VM = $(RMIC_JAVA)
else
-RMIC = $(BOOT_JAVA_CMD) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+RMIC_VM = $(BOOT_JAVA_CMD)
endif
+RMIC = $(RMIC_VM) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
$(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
$(prep-target)
+ if [ -x $(PAX_COMMAND) ] ; then \
+ if $(CAT) /proc/self/status | grep '^PaX' > /dev/null ; then \
+ if [ -w $(RMIC_VM) ] ; then \
+ $(PAX_COMMAND) $(PAX_COMMAND_ARGS) $(RMIC_VM) ; \
+ fi ; \
+ fi ; \
+ fi
$(RMIC) -classpath "$(CLASSDESTDIR)" \
-d $(CLASSDESTDIR) \
-v1.2 \
diff -r 0654d3488c7a -r 23413abdf066 make/com/sun/nio/Makefile
--- a/make/com/sun/nio/Makefile Fri Jul 03 23:53:28 2015 +0100
+++ b/make/com/sun/nio/Makefile Wed Oct 14 05:37:46 2015 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
@@ -29,8 +29,13 @@
BUILDDIR = ../../..
include $(BUILDDIR)/common/Defs.gmk
+
+# MMM: disable for now
+ifeq (, $(findstring $(PLATFORM), macosx aix))
include $(BUILDDIR)/common/Subdirs.gmk
SUBDIRS = sctp
+endif
+
all build clean clobber::
$(SUBDIRS-loop)
diff -r 0654d3488c7a -r 23413abdf066 make/com/sun/nio/sctp/Makefile
--- a/make/com/sun/nio/sctp/Makefile Fri Jul 03 23:53:28 2015 +0100
+++ b/make/com/sun/nio/sctp/Makefile Wed Oct 14 05:37:46 2015 +0100
@@ -29,7 +29,7 @@
BUILDDIR = ../../../..
PACKAGE = com.sun.nio.sctp
-LIBRARY = sctp
+LIBRARY = javasctp
PRODUCT = sun
#OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint
include $(BUILDDIR)/common/Defs.gmk
@@ -67,10 +67,16 @@
-I$(PLATFORM_SRC)/native/java/net \
-I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders
+ifeq ($(SYSTEM_SCTP), true)
+ OTHER_INCLUDES += $(SCTP_CFLAGS)
+endif
+
ifeq ($(PLATFORM), linux)
+ifneq ($(COMPILER_WARNINGS_FATAL),false)
COMPILER_WARNINGS_FATAL=true
+endif
#OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread
endif
ifeq ($(PLATFORM), solaris)
#LIBSCTP = -lsctp
@@ -79,6 +85,13 @@
endif # macosx
endif # windows
+ifeq ($(SYSTEM_SCTP), true)
+ OTHER_LDLIBS += $(SCTP_LIBS)
+ OTHER_CFLAGS += -DUSE_SYSTEM_SCTP
+else
+ OTHER_LDLIBS += -ldl
+endif
+
clean clobber::
$(RM) -r $(CLASSDESTDIR)/com/sun/nio/sctp
$(RM) -r $(CLASSDESTDIR)/sun/nio/ch
diff -r 0654d3488c7a -r 23413abdf066 make/com/sun/security/auth/module/Makefile
--- a/make/com/sun/security/auth/module/Makefile Fri Jul 03 23:53:28 2015 +0100
+++ b/make/com/sun/security/auth/module/Makefile Wed Oct 14 05:37:46 2015 +0100
@@ -67,7 +67,7 @@
include FILES_c_solaris.gmk
endif # solaris
-ifneq (,$(findstring $(PLATFORM), linux macosx))
+ifneq (,$(findstring $(PLATFORM), linux macosx aix))
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
@@ -78,7 +78,3 @@
#
include $(BUILDDIR)/common/Library.gmk
-#
-# JVMDI implementation lives in the VM.
-#
-OTHER_LDLIBS = $(JVMLIB)
diff -r 0654d3488c7a -r 23413abdf066 make/com/sun/tools/attach/Exportedfiles.gmk
--- a/make/com/sun/tools/attach/Exportedfiles.gmk Fri Jul 03 23:53:28 2015 +0100
+++ b/make/com/sun/tools/attach/Exportedfiles.gmk Wed Oct 14 05:37:46 2015 +0100
@@ -47,3 +47,8 @@
FILES_export = \
sun/tools/attach/BsdVirtualMachine.java
endif
+
+ifeq ($(PLATFORM), aix)
+FILES_export = \
+ sun/tools/attach/AixVirtualMachine.java
+endif
diff -r 0654d3488c7a -r 23413abdf066 make/com/sun/tools/attach/FILES_c.gmk
--- a/make/com/sun/tools/attach/FILES_c.gmk Fri Jul 03 23:53:28 2015 +0100
+++ b/make/com/sun/tools/attach/FILES_c.gmk Wed Oct 14 05:37:46 2015 +0100
@@ -43,3 +43,8 @@
FILES_c = \
BsdVirtualMachine.c
endif
+
+ifeq ($(PLATFORM), aix)
+FILES_c = \
+ AixVirtualMachine.c
+endif
diff -r 0654d3488c7a -r 23413abdf066 make/com/sun/tools/attach/FILES_java.gmk
--- a/make/com/sun/tools/attach/FILES_java.gmk Fri Jul 03 23:53:28 2015 +0100
+++ b/make/com/sun/tools/attach/FILES_java.gmk Wed Oct 14 05:37:46 2015 +0100
@@ -32,7 +32,7 @@
com/sun/tools/attach/spi/AttachProvider.java \
sun/tools/attach/HotSpotAttachProvider.java \
sun/tools/attach/HotSpotVirtualMachine.java
-
+
ifeq ($(PLATFORM), solaris)
FILES_java += \
sun/tools/attach/SolarisAttachProvider.java
@@ -48,11 +48,16 @@
sun/tools/attach/BsdAttachProvider.java
endif
+ifeq ($(PLATFORM), aix)
+FILES_java += \
+ sun/tools/attach/AixAttachProvider.java
+endif
+
#
# Files that need to be copied
#
SERVICEDIR = $(CLASSBINDIR)/META-INF/services
-
+
FILES_copy = \
$(SERVICEDIR)/com.sun.tools.attach.spi.AttachProvider
diff -r 0654d3488c7a -r 23413abdf066 make/common/Defs-aix.gmk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/Defs-aix.gmk Wed Oct 14 05:37:46 2015 +0100
@@ -0,0 +1,391 @@
+#
+# Copyright (c) 1995, 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. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Makefile to specify compiler flags for programs and libraries
+# targeted to AIX. Should not contain any rules.
+#
+# WARNING: This file is shared with other workspaces.
+# So when it includes other files, it must use JDK_TOPDIR.
+#
+
+# Warning: the following variables are overridden by Defs.gmk. Set
+# values will be silently ignored:
+# CFLAGS (set $(OTHER_CFLAGS) instead)
+# CPPFLAGS (set $(OTHER_CPPFLAGS) instead)
+# CXXFLAGS (set $(OTHER_CXXFLAGS) instead)
+# LDFLAGS (set $(OTHER_LDFAGS) instead)
+# LDLIBS (set $(EXTRA_LIBS) instead)
+# LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
+# LINTFLAGS (set $(OTHER_LINTFLAGS) instead)
+#
+# Note: CPPFLAGS are used in C and C++ compiles.
+#
+
+# Get shared JDK settings
+include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
+
+# define these to avoid picking up ones from aliases or from
+# non-standard locations
+#
+
+AR = $(USRBIN_PATH)ar
+BASENAME = $(UNIXCOMMAND_PATH)basename
+CAT = $(UNIXCOMMAND_PATH)cat
+CD = cd # intrinsic unix command
+CHMOD = $(UNIXCOMMAND_PATH)chmod
+CMP = $(USRBIN_PATH)cmp
+COMPRESS = $(USRBIN_PATH)compress
+CP = $(UNIXCOMMAND_PATH)cp
+CPIO = $(UNIXCOMMAND_PATH)cpio
+CUT = $(USRBIN_PATH)cut
+DATE = $(UNIXCOMMAND_PATH)date
+DF = $(UNIXCOMMAND_PATH)df
+DIFF = $(USRBIN_PATH)diff
+DIRNAME = $(USRBIN_PATH)dirname
+ECHO = echo # intrinsic unix command, with backslash-escaped character interpretation
+EGREP = $(UNIXCOMMAND_PATH)egrep
+EXPR = $(USRBIN_PATH)expr
+
+FIND = $(UNIXCOMMAND_PATH)find
+
+HEAD = $(USRBIN_PATH)head
+GREP = $(UNIXCOMMAND_PATH)grep
+GUNZIP = $(UNIXCOMMAND_PATH)gunzip
+LEX = $(USRBIN_PATH)lex
+LN = $(UNIXCOMMAND_PATH)ln
+LS = $(UNIXCOMMAND_PATH)ls
+M4 = $(USRBIN_PATH)m4
+MKDIR = $(UNIXCOMMAND_PATH)mkdir
+MV = $(UNIXCOMMAND_PATH)mv
+NAWK = $(USRBIN_PATH)awk
+PWD = $(UNIXCOMMAND_PATH)pwd
+#RM is defined by GNU Make as 'rm -f'
+RMDIR = $(UNIXCOMMAND_PATH)rmdir
+RPM = $(UNIXCOMMAND_PATH)rpm
+SED = $(UNIXCOMMAND_PATH)sed
+SH = $(UNIXCOMMAND_PATH)sh
+SORT = $(UNIXCOMMAND_PATH)sort
+STRIP = $(USRBIN_PATH)strip
+TAIL = $(USRBIN_PATH)tail
+
+TAR = tar # We need GNU TAR which must be found trough PATH (may be in /opt/freeware/bin or /usr/local/bin)
+
+TEST = $(USRBIN_PATH)test
+TOUCH = $(UNIXCOMMAND_PATH)touch
+TR = $(USRBIN_PATH)tr
More information about the distro-pkg-dev
mailing list