From 6c4f6dc574ad334bd625e53947bc3cf3e6a584c0 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 16 Nov 2015 11:13:14 +0000 Subject: [PATCH] tzdata: updated to 2015g --- tzdata/.footprint | 13 +++++++++++++ tzdata/.md5sum | 8 ++++---- tzdata/Pkgfile | 2 +- tzdata/tzcode-makefile.patch | 30 +++++++++++++++--------------- tzdata/zic_host-makefile.patch | 24 +++++++++++++++--------- 5 files changed, 48 insertions(+), 29 deletions(-) diff --git a/tzdata/.footprint b/tzdata/.footprint index 6acf58a..08054ad 100644 --- a/tzdata/.footprint +++ b/tzdata/.footprint @@ -128,6 +128,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/America/Argentina/ -rw-r--r-- root/root usr/share/zoneinfo/America/Eirunepe -rw-r--r-- root/root usr/share/zoneinfo/America/El_Salvador -rw-r--r-- root/root usr/share/zoneinfo/America/Ensenada +-rw-r--r-- root/root usr/share/zoneinfo/America/Fort_Nelson -rw-r--r-- root/root usr/share/zoneinfo/America/Fort_Wayne -rw-r--r-- root/root usr/share/zoneinfo/America/Fortaleza -rw-r--r-- root/root usr/share/zoneinfo/America/Glace_Bay @@ -270,6 +271,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/Asia/Bishkek -rw-r--r-- root/root usr/share/zoneinfo/Asia/Brunei -rw-r--r-- root/root usr/share/zoneinfo/Asia/Calcutta +-rw-r--r-- root/root usr/share/zoneinfo/Asia/Chita -rw-r--r-- root/root usr/share/zoneinfo/Asia/Choibalsan -rw-r--r-- root/root usr/share/zoneinfo/Asia/Chongqing -rw-r--r-- root/root usr/share/zoneinfo/Asia/Chungking @@ -327,6 +329,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/Asia/Seoul -rw-r--r-- root/root usr/share/zoneinfo/Asia/Shanghai -rw-r--r-- root/root usr/share/zoneinfo/Asia/Singapore +-rw-r--r-- root/root usr/share/zoneinfo/Asia/Srednekolymsk -rw-r--r-- root/root usr/share/zoneinfo/Asia/Taipei -rw-r--r-- root/root usr/share/zoneinfo/Asia/Tashkent -rw-r--r-- root/root usr/share/zoneinfo/Asia/Tbilisi @@ -548,6 +551,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/Mexico/ drwxr-xr-x root/root usr/share/zoneinfo/Pacific/ -rw-r--r-- root/root usr/share/zoneinfo/Pacific/Apia -rw-r--r-- root/root usr/share/zoneinfo/Pacific/Auckland +-rw-r--r-- root/root usr/share/zoneinfo/Pacific/Bougainville -rw-r--r-- root/root usr/share/zoneinfo/Pacific/Chatham -rw-r--r-- root/root usr/share/zoneinfo/Pacific/Chuuk -rw-r--r-- root/root usr/share/zoneinfo/Pacific/Easter @@ -731,6 +735,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/America/Argentina/ -rw-r--r-- root/root usr/share/zoneinfo/posix/America/Eirunepe -rw-r--r-- root/root usr/share/zoneinfo/posix/America/El_Salvador -rw-r--r-- root/root usr/share/zoneinfo/posix/America/Ensenada +-rw-r--r-- root/root usr/share/zoneinfo/posix/America/Fort_Nelson -rw-r--r-- root/root usr/share/zoneinfo/posix/America/Fort_Wayne -rw-r--r-- root/root usr/share/zoneinfo/posix/America/Fortaleza -rw-r--r-- root/root usr/share/zoneinfo/posix/America/Glace_Bay @@ -873,6 +878,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Bishkek -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Brunei -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Calcutta +-rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Chita -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Choibalsan -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Chongqing -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Chungking @@ -930,6 +936,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Seoul -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Shanghai -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Singapore +-rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Srednekolymsk -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Taipei -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Tashkent -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Tbilisi @@ -1151,6 +1158,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Mexico/ drwxr-xr-x root/root usr/share/zoneinfo/posix/Pacific/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Pacific/Apia -rw-r--r-- root/root usr/share/zoneinfo/posix/Pacific/Auckland +-rw-r--r-- root/root usr/share/zoneinfo/posix/Pacific/Bougainville -rw-r--r-- root/root usr/share/zoneinfo/posix/Pacific/Chatham -rw-r--r-- root/root usr/share/zoneinfo/posix/Pacific/Chuuk -rw-r--r-- root/root usr/share/zoneinfo/posix/Pacific/Easter @@ -1333,6 +1341,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/America/Argentina/ -rw-r--r-- root/root usr/share/zoneinfo/right/America/Eirunepe -rw-r--r-- root/root usr/share/zoneinfo/right/America/El_Salvador -rw-r--r-- root/root usr/share/zoneinfo/right/America/Ensenada +-rw-r--r-- root/root usr/share/zoneinfo/right/America/Fort_Nelson -rw-r--r-- root/root usr/share/zoneinfo/right/America/Fort_Wayne -rw-r--r-- root/root usr/share/zoneinfo/right/America/Fortaleza -rw-r--r-- root/root usr/share/zoneinfo/right/America/Glace_Bay @@ -1475,6 +1484,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Bishkek -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Brunei -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Calcutta +-rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Chita -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Choibalsan -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Chongqing -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Chungking @@ -1532,6 +1542,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Seoul -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Shanghai -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Singapore +-rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Srednekolymsk -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Taipei -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Tashkent -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Tbilisi @@ -1753,6 +1764,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Mexico/ drwxr-xr-x root/root usr/share/zoneinfo/right/Pacific/ -rw-r--r-- root/root usr/share/zoneinfo/right/Pacific/Apia -rw-r--r-- root/root usr/share/zoneinfo/right/Pacific/Auckland +-rw-r--r-- root/root usr/share/zoneinfo/right/Pacific/Bougainville -rw-r--r-- root/root usr/share/zoneinfo/right/Pacific/Chatham -rw-r--r-- root/root usr/share/zoneinfo/right/Pacific/Chuuk -rw-r--r-- root/root usr/share/zoneinfo/right/Pacific/Easter @@ -1820,3 +1832,4 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/US/ -rw-r--r-- root/root usr/share/zoneinfo/right/WET -rw-r--r-- root/root usr/share/zoneinfo/right/Zulu -rw-r--r-- root/root usr/share/zoneinfo/zone.tab +-rw-r--r-- root/root usr/share/zoneinfo/zone1970.tab diff --git a/tzdata/.md5sum b/tzdata/.md5sum index 0e8a346..0060995 100644 --- a/tzdata/.md5sum +++ b/tzdata/.md5sum @@ -1,4 +1,4 @@ -cd1eb9bce381be0d6a35337f593aca18 tzcode-makefile.patch -552251600ee3571c244d33c7196ec2ed tzcode2014e.tar.gz -8a49fdedd4e832da8e85f7f9bcaedc33 tzdata2014e.tar.gz -551ff6a7cbf071846bf3b18114bb3ab4 zic_host-makefile.patch +19986ddaf9ce3bec9f15079cfeb38646 tzcode-makefile.patch +a2c47d908a6426f530efb1393cf1cd06 tzcode2015g.tar.gz +8d46e8b225b9a04c75f5c39636435ad6 tzdata2015g.tar.gz +203bb291f71de5506b42088783d2f164 zic_host-makefile.patch diff --git a/tzdata/Pkgfile b/tzdata/Pkgfile index 5064d31..f2eab03 100644 --- a/tzdata/Pkgfile +++ b/tzdata/Pkgfile @@ -4,7 +4,7 @@ # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu name=tzdata -version=2014e +version=2015g release=1 source=(http://www.iana.org/time-zones/repository/releases/$name$version.tar.gz diff --git a/tzdata/tzcode-makefile.patch b/tzdata/tzcode-makefile.patch index 1c964c1..c47f508 100644 --- a/tzdata/tzcode-makefile.patch +++ b/tzdata/tzcode-makefile.patch @@ -10,9 +10,9 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile ---- tzcode.orig/Makefile 2013-12-21 14:05:52.169527862 +0100 -+++ tzcode/Makefile 2013-12-21 14:06:05.299054045 +0100 -@@ -45,21 +45,21 @@ +--- tzcode.orig/Makefile 2015-08-12 11:00:16.696813835 +0200 ++++ tzcode/Makefile 2015-08-12 11:00:45.296792265 +0200 +@@ -44,21 +44,21 @@ # Everything gets put in subdirectories of. . . @@ -37,9 +37,9 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile # If you "make INSTALL", the "date" command gets installed in. . . -@@ -290,8 +290,10 @@ +@@ -320,8 +320,10 @@ - ############################################################################### + #MAKE= make -cc= cc -CC= $(cc) -DTZDIR=\"$(TZDIR)\" @@ -50,8 +50,8 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile AR= ar -@@ -341,19 +343,18 @@ - ALL: all date +@@ -371,19 +373,18 @@ + ALL: all date $(ENCHILADA) install: all $(DATA) $(REDO) $(MANS) - mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \ @@ -62,7 +62,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile $(DESTDIR)$(MANDIR)/man8 $(ZIC) -y $(YEARISTYPE) \ -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/. + cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. - cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. + cp zic zdump $(DESTDIR)$(SBINDIR)/. + cp tzselect $(DESTDIR)$(BINDIR)/. @@ -74,7 +74,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile INSTALL: ALL install date.1 mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 -@@ -396,19 +397,17 @@ +@@ -426,19 +427,17 @@ # You must replace all of $(TZDIR) to switch from not using leap seconds # to using them, or vice versa. right_posix: right_only leapseconds @@ -98,13 +98,13 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile + $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ -L leapseconds $(TDATA) - zones: $(REDO) -@@ -431,7 +430,7 @@ - <$? >$@ + posix_packrat: posix_only backzone +@@ -467,7 +466,7 @@ chmod +x $@ --check: check_character_set check_tables check_web -+check: check_character_set check_tables + check: check_character_set check_white_space check_links check_sorted \ +- check_tables check_web ++ check_tables check_character_set: $(ENCHILADA) - sharp='#'; ! grep -n $(INVALID_CHAR) $(ENCHILADA) + LC_ALL=en_US.utf8 && export LC_ALL && \ diff --git a/tzdata/zic_host-makefile.patch b/tzdata/zic_host-makefile.patch index 5772498..18698d1 100644 --- a/tzdata/zic_host-makefile.patch +++ b/tzdata/zic_host-makefile.patch @@ -1,26 +1,26 @@ ---- Makefile.orig 2014-10-01 15:40:50.900427432 +0000 -+++ Makefile 2014-10-01 15:42:37.400428739 +0000 -@@ -231,8 +231,8 @@ +--- Makefile.orig 2015-11-16 11:06:13.302320678 +0000 ++++ Makefile 2015-11-16 11:07:23.232321567 +0000 +@@ -236,8 +236,8 @@ LDFLAGS= $(LFLAGS) -zic= ./zic -ZIC= $(zic) $(ZFLAGS) -+ZIC_HOST= ./zic_host -+ZIC= $(ZIC_HOST) $(ZFLAGS) ++zic= ./zic_host ++ZIC_HOST= $(zic) $(ZFLAGS) ZFLAGS= -@@ -347,7 +347,7 @@ +@@ -377,7 +377,7 @@ $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) \ $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ $(DESTDIR)$(MANDIR)/man8 - $(ZIC) -y $(YEARISTYPE) \ + $(ZIC_HOST) -y $(YEARISTYPE) \ -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/. + cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. cp zic zdump $(DESTDIR)$(SBINDIR)/. -@@ -380,11 +380,11 @@ +@@ -410,11 +410,11 @@ $(AWK) -f leapseconds.awk leap-seconds.list >$@ posix_only: zic $(TDATA) @@ -34,7 +34,7 @@ -L leapseconds $(TDATA) # In earlier versions of this makefile, the other two directories were -@@ -398,16 +398,16 @@ +@@ -428,21 +428,21 @@ # to using them, or vice versa. right_posix: right_only leapseconds rm -fr $(DESTDIR)$(TZDIR)/right @@ -54,4 +54,10 @@ + $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ -L leapseconds $(TDATA) + posix_packrat: posix_only backzone + $(AWK) '/^Rule/' $(TDATA) | \ +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ ++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ + -L /dev/null - backzone + zones: $(REDO) -- 2.26.2