aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/tzdata/APKBUILD14
-rw-r--r--main/tzdata/Makefile.patch29
2 files changed, 24 insertions, 19 deletions
diff --git a/main/tzdata/APKBUILD b/main/tzdata/APKBUILD
index 3b17b1efd1..80ba5fb655 100644
--- a/main/tzdata/APKBUILD
+++ b/main/tzdata/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=tzdata
-pkgver=2013c
+pkgver=2013d
_tzcodever=2011i
_ptzver=0.3
pkgrel=0
@@ -56,17 +56,17 @@ package() {
}
md5sums="cf7f4335b7c8682899fa2814e711c1b2 tzcode2011i.tar.gz
-b5062217a2dea6823dd69b4dda97b249 tzdata2013c.tar.gz
+65b6818162230fc02f86f293376c73df tzdata2013d.tar.gz
99efce32b3f870e1b071ce47f3a98a18 posixtz-0.3.tar.bz2
-c5bb94e9a3605485069c027373f68689 Makefile.patch
+ad92d330afeb73e48645513a92eecc04 Makefile.patch
0b4d86d855f7daa3f79c9f28f04a48f9 0001-posixtz-fix-up-lseek.patch"
sha256sums="f0dd991de3f8d6c599c104e294377c9befa1ef40aa5a1d09e2e295a453f3c1ec tzcode2011i.tar.gz
-e597a7eb239155eb2247fd4788f7fa10bf21d6469961200a6ca202f19cc15c87 tzdata2013c.tar.gz
+cd1c96f0676e0edceebc6a418a2222ffb05becb41180dd9f847b9c7cef303b04 tzdata2013d.tar.gz
574a765e0569458d7ccb76e97b3a96de2f0c19ad093c6811675b8a57f7088a53 posixtz-0.3.tar.bz2
-9f7c97a7c7a0c325b2d3797bfcd60d03540f08b5b437c8146a0171258741e018 Makefile.patch
+3c3ffe3baa33a4fa9b73d64c5fded51015215efc107232c04358f6985cbcc685 Makefile.patch
e0b6de6a3d389f96dc95e5b75c2ada9afc63858e3770a0f07a62e1e56a77561e 0001-posixtz-fix-up-lseek.patch"
sha512sums="4febb158d9799cb9a7017259d76b74d54d0a8f9dfb46443fa79701f488964080b1d64d81eec38c11fcb85aecf31f42bf42437d77575537c598c37a6569765696 tzcode2011i.tar.gz
-9fafc76ab3177672339a0e94f0083f01f8955d16f498fcd3d15c7e2f436f7f9d9b8d234e35b9acfd9ea58e5bfaeccca26a580f0498e07474555c963b31cf6de9 tzdata2013c.tar.gz
+dc4220c8c2113d899b8901561a1335eb4de31881622fd78f2470c625689efe08d50575aeb927d688fd5d24739f1d64222d40221091ff25f9ad61a65f0ca039d0 tzdata2013d.tar.gz
57dfd38a4050230e49ec9a23bfec5e995dd48ed1fa338a72c4d2c3b86590d4c7357d3dc6d12b4f1564beebcf48f0d0ed855574e4ba29268160d8f84928a477fd posixtz-0.3.tar.bz2
-2000e0381978957dd80e1b6b930932acb3f0397fe682fc194818848b14a2872242f96b98c24b8ab8b8af0e57ccf3a541ab1de4b2f114e6a15d22ed71a19331a3 Makefile.patch
+91f2f21cb84de0e3997685a023ab91d04415b0ace8c439743905bae8c77d313a48b911bababd5e389266c76b2bf0c50a84cf13f209bdd3a9c81933eff96dcd5f Makefile.patch
c7ddb4eecf8e55e6153f641d478a3affa2522e093e94e95e2ee43039a5c6eed28dcc472bcaa3a7c7c1b84747744c25028467e0048765ef0fc75b89345fc29318 0001-posixtz-fix-up-lseek.patch"
diff --git a/main/tzdata/Makefile.patch b/main/tzdata/Makefile.patch
index 9caefcbfbf..7e6e38d6a4 100644
--- a/main/tzdata/Makefile.patch
+++ b/main/tzdata/Makefile.patch
@@ -1,6 +1,8 @@
---- ./Makefile.orig 2013-02-27 17:20:35.000000000 +0000
-+++ ./Makefile 2013-03-13 15:03:39.518555524 +0000
-@@ -45,17 +45,17 @@
+diff --git a/Makefile b/Makefile
+index 3659378..3d9c9d1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -45,20 +45,20 @@ POSIXRULES= America/New_York
# Everything gets put in subdirectories of. . .
@@ -14,14 +16,17 @@
-TZDIR= $(TOPDIR)/etc/zoneinfo
+TZDIR= $(TOPDIR)/share/zoneinfo
+ # 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
+
# 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. . .
-@@ -63,7 +63,7 @@
+@@ -66,7 +66,7 @@ BINDIR= $(TOPDIR)/bin
# Manual pages go in subdirectories of. . .
@@ -30,7 +35,7 @@
# Library functions are put in an archive in LIBDIR.
-@@ -94,7 +94,7 @@
+@@ -97,7 +97,7 @@ YEARISTYPE= ./yearistype
# Non-default libraries needed to link.
# Add -lintl if you want to use `gettext' on Solaris.
@@ -39,7 +44,7 @@
# Add the following to the end of the "CFLAGS=" line as needed.
# -DHAVE_ADJTIME=0 if `adjtime' does not exist (SVR0?)
-@@ -228,7 +228,7 @@
+@@ -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.
@@ -48,7 +53,7 @@
# Linker flags. Default to $(LFLAGS) for backwards compatibility
# to tzcode2012h and earlier.
-@@ -289,8 +289,10 @@
+@@ -292,8 +292,10 @@ GZIPFLAGS= -9n
###############################################################################
@@ -61,7 +66,7 @@
TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c
TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -331,14 +333,16 @@
+@@ -334,14 +336,16 @@ all: tzselect zic zdump $(LIBOBJS)
ALL: all date
@@ -82,7 +87,7 @@
$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
-rm -f $(MANDIR)/man3/newctime.3 \
$(MANDIR)/man3/newtzset.3 \
-@@ -347,13 +351,11 @@
+@@ -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/.
@@ -98,7 +103,7 @@
-rm -f $(MANDIR)/man1/date.1
cp date.1 $(MANDIR)/man1/.
-@@ -388,9 +390,9 @@
+@@ -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)
@@ -110,7 +115,7 @@
posix_right: posix_only other_two
-@@ -418,7 +420,7 @@
+@@ -421,7 +423,7 @@ tzselect: tzselect.ksh
<$? >$@
chmod +x $@