Skip to content

Commit 377722b

Browse files
author
GitHub Actions
committed
Update tzdata and zoneinfo to version 2013h.
1 parent 24797c4 commit 377722b

File tree

8 files changed

+224
-102
lines changed

8 files changed

+224
-102
lines changed

tzdata/Makefile

Lines changed: 51 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
PACKAGE= tzcode
77

88
# Version numbers of the code and data distributions.
9-
VERSION= 2013g
9+
VERSION= 2013h
1010

1111
# Email address for bug reports.
1212
@@ -72,7 +72,6 @@ MANDIR= $(TOPDIR)/man
7272
# Library functions are put in an archive in LIBDIR.
7373

7474
LIBDIR= $(TOPDIR)/lib
75-
TZLIB= $(LIBDIR)/libtz.a
7675

7776
# If you always want time values interpreted as "seconds since the epoch
7877
# (not counting leap seconds)", use
@@ -247,8 +246,12 @@ ZFLAGS=
247246
# The name of a Posix-compliant `awk' on your system.
248247
AWK= awk
249248

250-
# The full path name of a Posix-compliant shell that supports the Korn shell's
251-
# 'select' statement, as an extension. These days, Bash is the most popular.
249+
# The full path name of a Posix-compliant shell, preferably one that supports
250+
# the Korn shell's 'select' statement as an extension.
251+
# These days, Bash is the most popular.
252+
# It should be OK to set this to /bin/sh, on platforms where /bin/sh
253+
# lacks 'select' or doesn't completely conform to Posix, but /bin/bash
254+
# is typically nicer if it works.
252255
KSHELL= /bin/bash
253256

254257
# The path where SGML DTDs are kept.
@@ -298,11 +301,13 @@ GZIPFLAGS= -9n
298301
cc= cc
299302
CC= $(cc) -DTZDIR=\"$(TZDIR)\"
300303
301-
TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c
304+
AR= ar
305+
306+
# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib.
307+
RANLIB= :
308+
302309
TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o
303-
TZDSRCS= zdump.c localtime.c ialloc.c asctime.o
304-
TZDOBJS= zdump.o localtime.o ialloc.o asctime.c
305-
DATESRCS= date.c localtime.c strftime.c asctime.c
310+
TZDOBJS= zdump.o localtime.o ialloc.o asctime.o
306311
DATEOBJS= date.o localtime.o strftime.o asctime.o
307312
LIBSRCS= localtime.c asctime.c difftime.c
308313
LIBOBJS= localtime.o asctime.o difftime.o
@@ -324,10 +329,10 @@ YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward
324329
NDATA= systemv factory
325330
SDATA= solar87 solar88 solar89
326331
TDATA= $(YDATA) $(NDATA) $(SDATA)
327-
TABDATA= iso3166.tab zone.tab
332+
TABDATA= iso3166.tab zone.tab leapseconds
328333
LEAP_DEPS= leapseconds.awk leap-seconds.list
329334
DATA= $(YDATA) $(NDATA) $(SDATA) $(TABDATA) \
330-
leapseconds $(LEAP_DEPS) yearistype.sh
335+
$(LEAP_DEPS) yearistype.sh
331336
WEB_PAGES= tz-art.htm tz-link.htm
332337
AWK_SCRIPTS= checktab.awk leapseconds.awk
333338
MISC= usno1988 usno1989 usno1989a usno1995 usno1997 usno1998 \
@@ -340,38 +345,29 @@ ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC)
340345
341346
SHELL= /bin/sh
342347
343-
all: tzselect zic zdump $(LIBOBJS) $(TABDATA)
348+
all: tzselect zic zdump libtz.a $(TABDATA)
344349
345350
ALL: all date
346351
347-
install: all $(DATA) $(REDO) $(DESTDIR)$(TZLIB) $(MANS)
352+
install: all $(DATA) $(REDO) $(MANS)
353+
mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
354+
$(DESTDIR)$(LIBDIR) \
355+
$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
356+
$(DESTDIR)$(MANDIR)/man8
348357
$(ZIC) -y $(YEARISTYPE) \
349358
-d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
350-
-rm -f $(DESTDIR)$(TZDIR)/iso3166.tab \
351-
$(DESTDIR)$(TZDIR)/zone.tab
352-
cp iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/.
353-
-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(ETCDIR)
359+
cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/.
354360
cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
355-
-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(MANDIR) \
356-
$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
357-
$(DESTDIR)$(MANDIR)/man8
358-
-rm -f $(DESTDIR)$(MANDIR)/man3/newctime.3 \
359-
$(DESTDIR)$(MANDIR)/man3/newtzset.3 \
360-
$(DESTDIR)$(MANDIR)/man5/tzfile.5 \
361-
$(DESTDIR)$(MANDIR)/man8/tzselect.8 \
362-
$(DESTDIR)$(MANDIR)/man8/zdump.8 \
363-
$(DESTDIR)$(MANDIR)/man8/zic.8
364-
cp newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
365-
cp tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
366-
cp tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
361+
cp libtz.a $(DESTDIR)$(LIBDIR)/.
362+
$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
363+
cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
364+
cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
365+
cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
367366
368367
INSTALL: ALL install date.1
369-
-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(BINDIR)
368+
mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
370369
cp date $(DESTDIR)$(BINDIR)/.
371-
-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(MANDIR) \
372-
$(DESTDIR)$(MANDIR)/man1
373-
-rm -f $(DESTDIR)$(MANDIR)/man1/date.1
374-
cp date.1 $(DESTDIR)$(MANDIR)/man1/.
370+
cp -f date.1 $(DESTDIR)$(MANDIR)/man1/.
375371
376372
version.h:
377373
(echo 'static char const PKGVERSION[]="($(PACKAGE)) ";' && \
@@ -426,11 +422,9 @@ posix_right: posix_only leapseconds
426422
427423
zones: $(REDO)
428424
429-
$(DESTDIR)$(TZLIB): $(LIBOBJS)
430-
-mkdir -p $(DESTDIR)$(TOPDIR) $(DESTDIR)$(LIBDIR)
431-
ar ru $@ $(LIBOBJS)
432-
if [ -x /usr/ucb/ranlib ] || [ -x /usr/bin/ranlib ]; \
433-
then ranlib $@ ; fi
425+
libtz.a: $(LIBOBJS)
426+
$(AR) ru $@ $(LIBOBJS)
427+
$(RANLIB) $@
434428
435429
date: $(DATEOBJS)
436430
$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS)
@@ -459,14 +453,14 @@ check_web: $(WEB_PAGES)
459453
460454
clean_misc:
461455
rm -f core *.o *.out \
462-
date leapseconds tzselect version.h zdump zic yearistype
456+
date tzselect version.h zdump zic yearistype
463457
clean: clean_misc
464-
rm -f -r tzpublic
458+
rm -fr tzpublic
465459
466460
maintainer-clean: clean
467461
@echo 'This command is intended for maintainers to use; it'
468462
@echo 'deletes files that may need special tools to rebuild.'
469-
rm -f $(MANTXTS) *.asc *.tar.gz
463+
rm -f leapseconds $(MANTXTS) *.asc *.tar.gz
470464
471465
names:
472466
@echo $(ENCHILADA)
@@ -491,21 +485,23 @@ $(MANTXTS): workman.sh
491485
# and if the files have not changed since then.
492486
# This uses GNU 'touch' syntax 'touch -d@N FILE',
493487
# where N is the number of seconds since 1970.
494-
# If git or GNU 'touch' is absent, do nothing and fail.
488+
# If git or GNU 'touch' is absent, don't bother to sync with git timestamps.
495489
# Also, set the timestamp of each prebuilt file like 'leapseconds'
496490
# to be the maximum of the files it depends on.
497491
set-timestamps.out: $(ENCHILADA)
498492
rm -f $@
499-
-files=`git ls-files $(ENCHILADA)` && \
500-
touch -md @1 test.out && rm -f test.out && \
501-
for file in $$files; do \
502-
if git diff --quiet $$file; then \
503-
time=`git log -1 --format='tformat:%ct' $$file` && \
504-
touch -cmd @$$time $$file; \
505-
else \
506-
echo >&2 "$$file: warning: does not match repository"; \
507-
fi || exit; \
508-
done
493+
if files=`git ls-files $(ENCHILADA)` && \
494+
touch -md @1 test.out; then \
495+
rm -f test.out && \
496+
for file in $$files; do \
497+
if git diff --quiet $$file; then \
498+
time=`git log -1 --format='tformat:%ct' $$file` && \
499+
touch -cmd @$$time $$file; \
500+
else \
501+
echo >&2 "$$file: warning: does not match repository"; \
502+
fi || exit; \
503+
done; \
504+
fi
509505
touch -cmr `ls -t $(LEAP_DEPS) | sed 1q` leapseconds
510506
for file in `ls $(MANTXTS) | sed 's/\.txt$$//'`; do \
511507
touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \
@@ -524,15 +520,14 @@ check_public: $(ENCHILADA)
524520
$(zic) -v -d tzpublic $$i 2>&1 || exit; \
525521
done
526522
$(zic) -v -d tzpublic $(TDATA)
527-
rm -f -r tzpublic
523+
rm -fr tzpublic
528524
529525
# Check that the code works under various alternative
530526
# implementations of time_t.
531527
check_time_t_alternatives:
532-
mkdir tzpublic
533528
zones=`$(AWK) '/^[^#]/ { print $$3 }' <zone.tab` && \
534529
for type in $(TIME_T_ALTERNATIVES); do \
535-
mkdir tzpublic/$$type && \
530+
mkdir -p tzpublic/$$type && \
536531
make clean_misc && \
537532
make TOPDIR=`pwd`/tzpublic/$$type \
538533
CFLAGS='$(CFLAGS) -Dtime_tz='"'$$type'" \
@@ -553,7 +548,7 @@ check_time_t_alternatives:
553548
diff -u tzpublic/int64_t.out tzpublic/$$type.out \
554549
|| exit; \
555550
done
556-
rm -f -r tzpublic
551+
rm -fr tzpublic
557552

558553
tarballs: tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz
559554

tzdata/africa

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,14 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882
451451
# (either two days before them or five days after them, so as to fall on
452452
# lastFri instead of lastSun).
453453

454+
# From Even Scharning (2013-10-25):
455+
# The scheduled end of DST in Libya on Friday, October 25, 2013 was
456+
# cancelled yesterday....
457+
# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
458+
#
459+
# From Paul Eggert (2013-10-25):
460+
# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2.
461+
454462
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
455463
Rule Libya 1951 only - Oct 14 2:00 1:00 S
456464
Rule Libya 1952 only - Jan 1 0:00 0 -
@@ -467,8 +475,8 @@ Rule Libya 1987 1989 - Apr 1 0:00 1:00 S
467475
Rule Libya 1987 1989 - Oct 1 0:00 0 -
468476
Rule Libya 1997 only - Apr 4 0:00 1:00 S
469477
Rule Libya 1997 only - Oct 4 0:00 0 -
470-
Rule Libya 2013 max - Mar lastFri 1:00 1:00 S
471-
Rule Libya 2013 max - Oct lastFri 2:00 0 -
478+
Rule Libya 2013 only - Mar lastFri 1:00 1:00 S
479+
Rule Libya 2013 only - Oct lastFri 2:00 0 -
472480
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
473481
Zone Africa/Tripoli 0:52:44 - LMT 1920
474482
1:00 Libya CE%sT 1959
@@ -479,7 +487,8 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920
479487
2:00 - EET 1996 Sep 30
480488
1:00 Libya CE%sT 1997 Oct 4
481489
2:00 - EET 2012 Nov 10 2:00
482-
1:00 Libya CE%sT
490+
1:00 Libya CE%sT 2013 Oct 25 2:00
491+
2:00 - EET
483492

484493
# Madagascar
485494
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -684,15 +693,6 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
684693
# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
685694
# </a>
686695

687-
# From Alex Krivenyshev (2008-05-09):
688-
# Is Western Sahara (part which administrated by Morocco) going to follow
689-
# Morocco DST changes? Any information? What about other part of
690-
# Western Sahara - under administration of POLISARIO Front (also named
691-
# SADR Saharawi Arab Democratic Republic)?
692-
693-
# From Arthur David Olson (2008-05-09):
694-
# XXX--guess that it is only Morocco for now; guess only 2008 for now.
695-
696696
# From Steffen Thorsen (2008-08-27):
697697
# Morocco will change the clocks back on the midnight between August 31
698698
# and September 1. They originally planned to observe DST to near the end
@@ -868,13 +868,13 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
868868
# Another source (specifying the time for start and end in the decree):
869869
# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
870870

871-
# From Paul Eggert (2013-09-30):
871+
# From Paul Eggert (2013-10-03):
872872
# To estimate what the Moroccan government will do in future years,
873-
# transition dates for 2014 through 2037 were determined by running
873+
# transition dates for 2014 through 2038 were determined by running
874874
# the following program under GNU Emacs 24.3:
875875
#
876876
# (let ((islamic-year 1435))
877-
# (while (< islamic-year 1460)
877+
# (while (< islamic-year 1461)
878878
# (let ((a
879879
# (calendar-gregorian-from-absolute
880880
# (calendar-islamic-to-absolute (list 9 1 islamic-year))))
@@ -894,9 +894,13 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
894894
# all transitions removed for 2026-2035, where the estimated Ramadan
895895
# falls entirely outside daylight-saving time; and with fall-back
896896
# transitions removed for 2036-2037, where the normal fall-back
897-
# date falls during the estimated Ramadan. Problems continue after that,
898-
# but 32-bit time_t values roll around in 2038 so for now do not worry
899-
# about dates after 2037.
897+
# date falls during the estimated Ramadan. Normally, the table would
898+
# stop after 2037 because 32-bit time_t values roll around early in 2038,
899+
# but that would imply a prediction of perpetual DST after March 2038
900+
# due to the year-2037 glitches. So, this table instead stops after
901+
# 2038, the first non-glitchy year after the 32-bit rollover.
902+
# An advantage of stopping after 2038 is that it lets zic guess
903+
# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future.
900904

901905
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
902906

@@ -955,16 +959,30 @@ Rule Morocco 2025 only - Mar 31 2:00 1:00 S
955959
Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
956960
Rule Morocco 2036 only - Oct 21 3:00 0 -
957961
Rule Morocco 2037 only - Oct 11 3:00 0 -
962+
Rule Morocco 2038 only - Sep 30 3:00 0 -
963+
Rule Morocco 2038 only - Oct 30 2:00 1:00 S
964+
Rule Morocco 2038 max - Oct lastSun 3:00 0 -
958965

959966
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
960967
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
961968
0:00 Morocco WE%sT 1984 Mar 16
962969
1:00 - CET 1986
963970
0:00 Morocco WE%sT
971+
964972
# Western Sahara
973+
#
974+
# From Gwillim Law (2013-10-22):
975+
# A correspondent who is usually well informed about time zone matters
976+
# ... says that Western Sahara observes daylight saving time, just as
977+
# Morocco does.
978+
#
979+
# From Paul Eggert (2013-10-23):
980+
# Assume that this has been true since Western Sahara switched to GMT,
981+
# since most of it was then controlled by Morocco.
982+
965983
Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan
966984
-1:00 - WAT 1976 Apr 14
967-
0:00 - WET
985+
0:00 Morocco WE%sT
968986

969987
# Mozambique
970988
# Zone NAME GMTOFF RULES FORMAT [UNTIL]

tzdata/southamerica

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,6 +851,15 @@ Zone America/La_Paz -4:32:36 - LMT 1890
851851
# We will keep this article updated when this is confirmed:
852852
# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
853853

854+
# From Steffen Thorsen (2013-10-17):
855+
# http://www.timeanddate.com/news/time/acre-amazonas-change-time-zone.html
856+
# Senator Jorge Viana announced that Acre will change time zone on November 10.
857+
# He did not specify the time of the change, nor if western parts of Amazonas
858+
# will change as well.
859+
#
860+
# From Paul Eggert (2013-10-17):
861+
# For now, assume western Amazonas will change as well.
862+
854863
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
855864
# Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
856865
# Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
@@ -1139,13 +1148,15 @@ Zone America/Eirunepe -4:39:28 - LMT 1914
11391148
-5:00 - ACT 1993 Sep 28
11401149
-5:00 Brazil AC%sT 1994 Sep 22
11411150
-5:00 - ACT 2008 Jun 24 00:00
1142-
-4:00 - AMT
1151+
-4:00 - AMT 2013 Nov 10
1152+
-5:00 - ACT
11431153
#
11441154
# Acre (AC)
11451155
Zone America/Rio_Branco -4:31:12 - LMT 1914
11461156
-5:00 Brazil AC%sT 1988 Sep 12
11471157
-5:00 - ACT 2008 Jun 24 00:00
1148-
-4:00 - AMT
1158+
-4:00 - AMT 2013 Nov 10
1159+
-5:00 - ACT
11491160

11501161
# Chile
11511162

0 commit comments

Comments
 (0)