From cab5d98d6857932dd8e4954f94ae765ba9aa9e8e Mon Sep 17 00:00:00 2001
From: Bradley White <bww@acm.org>
Date: Wed, 24 Jan 2018 22:59:06 -0500
Subject: [PATCH] Update zoneinfo files to 2018c.

---
 testdata/README.zoneinfo               |   6 ++++--
 testdata/version                       |   1 +
 testdata/zoneinfo/Africa/Sao_Tome      | Bin 170 -> 234 bytes
 testdata/zoneinfo/America/Campo_Grande | Bin 2016 -> 2016 bytes
 testdata/zoneinfo/America/Cuiaba       | Bin 1988 -> 1988 bytes
 testdata/zoneinfo/America/La_Paz       | Bin 259 -> 257 bytes
 testdata/zoneinfo/America/Sao_Paulo    | Bin 2016 -> 2016 bytes
 testdata/zoneinfo/Asia/Tokyo           | Bin 318 -> 318 bytes
 testdata/zoneinfo/Brazil/East          | Bin 2016 -> 2016 bytes
 testdata/zoneinfo/Japan                | Bin 318 -> 318 bytes
 testdata/zoneinfo/zone1970.tab         |   3 ++-
 11 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 testdata/version

diff --git a/testdata/README.zoneinfo b/testdata/README.zoneinfo
index 38b59601..36b39db6 100644
--- a/testdata/README.zoneinfo
+++ b/testdata/README.zoneinfo
@@ -8,6 +8,7 @@ already be found in the default ${TZDIR} location, /usr/share/zoneinfo.
 New versions can be generated using the following shell script.
 
   #!/bin/sh -
+  set -e
   DESTDIR=$(mktemp -d)
   trap "rm -fr ${DESTDIR}" 0 2 15
   (
@@ -20,8 +21,9 @@ New versions can be generated using the following shell script.
                 LOCALTIME=Factory \
                 TZDATA_TEXT= \
                 ZONETABLES=zone1970.tab
-    rm zoneinfo/posixrules
-    tar --create --dereference --hard-dereference --file zoneinfo.tar zoneinfo
+    tar --create --dereference --hard-dereference --file zoneinfo.tar \
+        --exclude=zoneinfo/posixrules zoneinfo \
+        --directory=tz version
   )
   tar --extract --directory testdata --file ${DESTDIR}/zoneinfo.tar
   exit 0
diff --git a/testdata/version b/testdata/version
new file mode 100644
index 00000000..2b0599d3
--- /dev/null
+++ b/testdata/version
@@ -0,0 +1 @@
+2018c-2-gec1c7bf
diff --git a/testdata/zoneinfo/Africa/Sao_Tome b/testdata/zoneinfo/Africa/Sao_Tome
index 6fd1af32daec193239ab6b472526fd3d6bdb2f76..3c0d33b0cbbc84b25dc00df433264a940fb01235 100644
GIT binary patch
literal 234
zcmWHE%1kq2zyK^j5fBCeW*`Q!c^ZJkq-WD*qdYqV7@2^=Yyk`m|Nnna28x3KP!XR1
z1BZ`q2!lHihdYKq#DQc8VQXMk^8A46`VRzgHh&F3G{{<zFvw~K67A*!Iz-oy3jj<y
BBsTy6

literal 170
zcmWHE%1kq2zyM4@5fBCe7@MO3$eHwPk_Q9h|Nnn1KvF=!;^P~_;10wf5JG}!KfpQ|
Q82$qRep9)C#v5<}0M)@5+W-In

diff --git a/testdata/zoneinfo/America/Campo_Grande b/testdata/zoneinfo/America/Campo_Grande
index 58c56a84b12522c7b16258a3eec872d5d97125d5..de52bb68143db08d381e441ba26a84c62048f0b5 100644
GIT binary patch
delta 520
zcmW;I&nv@m9LMpQqFmN;KrT)$w0$<M<e<+*lr+Ujn;%<ier_x+Hug0aM~5X@xH>34
za=?K;xe_@DDeWNt0hyD}^YgttzTfZZ{d`qC6_47faXwNyGW{T;H^X{-K#7UNpq>oe
ztEsK9jCoH~JQ<MjzdMoWZ<L9rj7qkD%jDUpnyGt{Gvy^Q`*kJfawB5?@mVj7g+%J~
zLZ^G0#NzgzUTUd|OggVK)pxNRj_T#NYmx2F$?WZ$T4|2RmE#}Ly87EIbDIY$|Jo+k
zVvbtBbj!lvzHoLw&;9PBS`KuXha-_gkz<jAk)x5rk>im7tBF8DtR@BtvYIF)%xdD$
zp^z6Uky4}<DMqT1a-<$vz-m@Nmav*NkVUL!6=WH!S;yGtVj+I860#Js7P1(!8k*%K
hZgdpvcd_WwCE+fX%Jm^{z!&fdzvvta`nq^&_y-tJqCEfr

delta 519
zcmXBQy-Pw-9EWi;sAv%(h^R4I3_TSt(QpQbKpLW^$X*oDvNA=iEMK81YOxk6nxeso
z6SWG5pd}*+TEqs&{(uOKhR$=l%je!Z{hn{j(Q>G>j(okX7o)EtP;Kg^X(g7AYI<et
zMXkmzb<laMLjIx-{nSO+71H6iq>A(vWaMsMMZbb_t&$My?>-sJ%!!SM5xKeG6<eo0
zGCtWawzI=JG0+ytK$lLon<6#!sZ))bNDn>h^kYNq{NCu@>bDr&`#8~=(uLZ8s>*|4
zUS+S2WzK&t@`v$zkNvun18wHvNaRrDSma>jXykC@cqG8mL?9uSCI$(zG*L(x5{G#T
zd7%<1MQV{^q#7wl>X8L3%?ij8mSzoP5lgcQvJA40!DnM3ey|d<6tWhw7_u6g<s=qd
dIqSO^o-KRqrE;a)>lE$@xA2J3neqRZ-ap2ss6qe$

diff --git a/testdata/zoneinfo/America/Cuiaba b/testdata/zoneinfo/America/Cuiaba
index 6d45d512d61d511cfb40b161883ee029cc4f7988..145c89e0f88a210dd7fa3d953d2f62af803b62b9 100644
GIT binary patch
delta 539
zcmXxgy)Q#i9Eb7hfOJ6&7$gR<kUF=GL=18!BqEhCNxe2r)k~{Q(@-zPViH3KA@~O*
z95G-ZC(^A#3_>F@iQPcd<UA*Fm(RU-`hA~#RlZ7Xmu25#IyikVMsEi7Sf3K(M?O8_
z+^NZ}fSjs1QK5(<L%#(P?yZ&K$E1q1e96e!u!@#H%jkYW%zRwQ+02lbdwA0GBOM}k
zdZFW8bz)&>PbV5mA{k%S$<nJx1x9tMcrDVM8JWH<s>S-CTs;03jY~h>GP8N8mS39W
z%2ZaZUb^L4|AENvzDrlmai??D6_vU5istiz`_s+2F7t3QayD{0ay~KvnSo3}=2*=n
zWR}%TL*`k{L}aGbOvNmFd0{iM8`+NRM;ag<kQPV}t7(FCv6?nWAFFAEbh4UO#vT{F
t_(3zI8`2Kxhcran(YW5aX1_N!T>8JO$8`1AI9|sq+C|%d&+F&K^9LZ7rr!Vn

delta 539
zcmX}oze_?<9ENdoNNF)4h@duUG3=PMM8h2-0%?evBKx6;mX#@DW$D$RDQvMRil!zb
zPSh$K!j_C6Xc7AZT7w9ThR$<??((_!PT%*byXr1k?l2o|wGe+6p=wJlPD!zJR8!0T
zC%KZiP+|AAj08(6^4$<oZ$w33(lXXlG-5Y%GX5DhR!>u6?RCOP<YvYC-Jr2CKPom)
zoJMl2S8U}yD%IB(=}@Oiw_74J{;o33n#lG)s_cDJZvR}Vo$8ku*nK-zxr1}L_fR$V
z!=}t%mW@L2OqhpB!&dRzvz2a#vr=?;ZX5OwJLlT;!^z0m$mz)W$OL2tG6k7qsV5<`
zEcG;Go~53M%tWT5$zERAjO<3XBm0pCNC%_^(!)|WLAqG#Hb@^!-3aM~w9-u4=*173
pA>EL6NI#?@S{=1TZ^8O5MQ8rIcImDGx9|mgVpt4KkNmxK{Q||utt9{e

diff --git a/testdata/zoneinfo/America/La_Paz b/testdata/zoneinfo/America/La_Paz
index e83068b11f1f66be3367dbe63967fd32f9aede3f..bc3df523516d19191aa9d9b88ecc97c3ea1acd4c 100644
GIT binary patch
delta 64
zcmZo>YGj(A%_uNYN1Kbs$2Ww*8Hk-GCRqW6=DH{%gn~mDbPY@xV1Ua8$g?xy0szrE
B3}FBO

delta 66
zcmZo<YG#_C%_ulgN1L11$2Ww*8Hk<yCnj0}#pbvuA&CWtFz6bXFu(wp4UlJN!UX{J
Cvke0P

diff --git a/testdata/zoneinfo/America/Sao_Paulo b/testdata/zoneinfo/America/Sao_Paulo
index 62dcd7bc43c3f1c8106f2b1e99e88dde5868056f..308a545ce5931939fb6353fa4273aedf00b49372 100644
GIT binary patch
delta 520
zcmW;IPbkA-9LI4c#AR_Jm#2sWZO=%_jT%bqE`MgTX3U?hwPyZob8%1{B(;N{T%;ZL
z$ia!^B1v))7wv>{lLJnk_w&2Fe!t)8`~H-iC8ypm&%FBe`0SOKxa`-HLq}rjutobl
zmuh;ePX_9g3Wl3y@b5x|1}kOgaYlt(-(~o8Kt-x<Wh5UIb8iJXpZ1FA!;M}TYZHsb
z6TQ@1BbIl!b*%AI#FrLy{P$iYd_J9cDT-uIR3@+QRH|WArV1aTY2`=C^yaQweXf^l
zftXr9|CSrWJ0f%Nbmn#(S8!mNc{ma|6gd_-7&#g_9625du$l-Y#A;%YAghT&!mK6^
zGZgYdB~psiBE?8GQjXLk3s}tx$P!kw2C|6Ntb#0KHR~9?Wh}%GRzj9S)<PCTRztI#
j{m!;8+wWZVOYccXZZBWmUFUImT+%H&Mmk+xywv^!rxly(

delta 519
zcmXBQJxD@P9ENeTA!-pJqNw3)4TheI8ltTa0%@xy>_bho>_bhgEW0K&1w}}UP+Wp&
zaPUNp6%jOvL(oz*I0mi_B@LbDc9-A1cltkX)lqe*(*~nlQ@+Tfm@QV++{A^LKP;(*
z-UrhkJy8LtX$HL;Dp<c4A=k7Dy)2sH)`SdSkDHONDY;Y#isjcq8BLFgmD_f?I@2xI
z@^!gB)GT6|HWlxviG=T4C4MR*IsC4YZzYlHx>KpAvbp(tuC|JwqI3HrtJ1k+bLaU?
z?grv!=F*UR-Xmcg_-{P+t40pA>4zhcLy=>VgOQ_=!;#~W081T#gjnhrB*;=nAz?@y
z8Wi$EB~psiBE?8GQjXLk3s~wEkR>ej8ptA+dKF|DWF5_@jfMEZO2|^kTF7F^YN(g9
gzO$~F^}Qb&$$RX%e4%N;Dc${U>5)B?eg7{le>=FM{r~^~

diff --git a/testdata/zoneinfo/Asia/Tokyo b/testdata/zoneinfo/Asia/Tokyo
index 931baf224c1881db7bc7b664918ee1169debfbb9..8ad44ba981a2d97d40d3de2c8bf29606be50aa4b 100644
GIT binary patch
delta 103
zcmdnTw2x_mksMRO^|#&+Zv6OFaPzG0gWK#3A8xPZe{kp7qYrm`K0cTjP;SLk@E-_3
fsz5YIC5Q&82GJlLU>c|kM1ypKXprv7jEuGb_<l)q

delta 103
zcmdnTw2x_mk(}Iw>u<ywZu}IRaP#z!hTH720=HM+YPj?4zrfw@Jq;5B%B|!k{09P%
fDi94)38F!&K{QAQm<H+s(IA~58l-zNBcm+<0dhp8

diff --git a/testdata/zoneinfo/Brazil/East b/testdata/zoneinfo/Brazil/East
index 62dcd7bc43c3f1c8106f2b1e99e88dde5868056f..308a545ce5931939fb6353fa4273aedf00b49372 100644
GIT binary patch
delta 520
zcmW;IPbkA-9LI4c#AR_Jm#2sWZO=%_jT%bqE`MgTX3U?hwPyZob8%1{B(;N{T%;ZL
z$ia!^B1v))7wv>{lLJnk_w&2Fe!t)8`~H-iC8ypm&%FBe`0SOKxa`-HLq}rjutobl
zmuh;ePX_9g3Wl3y@b5x|1}kOgaYlt(-(~o8Kt-x<Wh5UIb8iJXpZ1FA!;M}TYZHsb
z6TQ@1BbIl!b*%AI#FrLy{P$iYd_J9cDT-uIR3@+QRH|WArV1aTY2`=C^yaQweXf^l
zftXr9|CSrWJ0f%Nbmn#(S8!mNc{ma|6gd_-7&#g_9625du$l-Y#A;%YAghT&!mK6^
zGZgYdB~psiBE?8GQjXLk3s}tx$P!kw2C|6Ntb#0KHR~9?Wh}%GRzj9S)<PCTRztI#
j{m!;8+wWZVOYccXZZBWmUFUImT+%H&Mmk+xywv^!rxly(

delta 519
zcmXBQJxD@P9ENeTA!-pJqNw3)4TheI8ltTa0%@xy>_bho>_bhgEW0K&1w}}UP+Wp&
zaPUNp6%jOvL(oz*I0mi_B@LbDc9-A1cltkX)lqe*(*~nlQ@+Tfm@QV++{A^LKP;(*
z-UrhkJy8LtX$HL;Dp<c4A=k7Dy)2sH)`SdSkDHONDY;Y#isjcq8BLFgmD_f?I@2xI
z@^!gB)GT6|HWlxviG=T4C4MR*IsC4YZzYlHx>KpAvbp(tuC|JwqI3HrtJ1k+bLaU?
z?grv!=F*UR-Xmcg_-{P+t40pA>4zhcLy=>VgOQ_=!;#~W081T#gjnhrB*;=nAz?@y
z8Wi$EB~psiBE?8GQjXLk3s~wEkR>ej8ptA+dKF|DWF5_@jfMEZO2|^kTF7F^YN(g9
gzO$~F^}Qb&$$RX%e4%N;Dc${U>5)B?eg7{le>=FM{r~^~

diff --git a/testdata/zoneinfo/Japan b/testdata/zoneinfo/Japan
index 931baf224c1881db7bc7b664918ee1169debfbb9..8ad44ba981a2d97d40d3de2c8bf29606be50aa4b 100644
GIT binary patch
delta 103
zcmdnTw2x_mksMRO^|#&+Zv6OFaPzG0gWK#3A8xPZe{kp7qYrm`K0cTjP;SLk@E-_3
fsz5YIC5Q&82GJlLU>c|kM1ypKXprv7jEuGb_<l)q

delta 103
zcmdnTw2x_mk(}Iw>u<ywZu}IRaP#z!hTH720=HM+YPj?4zrfw@Jq;5B%B|!k{09P%
fDi94)38F!&K{QAQm<H+s(IA~58l-zNBcm+<0dhp8

diff --git a/testdata/zoneinfo/zone1970.tab b/testdata/zoneinfo/zone1970.tab
index 455e7976..4ee8ce51 100644
--- a/testdata/zoneinfo/zone1970.tab
+++ b/testdata/zoneinfo/zone1970.tab
@@ -132,7 +132,7 @@ CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
 CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
 CC	-1210+09655	Indian/Cocos
 CH,DE,LI	+4723+00832	Europe/Zurich	Swiss time
-CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG	+0519-00402	Africa/Abidjan
+CI,BF,GM,GN,ML,MR,SH,SL,SN,TG	+0519-00402	Africa/Abidjan
 CK	-2114-15946	Pacific/Rarotonga
 CL	-3327-07040	America/Santiago	Chile (most areas)
 CL	-5309-07055	America/Punta_Arenas	Region of Magallanes
@@ -321,6 +321,7 @@ SE	+5920+01803	Europe/Stockholm
 SG	+0117+10351	Asia/Singapore
 SR	+0550-05510	America/Paramaribo
 SS	+0451+03137	Africa/Juba
+ST	+0020+00644	Africa/Sao_Tome
 SV	+1342-08912	America/El_Salvador
 SY	+3330+03618	Asia/Damascus
 TC	+2128-07108	America/Grand_Turk