main/tzdata: upgrade to 2013f

2 files changed, 82 insertions, 95 deletions

diff --git a/main/tzdata/APKBUILD b/main/tzdata/APKBUILD
index 80ba5fb655..f6dc269ef0 100644
--- a/main/tzdata/APKBUILD
+++ b/main/tzdata/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tzdata
-pkgver=2013d
-_tzcodever=2011i
+pkgver=2013f
+_tzcodever=2013f
 _ptzver=0.3
 pkgrel=0
 pkgdesc="Timezone data"
@@ -40,33 +40,27 @@ build() {
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" \
+		install || return 1
 	rm -f "$pkgdir"/usr/share/zoneinfo/localtime
-	
-	if [ "$ALPINE_LIBC" = "eglibc" ]; then
-		# tzselect is bashish
-		depends="bash"
-		# we have this in eglibc
-		rm -rf "$pkgdir"/usr/sbin
-	else
-		rm -f "$pkgdir"/usr/bin/tzselect
-		install -Dm755 "$srcdir"/posixtz-$_ptzver/posixtz \
-			"$pkgdir"/usr/bin/posixtz || return 1
-	fi
+
+	rm "$pkgdir"/usr/bin/tzselect || return 1
+	install -Dm755 "$srcdir"/posixtz-$_ptzver/posixtz \
+		"$pkgdir"/usr/bin/posixtz || return 1
 }
 
-md5sums="cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
-65b6818162230fc02f86f293376c73df  tzdata2013d.tar.gz
+md5sums="0cca1a29a3734935e7dd44e86fa3bbd5  tzcode2013f.tar.gz
+6d35470a6090e741c39aa9bc9cd103e3  tzdata2013f.tar.gz
 99efce32b3f870e1b071ce47f3a98a18  posixtz-0.3.tar.bz2
-ad92d330afeb73e48645513a92eecc04  Makefile.patch
+8c44bb07b4e86568f5ed4bdf10de6a0f  Makefile.patch
 0b4d86d855f7daa3f79c9f28f04a48f9  0001-posixtz-fix-up-lseek.patch"
-sha256sums="f0dd991de3f8d6c599c104e294377c9befa1ef40aa5a1d09e2e295a453f3c1ec  tzcode2011i.tar.gz
-cd1c96f0676e0edceebc6a418a2222ffb05becb41180dd9f847b9c7cef303b04  tzdata2013d.tar.gz
+sha256sums="ffd83e06f61f7854827cd7ac34239ef29c3d5ec760d7216f06c68f1b1d805ea3  tzcode2013f.tar.gz
+5b72ed29bea75e0b59cbd3f575db0aac62f96a2a36e652725f674a92a95d4ada  tzdata2013f.tar.gz
 574a765e0569458d7ccb76e97b3a96de2f0c19ad093c6811675b8a57f7088a53  posixtz-0.3.tar.bz2
-3c3ffe3baa33a4fa9b73d64c5fded51015215efc107232c04358f6985cbcc685  Makefile.patch
+7437b00386ee673467e0fa01a0dbae1a3a32d709e444443c1eefd00b890ed725  Makefile.patch
 e0b6de6a3d389f96dc95e5b75c2ada9afc63858e3770a0f07a62e1e56a77561e  0001-posixtz-fix-up-lseek.patch"
-sha512sums="4febb158d9799cb9a7017259d76b74d54d0a8f9dfb46443fa79701f488964080b1d64d81eec38c11fcb85aecf31f42bf42437d77575537c598c37a6569765696  tzcode2011i.tar.gz
-dc4220c8c2113d899b8901561a1335eb4de31881622fd78f2470c625689efe08d50575aeb927d688fd5d24739f1d64222d40221091ff25f9ad61a65f0ca039d0  tzdata2013d.tar.gz
+sha512sums="80015341cb969345ba629da65bc41c3abc75e170ab4b6795ef83828d05a737ae6d3de89806a116ba7e43e0f2c8c0f28e91cbee2022b9f9115a79df26d046bd66  tzcode2013f.tar.gz
+489c6386b3926bcd5c257efbfdfe4fc62beff7bd030e2c686c7de4857d8b8ba13d09522358aedc6c324a0dc5d449e0dbf48ec289a5e91b1cb70f36886604c239  tzdata2013f.tar.gz
 57dfd38a4050230e49ec9a23bfec5e995dd48ed1fa338a72c4d2c3b86590d4c7357d3dc6d12b4f1564beebcf48f0d0ed855574e4ba29268160d8f84928a477fd  posixtz-0.3.tar.bz2
-91f2f21cb84de0e3997685a023ab91d04415b0ace8c439743905bae8c77d313a48b911bababd5e389266c76b2bf0c50a84cf13f209bdd3a9c81933eff96dcd5f  Makefile.patch
+5ab04af020cca764179885f7c7b93402bc16a625a92acdde0e52ba56552aaa04c50723d2e0f98e13d7090a1a34b450818a86119d20301e2b8518bccc0cbdd10f  Makefile.patch
 c7ddb4eecf8e55e6153f641d478a3affa2522e093e94e95e2ee43039a5c6eed28dcc472bcaa3a7c7c1b84747744c25028467e0048765ef0fc75b89345fc29318  0001-posixtz-fix-up-lseek.patch"
diff --git a/main/tzdata/Makefile.patch b/main/tzdata/Makefile.patch
index 7e6e38d6a4..f496098f30 100644
--- a/main/tzdata/Makefile.patch
+++ b/main/tzdata/Makefile.patch
@@ -1,20 +1,27 @@
-diff --git a/Makefile b/Makefile
-index 3659378..3d9c9d1 100644
+ - Fix up default paths
+ - Support env CC
+ - Don't build/install libtz.a
+ - Don't install man-pages provided by sys-apps/man-pages
+ - Move zic, zdump to sbin and tzselect to bin ala glibc
+ - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc
+ - Install leaps zoneinfo into zoneinfo/right/ ala glibc
+
 --- a/Makefile
 +++ b/Makefile
-@@ -45,20 +45,20 @@ POSIXRULES=	America/New_York
+@@ -45,21 +45,21 @@
  
  # Everything gets put in subdirectories of. . .
  
 -TOPDIR=		/usr/local
-+TOPDIR=		$(DESTDIR)/usr
++TOPDIR=		/usr
  
  # "Compiled" time zone information is placed in the "TZDIR" directory
  # (and subdirectories).
  # Use an absolute path name for TZDIR unless you're just testing the software.
  
--TZDIR=		$(TOPDIR)/etc/zoneinfo
-+TZDIR=		$(TOPDIR)/share/zoneinfo
+ TZDIR_BASENAME=	zoneinfo
+-TZDIR=		$(TOPDIR)/etc/$(TZDIR_BASENAME)
++TZDIR=		$(TOPDIR)/share/$(TZDIR_BASENAME)
  
  # Types to try, as an alternative to time_t.  int64_t should be first.
  TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
@@ -22,11 +29,11 @@ index 3659378..3d9c9d1 100644
  # The "tzselect", "zic", and "zdump" commands get installed in. . .
  
 -ETCDIR=		$(TOPDIR)/etc
-+SBINDIR=	$(TOPDIR)/sbin
++SBINDIR=		$(TOPDIR)/sbin
  
  # If you "make INSTALL", the "date" command gets installed in. . .
  
-@@ -66,7 +66,7 @@ BINDIR=		$(TOPDIR)/bin
+@@ -67,7 +67,7 @@
  
  # Manual pages go in subdirectories of. . .
  
@@ -35,25 +42,7 @@ index 3659378..3d9c9d1 100644
  
  # Library functions are put in an archive in LIBDIR.
  
-@@ -97,7 +97,7 @@ YEARISTYPE=	./yearistype
- 
- # Non-default libraries needed to link.
- # Add -lintl if you want to use `gettext' on Solaris.
--LDLIBS=
-+LDLIBS=$(LDFLAGS)
- 
- # Add the following to the end of the "CFLAGS=" line as needed.
- #  -DHAVE_ADJTIME=0 if `adjtime' does not exist (SVR0?)
-@@ -231,7 +231,7 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \
- # before the first Monday in January when a "%V" format is used and January 1
- # falls on a Friday, Saturday, or Sunday.
- 
--CFLAGS=
-+CFLAGS += -std=gnu99
- 
- # Linker flags.  Default to $(LFLAGS) for backwards compatibility
- # to tzcode2012h and earlier.
-@@ -292,8 +292,10 @@ GZIPFLAGS=	-9n
+@@ -294,8 +294,10 @@
  
  ###############################################################################
  
@@ -61,61 +50,65 @@ index 3659378..3d9c9d1 100644
 -CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
 +CC+=		-DTZDIR=\"$(TZDIR)\"
 +ifeq ($(NLS),1)
-+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
++CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
 +endif
  
  TZCSRCS=	zic.c localtime.c asctime.c scheck.c ialloc.c
  TZCOBJS=	zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -334,14 +336,16 @@ all:		tzselect zic zdump $(LIBOBJS)
+@@ -338,14 +340,16 @@
  
  ALL:		all date
  
--install:	all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
-+install:	all $(DATA) $(REDO) $(MANS) $(TABDATA)
+-install:	all $(DATA) $(REDO) $(DESTDIR)$(TZLIB) $(MANS)
++install:	all $(DATA) $(REDO) $(MANS)
  		$(ZIC) -y $(YEARISTYPE) \
- 			-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- 		-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
- 		cp iso3166.tab zone.tab $(TZDIR)/.
--		-mkdir $(TOPDIR) $(ETCDIR)
--		cp tzselect zic zdump $(ETCDIR)/.
--		-mkdir $(TOPDIR) $(MANDIR) \
-+		-mkdir -p $(TOPDIR) $(SBINDIR)
-+		cp zic zdump $(SBINDIR)/.
-+		-mkdir -p $(TOPDIR) $(BINDIR)
-+		cp tzselect $(BINDIR)/.
-+		-mkdir -p $(TOPDIR) $(MANDIR) \
- 			$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
- 		-rm -f $(MANDIR)/man3/newctime.3 \
- 			$(MANDIR)/man3/newtzset.3 \
-@@ -350,13 +354,11 @@ install:	all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
- 			$(MANDIR)/man8/zdump.8 \
- 			$(MANDIR)/man8/zic.8
- 		cp newctime.3 newtzset.3 $(MANDIR)/man3/.
--		cp tzfile.5 $(MANDIR)/man5/.
--		cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
+ 			-d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
+ 		-rm -f $(DESTDIR)$(TZDIR)/iso3166.tab \
+ 			$(DESTDIR)$(TZDIR)/zone.tab
+ 		cp iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/.
+-		-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(ETCDIR)
+-		cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
++		-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(SBINDIR)
++		cp zic zdump $(DESTDIR)$(SBINDIR)/.
++		-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(BINDIR)
++		cp tzselect $(DESTDIR)$(BINDIR)/.
+ 		-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(MANDIR) \
+ 			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
+ 			$(DESTDIR)$(MANDIR)/man8
+@@ -356,8 +360,6 @@
+ 			$(DESTDIR)$(MANDIR)/man8/zdump.8 \
+ 			$(DESTDIR)$(MANDIR)/man8/zic.8
+ 		cp newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
+-		cp tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
+-		cp tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
  
  INSTALL:	ALL install date.1
--		-mkdir $(TOPDIR) $(BINDIR)
-+		-mkdir -p $(TOPDIR) $(BINDIR)
- 		cp date $(BINDIR)/.
--		-mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1
-+		-mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1
- 		-rm -f $(MANDIR)/man1/date.1
- 		cp date.1 $(MANDIR)/man1/.
- 
-@@ -391,9 +393,9 @@ right_only:	zic leapseconds $(TDATA)
- # You must replace all of $(TZDIR) to switch from not using leap seconds
- # to using them, or vice versa.
- other_two:	zic leapseconds $(TDATA)
--		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
-+		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
- 		$(ZIC) -y $(YEARISTYPE) \
--			-d $(TZDIR)-leaps -L leapseconds $(TDATA)
-+			-d $(TZDIR)/right -L leapseconds $(TDATA)
- 
- posix_right:	posix_only other_two
- 
-@@ -421,7 +423,7 @@ tzselect:	tzselect.ksh
+ 		-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(BINDIR)
+@@ -405,17 +407,17 @@
+ right_posix:	right_only leapseconds
+ 		rm -fr $(DESTDIR)$(TZDIR)-leaps
+-		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
++		ln -s . $(DESTDIR)$(TZDIR)/right || \
+-		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
++		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
+ 			-L leapseconds $(TDATA)
+-		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
++		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
+ 			-L /dev/null $(TDATA)
+ 
+ posix_right:	posix_only leapseconds
+ 		rm -fr $(DESTDIR)$(TZDIR)-posix
+-		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
++		ln -s . $(DESTDIR)$(TZDIR)/posix || \
+-		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
++		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
+ 			-L /dev/null $(TDATA)
+-		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
++		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
+ 			-L leapseconds $(TDATA)
+ 
+ zones:		$(REDO)
+@@ -442,7 +442,7 @@
  			<$? >$@
  		chmod +x $@