- tz - lists.iana.org

New shapefile of world's timezones based off of Open Street Map data
by Evan Siroky Oct. 11, 2016

Oct. 11, 2016

Hello All, I have just made a first release of a shapefile of the geographic extent of the timezone database based mostly off of Open Street Map data. All of the borders between countries, states and cities come directly from Open Street Map. This shapefile also includes the territorial waters of countries as defined in Open Street Map. Please see my github project for more details. The shapefile can be found in the project releases. https://github.com/evansiroky/timezone-boundary-builder Evan.

4 3

[PROPOSED PATCH] * tz-link.htm: Add section IDs.
by Paul Eggert Oct. 11, 2016

Oct. 11, 2016

--- tz-link.htm | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/tz-link.htm b/tz-link.htm index ed926c7..43188a4 100644 --- a/tz-link.htm +++ b/tz-link.htm @@ -10,7 +10,7 @@ content="Sources for time zone and daylight saving time data"> <meta name="DC.Creator" content="Eggert, Paul"> <meta name="DC.Contributor" content="Olson, Arthur David"> -<meta name="DC.Date" content="2016-09-21"> +<meta name="DC.Date" content="2016-10-11"> <meta name="DC.Description" content="Sources of information about time zones and daylight saving time"> <meta name="DC.Identifier" @@ -27,7 +27,7 @@ histories and planned futures are often recorded only fitfully. Here is a summary of attempts to organize and record relevant data in this area. </p> -<h2>The <code><abbr title="time zone">tz</abbr></code> database</h2> +<h2 id="tzdb">The <code><abbr title="time zone">tz</abbr></code> database</h2> <p> The <a href="https://en.wikipedia.org/wiki/Public_domain">public-domain</a> time zone database contains code and data @@ -152,7 +152,7 @@ The code lets you compile the <code><abbr>tz</abbr></code> source files into machine-readable binary files, one for each location. It also lets you read a <code><abbr>tz</abbr></code> binary file and interpret time stamps for that location.</p> -<h2>Changes to the <code><abbr>tz</abbr></code> database</h2> +<h2 id="changes">Changes to the <code><abbr>tz</abbr></code> database</h2> <p> The <code><abbr>tz</abbr></code> code and data are by no means authoritative. If you find errors, please @@ -194,7 +194,7 @@ For further information about updates, please see <a href="https://tools.ietf.org/html/rfc6557">Procedures for Maintaining the Time Zone Database</a> (Internet <abbr title="Request For Comments">RFC</abbr> 6557).</p> -<h2>Commentary on the <code><abbr>tz</abbr></code> database</h2> +<h2 id="commentary">Commentary on the <code><abbr>tz</abbr></code> database</h2> <ul> <li>The article <a href="https://en.wikipedia.org/wiki/Tz_database">tz database</a> is @@ -212,7 +212,8 @@ href="https://blog.jonudell.net/2009/10/23/a-literary-appreciation-of-the-olsonz literary appreciation of the Olson/Zoneinfo/tz database</a> comments on the database's style.</li> </ul> -<h2>Web sites using recent versions of the <code><abbr>tz</abbr></code> database</h2> +<h2 id="web">Web sites using recent versions of the +<code><abbr>tz</abbr></code> database</h2> <p> These are listed roughly in ascending order of complexity and fanciness. </p> @@ -242,7 +243,7 @@ calculates the current time difference between locations.</li> also contains data about time zone boundaries; it supports queries via place names and shows location maps.</li> </ul> -<h2>Network protocols for <code><abbr>tz</abbr></code> data</h2> +<h2 id="protocols">Network protocols for <code><abbr>tz</abbr></code> data</h2> <ul> <li>The <a href="https://www.ietf.org">Internet Engineering Task Force</a>'s <a href="https://datatracker.ietf.org/wg/tzdist/charter/">Time Zone Data @@ -267,7 +268,7 @@ title="Extensible Markup Language">XML</abbr></a> format, and a variant uses <a href="http://www.json.org"><abbr title="JavaScript Object Notation">JSON</abbr></a> format.</li> </ul> -<h2>Other <code><abbr>tz</abbr></code> compilers</h2> +<h2 id="compilers">Other <code><abbr>tz</abbr></code> compilers</h2> <ul> <li><a href="https://sourceforge.net/projects/vzic/">Vzic</a> is a <a href="https://en.wikipedia.org/wiki/C_%28programming_language%29">C</a> @@ -390,7 +391,7 @@ source into text files, along with a runtime that can read those files. Tcl is freely available under a <abbr>BSD</abbr>-style license.</li> </ul> -<h2>Other <code><abbr>tz</abbr></code> binary file readers</h2> +<h2 id="binary">Other <code><abbr>tz</abbr></code> binary file readers</h2> <ul> <li>The <a href="https://www.gnu.org/software/libc/"><abbr>GNU</abbr> C @@ -439,7 +440,7 @@ package contains <a href="https://www.haskell.org">Haskell</a> code that parses and uses <code><abbr>tz</abbr></code> binary data. It is freely available under a <abbr>BSD</abbr>-style license.</li> </ul> -<h2>Other <code><abbr>tz</abbr></code>-based time zone software</h2> +<h2 id="software">Other <code><abbr>tz</abbr></code>-based time zone software</h2> <ul> <li><a href="https://foxclocks.org">FoxClocks</a> is an extension for <a href="https://www.google.com/chrome/">Google @@ -496,7 +497,7 @@ an <abbr>OS X</abbr> program. Its developers <a href="http://veladg.com/tzoffer.html">offer free licenses</a> to <code><abbr>tz</abbr></code> contributors.</li> </ul> -<h2>Other time zone databases</h2> +<h2 id="other-dbs">Other time zone databases</h2> <ul> <li><a href="http://www.astro.com/atlas">Time-zone Atlas</a> is Astrodienst's Web version of Shanks and Pottenger's @@ -525,7 +526,7 @@ Schedules Information Manual</a> of the International Air Transport Association gives current time zone rules for airports served by commercial aviation.</li> </ul> -<h2>Maps</h2> +<h2 id="maps">Maps</h2> <ul> <li>The <a href="https://www.cia.gov/index.html">United States Central Intelligence Agency (<abbr @@ -552,7 +553,7 @@ much is time wrong around the world?</a> maps the difference between mean solar and standard time, highlighting areas such as western China where the two differ greatly. It's a bit out of date, unfortunately.</li> </ul> -<h2>Time zone boundaries</h2> +<h2 id="boundaries">Time zone boundaries</h2> <ul> <li><a href="http://efele.net/maps/tz/"><abbr>TZ</abbr> timezones maps</a> contains <a @@ -589,7 +590,7 @@ for land and territorial waters only). A captain can change ship's clocks any time after entering a new time zone; midnight changes are common.</li> </ul> -<h2>Civil time concepts and history</h2> +<h2 id="civil">Civil time concepts and history</h2> <ul> <li><a href="http://physics.nist.gov/time">A Walk through Time</a> @@ -609,7 +610,7 @@ time zone boundary.</li> <li><a href="http://statoids.com/tconcept.html">Basic Time Zone Concepts</a> discusses terminological issues behind time zones.</li> </ul> -<h2>National histories of legal time</h2> +<h2 id="national">National histories of legal time</h2> <dl> <dt>Australia</dt> <dd>The Parliamentary Library has commissioned a <a @@ -679,7 +680,7 @@ of Summer time dates</a>.</dd> href="https://www.transportation.gov/regulations/recent-time-zone-proceedings">Recent Time Zone Proceedings</a> lists changes to time zone boundaries.</dd> </dl> -<h2>Precision timekeeping</h2> +<h2 id="precision">Precision timekeeping</h2> <ul> <li><a href="http://literature.agilent.com/litweb/pdf/5965-7984E.pdf">The @@ -752,7 +753,7 @@ might be redefined without Leap Seconds</a> gives pointers on this contentious issue.</li> </ul> -<h2>Time notation</h2> +<h2 id="notation">Time notation</h2> <ul> <li>The <a href="http://cldr.unicode.org">Unicode Common Locale Data Repository (<abbr>CLDR</abbr>) Project</a> has localizations for time @@ -826,7 +827,7 @@ any future changes to the rules. One should never set local time is nine hours ahead of <abbr>UTC</abbr> and the time zone is called "<abbr>GMT</abbr>".</li> </ul> -<h2>See also</h2> +<h2 id="see-also">See also</h2> <ul> <li><a href="tz-art.htm">Time and the Arts</a></li> </ul> -- 2.7.4

1 0

Adapting localtime.c
by Carsten Larsen Oct. 10, 2016

Oct. 10, 2016

Hello list I am trying to adapt the tz code to a local system without any timezone database (AmigaOS). I got the code up and running and everything seems to work as intended. But one thing about the code puzzles me. I need to implement "time_t time(time_t *p)" which is the very last part of localtime.c. Should this code return time as local time or as GMT time ? Because I cannot get the time calculations to work properly. I use tzsetwall() to guess the timezone from the systems locale zone information (GMT+1, etc) and tzset() to load timezone from the TZ environment variable. Should "time_t time(time_t *p)" try to compensate if lclptr is set, or should it always just return the plain system time? I hope someone knows the answer and also thank you for any clarifications on this issue. Kind regards Carsten Larsen

8 13

TimeZone
by Ali Emre Gürsu Oct. 9, 2016

Oct. 9, 2016

Hello there, Is there any know tool or way to read and check your binary timezone files that you upload? Thanks for the work, great job. Best Regards, Ali Emre Gürsu

3 3

Re: [tz] New shapefile of world' s timezones based off of Open Street Map data
by Evan Siroky Oct. 8, 2016

Oct. 8, 2016

I got really worried for a second wondering if I had misspelled the Rankin_Inlet timezone name, but looks like I'm good! Whew. Thanks for your compliment and suggestion.

1 0

tzdata2016g.tar.gz\Makefile has a bug
by Help rtds.ru Oct. 7, 2016

Oct. 7, 2016

Hello. "Makefile" from tzdata2016g.tar.gz has the line: Version= unknown I think this is a bug. At least, it disrupts Oracle's tzupdater (ver.2.1.0). -- Best regards, *Nikotin Sergey* IT Dept *GK RTDService * Russia, 117393, Moscow, Obrucheva st., 52/69. phone: +7 (495) 718-66-77 e-mail: help(a)rtds.ru <mailto:help@rtds.ru> web: www.rtds.ru

2 1

zic: symlink generation issue
by Andreas Stieger Oct. 6, 2016

Oct. 6, 2016

Hello, on openSUSE we are seeing issues generating symlinks after replacing our distribution specific patches with the upstream code: $ rm /etc/localtime $ ln -s /usr/share/zoneinfo/Europe/London /etc/localtime $ ls -l /etc/localtime lrwxrwxrwx 1 root root 33 Oct 6 12:47 /etc/localtime -> /usr/share/zoneinfo/Europe/London $ zic -l Europe/Berlin $ ls -l /etc/localtime lrwxrwxrwx 1 root root 19 Oct 6 11:47 /etc/localtime -> ../../Europe/Berlin resulting in a broken symbolic link. The previous code supplied relname(), and in dolink() instead of calculating the dotdots using fromfield/tofield we used fromname/toname, respectively. I though I'd let you know while we are working on this, in case you have a quick fix. Otherwise we'll attempt to upstream what we come up with. Andreas -- Andreas Stieger <astieger(a)suse.com> Project Manager Security SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)

2 2

zic: symlink generation issue
by Andreas Stieger Oct. 6, 2016

Oct. 6, 2016

Hello, on openSUSE we are seeing issues generating symlinks after replacing our distribution specific patches with the upstream code: $ rm /etc/localtime $ ln -s /usr/share/zoneinfo/Europe/London /etc/localtime $ ls -l /etc/localtime lrwxrwxrwx 1 root root 33 Oct 6 12:47 /etc/localtime -> /usr/share/zoneinfo/Europe/London $ zic -l Europe/Berlin $ ls -l /etc/localtime lrwxrwxrwx 1 root root 19 Oct 6 11:47 /etc/localtime -> ../../Europe/Berlin resulting in a broken symbolic link. The previous code supplied relname(), and in dolink() instead of calculating the dotdots using fromfield/tofield we used fromname/toname, respectively. I though I'd let you know while we are working on this, in case you have a quick fix. Otherwise we'll attempt to upstream what we come up with. Andreas -- Andreas Stieger <astieger(a)suse.de> Project Manager Security SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)

1 0

[PROPOSED PATCH] Make targets more atomically
by Paul Eggert Oct. 4, 2016

Oct. 4, 2016

A 'make' that failed due to a write failure could leave behind a junk file that was up-to-date, confusing a later 'make'. * Makefile (version, version.h, leapseconds, zones, tzselect) ($(MANTXTS), tzcode$(VERSION).tar.gz, tzdata$(VERSION).tar.gz) (tzdb-$(VERSION).tar.lz): Use mv to create targets atomically. --- Makefile | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 4781633..f7553a3 100644 --- a/Makefile +++ b/Makefile @@ -438,14 +438,16 @@ version: $(VERSION_DEPS) V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ --abbrev=7 --dirty` || \ V=$(VERSION); } && \ - printf '%s\n' "$$V" >$@ + printf '%s\n' "$$V" >$@.out + mv $@.out $@ version.h: version VERSION=`cat version` && printf '%s\n' \ 'static char const PKGVERSION[]="($(PACKAGE)) ";' \ "static char const TZVERSION[]=\"$$VERSION\";" \ 'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";' \ - >$@ + >$@.out + mv $@.out $@ zdump: $(TZDOBJS) $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) @@ -458,7 +460,8 @@ yearistype: yearistype.sh chmod +x yearistype leapseconds: $(LEAP_DEPS) - $(AWK) -f leapseconds.awk leap-seconds.list >$@ + $(AWK) -f leapseconds.awk leap-seconds.list >$@.out + mv $@.out $@ # Arguments to pass to submakes of install_data. # They can be overridden by later submake arguments. @@ -521,8 +524,9 @@ $(TZS_NEW): $(TDATA) zdump zic '/^Zone/{print wd "/tzs.dir/" $$2}' $(TDATA) \ | LC_ALL=C sort` && \ ./zdump -i -c $(TZS_YEAR) $$zones >>$@.out - sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@ + sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@.sed.out rm -fr tzs.dir $@.out + mv $@.sed.out $@ # If $(TZS) does not already exist (e.g., old-format tarballs), create it. # If it exists but 'make check_tzs' fails, a maintainer should inspect the @@ -548,8 +552,9 @@ tzselect: tzselect.ksh version -e 's|$REPORT_BUGS_TO$=.*|\1=$(BUGEMAIL)|' \ -e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \ -e 's|$TZVERSION$=.*|\1='"$$VERSION"'|' \ - <$@.ksh >$@ - chmod +x $@ + <$@.ksh >$@.out + chmod +x $@.out + mv $@.out $@ check: check_character_set check_white_space check_links check_sorted \ check_tables check_tzs check_web @@ -624,7 +629,8 @@ zdump.8.txt: zdump.8 zic.8.txt: zic.8 $(MANTXTS): workman.sh - LC_ALL=C sh workman.sh `expr $@ : '$.*$\.txt$$'` >$@ + LC_ALL=C sh workman.sh `expr $@ : '$.*$\.txt$$'` >$@.out + mv $@.out $@ # Set the time stamps to those of the git repository, if available, # and if the files have not changed since then. @@ -722,12 +728,14 @@ tzcode$(VERSION).tar.gz: set-timestamps.out LC_ALL=C && export LC_ALL && \ tar $(TARFLAGS) -cf - \ $(COMMON) $(DOCS) $(SOURCES) | \ - gzip $(GZIPFLAGS) > $@ + gzip $(GZIPFLAGS) >$@.out + mv $@.out $@ tzdata$(VERSION).tar.gz: set-timestamps.out LC_ALL=C && export LC_ALL && \ tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) | \ - gzip $(GZIPFLAGS) > $@ + gzip $(GZIPFLAGS) >$@.out + mv $@.out $@ tzdb-$(VERSION).tar.lz: set-timestamps.out rm -fr tzdb-$(VERSION) @@ -735,7 +743,8 @@ tzdb-$(VERSION).tar.lz: set-timestamps.out ln $(ENCHILADA) tzdb-$(VERSION) touch -cmr `ls -t tzdb-$(VERSION)/* | sed 1q` tzdb-$(VERSION) LC_ALL=C && export LC_ALL && \ - tar $(TARFLAGS) -cf - tzdb-$(VERSION) | lzip -9 > $@ + tar $(TARFLAGS) -cf - tzdb-$(VERSION) | lzip -9 >$@.out + mv $@.out $@ tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz gpg --armor --detach-sign $? -- 2.7.4

1 0

[PROPOSED PATCH] Port better to Solaris 10
by Paul Eggert Oct. 4, 2016

Oct. 4, 2016

Solaris 10 /bin/sh does not handle exit status properly when called from 'make', and does not support the $(...) syntax. Also, simplify by removing comments about Solaris 9 and earlier, which are no longer maintained. * Makefile: Update comments for current operating system status. (version, set-timestamps.out): Don’t fail on Solaris 10 merely because git is not installed. (version, version.h, $(TZS_NEW), tzselect, check_white_space) (set-timestamps.out, check_time_t_alternatives, tarballs) (traditional_tarballs, signatures, traditional_signatures) (tzdb-$(VERSION).tar.lz): Use `foo`, not $(foo), for Solaris 10 /bin/sh. Check for command failure the old-fashioned way. * private.h, zdump.c (HAVE_STDINT_H): Default to 1 if limits.h defines INTMAX_MAX, for Solaris 10. * strftime.c (_fmt): Rework to avoid diagnostic about unreachable code from Sun C 5.9. Remove unwanted test for tm_isdst in the case where TM_GMTOFF is defined. --- Makefile | 47 +++++++++++++++++++++++++++-------------------- private.h | 12 ++++++------ strftime.c | 24 +++++++++++++----------- zdump.c | 2 +- 4 files changed, 47 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index abeacfa..4781633 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,6 @@ PACKRATDATA= YEARISTYPE= ./yearistype # Non-default libraries needed to link. -# Add -lintl if you want to use 'gettext' on Solaris. LDLIBS= # Add the following to the end of the "CFLAGS=" line as needed. @@ -109,9 +108,10 @@ LDLIBS= # -DHAVE_DECL_ASCTIME_R=0 if <time.h> does not declare asctime_r # -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows) # -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS) -# -DHAVE_GETTEXT=1 if 'gettext' works (GNU, Linux, Solaris); also see LDLIBS +# -DHAVE_GETTEXT=1 if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris) # -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares -# ctime_r and asctime_r incompatibly with the POSIX standard (Solaris 8). +# ctime_r and asctime_r incompatibly with the POSIX standard +# (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). # -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h" # -DHAVE_LINK=0 if your system lacks a link function # -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function @@ -434,16 +434,18 @@ INSTALL: ALL install date.1 cp -f date.1 $(DESTDIR)$(MANDIR)/man1/. version: $(VERSION_DEPS) - { V=$$(git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ - --abbrev=7 --dirty) || \ + { (type git) >/dev/null 2>&1 && \ + V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ + --abbrev=7 --dirty` || \ V=$(VERSION); } && \ printf '%s\n' "$$V" >$@ version.h: version - (echo 'static char const PKGVERSION[]="($(PACKAGE)) ";' && \ - printf 'static char const TZVERSION[]="%s";\n' \ - "$$(cat version)" && \ - echo 'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";') >$@ + VERSION=`cat version` && printf '%s\n' \ + 'static char const PKGVERSION[]="($(PACKAGE)) ";' \ + "static char const TZVERSION[]=\"$$VERSION\";" \ + 'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";' \ + >$@ zdump: $(TZDOBJS) $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) @@ -514,9 +516,10 @@ $(TZS_NEW): $(TDATA) zdump zic $(zic) -d tzs.dir $(TDATA) $(AWK) '/^Link/{print $$1 "\t" $$2 "\t" $$3}' \ $(TDATA) | LC_ALL=C sort >$@.out - zones=$$($(AWK) -v wd="$$(pwd)" \ + wd=`pwd` && \ + zones=`$(AWK) -v wd="$$wd" \ '/^Zone/{print wd "/tzs.dir/" $$2}' $(TDATA) \ - | LC_ALL=C sort) && \ + | LC_ALL=C sort` && \ ./zdump -i -c $(TZS_YEAR) $$zones >>$@.out sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@ rm -fr tzs.dir $@.out @@ -538,13 +541,13 @@ date: $(DATEOBJS) $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS) tzselect: tzselect.ksh version - sed \ + VERSION=`cat version` && sed \ -e 's|#!/bin/bash|#!$(KSHELL)|g' \ -e 's|AWK=[^}]*|AWK=$(AWK)|g' \ -e 's|$PKGVERSION$=.*|\1='\''($(PACKAGE)) '\''|' \ -e 's|$REPORT_BUGS_TO$=.*|\1=$(BUGEMAIL)|' \ -e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \ - -e 's|$TZVERSION$=.*|\1='"$$(cat version)"'|' \ + -e 's|$TZVERSION$=.*|\1='"$$VERSION"'|' \ <$@.ksh >$@ chmod +x $@ @@ -562,7 +565,8 @@ check_character_set: $(ENCHILADA) ! grep -Env $(OK_LINE) $(ENCHILADA) check_white_space: $(ENCHILADA) - ! grep -En ' '$(TAB_CHAR)"|$$(printf '[\f\r\v]')" $(ENCHILADA) + patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \ + ! grep -En "$$pat" $(ENCHILADA) ! grep -n '[[:space:]]$$' $(ENCHILADA) CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; } @@ -631,7 +635,8 @@ $(MANTXTS): workman.sh # to be the maximum of the files it depends on. set-timestamps.out: $(ENCHILADA) rm -f $@ - if files=`git ls-files $(ENCHILADA)` && \ + if (type git) >/dev/null 2>&1 && \ + files=`git ls-files $(ENCHILADA)` && \ touch -md @1 test.out; then \ rm -f test.out && \ for file in $$files; do \ @@ -648,8 +653,8 @@ set-timestamps.out: $(ENCHILADA) touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \ exit; \ done - touch -cmr $$(ls -t $(TZS_DEPS) | sed 1q) $(TZS) - touch -cmr $$(ls -t $(VERSION_DEPS) | sed 1q) version + touch -cmr `ls -t $(TZS_DEPS) | sed 1q` $(TZS) + touch -cmr `ls -t $(VERSION_DEPS) | sed 1q` version touch $@ # The zics below ensure that each data file can stand on its own. @@ -673,11 +678,12 @@ check_time_t_alternatives: else \ quiet_option=''; \ fi && \ + wd=`pwd` && \ zones=`$(AWK) '/^[^#]/ { print $$3 }' <zone1970.tab` && \ for type in $(TIME_T_ALTERNATIVES); do \ mkdir -p time_t.dir/$$type && \ $(MAKE) clean_misc && \ - $(MAKE) TOPDIR=$$(pwd)/time_t.dir/$$type \ + $(MAKE) TOPDIR="$$wd/time_t.dir/$$type" \ CFLAGS='$(CFLAGS) -Dtime_tz='"'$$type'" \ REDO='$(REDO)' \ install && \ @@ -702,7 +708,8 @@ check_time_t_alternatives: rm -fr time_t.dir tarballs traditional_tarballs signatures traditional_signatures: version - $(MAKE) VERSION="$$(cat version)" $@_version + VERSION=`cat version` && \ + $(MAKE) VERSION="$$VERSION" $@_version tarballs_version: traditional_tarballs_version tzdb-$(VERSION).tar.lz traditional_tarballs_version: \ @@ -726,7 +733,7 @@ tzdb-$(VERSION).tar.lz: set-timestamps.out rm -fr tzdb-$(VERSION) mkdir tzdb-$(VERSION) ln $(ENCHILADA) tzdb-$(VERSION) - touch -cmr $$(ls -t tzdb-$(VERSION)/* | sed 1q) tzdb-$(VERSION) + touch -cmr `ls -t tzdb-$(VERSION)/* | sed 1q` tzdb-$(VERSION) LC_ALL=C && export LC_ALL && \ tar $(TARFLAGS) -cf - tzdb-$(VERSION) | lzip -9 > $@ diff --git a/private.h b/private.h index daad297..d6a6c5d 100644 --- a/private.h +++ b/private.h @@ -78,9 +78,9 @@ /* Enable tm_gmtoff and tm_zone on GNUish systems. */ #define _GNU_SOURCE 1 -/* Fix asctime_r on Solaris 10. */ +/* Fix asctime_r on Solaris 11. */ #define _POSIX_PTHREAD_SEMANTICS 1 -/* Enable strtoimax on Solaris 10. */ +/* Enable strtoimax on pre-C99 Solaris 11. */ #define __EXTENSIONS__ 1 /* @@ -161,15 +161,15 @@ /* ** Define HAVE_STDINT_H's default value here, rather than at the -** start, since __GLIBC__'s value depends on previously-included -** files. -** (glibc 2.1 and later have stdint.h, even with pre-C99 compilers.) +** start, since __GLIBC__ and INTMAX_MAX's values depend on +** previously-included files. glibc 2.1 and Solaris 10 and later have +** stdint.h, even with pre-C99 compilers. */ #ifndef HAVE_STDINT_H #define HAVE_STDINT_H \ (199901 <= __STDC_VERSION__ \ || 2 < __GLIBC__ + (1 <= __GLIBC_MINOR__) \ - || __CYGWIN__) + || __CYGWIN__ || INTMAX_MAX) #endif /* !defined HAVE_STDINT_H */ #if HAVE_STDINT_H diff --git a/strftime.c b/strftime.c index 151b2e9..984ead5 100644 --- a/strftime.c +++ b/strftime.c @@ -496,15 +496,14 @@ label: */ continue; case 'z': +#if defined TM_GMTOFF || defined USG_COMPAT || defined ALTZONE { long diff; char const * sign; - if (t->tm_isdst < 0) - continue; -#ifdef TM_GMTOFF +# ifdef TM_GMTOFF diff = t->TM_GMTOFF; -#else /* !defined TM_GMTOFF */ +# else /* ** C99 says that the UT offset must ** be computed by looking only at @@ -524,19 +523,21 @@ label: ** determinable, so output nothing if the ** appropriate variables are not available. */ + if (t->tm_isdst < 0) + continue; if (t->tm_isdst == 0) -#ifdef USG_COMPAT +# ifdef USG_COMPAT diff = -timezone; -#else /* !defined USG_COMPAT */ +# else continue; -#endif /* !defined USG_COMPAT */ +# endif else -#ifdef ALTZONE +# ifdef ALTZONE diff = -altzone; -#else /* !defined ALTZONE */ +# else continue; -#endif /* !defined ALTZONE */ -#endif /* !defined TM_GMTOFF */ +# endif +# endif if (diff < 0) { sign = "-"; diff = -diff; @@ -547,6 +548,7 @@ label: (diff % MINSPERHOUR); pt = _conv(diff, "%04d", pt, ptlim); } +#endif continue; case '+': pt = _fmt(Locale->date_fmt, t, pt, ptlim, diff --git a/zdump.c b/zdump.c index f68ba3d..a901aff 100644 --- a/zdump.c +++ b/zdump.c @@ -45,7 +45,7 @@ # define HAVE_STDINT_H \ (199901 <= __STDC_VERSION__ \ || 2 < __GLIBC__ + (1 <= __GLIBC_MINOR__) \ - || __CYGWIN__) + || __CYGWIN__ || INTMAX_MAX) #endif #if HAVE_STDINT_H # include "stdint.h" -- 2.7.4

1 0