/hg/release/icedtea7-forest-2.6/jdk: 50 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Mar 4 22:57:04 UTC 2019
changeset 0839b7f5f978 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=0839b7f5f978
author: andrew
date: Wed Feb 20 19:53:18 2019 +0000
Bump to icedtea-2.6.17pre01
changeset 8f4098e2534e in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=8f4098e2534e
author: andrew
date: Thu Feb 21 04:50:22 2019 +0000
Added tag icedtea-2.6.17pre01 for changeset 0839b7f5f978
changeset ba803fabd92f in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=ba803fabd92f
author: mbalao
date: Wed Sep 19 18:04:23 2018 +0200
8029661: Support TLS v1.2 algorithm in SunPKCS11 provider
Summary: TLS v1.2 algorithms for key and MAC derivation added to SunPKCS11 crypto provider. 8210912 fix is included as part of this changeset.
Reviewed-by: valeriep
changeset 2944530d5e53 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=2944530d5e53
author: chegar
date: Wed Oct 24 21:20:40 2012 +0100
8000203: File descriptor leak in src/solaris/native/java/net/net_util_md.c
Reviewed-by: dsamersoff, khazra, chegar
Contributed-by: John Zavgren <john.zavgren at oracle.com>
changeset 6c6803ef11e1 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=6c6803ef11e1
author: igerasim
date: Wed Aug 15 12:12:16 2018 -0700
8199156: Better route routing
Reviewed-by: igerasim, mschoene, michaelm, rhalade
changeset 979a2946879c in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=979a2946879c
author: igerasim
date: Wed Aug 15 12:13:20 2018 -0700
8199161: Better interface enumeration
Reviewed-by: igerasim, mschoene, michaelm, rhalade
changeset 2516b530fac3 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=2516b530fac3
author: chegar
date: Fri Aug 10 14:35:44 2018 +0100
8199166: Better interface lists
Reviewed-by: igerasim, mschoene, michaelm, rhalade
changeset e8b8ef2ce891 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=e8b8ef2ce891
author: serb
date: Tue Jan 29 09:56:33 2019 +0000
8203955: Improve robot support
Reviewed-by: prr, psadhukhan, rhalade, skoivu
changeset f9b804d9b983 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=f9b804d9b983
author: serb
date: Tue Jan 29 10:15:46 2019 +0000
8204895: Better icon support
Reviewed-by: prr, mschoene, aghaisas, rhalade
changeset fc0d98b4f146 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=fc0d98b4f146
author: psadhukhan
date: Tue Aug 21 11:43:03 2018 +0530
8205356: Choose printer defaults
Reviewed-by: prr, mschoene, rhalade
changeset b7f790390313 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=b7f790390313
author: dtitov
date: Wed Jul 25 13:39:13 2018 -0700
8205709: Proper allocation handling
Reviewed-by: sspitsyn
changeset 7c556f6c8711 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=7c556f6c8711
author: igerasim
date: Fri Sep 28 23:04:10 2018 -0700
8206290: Better FileChannel transfer performance
Reviewed-by: alanb, rhalade, mschoene
changeset c85507fa74f8 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=c85507fa74f8
author: igerasim
date: Mon Jul 23 21:34:30 2018 -0700
8206295: More reliable p11 transactions
Reviewed-by: valeriep, mschoene, rhalade
changeset 25c5bade0406 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=25c5bade0406
author: igerasim
date: Thu Jul 26 04:36:08 2018 -0700
8206301: Improve NIO stability
Reviewed-by: alanb, mschoene, rhalade
changeset 30a937b33d21 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=30a937b33d21
author: coffeys
date: Mon Aug 27 11:29:14 2018 +0100
8208585: Make crypto code more robust
Reviewed-by: ascarpino, mschoene
changeset 38d6c467c411 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=38d6c467c411
author: igerasim
date: Tue Jan 29 17:55:30 2019 +0000
8209094: Improve web server connections
Reviewed-by: chegar, dfuchs, mschoene, igerasim
changeset a4401efb67e7 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a4401efb67e7
author: prr
date: Fri Oct 05 11:37:39 2018 -0700
8210606: Improved data set handling
Reviewed-by: serb, psadhukhan, mschoene, rhalade
changeset 1636cb164608 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=1636cb164608
author: igerasim
date: Sat Oct 06 12:27:18 2018 -0700
8210610: Improved LSA authentication
Reviewed-by: valeriep, mschoene, rhalade
changeset d541364c9376 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=d541364c9376
author: prr
date: Mon Oct 08 15:24:21 2018 -0700
8210866: Improve JPEG processing
Reviewed-by: serb, psadhukhan, rhalade
changeset 9e7b93facf9a in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=9e7b93facf9a
author: igerasim
date: Fri Jul 03 17:28:02 2015 +0300
8098854: Do cleanup in a proper order in sunmscapi code
Reviewed-by: vinnie
changeset 0a4a916e89ae in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=0a4a916e89ae
author: igerasim
date: Thu Jan 31 04:33:24 2019 +0000
8143913: MSCAPI keystore should accept Certificate[] in setEntry()
6483657: MSCAPI provider does not create unique alias names
Reviewed-by: vinnie
changeset 0fdbcf2eb794 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=0fdbcf2eb794
author: igerasim
date: Thu Jan 31 04:54:52 2019 +0000
8165463: Native implementation of sunmscapi should use operator new (nothrow) for allocations
Reviewed-by: clanger, jnimeh, vinnie
changeset e960bce2d584 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=e960bce2d584
author: igerasim
date: Thu Jan 31 04:57:12 2019 +0000
8210870: Libsunmscapi improved interactions
Reviewed-by: valeriep, mschoene, rhalade
changeset 0d2ec8760dbc in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=0d2ec8760dbc
author: igerasim
date: Thu Jan 31 05:57:31 2019 +0000
8191438: jarsigner should print when a timestamp will expire
8027781: New jarsigner timestamp warning is grammatically incorrect
8159805: sun/security/tools/jarsigner/warnings/NoTimestampTest.java fails after JDK-8027781
Reviewed-by: weijun, coffeys, mullan
changeset 8c97df2d2e7c in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=8c97df2d2e7c
author: alanb
date: Fri Jan 03 15:42:05 2014 +0000
8029018: (bf) Check src/share/native/java/nio/Bits.c for JNI pending exceptions
Reviewed-by: chegar
changeset feba444e5167 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=feba444e5167
author: dbuck
date: Thu Feb 07 18:19:45 2019 +0000
8141491: Unaligned memory access in Bits.c
Summary: Introduce alignment-safe Copy::conjoint_swap and JVM_CopySwapMemory
Reviewed-by: mikael, dholmes
changeset 3e4b0d90fafd in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=3e4b0d90fafd
author: robm
date: Fri Oct 05 14:10:00 2018 -0700
8205330: InitialDirContext ctor sometimes throws NPE if the server has sent a disconnection
Reviewed-by: chegar, dfuchs
changeset d351f417e00a in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=d351f417e00a
author: coffeys
date: Tue Feb 12 04:25:26 2019 +0000
8208583: Better management of internal KeyStore buffers
8207775: Better management of CipherCore buffers
Reviewed-by: weijun, ascarpino
changeset 1c3c301c99ba in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=1c3c301c99ba
author: vinnie
date: Wed Feb 13 04:21:57 2019 +0000
6383200: PBE: need new algorithm support in password based encryption
Reviewed-by: valeriep
changeset 665ca9aa6e19 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=665ca9aa6e19
author: valeriep
date: Wed Feb 13 04:31:50 2019 +0000
8013069: javax.crypto tests fail with new PBE algorithm names
Summary: Shouldn't auto-generate default parameters for MAC objects.
Reviewed-by: vinnie
changeset df04e486c6cc in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=df04e486c6cc
author: igerasim
date: Wed Feb 13 04:55:28 2019 +0000
8138589: Correct limits on unlimited cryptography
Reviewed-by: mullan
changeset 3262853a2746 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=3262853a2746
author: coffeys
date: Wed Feb 13 04:58:54 2019 +0000
8209129: Further improvements to cipher buffer management
Reviewed-by: weijun, igerasim
changeset 80dd958417a8 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=80dd958417a8
author: coffeys
date: Wed Feb 13 05:22:12 2019 +0000
8209862: CipherCore performance improvement
Reviewed-by: apetcher, ascarpino
Contributed-by: sergey.kuksenko at oracle.com, sean.coffey at oracle.com
changeset 83079b594f5e in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=83079b594f5e
author: robm
date: Fri Oct 05 14:11:39 2018 -0700
8210695: Create test to cover JDK-8205330 InitialDirContext ctor sometimes throws NPE if the server has sent a disconnection
Reviewed-by: vtewari, dfuchs, chegar, coffeys
changeset bbb49ffe60a3 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=bbb49ffe60a3
author: igerasim
date: Wed Feb 13 06:50:44 2019 +0000
8133070: Hot lock on BulkCipher.isAvailable
Reviewed-by: mullan
Contributed-by: xuelei.fan at oracle.com, kungu.mjh at alibaba-inc.com
changeset 1f10820808c5 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=1f10820808c5
author: coffeys
date: Tue Mar 27 16:54:03 2018 +0100
8162362: Introduce system property to control enabled ciphersuites
Reviewed-by: xuelei
changeset ba99d2bbbda5 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=ba99d2bbbda5
author: aefimov
date: Mon Oct 01 23:44:46 2018 +0100
8210951: Test sun/security/ssl/SSLContextImpl/CustomizedCipherSuites.java fails
Reviewed-by: pkoppula, coffeys
changeset 4586938ba63d in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=4586938ba63d
author: pkoppula
date: Wed Feb 13 07:49:48 2019 +0000
8211883: Disable anon and NULL cipher suites
Reviewed-by: mullan, coffeys
changeset d3294ba0c8a4 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=d3294ba0c8a4
author: rpatil
date: Wed Feb 13 08:35:08 2019 +0000
8213085: (tz) Upgrade time-zone data to tzdata2018g
Reviewed-by: martin, naoto
changeset a9d882e4b69a in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a9d882e4b69a
author: ljiang
date: Wed Nov 07 19:02:21 2018 -0800
8213368: JDK 8u201 l10n resource file update
Reviewed-by: coffeys
changeset a2b9c221a234 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a2b9c221a234
author: aivanov
date: Wed Feb 13 08:38:16 2019 +0000
8213949: OpenJDK 8 CCharToGlyphMapper.m missing the Classpath exception license text
Reviewed-by: coffeys
changeset b4a41a652192 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=b4a41a652192
author: andrew
date: Fri Feb 15 05:16:17 2019 +0000
Added tag jdk7u211-b00 for changeset a2b9c221a234
changeset 9568173396db in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=9568173396db
author: igerasim
date: Tue Oct 09 21:31:31 2018 -0700
8200659: Improve BigDecimal support
Reviewed-by: darcy, rhalade, mschoene
changeset f992c97c7f1e in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=f992c97c7f1e
author: mbalao
date: Thu Feb 21 03:38:17 2019 +0000
8213154: Update copyright headers of files in src tree that are missing Classpath exception
Reviewed-by: andrew
changeset 758e83340d0a in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=758e83340d0a
author: andrew
date: Thu Feb 21 03:38:58 2019 +0000
Added tag jdk7u211-b01 for changeset f992c97c7f1e
changeset 2028cc078830 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=2028cc078830
author: andrew
date: Fri Feb 22 06:16:11 2019 +0000
Merge jdk7u211-b01
changeset 8701411b434e in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=8701411b434e
author: andrew
date: Fri Feb 22 06:16:46 2019 +0000
Bump to icedtea-2.6.17
changeset 303a29c24e3b in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=303a29c24e3b
author: andrew
date: Fri Feb 22 11:34:23 2019 +0000
8219570: JDK-6383200 wrongly extends PBEParameterSpec API
Reviewed-by: mbalao
changeset ca1fa5965ae7 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=ca1fa5965ae7
author: andrew
date: Mon Feb 25 00:14:14 2019 +0000
Added tag jdk7u211-b02 for changeset 303a29c24e3b
changeset 6093d128c588 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=6093d128c588
author: andrew
date: Mon Feb 25 01:45:18 2019 +0000
Merge jdk7u211-b02
diffstat:
.hgtags | 4 +
make/com/sun/crypto/provider/Makefile | 1 +
make/common/Release.gmk | 1 +
make/java/java/mapfile-vers | 2 +-
make/java/net/Makefile | 2 +-
make/jdk_generic_profile.sh | 2 +-
make/sun/javazic/tzdata/VERSION | 2 +-
make/sun/javazic/tzdata/africa | 121 +-
make/sun/javazic/tzdata/antarctica | 2 +
make/sun/javazic/tzdata/asia | 314 +++-
make/sun/javazic/tzdata/australasia | 13 +-
make/sun/javazic/tzdata/backward | 4 +-
make/sun/javazic/tzdata/etcetera | 4 +-
make/sun/javazic/tzdata/europe | 77 +-
make/sun/javazic/tzdata/factory | 6 +-
make/sun/javazic/tzdata/leapseconds | 31 +-
make/sun/javazic/tzdata/northamerica | 21 +-
make/sun/javazic/tzdata/pacificnew | 2 +
make/sun/javazic/tzdata/southamerica | 36 +-
make/sun/javazic/tzdata/systemv | 2 +
make/sun/javazic/tzdata/zone.tab | 14 +-
src/macosx/native/sun/font/CCharToGlyphMapper.m | 12 +-
src/share/classes/com/sun/crypto/provider/CipherCore.java | 204 +-
src/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java | 88 +-
src/share/classes/com/sun/crypto/provider/KeyProtector.java | 64 +-
src/share/classes/com/sun/crypto/provider/PBEKey.java | 18 +-
src/share/classes/com/sun/crypto/provider/PBEKeyFactory.java | 107 +-
src/share/classes/com/sun/crypto/provider/PBEParameters.java | 13 +-
src/share/classes/com/sun/crypto/provider/PBES1Core.java | 544 ++++++
src/share/classes/com/sun/crypto/provider/PBES2Core.java | 428 +++++
src/share/classes/com/sun/crypto/provider/PBES2Parameters.java | 526 ++++++
src/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java | 6 +-
src/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java | 6 +-
src/share/classes/com/sun/crypto/provider/PBKDF2Core.java | 182 ++
src/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java | 12 +-
src/share/classes/com/sun/crypto/provider/PBMAC1Core.java | 222 ++
src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java | 478 ++++-
src/share/classes/com/sun/crypto/provider/RSACipher.java | 4 +-
src/share/classes/com/sun/crypto/provider/SunJCE.java | 245 ++-
src/share/classes/com/sun/crypto/spec/PBE2ParameterSpec.java | 75 +
src/share/classes/com/sun/jndi/ldap/LdapClient.java | 26 +-
src/share/classes/java/awt/Robot.java | 1 +
src/share/classes/java/math/BigDecimal.java | 13 +-
src/share/classes/java/nio/Bits.java | 2 +-
src/share/classes/javax/crypto/spec/PBEKeySpec.java | 7 +-
src/share/classes/javax/crypto/spec/PBEParameterSpec.java | 3 +-
src/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java | 8 +-
src/share/classes/sun/nio/ch/FileChannelImpl.java | 10 +-
src/share/classes/sun/security/pkcs11/P11Signature.java | 6 +-
src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java | 38 +-
src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java | 42 +-
src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java | 42 +-
src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java | 9 +-
src/share/classes/sun/security/pkcs11/SunPKCS11.java | 39 +-
src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java | 14 +-
src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_KEY_MAT_PARAMS.java | 151 +
src/share/classes/sun/security/pkcs11/wrapper/CK_TLS12_MASTER_KEY_DERIVE_PARAMS.java | 65 +
src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_MAC_PARAMS.java | 64 +
src/share/classes/sun/security/pkcs11/wrapper/Functions.java | 24 +-
src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java | 10 +-
src/share/classes/sun/security/provider/DSA.java | 6 +-
src/share/classes/sun/security/provider/DigestBase.java | 2 +
src/share/classes/sun/security/provider/JavaKeyStore.java | 39 +-
src/share/classes/sun/security/provider/KeyProtector.java | 21 +-
src/share/classes/sun/security/provider/MD4.java | 9 +-
src/share/classes/sun/security/provider/MD5.java | 10 +-
src/share/classes/sun/security/provider/SHA.java | 11 +-
src/share/classes/sun/security/provider/SHA2.java | 9 +-
src/share/classes/sun/security/provider/SHA5.java | 10 +-
src/share/classes/sun/security/ssl/CipherSuite.java | 89 +-
src/share/classes/sun/security/ssl/CipherSuiteList.java | 28 +-
src/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java | 7 +-
src/share/classes/sun/security/ssl/JsseJce.java | 50 +-
src/share/classes/sun/security/ssl/SSLContextImpl.java | 726 +++++---
src/share/classes/sun/security/ssl/SSLEngineImpl.java | 20 +-
src/share/classes/sun/security/ssl/SSLSocketImpl.java | 19 +-
src/share/classes/sun/security/tools/jarsigner/Main.java | 791 +++++----
src/share/classes/sun/security/tools/jarsigner/Resources.java | 19 +-
src/share/classes/sun/security/tools/jarsigner/Resources_ja.java | 19 +-
src/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java | 19 +-
src/share/classes/sun/security/util/Resources_sv.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_de.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_es.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_fr.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_it.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_ja.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_ko.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_sv.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java | 4 +-
src/share/javavm/export/jvm.h | 10 +-
src/share/lib/net.properties | 28 +-
src/share/lib/security/java.security-linux | 2 +-
src/share/lib/security/java.security-macosx | 2 +-
src/share/lib/security/java.security-solaris | 2 +-
src/share/lib/security/java.security-windows | 2 +-
src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemmgr.c | 7 +
src/share/native/sun/security/pkcs11/wrapper/p11_convert.c | 422 ++++-
src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c | 296 ++-
src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h | 36 +
src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h | 13 +-
src/solaris/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java | 7 +-
src/solaris/instrument/FileSystemSupport_md.c | 28 +-
src/solaris/native/java/net/net_util_md.c | 15 +-
src/solaris/native/sun/awt/awt_GTKToolkit.c | 3 +-
src/solaris/native/sun/awt/awt_UNIXToolkit.c | 2 +-
src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java | 37 +-
src/windows/classes/sun/security/mscapi/KeyStore.java | 239 +-
src/windows/classes/sun/security/mscapi/RSASignature.java | 6 +-
src/windows/instrument/FileSystemSupport_md.c | 27 +-
src/windows/native/java/net/NetworkInterface.c | 6 +-
src/windows/native/sun/net/www/protocol/http/ntlm/NTLMAuthentication.c | 107 +
src/windows/native/sun/nio/ch/DatagramDispatcher.c | 10 +-
src/windows/native/sun/nio/ch/WindowsSelectorImpl.c | 6 +-
src/windows/native/sun/security/krb5/NativeCreds.c | 32 +-
src/windows/native/sun/security/mscapi/security.cpp | 366 +++-
src/windows/native/sun/security/pkcs11/wrapper/p11_md.c | 50 +-
src/windows/native/sun/windows/WPrinterJob.cpp | 8 +-
test/com/sun/crypto/provider/Cipher/PBE/PBEInvalidParamsTest.java | 18 +-
test/com/sun/crypto/provider/Cipher/PBE/PBEKeysAlgorithmNames.java | 13 +-
test/com/sun/crypto/provider/Cipher/PBE/PBEParametersTest.java | 18 +-
test/com/sun/crypto/provider/Cipher/PBE/PBES2Test.java | 138 +
test/com/sun/crypto/provider/Cipher/PBE/PKCS12Cipher.java | 13 +-
test/com/sun/crypto/provider/Cipher/PBE/PKCS12Oid.java | 20 +-
test/com/sun/crypto/provider/Mac/HmacPBESHA1.java | 44 +-
test/com/sun/crypto/provider/Mac/HmacSaltLengths.java | 15 +-
test/com/sun/crypto/provider/Mac/MacClone.java | 24 +-
test/com/sun/jndi/ldap/DisconnectNPETest.java | 198 ++
test/sun/security/mscapi/CastError.java | 54 +
test/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.sh | 100 +
test/sun/security/mscapi/nonUniqueAliases/nonUniq1.pem | 13 +
test/sun/security/mscapi/nonUniqueAliases/nonUniq2.pem | 13 +
test/sun/security/pkcs11/fips/TestTLS12.java | 450 +++++
test/sun/security/pkcs11/fips/cert8.db | Bin
test/sun/security/pkcs11/fips/key3.db | Bin
test/sun/security/pkcs11/fips/keystore | Bin
test/sun/security/ssl/SSLContextImpl/CustomizedCipherSuites.java | 275 +++
test/sun/security/ssl/javax/net/ssl/NewAPIs/JSSERenegotiate.java | 7 +-
test/sun/security/tools/jarsigner/TimestampCheck.java | 212 ++-
test/sun/security/tools/jarsigner/warnings/AliasNotInStoreTest.java | 32 +-
test/sun/security/tools/jarsigner/warnings/BadExtendedKeyUsageTest.java | 19 +-
test/sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java | 18 +-
test/sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java | 36 +-
test/sun/security/tools/jarsigner/warnings/ChainNotValidatedTest.java | 133 +-
test/sun/security/tools/jarsigner/warnings/HasExpiredCertTest.java | 19 +-
test/sun/security/tools/jarsigner/warnings/HasExpiringCertTest.java | 19 +-
test/sun/security/tools/jarsigner/warnings/HasUnsignedEntryTest.java | 17 +-
test/sun/security/tools/jarsigner/warnings/MultipleWarningsTest.java | 32 +-
test/sun/security/tools/jarsigner/warnings/NoTimestampTest.java | 14 +-
test/sun/security/tools/jarsigner/warnings/NotSignedByAliasTest.java | 34 +-
test/sun/security/tools/jarsigner/warnings/NotYetValidCertTest.java | 16 +-
test/sun/security/tools/jarsigner/warnings/Test.java | 87 +-
test/sun/security/tools/jarsigner/warnings/bad_netscape_cert_type.jks.base64 | 26 -
test/sun/security/tools/jarsigner/warnings/bad_netscape_cert_type.sh | 48 -
156 files changed, 8144 insertions(+), 2221 deletions(-)
diffs (truncated from 15276 to 500 lines):
diff -r f6e711e276ad -r 6093d128c588 .hgtags
--- a/.hgtags Fri Feb 15 18:32:18 2019 +0000
+++ b/.hgtags Mon Feb 25 01:45:18 2019 +0000
@@ -687,3 +687,7 @@
25542ea9adead21edc0041685d6930fdd8c7a53b icedtea-2.6.15
2c8fc8aa5524b3bfc95364d97c8ee1a42899d358 jdk7u201-b00
b624599b602c6a7b04650104c8f7cca8436bc706 icedtea-2.6.16
+0839b7f5f978b4ff1865c8558f4a7ff64a397583 icedtea-2.6.17pre01
+a2b9c221a234c108fe5a0ab574182ae0a4a1f16f jdk7u211-b00
+f992c97c7f1e47b8a0dacddb5b91ac2e937c4eb8 jdk7u211-b01
+303a29c24e3b1c876b4142f14d5dcacdbc33fac4 jdk7u211-b02
diff -r f6e711e276ad -r 6093d128c588 make/com/sun/crypto/provider/Makefile
--- a/make/com/sun/crypto/provider/Makefile Fri Feb 15 18:32:18 2019 +0000
+++ b/make/com/sun/crypto/provider/Makefile Mon Feb 25 01:45:18 2019 +0000
@@ -126,6 +126,7 @@
# Subdirectories of these are automatically included.
#
AUTO_FILES_JAVA_DIRS = \
+ com/sun/crypto/spec \
com/sun/crypto/provider
include $(BUILDDIR)/common/Classes.gmk
diff -r f6e711e276ad -r 6093d128c588 make/common/Release.gmk
--- a/make/common/Release.gmk Fri Feb 15 18:32:18 2019 +0000
+++ b/make/common/Release.gmk Mon Feb 25 01:45:18 2019 +0000
@@ -608,6 +608,7 @@
$(ECHO) "com/sun/net/ssl/internal/ssl/" >> $@
$(ECHO) "javax/crypto/" >> $@
$(ECHO) "sun/security/internal/" >> $@
+ $(ECHO) "com/sun/crypto/spec/" >> $@
$(ECHO) "com/sun/crypto/provider/" >> $@
$(ECHO) "META-INF/services/com.sun.tools.attach.spi.AttachProvider" >> $@
$(ECHO) "com/sun/tools/attach/" >> $@
diff -r f6e711e276ad -r 6093d128c588 make/java/java/mapfile-vers
--- a/make/java/java/mapfile-vers Fri Feb 15 18:32:18 2019 +0000
+++ b/make/java/java/mapfile-vers Mon Feb 25 01:45:18 2019 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
diff -r f6e711e276ad -r 6093d128c588 make/java/net/Makefile
--- a/make/java/net/Makefile Fri Feb 15 18:32:18 2019 +0000
+++ b/make/java/net/Makefile Mon Feb 25 01:45:18 2019 +0000
@@ -115,7 +115,7 @@
else
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS = ws2_32.lib $(JVMLIB) \
- secur32.lib iphlpapi.lib delayimp.lib \
+ secur32.lib iphlpapi.lib delayimp.lib urlmon.lib \
/DELAYLOAD:secur32.dll /DELAYLOAD:iphlpapi.dll
else
OTHER_LDLIBS = $(LIBSOCKET) $(LIBNSL) $(JVMLIB)
diff -r f6e711e276ad -r 6093d128c588 make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh Fri Feb 15 18:32:18 2019 +0000
+++ b/make/jdk_generic_profile.sh Mon Feb 25 01:45:18 2019 +0000
@@ -672,7 +672,7 @@
# IcedTea versioning
export ICEDTEA_NAME="IcedTea"
-export PACKAGE_VERSION="2.6.16"
+export PACKAGE_VERSION="2.6.17"
export DERIVATIVE_ID="${ICEDTEA_NAME} ${PACKAGE_VERSION}"
echo "Building ${DERIVATIVE_ID}"
diff -r f6e711e276ad -r 6093d128c588 make/sun/javazic/tzdata/VERSION
--- a/make/sun/javazic/tzdata/VERSION Fri Feb 15 18:32:18 2019 +0000
+++ b/make/sun/javazic/tzdata/VERSION Mon Feb 25 01:45:18 2019 +0000
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2018e
+tzdata2018g
diff -r f6e711e276ad -r 6093d128c588 make/sun/javazic/tzdata/africa
--- a/make/sun/javazic/tzdata/africa Fri Feb 15 18:32:18 2019 +0000
+++ b/make/sun/javazic/tzdata/africa Mon Feb 25 01:45:18 2019 +0000
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
+# tzdb data for Africa and environs
+
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
@@ -29,7 +31,7 @@
# tz at iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
-# From Paul Eggert (2017-04-09):
+# From Paul Eggert (2018-05-27):
#
# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -74,13 +76,15 @@
# I vaguely recall 'WAT' also being used for -01 in the past but
# cannot now come up with solid citations.
#
-# I invented the following abbreviations; corrections are welcome!
-# +02 WAST West Africa Summer Time (no longer used)
-# +03 CAST Central Africa Summer Time (no longer used)
-# +03 SAST South Africa Summer Time (no longer used)
+# I invented the following abbreviations in the 1990s:
+# +02 WAST West Africa Summer Time
+# +03 CAST Central Africa Summer Time
+# +03 SAST South Africa Summer Time
# +03 EAT East Africa Time
-# 'EAT' also seems to have caught on; the others are rare but are paired
-# with better-attested non-DST abbreviations.
+# 'EAT' seems to have caught on and is in current timestamps, and though
+# the other abbreviations are rarer and are only in past timestamps,
+# they are paired with better-attested non-DST abbreviations.
+# Corrections are welcome.
# Algeria
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -385,6 +389,13 @@
# Eritrea
# Ethiopia
# See Africa/Nairobi.
+#
+# Unfortunately tzdb records only Western clock time in use in Ethiopia,
+# as the tzdb format is not up to properly recording a common Ethiopian
+# timekeeping practice that is based on solar time. See:
+# Mortada D. If you have a meeting in Ethiopia, you'd better double
+# check the time. PRI's The World. 2015-01-30 15:15 -05.
+# https://www.pri.org/stories/2015-01-30/if-you-have-meeting-ethiopia-you-better-double-check-time
# Gabon
# See Africa/Lagos.
@@ -856,94 +867,61 @@
# <https://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/> agrees
# with the patch.
-# From Paul Eggert (2015-06-08):
-# For now, guess that later spring and fall transitions will use 2015's rules,
-# and guess that Morocco will switch to standard time at 03:00 the last
-# Sunday before Ramadan, and back to DST at 02:00 the first Sunday after
-# Ramadan. To implement this, transition dates for 2016 through 2037 were
-# determined by running the following program under GNU Emacs 24.3, with the
-# results integrated by hand into the table below.
-# (let ((islamic-year 1437))
-# (require 'cal-islam)
-# (while (< islamic-year 1460)
-# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
-# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
-# (sunday 0))
-# (while (/= sunday (mod (setq a (1- a)) 7)))
-# (while (/= sunday (mod b 7))
-# (setq b (1+ b)))
-# (setq a (calendar-gregorian-from-absolute a))
-# (setq b (calendar-gregorian-from-absolute b))
-# (insert
-# (format
-# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t0\t-\n"
-# "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t1:00\tS\n")
-# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
-# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
-# (setq islamic-year (+ 1 islamic-year))))
+# From Mohamed Essedik Najd (2018-10-26):
+# Today, a Moroccan government council approved the perpetual addition
+# of 60 minutes to the regular Moroccan timezone.
+# From Brian Inglis (2018-10-26):
+# http://www.maroc.ma/fr/actualites/le-conseil-de-gouvernement-adopte-un-projet-de-decret-relatif-lheure-legale-stipulant-le
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-
-Rule Morocco 1939 only - Sep 12 0:00 1:00 S
+Rule Morocco 1939 only - Sep 12 0:00 1:00 -
Rule Morocco 1939 only - Nov 19 0:00 0 -
-Rule Morocco 1940 only - Feb 25 0:00 1:00 S
+Rule Morocco 1940 only - Feb 25 0:00 1:00 -
Rule Morocco 1945 only - Nov 18 0:00 0 -
-Rule Morocco 1950 only - Jun 11 0:00 1:00 S
+Rule Morocco 1950 only - Jun 11 0:00 1:00 -
Rule Morocco 1950 only - Oct 29 0:00 0 -
-Rule Morocco 1967 only - Jun 3 12:00 1:00 S
+Rule Morocco 1967 only - Jun 3 12:00 1:00 -
Rule Morocco 1967 only - Oct 1 0:00 0 -
-Rule Morocco 1974 only - Jun 24 0:00 1:00 S
+Rule Morocco 1974 only - Jun 24 0:00 1:00 -
Rule Morocco 1974 only - Sep 1 0:00 0 -
-Rule Morocco 1976 1977 - May 1 0:00 1:00 S
+Rule Morocco 1976 1977 - May 1 0:00 1:00 -
Rule Morocco 1976 only - Aug 1 0:00 0 -
Rule Morocco 1977 only - Sep 28 0:00 0 -
-Rule Morocco 1978 only - Jun 1 0:00 1:00 S
+Rule Morocco 1978 only - Jun 1 0:00 1:00 -
Rule Morocco 1978 only - Aug 4 0:00 0 -
-Rule Morocco 2008 only - Jun 1 0:00 1:00 S
+Rule Morocco 2008 only - Jun 1 0:00 1:00 -
Rule Morocco 2008 only - Sep 1 0:00 0 -
-Rule Morocco 2009 only - Jun 1 0:00 1:00 S
+Rule Morocco 2009 only - Jun 1 0:00 1:00 -
Rule Morocco 2009 only - Aug 21 0:00 0 -
-Rule Morocco 2010 only - May 2 0:00 1:00 S
+Rule Morocco 2010 only - May 2 0:00 1:00 -
Rule Morocco 2010 only - Aug 8 0:00 0 -
-Rule Morocco 2011 only - Apr 3 0:00 1:00 S
+Rule Morocco 2011 only - Apr 3 0:00 1:00 -
Rule Morocco 2011 only - Jul 31 0:00 0 -
-Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S
+Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 -
Rule Morocco 2012 only - Jul 20 3:00 0 -
-Rule Morocco 2012 only - Aug 20 2:00 1:00 S
+Rule Morocco 2012 only - Aug 20 2:00 1:00 -
Rule Morocco 2012 only - Sep 30 3:00 0 -
Rule Morocco 2013 only - Jul 7 3:00 0 -
-Rule Morocco 2013 only - Aug 10 2:00 1:00 S
-Rule Morocco 2013 max - Oct lastSun 3:00 0 -
-Rule Morocco 2014 2021 - Mar lastSun 2:00 1:00 S
+Rule Morocco 2013 only - Aug 10 2:00 1:00 -
+Rule Morocco 2013 2018 - Oct lastSun 3:00 0 -
+Rule Morocco 2014 2018 - Mar lastSun 2:00 1:00 -
Rule Morocco 2014 only - Jun 28 3:00 0 -
-Rule Morocco 2014 only - Aug 2 2:00 1:00 S
+Rule Morocco 2014 only - Aug 2 2:00 1:00 -
Rule Morocco 2015 only - Jun 14 3:00 0 -
-Rule Morocco 2015 only - Jul 19 2:00 1:00 S
+Rule Morocco 2015 only - Jul 19 2:00 1:00 -
Rule Morocco 2016 only - Jun 5 3:00 0 -
-Rule Morocco 2016 only - Jul 10 2:00 1:00 S
+Rule Morocco 2016 only - Jul 10 2:00 1:00 -
Rule Morocco 2017 only - May 21 3:00 0 -
-Rule Morocco 2017 only - Jul 2 2:00 1:00 S
+Rule Morocco 2017 only - Jul 2 2:00 1:00 -
Rule Morocco 2018 only - May 13 3:00 0 -
-Rule Morocco 2018 only - Jun 17 2:00 1:00 S
-Rule Morocco 2019 only - May 5 3:00 0 -
-Rule Morocco 2019 only - Jun 9 2:00 1:00 S
-Rule Morocco 2020 only - Apr 19 3:00 0 -
-Rule Morocco 2020 only - May 24 2:00 1:00 S
-Rule Morocco 2021 only - Apr 11 3:00 0 -
-Rule Morocco 2021 only - May 16 2:00 1:00 S
-Rule Morocco 2022 only - May 8 2:00 1:00 S
-Rule Morocco 2023 only - Apr 23 2:00 1:00 S
-Rule Morocco 2024 only - Apr 14 2:00 1:00 S
-Rule Morocco 2025 only - Apr 6 2:00 1:00 S
-Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
-Rule Morocco 2036 only - Oct 19 3:00 0 -
-Rule Morocco 2037 only - Oct 4 3:00 0 -
+Rule Morocco 2018 only - Jun 17 2:00 1:00 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
- 0:00 Morocco WE%sT 1984 Mar 16
- 1:00 - CET 1986
- 0:00 Morocco WE%sT
+ 0:00 Morocco +00/+01 1984 Mar 16
+ 1:00 - +01 1986
+ 0:00 Morocco +00/+01 2018 Oct 27
+ 1:00 - +01
# Western Sahara
#
@@ -958,7 +936,8 @@
Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún
-1:00 - -01 1976 Apr 14
- 0:00 Morocco WE%sT
+ 0:00 Morocco +00/+01 2018 Oct 27
+ 1:00 - +01
# Mozambique
#
diff -r f6e711e276ad -r 6093d128c588 make/sun/javazic/tzdata/antarctica
--- a/make/sun/javazic/tzdata/antarctica Fri Feb 15 18:32:18 2019 +0000
+++ b/make/sun/javazic/tzdata/antarctica Mon Feb 25 01:45:18 2019 +0000
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
+# tzdb data for Antarctica and environs
+
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
diff -r f6e711e276ad -r 6093d128c588 make/sun/javazic/tzdata/asia
--- a/make/sun/javazic/tzdata/asia Fri Feb 15 18:32:18 2019 +0000
+++ b/make/sun/javazic/tzdata/asia Mon Feb 25 01:45:18 2019 +0000
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
+# tzdb data for Asia and environs
+
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
@@ -29,7 +31,7 @@
# tz at iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
-# From Paul Eggert (2017-01-13):
+# From Paul Eggert (2018-06-19):
#
# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -58,7 +60,8 @@
# A reliable and entertaining source about time zones is
# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
#
-# The following alphabetic abbreviations appear in these tables:
+# The following alphabetic abbreviations appear in these tables
+# (corrections are welcome):
# std dst
# LMT Local Mean Time
# 2:00 EET EEST Eastern European Time
@@ -67,11 +70,13 @@
# 7:00 WIB west Indonesia (Waktu Indonesia Barat)
# 8:00 WITA central Indonesia (Waktu Indonesia Tengah)
# 8:00 CST China
+# 8:00 PST PDT* Philippine Standard Time
# 8:30 KST KDT Korea when at +0830
# 9:00 WIT east Indonesia (Waktu Indonesia Timur)
# 9:00 JST JDT Japan
# 9:00 KST KDT Korea when at +09
# 9:30 ACST Australian Central Standard Time
+# *I invented the abbreviation PDT; see "Philippines" below.
# Otherwise, these tables typically use numeric abbreviations like +03
# and +0330 for integer hour and minute UT offsets. Although earlier
# editions invented alphabetic time zone abbreviations for every
@@ -304,6 +309,29 @@
# China
+# From Paul Eggert (2018-10-02):
+# The following comes from Table 1 of:
+# Li Yu. Research on the daylight saving movement in 1940s Shanghai.
+# Nanjing Journal of Social Sciences. 2014;(2):144-50.
+# http://oversea.cnki.net/kns55/detail.aspx?dbname=CJFD2014&filename=NJSH201402020
+# The table lists dates only; I am guessing 00:00 and 24:00 transition times.
+# Also, the table lists the planned end of DST in 1949, but the corresponding
+# zone line cuts this off on May 28, when the Communists took power.
+#
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Shang 1940 only - Jun 1 0:00 1:00 D
+Rule Shang 1940 only - Oct 12 24:00 0 S
+Rule Shang 1941 only - Mar 15 0:00 1:00 D
+Rule Shang 1941 only - Nov 1 24:00 0 S
+Rule Shang 1942 only - Jan 31 0:00 1:00 D
+Rule Shang 1945 only - Sep 1 24:00 0 S
+Rule Shang 1946 only - May 15 0:00 1:00 D
+Rule Shang 1946 only - Sep 30 24:00 0 S
+Rule Shang 1947 only - Apr 15 0:00 1:00 D
+Rule Shang 1947 only - Oct 31 24:00 0 S
+Rule Shang 1948 1949 - May 1 0:00 1:00 D
+Rule Shang 1948 1949 - Sep 30 24:00 0 S #plan
+
# From Guy Harris:
# People's Republic of China. Yes, they really have only one time zone.
@@ -330,18 +358,33 @@
# time - sort of", Los Angeles Times, 1986-05-05 ... [says] that China began
# observing daylight saving time in 1986.
-# From Paul Eggert (2014-06-30):
-# Shanks & Pottenger have China switching to a single time zone in 1980, but
-# this doesn't seem to be correct. They also write that China observed summer
-# DST from 1986 through 1991, which seems to match the above commentary, so
-# go with them for DST rules as follows:
+# From P Chan (2018-05-07):
+# The start and end time of DST in China [from 1986 on] should be 2:00
+# (i.e. 2:00 to 3:00 at the start and 2:00 to 1:00 at the end)....
+# Government notices about summer time:
+#
+# 1986-04-12 http://www.zj.gov.cn/attach/zfgb/198608.pdf p.21-22
+# (To establish summer time from 1986. On 4 May, set the clocks ahead one hour
+# at 2 am. On 14 September, set the clocks backward one hour at 2 am.)
+#
+# 1987-02-15 http://www.gov.cn/gongbao/shuju/1987/gwyb198703.pdf p.114
+# (Summer time in 1987 to start from 12 April until 13 September)
+#
+# 1987-09-09 http://www.gov.cn/gongbao/shuju/1987/gwyb198721.pdf p.709
+# (From 1988, summer time to start from 2 am of the first Sunday of mid-April
+# until 2 am of the first Sunday of mid-September)
+#
+# 1992-03-03 http://www.gov.cn/gongbao/shuju/1992/gwyb199205.pdf p.152
+# (To suspend summer time from 1992)
+#
+# The first page of People's Daily on 12 April 1988 stating that summer time
+# to begin on 17 April.
+# http://data.people.com.cn/pic/101p/1988/04/1988041201.jpg
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Shang 1940 only - Jun 3 0:00 1:00 D
-Rule Shang 1940 1941 - Oct 1 0:00 0 S
-Rule Shang 1941 only - Mar 16 0:00 1:00 D
-Rule PRC 1986 only - May 4 0:00 1:00 D
-Rule PRC 1986 1991 - Sep Sun>=11 0:00 0 S
-Rule PRC 1987 1991 - Apr Sun>=10 0:00 1:00 D
+Rule PRC 1986 only - May 4 2:00 1:00 D
+Rule PRC 1986 1991 - Sep Sun>=11 2:00 0 S
+Rule PRC 1987 1991 - Apr Sun>=11 2:00 1:00 D
# From Anthony Fok (2001-12-20):
# BTW, I did some research on-line and found some info regarding these five
@@ -363,10 +406,11 @@
# Alois Treindl kindly sent me translations of the following two sources:
#
# (1)
-# Guo Qingsheng (National Time-Service Center, CAS, Xi'an 710600, China)
+# Guo Qing-sheng (National Time-Service Center, CAS, Xi'an 710600, China)
# Beijing Time at the Beginning of the PRC
# China Historical Materials of Science and Technology
-# (Zhongguo ke ji shi liao, ä¸å›½ç§‘技å²æ–™), Vol. 24, No. 1 (2003)
+# (Zhongguo ke ji shi liao, ä¸å›½ç§‘技å²æ–™). 2003;24(1):5-9.
+# http://oversea.cnki.net/kcms/detail/detail.aspx?filename=ZGKS200301000&dbname=CJFD2003
# It gives evidence that at the beginning of the PRC, Beijing time was
# officially apparent solar time! However, Guo also says that the
# evidence is dubious, as the relevant institute of astronomy had not
@@ -543,7 +587,7 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
# Beijing time, used throughout China; represented by Shanghai.
Zone Asia/Shanghai 8:05:43 - LMT 1901
- 8:00 Shang C%sT 1949
+ 8:00 Shang C%sT 1949 May 28
8:00 PRC C%sT
# Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
# / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.)
@@ -772,24 +816,140 @@
8:00 Taiwan C%sT
# Macau (Macao, Aomen)
+#
+# From P Chan (2018-05-10):
+# * LegisMac
+# http://legismac.safp.gov.mo/legismac/descqry/Descqry.jsf?lang=pt
+# A database for searching titles of legal documents of Macau in
+# Chinese and Portuguese. The term "HORÃRIO DE VERÃO" can be used for
+# searching decrees about summer time.
+# * Archives of Macao
+# http://www.archives.gov.mo/en/bo/
+# It contains images of old official gazettes.
+# * The Macao Meteorological and Geophysical Bureau have a page listing the
+# summer time history. But it is not complete and has some mistakes.
+# http://www.smg.gov.mo/smg/geophysics/e_t_Summer%20Time.htm
+# Macau adopted GMT+8 on 30 Oct 1904 to follow Hong Kong. Clocks were
+# advanced by 25 minutes and 50 seconds. Which means the LMT used was
+# +7:34:10. As stated in the "Portaria No. 204" dated 21 October 1904
+# and published in the Official Gazette on 29 October 1904.
+# http://igallery.icm.gov.mo/Images/Archives/BO/MO_AH_PUB_BO_1904_10/MO_AH_PUB_BO_1904_10_00025_Grey.JPG
+#
+# Therefore the 1911 decree of Portugal did not change time in Macau.
+#
+# From LegisMac, here is a list of decrees that changed the time ...
+# [Decree Gazette-no. date; titles omitted in this quotation]
+# DIL 732 BOCM 51 1941.12.20
+# DIL 764 BOCM 9S 1942.04.30
+# DIL 781 BOCM 21 1942.10.10
+# PT 3434 BOCM 8S 1943.04.17
+# PT 3504 BOCM 20 1943.09.25
+# PT 3843 BOCM 39 1945.09.29
+# PT 3961 BOCM 17 1946.04.27
+# PT 4026 BOCM 39 1946.09.28
+# PT 4153 BOCM 16 1947.04.10
+# PT 4271 BOCM 48 1947.11.29
+# PT 4374 BOCM 18 1948.05.01
+# PT 4465 BOCM 44 1948.10.30
+# PT 4590 BOCM 14 1949.04.02
+# PT 4666 BOCM 44 1949.10.29
+# PT 4771 BOCM 12 1950.03.25
+# PT 4838 BOCM 43 1950.10.28
+# PT 4946 BOCM 12 1951.03.24
+# PT 5025 BO 43 1951.10.27
+# PT 5149 BO 14 1952.04.05
+# PT 5251 BO 43 1952.10.25
+# PT 5366 BO 13 1953.03.28
+# PT 5444 BO 44 1953.10.31
+# PT 5540 BO 12 1954.03.20
+# PT 5589 BO 44 1954.10.30
+# PT 5676 BO 12 1955.03.19
+# PT 5739 BO 45 1955.11.05
+# PT 5823 BO 11 1956.03.17
+# PT 5891 BO 44 1956.11.03
+# PT 5981 BO 12 1957.03.23
+# PT 6064 BO 43 1957.10.26
+# PT 6172 BO 12 1958.03.22
+# PT 6243 BO 43 1958.10.25
+# PT 6341 BO 12 1959.03.21
+# PT 6411 BO 43 1959.10.24
+# PT 6514 BO 11 1960.03.12
+# PT 6584 BO 44 1960.10.29
+# PT 6721 BO 10 1961.03.11
+# PT 6815 BO 43 1961.10.28
+# PT 6947 BO 10 1962.03.10
+# PT 7080 BO 43 1962.10.27
+# PT 7218 BO 12 1963.03.23
+# PT 7340 BO 43 1963.10.26
+# PT 7491 BO 11 1964.03.14
+# PT 7664 BO 43 1964.10.24
+# PT 7846 BO 15 1965.04.10
+# PT 7979 BO 42 1965.10.16
+# PT 8146 BO 15 1966.04.09
+# PT 8252 BO 41 1966.10.08
+# PT 8429 BO 15 1967.04.15
+# PT 8540 BO 41 1967.10.14
More information about the distro-pkg-dev
mailing list