/hg/release/icedtea7-forest-2.5/jdk: 35 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Wed Jan 21 04:13:43 UTC 2015


changeset 7d15ddd8bd9f in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=7d15ddd8bd9f
author: aeriksso
date: Thu Jan 08 16:03:14 2015 +0000

	6461635: [TESTBUG] BasicTests.sh test fails intermittently
	Summary: Transform dummy class instead of BigInteger to avoid complication by -Xshare. Ported from script to java.
	Reviewed-by: sla, alanb
	Contributed-by: mattias.tobiasson at oracle.com


changeset f69c1bc93346 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=f69c1bc93346
author: dsamersoff
date: Thu Aug 09 17:42:55 2012 +0400

	7183753: [TEST] Some colon in the diff for this test
	Summary: Reference output file contains extra colon
	Reviewed-by: sspitsyn, mgronlun


changeset 17146fc9b4ad in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=17146fc9b4ad
author: mbankal
date: Wed Aug 06 04:26:22 2014 -0700

	8031046: Native Windows ccache might still get unsupported ticket
	Reviewed-by: weijun, coffeys


changeset 40a75335aff3 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=40a75335aff3
author: bae
date: Tue Aug 26 15:53:05 2014 +0100

	8040617: [macosx] Large JTable cell results in a OutOfMemoryException
	Reviewed-by: serb, prr


changeset 1c2be49fb61d in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=1c2be49fb61d
author: mcherkas
date: Wed Oct 29 23:33:38 2014 +0400

	8041572: [macosx] huge native memory leak in AWTWindow.m
	Reviewed-by: pchelko, serb


changeset 43245d9c82e1 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=43245d9c82e1
author: dmarkov
date: Wed Aug 06 12:42:25 2014 +0400

	8041990: [macosx] Language specific keys does not work in applets when opened outside the browser
	Reviewed-by: alexsch, serb


changeset 5a81dcf28686 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=5a81dcf28686
author: aivanov
date: Sat Aug 23 01:15:40 2014 +0400

	8043610: Sorting columns in JFileChooser fails with AppContext NPE
	Reviewed-by: anthony, alexsch


changeset 8483a9bfbb00 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=8483a9bfbb00
author: igerasim
date: Mon Sep 01 12:13:32 2014 +0400

	8046656: Update protocol support
	Reviewed-by: mullan, wetmore
	Contributed-by: jamil.nimeh at oracle.com


changeset 1974f0e56589 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=1974f0e56589
author: robm
date: Tue Oct 21 15:33:45 2014 +0100

	8048035: Ensure proper proxy protocols
	Reviewed-by: michaelm, coffeys


changeset 1ebbaf572262 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=1ebbaf572262
author: aefimov
date: Sun Jul 13 22:42:00 2014 +0400

	8025051: Update resource files for TimeZone display names
	Reviewed-by: okutsu, mfang


changeset 6ff1ecbfb772 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=6ff1ecbfb772
author: aefimov
date: Fri Sep 12 14:23:54 2014 +0400

	8049343: (tz) Support tzdata2014g
	Reviewed-by: mfang, okutsu


changeset d06ba1cf0380 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=d06ba1cf0380
author: dmarkov
date: Wed Sep 17 12:59:08 2014 +0400

	8051359: JPopupMenu creation in headless mode with JDK9b23 causes NPE
	Reviewed-by: serb, pchelko


changeset 653bbb472023 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=653bbb472023
author: igerasim
date: Thu May 29 01:50:50 2014 +0400

	7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true
	Reviewed-by: valeriep


changeset 3585d301d447 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=3585d301d447
author: igerasim
date: Tue Jul 15 02:26:55 2014 +0400

	8049250: Need a flag to invert the Card.disconnect(reset) argument
	Reviewed-by: valeriep


changeset 0f310ccb55ce in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=0f310ccb55ce
author: igerasim
date: Fri Aug 08 15:06:39 2014 +0400

	8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX
	Reviewed-by: mullan, valeriep


changeset ab77e9e01607 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=ab77e9e01607
author: coffeys
date: Wed Jul 23 20:14:02 2014 +0100

	8051614: smartcardio TCK tests fail due to lack of 'reset' permission
	Reviewed-by: valeriep


changeset e47e8b161311 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=e47e8b161311
author: alexsch
date: Wed Sep 24 13:32:29 2014 +0400

	8055304: More boxing for DirectoryComboBoxModel
	Reviewed-by: serb, prr, skoivu


changeset 862de6440369 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=862de6440369
author: igerasim
date: Thu Oct 16 22:49:04 2014 +0400

	8055309: RMI needs better transportation considerations
	Reviewed-by: alanb, skoivu, msheppar


changeset b49cb68f819c in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=b49cb68f819c
author: bae
date: Wed Oct 08 11:05:31 2014 +0400

	8055489: Better substitution formats
	Reviewed-by: prr


changeset 80041a1f79cf in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=80041a1f79cf
author: aivanov
date: Thu Sep 04 19:16:55 2014 +0400

	8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure
	Reviewed-by: pchelko, alexsch


changeset 3d853fbf7999 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=3d853fbf7999
author: robm
date: Tue Oct 07 13:23:30 2014 +0100

	8056264: Multicast support improvements
	Summary: avoid passing a null ifname string to GetStringUTFChars native fn calls within a NetworkInterface method call flows
	Reviewed-by: msheppar, coffeys


changeset d771092f8068 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=d771092f8068
author: bae
date: Tue Oct 07 12:12:52 2014 +0400

	8056276: Fontmanager feature improvements
	Reviewed-by: prr


changeset a43df294f811 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=a43df294f811
author: igerasim
date: Wed Oct 08 10:43:46 2014 +0400

	8057555: Less cryptic cipher suite management
	Reviewed-by: xuelei
	Contributed-by: jamil.j.nimeh at oracle.com


changeset 09c014e10e70 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=09c014e10e70
author: aefimov
date: Wed Nov 05 13:01:23 2014 +0300

	8059206: (tz) Support tzdata2014i
	Reviewed-by: okutsu


changeset 7bbc5241a4cd in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=7bbc5241a4cd
author: igerasim
date: Mon Oct 13 10:19:35 2014 +0400

	8059485: Resolve parsing ambiguity
	Reviewed-by: mullan, vinnie


changeset b007a96ec99f in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=b007a96ec99f
author: igerasim
date: Wed Oct 22 10:23:55 2014 +0400

	8060474: Resolve more parsing ambiguity
	Reviewed-by: mullan, ahgross
	Contributed-by: weijun.wang at oracle.com


changeset 9c653aa22bef in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=9c653aa22bef
author: igerasim
date: Tue Nov 04 22:22:17 2014 +0300

	8061210: Issues in TLS
	Reviewed-by: xuelei, wetmore, coffeys


changeset 25b01228ee78 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=25b01228ee78
author: igerasim
date: Thu Oct 23 12:35:02 2014 +0400

	8061826: Part of JDK-8060474 should be reverted
	Reviewed-by: mullan, ahgross
	Contributed-by: weijun.wang at oracle.com


changeset bc20879cdcc9 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=bc20879cdcc9
author: alexsch
date: Wed Nov 05 16:00:40 2014 +0400

	8062561: Test bug8055304 fails if file system default directory has read access
	Reviewed-by: serb


changeset 8f6f747b4945 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=8f6f747b4945
author: igerasim
date: Mon Nov 17 20:20:20 2014 +0300

	8062807: Exporting RMI objects fails when run under restrictive SecurityManager
	Reviewed-by: smarks


changeset 24a8200d581e in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=24a8200d581e
author: aefimov
date: Tue Nov 25 17:04:11 2014 +0300

	8064560: (tz) Support tzdata2014j
	Reviewed-by: okutsu


changeset be2b9a86e1c4 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=be2b9a86e1c4
author: mfang
date: Mon Nov 24 10:03:57 2014 -0800

	8065608: 7u75 l10n resource file translation update
	Reviewed-by: yhuang


changeset 563c5fce9ed1 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=563c5fce9ed1
author: mfang
date: Mon Dec 08 08:54:59 2014 -0800

	8066747: Backing out Japanese translation change in awt_ja.properties
	Reviewed-by: yhuang


changeset 1e6db4f8b0f3 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=1e6db4f8b0f3
author: andrew
date: Thu Jan 08 20:19:49 2015 +0000

	Bump to icedtea-2.5.4


changeset e445e197507e in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=e445e197507e
author: andrew
date: Wed Jan 21 03:56:42 2015 +0000

	Added tag icedtea-2.5.4 for changeset 1e6db4f8b0f3


diffstat:

 .hgtags                                                                                           |     1 +
 make/jdk_generic_profile.sh                                                                       |     2 +-
 make/sun/javazic/tzdata/VERSION                                                                   |    10 +-
 make/sun/javazic/tzdata/africa                                                                    |   803 ++---
 make/sun/javazic/tzdata/antarctica                                                                |   134 +-
 make/sun/javazic/tzdata/asia                                                                      |  1065 ++++---
 make/sun/javazic/tzdata/australasia                                                               |   984 +++---
 make/sun/javazic/tzdata/backward                                                                  |     9 +-
 make/sun/javazic/tzdata/etcetera                                                                  |     3 +-
 make/sun/javazic/tzdata/europe                                                                    |  1379 ++++++---
 make/sun/javazic/tzdata/factory                                                                   |     1 -
 make/sun/javazic/tzdata/iso3166.tab                                                               |    12 +-
 make/sun/javazic/tzdata/leapseconds                                                               |     8 +-
 make/sun/javazic/tzdata/northamerica                                                              |   744 ++--
 make/sun/javazic/tzdata/pacificnew                                                                |     1 -
 make/sun/javazic/tzdata/southamerica                                                              |   498 +--
 make/sun/javazic/tzdata/systemv                                                                   |     1 -
 make/sun/javazic/tzdata/zone.tab                                                                  |    72 +-
 src/macosx/native/sun/awt/AWTWindow.m                                                             |     9 +-
 src/share/classes/com/sun/java/swing/SwingUtilities3.java                                         |     6 +-
 src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java                       |    13 +-
 src/share/classes/com/sun/jndi/ldap/BerDecoder.java                                               |     3 +
 src/share/classes/java/awt/Component.java                                                         |     2 +-
 src/share/classes/java/awt/EventQueue.java                                                        |     5 +
 src/share/classes/java/awt/event/InputMethodEvent.java                                            |    34 +-
 src/share/classes/java/net/MulticastSocket.java                                                   |     4 +-
 src/share/classes/javax/swing/JComponent.java                                                     |     8 +-
 src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java                                  |    13 +-
 src/share/classes/sun/awt/AWTAccessor.java                                                        |     5 +
 src/share/classes/sun/awt/SunToolkit.java                                                         |    12 +-
 src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java                                      |     6 +-
 src/share/classes/sun/launcher/resources/launcher_de.properties                                   |     4 +-
 src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java                                |    13 +
 src/share/classes/sun/rmi/transport/Transport.java                                                |    35 +-
 src/share/classes/sun/rmi/transport/tcp/TCPTransport.java                                         |    21 +-
 src/share/classes/sun/security/jgss/GSSHeader.java                                                |     3 +
 src/share/classes/sun/security/jgss/GSSNameImpl.java                                              |     4 +
 src/share/classes/sun/security/jgss/wrapper/GSSNameElement.java                                   |     3 +
 src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java                        |    16 +-
 src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java                     |    78 +-
 src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java                         |    24 +-
 src/share/classes/sun/security/smartcardio/CardImpl.java                                          |    38 +-
 src/share/classes/sun/security/ssl/ClientHandshaker.java                                          |     7 +
 src/share/classes/sun/security/ssl/Handshaker.java                                                |   104 +-
 src/share/classes/sun/security/ssl/ProtocolVersion.java                                           |    27 +
 src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java                                   |     8 +
 src/share/classes/sun/security/ssl/SSLContextImpl.java                                            |   196 +-
 src/share/classes/sun/security/ssl/SSLEngineImpl.java                                             |    36 +-
 src/share/classes/sun/security/ssl/SSLSocketImpl.java                                             |    38 +-
 src/share/classes/sun/security/ssl/ServerHandshaker.java                                          |     7 +
 src/share/classes/sun/security/util/DerIndefLenConverter.java                                     |    21 +-
 src/share/classes/sun/security/util/DerInputStream.java                                           |     4 +
 src/share/classes/sun/swing/FilePane.java                                                         |     4 +
 src/share/classes/sun/swing/WindowsPlacesBar.java                                                 |     6 +-
 src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java                                |    13 +-
 src/share/classes/sun/tools/jconsole/resources/messages_ja.properties                             |     2 +-
 src/share/classes/sun/util/resources/TimeZoneNames.java                                           |    85 +-
 src/share/classes/sun/util/resources/TimeZoneNames_de.java                                        |    83 +-
 src/share/classes/sun/util/resources/TimeZoneNames_es.java                                        |    93 +-
 src/share/classes/sun/util/resources/TimeZoneNames_fr.java                                        |    83 +-
 src/share/classes/sun/util/resources/TimeZoneNames_it.java                                        |    83 +-
 src/share/classes/sun/util/resources/TimeZoneNames_ja.java                                        |    83 +-
 src/share/classes/sun/util/resources/TimeZoneNames_ko.java                                        |    83 +-
 src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java                                     |    83 +-
 src/share/classes/sun/util/resources/TimeZoneNames_sv.java                                        |    83 +-
 src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java                                     |    83 +-
 src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java                                     |    83 +-
 src/share/lib/security/java.security-linux                                                        |    11 +-
 src/share/lib/security/java.security-macosx                                                       |    11 +-
 src/share/lib/security/java.security-solaris                                                      |    11 +-
 src/share/lib/security/java.security-windows                                                      |    11 +-
 src/share/native/sun/font/layout/ContextualSubstSubtables.cpp                                     |     4 +-
 src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp                                   |     3 +
 src/share/native/sun/font/layout/Features.cpp                                                     |     3 +
 src/share/native/sun/font/layout/LETableReference.h                                               |     7 +-
 src/share/native/sun/font/layout/LigatureSubstSubtables.cpp                                       |     3 +
 src/share/native/sun/font/layout/MultipleSubstSubtables.cpp                                       |     2 +
 src/solaris/native/java/net/NetworkInterface.c                                                    |    28 +-
 src/solaris/native/java/net/PlainDatagramSocketImpl.c                                             |    19 +-
 src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java                                   |    55 +-
 src/windows/native/sun/security/krb5/NativeCreds.c                                                |    19 +-
 test/ProblemList.txt                                                                              |     3 -
 test/com/sun/tools/attach/AgentSetup.sh                                                           |    45 -
 test/com/sun/tools/attach/Application.java                                                        |    22 +-
 test/com/sun/tools/attach/ApplicationSetup.sh                                                     |    83 -
 test/com/sun/tools/attach/BasicTests.java                                                         |   345 +-
 test/com/sun/tools/attach/BasicTests.sh                                                           |    86 -
 test/com/sun/tools/attach/CommonSetup.sh                                                          |    81 -
 test/com/sun/tools/attach/PermissionTest.java                                                     |   130 +-
 test/com/sun/tools/attach/PermissionTests.sh                                                      |    72 -
 test/com/sun/tools/attach/ProviderTest.java                                                       |   104 +-
 test/com/sun/tools/attach/ProviderTests.sh                                                        |    51 -
 test/com/sun/tools/attach/RedefineAgent.java                                                      |     6 +-
 test/com/sun/tools/attach/RedefineDummy.java                                                      |    31 +
 test/com/sun/tools/attach/RunnerUtil.java                                                         |   180 +
 test/java/awt/im/8041990/bug8041990.java                                                          |   120 +
 test/javax/swing/JComponent/8043610/bug8043610.java                                               |   122 +
 test/sun/java2d/OpenGL/DrawHugeImageTest.java                                                     |   108 +
 test/sun/security/ec/TestEC.java                                                                  |     6 +-
 test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java                                         |     5 +
 test/sun/security/smartcardio/TestAll.java                                                        |     1 +
 test/sun/security/smartcardio/TestDirect.java                                                     |    48 +
 test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ProtocolVersion/HttpsProtocols.java            |     5 +
 test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/DelegatedTaskWrongException.java |     5 +-
 test/sun/security/ssl/javax/net/ssl/NewAPIs/testEnabledProtocols.java                             |     4 +
 test/sun/security/ssl/sanity/interop/CipherTest.java                                              |     4 +
 test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java                                    |     6 +
 test/sun/tools/jcmd/help_help.out                                                                 |     2 +-
 test/sun/util/resources/TimeZone/Bug6317929.java                                                  |    10 +-
 109 files changed, 5230 insertions(+), 4126 deletions(-)

diffs (truncated from 18477 to 500 lines):

diff -r 89d488d3bae9 -r e445e197507e .hgtags
--- a/.hgtags	Tue Jan 06 19:04:20 2015 +0000
+++ b/.hgtags	Wed Jan 21 03:56:42 2015 +0000
@@ -517,3 +517,4 @@
 c25a41237d27836a3bf01be344f7dc2fbc8f4bea icedtea-2.5.4pre01
 cc61d8104f31598a00c2b0208c45ca1c52b0762b icedtea-2.5.4pre02
 4a7c0da7e219ed2d1df27608388951b3dcdff57b icedtea-2.5.4pre03
+1e6db4f8b0f3c654be5d87504122bf776a066ef8 icedtea-2.5.4
diff -r 89d488d3bae9 -r e445e197507e make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh	Tue Jan 06 19:04:20 2015 +0000
+++ b/make/jdk_generic_profile.sh	Wed Jan 21 03:56:42 2015 +0000
@@ -625,7 +625,7 @@
 
 # IcedTea versioning
 export ICEDTEA_NAME="IcedTea"
-export PACKAGE_VERSION="2.5.4pre03"
+export PACKAGE_VERSION="2.5.4"
 export DERIVATIVE_ID="${ICEDTEA_NAME} ${PACKAGE_VERSION}"
 echo "Building ${DERIVATIVE_ID}"
 
diff -r 89d488d3bae9 -r e445e197507e make/sun/javazic/tzdata/VERSION
--- a/make/sun/javazic/tzdata/VERSION	Tue Jan 06 19:04:20 2015 +0000
+++ b/make/sun/javazic/tzdata/VERSION	Wed Jan 21 03:56:42 2015 +0000
@@ -1,24 +1,24 @@
 #
 # 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.
 #
-tzdata2014c
+tzdata2014j
diff -r 89d488d3bae9 -r e445e197507e make/sun/javazic/tzdata/africa
--- a/make/sun/javazic/tzdata/africa	Tue Jan 06 19:04:20 2015 +0000
+++ b/make/sun/javazic/tzdata/africa	Wed Jan 21 03:56:42 2015 +0000
@@ -21,36 +21,35 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# <pre>
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
-# This data is by no means authoritative; if you think you know better,
+# This file is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
-# tz at iana.org for general use in the future).
+# tz at iana.org for general use in the future).  For more, please see
+# the file CONTRIBUTING in the tz distribution.
 
-# From Paul Eggert (2013-02-21):
+# From Paul Eggert (2014-10-31):
 #
-# A good source for time zone historical data outside the U.S. is
+# Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
 # San Diego: ACS Publications, Inc. (2003).
+# Unfortunately this book contains many errors and cites no sources.
 #
 # Gwillim Law writes that a good source
 # for recent time zone data is the International Air Transport
 # Association's Standard Schedules Information Manual (IATA SSIM),
 # published semiannually.  Law sent in several helpful summaries
-# of the IATA's data after 1990.
-#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
+# of the IATA's data after 1990.  Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
 #
 # Another source occasionally used is Edward W. Whitman, World Time Differences,
 # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
 # I found in the UCLA library.
 #
 # For data circa 1899, a common source is:
-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
-# <http://www.jstor.org/stable/1774359>.
+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
+# http://www.jstor.org/stable/1774359
 #
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
@@ -58,13 +57,13 @@
 # Previous editions of this database used WAT, CAT, SAT, and EAT
 # for +0:00 through +3:00, respectively,
 # but Mark R V Murray reports that
-# `SAST' is the official abbreviation for +2:00 in the country of South Africa,
-# `CAT' is commonly used for +2:00 in countries north of South Africa, and
-# `WAT' is probably the best name for +1:00, as the common phrase for
-# the area that includes Nigeria is ``West Africa''.
-# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference.
+# 'SAST' is the official abbreviation for +2:00 in the country of South Africa,
+# 'CAT' is commonly used for +2:00 in countries north of South Africa, and
+# 'WAT' is probably the best name for +1:00, as the common phrase for
+# the area that includes Nigeria is "West Africa".
+# He has heard of "Western Sahara Time" for +0:00 but can find no reference.
 #
-# To make things confusing, `WAT' seems to have been used for -1:00 long ago;
+# To make things confusing, 'WAT' seems to have been used for -1:00 long ago;
 # I'd guess that this was because people needed _some_ name for -1:00,
 # and at the time, far west Africa was the only major land area in -1:00.
 # This usage is now obsolete, as the last use of -1:00 on the African
@@ -77,7 +76,7 @@
 #	 2:00	SAST	South Africa Standard Time
 # and Murray suggests the following abbreviation:
 #	 1:00	WAT	West Africa Time
-# I realize that this leads to `WAT' being used for both -1:00 and 1:00
+# I realize that this leads to 'WAT' being used for both -1:00 and 1:00
 # for times before 1976, but this is the best I can think of
 # until we get more information.
 #
@@ -88,7 +87,6 @@
 #	 3:00	CAST	Central Africa Summer Time (no longer used)
 #	 3:00	SAST	South Africa Summer Time (no longer used)
 #	 3:00	EAT	East Africa Time
-#	 4:00	EAST	East Africa Summer Time (no longer used)
 
 # Algeria
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -117,9 +115,9 @@
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
 # more precise 0:09:21.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15 0:01
-			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
-			0:00	Algeria	WE%sT	1940 Feb 25 2:00
+Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15  0:01
+			0:09:21	-	PMT	1911 Mar 11 # Paris Mean Time
+			0:00	Algeria	WE%sT	1940 Feb 25  2:00
 			1:00	Algeria	CE%sT	1946 Oct  7
 			0:00	-	WET	1956 Jan 29
 			1:00	-	CET	1963 Apr 14
@@ -129,92 +127,71 @@
 			1:00	-	CET
 
 # Angola
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Luanda	0:52:56	-	LMT	1892
-			0:52:04	-	AOT	1911 May 26 # Angola Time
-			1:00	-	WAT
-
 # Benin
-# Whitman says they switched to 1:00 in 1946, not 1934;
-# go with Shanks & Pottenger.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Porto-Novo	0:10:28	-	LMT	1912
-			0:00	-	GMT	1934 Feb 26
-			1:00	-	WAT
+# See Africa/Lagos.
 
 # Botswana
-# From Paul Eggert (2013-02-21):
-# Milne says they were regulated by the Cape Town Signal in 1899;
-# assume they switched to 2:00 when Cape Town did.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Gaborone	1:43:40 -	LMT	1885
-			1:30	-	SAST	1903 Mar
-			2:00	-	CAT	1943 Sep 19 2:00
-			2:00	1:00	CAST	1944 Mar 19 2:00
-			2:00	-	CAT
+# See Africa/Maputo.
 
 # Burkina Faso
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Burundi
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Bujumbura	1:57:28	-	LMT	1890
-			2:00	-	CAT
+# See Africa/Maputo.
 
 # Cameroon
-# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Douala	0:38:48	-	LMT	1912
-			1:00	-	WAT
+# See Africa/Lagos.
 
 # Cape Verde
+#
+# Shanks gives 1907 for the transition to CVT.
+# Perhaps the 1911-05-26 Portuguese decree
+# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
+# merely made it official?
+#
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907			# Praia
+Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907        # Praia
 			-2:00	-	CVT	1942 Sep
 			-2:00	1:00	CVST	1945 Oct 15
-			-2:00	-	CVT	1975 Nov 25 2:00
+			-2:00	-	CVT	1975 Nov 25  2:00
 			-1:00	-	CVT
 
 # Central African Republic
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Bangui	1:14:20	-	LMT	1912
-			1:00	-	WAT
+# See Africa/Lagos.
 
 # Chad
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Ndjamena	1:00:12 -	LMT	1912
+Zone	Africa/Ndjamena	1:00:12 -	LMT	1912        # N'Djamena
 			1:00	-	WAT	1979 Oct 14
 			1:00	1:00	WAST	1980 Mar  8
 			1:00	-	WAT
 
 # Comoros
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Comoro	2:53:04 -	LMT	1911 Jul   # Moroni, Gran Comoro
-			3:00	-	EAT
+# See Africa/Nairobi.
 
-# Democratic Republic of Congo
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov 9
-			1:00	-	WAT
-Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
-			2:00	-	CAT
+# Democratic Republic of the Congo
+# See Africa/Lagos for the western part and Africa/Maputo for the eastern.
 
 # Republic of the Congo
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Brazzaville	1:01:08 -	LMT	1912
-			1:00	-	WAT
+# See Africa/Lagos.
 
-# Cote D'Ivoire
+# Côte d'Ivoire / Ivory Coast
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
 			 0:00	-	GMT
+Link Africa/Abidjan Africa/Bamako	# Mali
+Link Africa/Abidjan Africa/Banjul	# Gambia
+Link Africa/Abidjan Africa/Conakry	# Guinea
+Link Africa/Abidjan Africa/Dakar	# Senegal
+Link Africa/Abidjan Africa/Freetown	# Sierra Leone
+Link Africa/Abidjan Africa/Lome		# Togo
+Link Africa/Abidjan Africa/Nouakchott	# Mauritania
+Link Africa/Abidjan Africa/Ouagadougou	# Burkina Faso
+Link Africa/Abidjan Africa/Sao_Tome	# São Tomé and Príncipe
+Link Africa/Abidjan Atlantic/St_Helena	# St Helena
 
 # Djibouti
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Djibouti	2:52:36 -	LMT	1911 Jul
-			3:00	-	EAT
+# See Africa/Nairobi.
 
 ###############################################################################
 
@@ -254,30 +231,26 @@
 # Egyptians would approve the cancellation."
 #
 # Egypt to cancel daylight saving time
-# <a href="http://www.almasryalyoum.com/en/node/407168">
 # http://www.almasryalyoum.com/en/node/407168
-# </a>
 # or
-# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt04.html">
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
-# </a>
 Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
-Rule	Egypt	1995	2005	-	Sep	lastThu	23:00s	0	-
+Rule	Egypt	1995	2005	-	Sep	lastThu	24:00	0	-
 # From Steffen Thorsen (2006-09-19):
 # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
 # Egypt will turn back clocks by one hour at the midnight of Thursday
 # after observing the daylight saving time since May.
 # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
-Rule	Egypt	2006	only	-	Sep	21	23:00s	0	-
+Rule	Egypt	2006	only	-	Sep	21	24:00	0	-
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
-# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
+# From Jesper Nørgaard Welen (2007-08-15): [The following agree:]
 # http://www.nentjes.info/Bill/bill5.htm
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
 # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
-Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s	0	-
+Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	0	-
 # From Abdelrahman Hassan (2007-09-06):
 # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
 # than the year of the Gregorian calendar, Ramadan shifts earlier each
@@ -311,15 +284,9 @@
 #
 # timeanddate[2] and another site I've found[3] also support that.
 #
-# [1] <a href="https://bugzilla.redhat.com/show_bug.cgi?id=492263">
-# https://bugzilla.redhat.com/show_bug.cgi?id=492263
-# </a>
-# [2] <a href="http://www.timeanddate.com/worldclock/clockchange.html?n=53">
-# http://www.timeanddate.com/worldclock/clockchange.html?n=53
-# </a>
-# [3] <a href="http://wwp.greenwichmeantime.com/time-zone/africa/egypt/">
-# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
-# </a>
+# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
+# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
+# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
 
 # From Arthur David Olson (2009-04-20):
 # In 2009 (and for the next several years), Ramadan ends before the fourth
@@ -329,14 +296,10 @@
 # From Steffen Thorsen (2009-08-11):
 # We have been able to confirm the August change with the Egyptian Cabinet
 # Information and Decision Support Center:
-# <a href="http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html">
 # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
-# </a>
 #
 # The Middle East News Agency
-# <a href="http://www.mena.org.eg/index.aspx">
 # http://www.mena.org.eg/index.aspx
-# </a>
 # also reports "Egypt starts winter time on August 21"
 # today in article numbered "71, 11/08/2009 12:25 GMT."
 # Only the title above is available without a subscription to their service,
@@ -344,67 +307,93 @@
 # (at least today).
 
 # From Alexander Krivenyshev (2010-07-20):
-# According to News from Egypt -  Al-Masry Al-Youm Egypt's cabinet has
+# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
 # decided that Daylight Saving Time will not be used in Egypt during
 # Ramadan.
 #
 # Arabic translation:
-# "Clocks to go back during Ramadan--and then forward again"
-# <a href="http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again">
+# "Clocks to go back during Ramadan - and then forward again"
 # http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
-# </a>
-# or
-# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt02.html">
 # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
-# </a>
 
 # From Ahmad El-Dardiry (2014-05-07):
 # Egypt is to change back to Daylight system on May 15
 # http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx
 
-# From Gunther Vermier (2015-05-13):
+# From Gunther Vermier (2014-05-13):
 # our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
 
-# From Paul Eggert (2014-05-13):
+# From Imed Chihi (2014-06-04):
+# We have finally "located" a precise official reference about the DST changes
+# in Egypt.  The Ministers Cabinet decision is explained at
+# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
+# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
+# translates into: "With regard to daylight saving time, it is scheduled to
+# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
+# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
+# and re-established again at the end of the month of Ramadan, at twelve
+# o'clock on the evening of Thursday, 31 JUL 2014."  This statement has been
+# reproduced by other (more accessible) sites[, e.g.,]...
+# http://elgornal.net/news/news.aspx?id=4699258
+
+# From Paul Eggert (2014-06-04):
 # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
 # the change is because of blackouts in Cairo, even though Ahram Online (cited
-# above) says DST had no affect on electricity consumption.  The AP story says
-# DST will not be observed during Ramadan.  There is no information about when
-# DST will end.  See:
+# above) says DST had no affect on electricity consumption.  There is
+# no information about when DST will end this fall.  See:
 # http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
 #
-# For now, guess that later transitions will use 2010's rules, and that
-# Egypt will agree with Morocco (see below) about the date Ramadan starts and
-# ends, though (unlike Morocco) it will switch at 00:00 standard time.  In
-# Egypt the spring-forward transitions are removed for 2020-2022, when the
-# guessed spring-forward date falls during the estimated Ramadan, and all
-# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
-# outside the guessed daylight-saving time.  Ramadan intrudes on the guessed
-# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
-
-Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
-Rule	Egypt	2009	only	-	Aug	20	23:00s	0	-
-Rule	Egypt	2010	only	-	Aug	11	0:00	0	-
-Rule	Egypt	2010	only	-	Sep	10	0:00	1:00	S
-Rule	Egypt	2010	only	-	Sep	lastThu	23:00s	0	-
+# For now, guess that later spring and fall transitions will use
+# 2010's rules, and guess that Egypt will switch to standard time at
+# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the
+# first Friday after Ramadan.  To implement this,
+# transition dates for 2015 through 2037 were determined by running
+# the following program under GNU Emacs 24.3, with the results integrated
+# by hand into the table below.  Ramadan again intrudes on the guessed
+# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff.
+# (let ((islamic-year 1436))
+#   (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)))
+#           (friday 5))
+#       (while (/= friday (mod a 7))
+#         (setq a (1- a)))
+#       (while (/= friday (mod b 7))
+#         (setq b (1+ b)))
+#       (setq a (1- a))
+#       (setq b (1- b))
+#       (setq a (calendar-gregorian-from-absolute a))
+#       (setq b (calendar-gregorian-from-absolute b))
+#       (insert
+#        (format
+#         (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n"
+#                 "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24: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))))
+Rule	Egypt	2008	only	-	Aug	lastThu	24:00	0	-
+Rule	Egypt	2009	only	-	Aug	20	24:00	0	-
+Rule	Egypt	2010	only	-	Aug	10	24:00	0	-
+Rule	Egypt	2010	only	-	Sep	 9	24:00	1:00	S
+Rule	Egypt	2010	only	-	Sep	lastThu	24:00	0	-
 Rule	Egypt	2014	only	-	May	15	24:00	1:00	S
-Rule	Egypt	2014	only	-	Jun	29	 0:00s	0	-
-Rule	Egypt	2014	only	-	Jul	29	 0:00s	1:00	S
-Rule	Egypt	2014	max	-	Sep	lastThu	23:00s	0	-
+Rule	Egypt	2014	only	-	Jun	26	24:00	0	-
+Rule	Egypt	2014	only	-	Jul	31	24:00	1:00	S
+Rule	Egypt	2014	max	-	Sep	lastThu	24:00	0	-
 Rule	Egypt	2015	2019	-	Apr	lastFri	 0:00s	1:00	S
-Rule	Egypt	2015	only	-	Jun	18	 0:00s	0	-
-Rule	Egypt	2015	only	-	Jul	18	 0:00s	1:00	S
-Rule	Egypt	2016	only	-	Jun	 7	 0:00s	0	-
-Rule	Egypt	2016	only	-	Jul	 7	 0:00s	1:00	S
-Rule	Egypt	2017	only	-	May	27	 0:00s	0	-
-Rule	Egypt	2017	only	-	Jun	26	 0:00s	1:00	S
-Rule	Egypt	2018	only	-	May	16	 0:00s	0	-
-Rule	Egypt	2018	only	-	Jun	15	 0:00s	1:00	S
-Rule	Egypt	2019	only	-	May	 6	 0:00s	0	-
-Rule	Egypt	2019	only	-	Jun	 5	 0:00s	1:00	S
-Rule	Egypt	2020	only	-	May	24	 0:00s	1:00	S
-Rule	Egypt	2021	only	-	May	13	 0:00s	1:00	S
-Rule	Egypt	2022	only	-	May	 3	 0:00s	1:00	S
+Rule	Egypt	2015	only	-	Jun	11	24:00	0	-
+Rule	Egypt	2015	only	-	Jul	23	24:00	1:00	S
+Rule	Egypt	2016	only	-	Jun	 2	24:00	0	-
+Rule	Egypt	2016	only	-	Jul	 7	24:00	1:00	S
+Rule	Egypt	2017	only	-	May	25	24:00	0	-
+Rule	Egypt	2017	only	-	Jun	29	24:00	1:00	S
+Rule	Egypt	2018	only	-	May	10	24:00	0	-
+Rule	Egypt	2018	only	-	Jun	14	24:00	1:00	S
+Rule	Egypt	2019	only	-	May	 2	24:00	0	-
+Rule	Egypt	2019	only	-	Jun	 6	24:00	1:00	S
+Rule	Egypt	2020	only	-	May	28	24:00	1:00	S
+Rule	Egypt	2021	only	-	May	13	24:00	1:00	S
+Rule	Egypt	2022	only	-	May	 5	24:00	1:00	S
 Rule	Egypt	2023	max	-	Apr	lastFri	 0:00s	1:00	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -412,60 +401,44 @@
 			2:00	Egypt	EE%sT
 
 # Equatorial Guinea
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Malabo	0:35:08 -	LMT	1912
-			0:00	-	GMT	1963 Dec 15
-			1:00	-	WAT
+# See Africa/Lagos.
 
 # Eritrea
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Asmara	2:35:32 -	LMT	1870
-			2:35:32	-	AMT	1890	      # Asmara Mean Time
-			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
-			3:00	-	EAT
-
 # Ethiopia


More information about the distro-pkg-dev mailing list