tzdata: updated to 2018d

diff --git a/tzdata/.footprint b/tzdata/.footprint
index d54785af4fee8f7612bcbf3a6bf2596ce39365a8..de1c5808930465d78830133985b9fdab1ae72e63 100644 (file)
--- a/tzdata/.footprint
+++ b/tzdata/.footprint
@@ -1,10 +1,10 @@
 drwxr-xr-x     root/root       usr/
 drwxr-xr-x     root/root       usr/bin/
 -rwxr-xr-x     root/root       usr/bin/tzselect
+-rwxr-xr-x     root/root       usr/bin/zdump
 drwxr-xr-x     root/root       usr/lib/
 -rw-r--r--     root/root       usr/lib/libtz.a
 drwxr-xr-x     root/root       usr/sbin/
--rwxr-xr-x     root/root       usr/sbin/zdump
 -rwxr-xr-x     root/root       usr/sbin/zic
 drwxr-xr-x     root/root       usr/share/
 drwxr-xr-x     root/root       usr/share/man/
@@ -203,6 +203,7 @@ drwxr-xr-x  root/root       usr/share/zoneinfo-leaps/America/North_Dakota/
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/America/Porto_Acre
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/America/Porto_Velho
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/America/Puerto_Rico
+-rw-r--r--     root/root       usr/share/zoneinfo-leaps/America/Punta_Arenas
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/America/Rainy_River
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/America/Rankin_Inlet
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/America/Recife
@@ -398,7 +399,6 @@ drwxr-xr-x  root/root       usr/share/zoneinfo-leaps/Brazil/
 drwxr-xr-x     root/root       usr/share/zoneinfo-leaps/Canada/
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/Canada/Atlantic
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/Canada/Central
--rw-r--r--     root/root       usr/share/zoneinfo-leaps/Canada/East-Saskatchewan
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/Canada/Eastern
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/Canada/Mountain
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/Canada/Newfoundland
@@ -618,7 +618,6 @@ drwxr-xr-x  root/root       usr/share/zoneinfo-leaps/US/
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/US/Michigan
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/US/Mountain
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/US/Pacific
--rw-r--r--     root/root       usr/share/zoneinfo-leaps/US/Pacific-New
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/US/Samoa
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/UTC
 -rw-r--r--     root/root       usr/share/zoneinfo-leaps/Universal
@@ -818,6 +817,7 @@ drwxr-xr-x  root/root       usr/share/zoneinfo/America/North_Dakota/
 -rw-r--r--     root/root       usr/share/zoneinfo/America/Porto_Acre
 -rw-r--r--     root/root       usr/share/zoneinfo/America/Porto_Velho
 -rw-r--r--     root/root       usr/share/zoneinfo/America/Puerto_Rico
+-rw-r--r--     root/root       usr/share/zoneinfo/America/Punta_Arenas
 -rw-r--r--     root/root       usr/share/zoneinfo/America/Rainy_River
 -rw-r--r--     root/root       usr/share/zoneinfo/America/Rankin_Inlet
 -rw-r--r--     root/root       usr/share/zoneinfo/America/Recife
@@ -1013,7 +1013,6 @@ drwxr-xr-x        root/root       usr/share/zoneinfo/Brazil/
 drwxr-xr-x     root/root       usr/share/zoneinfo/Canada/
 -rw-r--r--     root/root       usr/share/zoneinfo/Canada/Atlantic
 -rw-r--r--     root/root       usr/share/zoneinfo/Canada/Central
--rw-r--r--     root/root       usr/share/zoneinfo/Canada/East-Saskatchewan
 -rw-r--r--     root/root       usr/share/zoneinfo/Canada/Eastern
 -rw-r--r--     root/root       usr/share/zoneinfo/Canada/Mountain
 -rw-r--r--     root/root       usr/share/zoneinfo/Canada/Newfoundland
@@ -1233,7 +1232,6 @@ drwxr-xr-x        root/root       usr/share/zoneinfo/US/
 -rw-r--r--     root/root       usr/share/zoneinfo/US/Michigan
 -rw-r--r--     root/root       usr/share/zoneinfo/US/Mountain
 -rw-r--r--     root/root       usr/share/zoneinfo/US/Pacific
--rw-r--r--     root/root       usr/share/zoneinfo/US/Pacific-New
 -rw-r--r--     root/root       usr/share/zoneinfo/US/Samoa
 -rw-r--r--     root/root       usr/share/zoneinfo/UTC
 -rw-r--r--     root/root       usr/share/zoneinfo/Universal
@@ -1241,7 +1239,8 @@ drwxr-xr-x        root/root       usr/share/zoneinfo/US/
 -rw-r--r--     root/root       usr/share/zoneinfo/WET
 -rw-r--r--     root/root       usr/share/zoneinfo/Zulu
 -rw-r--r--     root/root       usr/share/zoneinfo/iso3166.tab
--rw-r--r--     root/root       usr/share/zoneinfo/localtime
+-rw-r--r--     root/root       usr/share/zoneinfo/leapseconds
 -rw-r--r--     root/root       usr/share/zoneinfo/posixrules
+-rw-r--r--     root/root       usr/share/zoneinfo/tzdata.zi
 -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 f39b699ccd37b929f7c987953140d65410f6a02c..9c147c134bcea28495b3c9807bc04148ae8c04b5 100644 (file)
--- a/tzdata/.md5sum
+++ b/tzdata/.md5sum
@@ -1,3 +1,3 @@
-0684b98eb184fab250b6ca946862078d  tzcode2016j.tar.gz
-db361d005ac8b30a2d18c5ca38d3e8ab  tzdata2016j.tar.gz
-80108700f43a0760704ff5bb5dd6abef  zic_host-makefile.patch
+96612b4f5d7e8804fd9a0981c021be90  tzcode2018d.tar.gz
+871a7ef808eb42ebc551acdb3d661554  tzdata2018d.tar.gz
+0ca71c1ee194354048eb5383ed25bc10  zic_host-makefile.patch

diff --git a/tzdata/Pkgfile b/tzdata/Pkgfile
index 56893623b86d3fbf2ea7dc91fb2b32610ae4e3f7..05e54bbe9349d4e49d4419c22e3705af5590cbb3 100644 (file)
--- 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=2016j
+version=2018d
 release=1
 
 source=(http://www.iana.org/time-zones/repository/releases/$name$version.tar.gz
@@ -19,19 +19,13 @@ build() {
 
   patch -p1 -i $SRC/zic_host-makefile.patch
 
-  make -j1 install \
-    CFLAGS="$CFLAGS" \
-    DESTDIR=$PKG \
-    TOPDIR=/usr \
-    TZDIR=/usr/share/zoneinfo \
-    ETCDIR=/usr/sbin \
-    MANDIR=/usr/share/man \
-    CC=$CC AR=$AR
+  make CFLAGS="$CFLAGS" CC=$CC AR=$AR
+  make DESTDIR=$PKG install CC=$CC AR=$AR
 
   # provided by man-pages
   rm -r $PKG/usr/share/man/man{5,8}
 
-  # move tzselect to /usr/bin
-  install -d $PKG/usr/bin
-  mv $PKG/usr/{sbin/tzselect,bin}
+  # conflict with glibc
+  rm $PKG/etc/localtime
+  rmdir $PKG/etc
 }

diff --git a/tzdata/zic_host-makefile.patch b/tzdata/zic_host-makefile.patch
index fab8b9cc64dd8f8ca56912ac5eb6a53c521a129a..f18fcf2260a821d56f9c0cb959158dd30f5b7258 100644 (file)
--- a/tzdata/zic_host-makefile.patch
+++ b/tzdata/zic_host-makefile.patch
@@ -1,8 +1,6 @@
-Binary files orig/.Makefile.un~ and new/.Makefile.un~ differ
-diff -pruN orig/Makefile new/Makefile
---- orig/Makefile      2016-11-07 00:38:36.000000000 +0000
-+++ new/Makefile       2017-02-15 18:46:50.541740747 +0000
-@@ -255,14 +255,14 @@ LEAPSECONDS=
+--- src.orig/Makefile  2018-05-09 22:44:57.787104123 +0000
++++ src/Makefile       2018-05-09 22:47:08.227103096 +0000
+@@ -350,14 +350,14 @@
  
  # The zic command and its arguments.
  
@@ -15,17 +13,17 @@ diff -pruN orig/Makefile new/Makefile
  
  # How to use zic to install tz binary files.
  
--ZIC_INSTALL=  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
-+ZIC_INSTALL=  $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
+-ZIC_INSTALL=  $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS)
++ZIC_INSTALL=  $(ZIC_HOST) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS)
  
  # The name of a Posix-compliant 'awk' on your system.
  AWK=          awk
-@@ -475,7 +475,7 @@ INSTALLARGS = \
-  PACKRATDATA='$(PACKRATDATA)' \
-  TZDIR=$(TZDIR) \
-  YEARISTYPE=$(YEARISTYPE) \
+@@ -600,7 +600,7 @@
+  TZDEFAULT='$(TZDEFAULT)' \
+  TZDIR='$(TZDIR)' \
+  YEARISTYPE='$(YEARISTYPE)' \
 - ZIC='$(ZIC)'
 + ZIC='$(ZIC_HOST)'
  
  # 'make install_data' installs one set of tz binary files.
- # It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc.
+ install_data: zic leapseconds yearistype tzdata.zi