From b8f56a08f2538a7c2300fea9d1b9e9a24bb7d893 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 13 Mar 2013 15:04:12 +0000
Subject: [PATCH] main/tzdata: upgrade to 2013a
---
main/tzdata/APKBUILD | 18 +++++++++++----
main/tzdata/Makefile.patch | 46 +++++++++++++++-----------------------
2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/main/tzdata/APKBUILD b/main/tzdata/APKBUILD
index b96832119833..bb3b7839ed15 100644
--- a/main/tzdata/APKBUILD
+++ b/main/tzdata/APKBUILD
@@ -1,10 +1,10 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=tzdata
-pkgver=2012j
+pkgver=2013a
_tzcodever=2011i
_ptzver=0.3
-pkgrel=1
+pkgrel=0
pkgdesc="Timezone data"
url="http://www.twinsun.com/tz/tz-link.htm"
arch="all"
@@ -56,7 +56,17 @@ package() {
}
md5sums="cf7f4335b7c8682899fa2814e711c1b2 tzcode2011i.tar.gz
-ba2f92ae7ad099090e8f86cff2f2d799 tzdata2012j.tar.gz
+2a9b3208ed91652dd554e4d104662e67 tzdata2013a.tar.gz
99efce32b3f870e1b071ce47f3a98a18 posixtz-0.3.tar.bz2
-b12fcd52ddda1d4de16655e0c52a3675 Makefile.patch
+c5bb94e9a3605485069c027373f68689 Makefile.patch
0b4d86d855f7daa3f79c9f28f04a48f9 0001-posixtz-fix-up-lseek.patch"
+sha256sums="f0dd991de3f8d6c599c104e294377c9befa1ef40aa5a1d09e2e295a453f3c1ec tzcode2011i.tar.gz
+ed9f273f52d5df9ec09fdcf6684176bbdc86d0fbafcbc27b97e5a9c103024afc tzdata2013a.tar.gz
+574a765e0569458d7ccb76e97b3a96de2f0c19ad093c6811675b8a57f7088a53 posixtz-0.3.tar.bz2
+9f7c97a7c7a0c325b2d3797bfcd60d03540f08b5b437c8146a0171258741e018 Makefile.patch
+e0b6de6a3d389f96dc95e5b75c2ada9afc63858e3770a0f07a62e1e56a77561e 0001-posixtz-fix-up-lseek.patch"
+sha512sums="4febb158d9799cb9a7017259d76b74d54d0a8f9dfb46443fa79701f488964080b1d64d81eec38c11fcb85aecf31f42bf42437d77575537c598c37a6569765696 tzcode2011i.tar.gz
+c5b07246218f5c3c751b7ddc5c4ee127432fc19187019321beeff589596ae91c4d64400a63b6e335cf6a30643a8d9c8b9bd37d31c553424718626d7591aab995 tzdata2013a.tar.gz
+57dfd38a4050230e49ec9a23bfec5e995dd48ed1fa338a72c4d2c3b86590d4c7357d3dc6d12b4f1564beebcf48f0d0ed855574e4ba29268160d8f84928a477fd posixtz-0.3.tar.bz2
+2000e0381978957dd80e1b6b930932acb3f0397fe682fc194818848b14a2872242f96b98c24b8ab8b8af0e57ccf3a541ab1de4b2f114e6a15d22ed71a19331a3 Makefile.patch
+c7ddb4eecf8e55e6153f641d478a3affa2522e093e94e95e2ee43039a5c6eed28dcc472bcaa3a7c7c1b84747744c25028467e0048765ef0fc75b89345fc29318 0001-posixtz-fix-up-lseek.patch"
diff --git a/main/tzdata/Makefile.patch b/main/tzdata/Makefile.patch
index 904416294846..9caefcbfbfe2 100644
--- a/main/tzdata/Makefile.patch
+++ b/main/tzdata/Makefile.patch
@@ -1,7 +1,6 @@
-diff -Naur src/Makefile src-p/Makefile
---- src/Makefile 2007-08-20 16:47:41.000000000 +0200
-+++ src-p/Makefile 2007-10-02 04:07:44.000000000 +0200
-@@ -34,17 +34,17 @@
+--- ./Makefile.orig 2013-02-27 17:20:35.000000000 +0000
++++ ./Makefile 2013-03-13 15:03:39.518555524 +0000
+@@ -45,17 +45,17 @@
# Everything gets put in subdirectories of. . .
@@ -22,7 +21,7 @@ diff -Naur src/Makefile src-p/Makefile
# If you "make INSTALL", the "date" command gets installed in. . .
-@@ -52,7 +52,7 @@
+@@ -63,7 +63,7 @@
# Manual pages go in subdirectories of. . .
@@ -31,7 +30,7 @@ diff -Naur src/Makefile src-p/Makefile
# Library functions are put in an archive in LIBDIR.
-@@ -83,7 +83,7 @@
+@@ -94,7 +94,7 @@
# Non-default libraries needed to link.
# Add -lintl if you want to use `gettext' on Solaris.
@@ -39,17 +38,17 @@ diff -Naur src/Makefile src-p/Makefile
+LDLIBS=$(LDFLAGS)
# Add the following to the end of the "CFLAGS=" line as needed.
- # -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc)
-@@ -211,7 +211,7 @@
+ # -DHAVE_ADJTIME=0 if `adjtime' does not exist (SVR0?)
+@@ -228,7 +228,7 @@
# 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
- # If you want zic's -s option used when installing, uncomment the next line
- # ZFLAGS= -s
-@@ -241,8 +241,10 @@
+ # Linker flags. Default to $(LFLAGS) for backwards compatibility
+ # to tzcode2012h and earlier.
+@@ -289,8 +289,10 @@
###############################################################################
@@ -62,7 +61,7 @@ diff -Naur src/Makefile src-p/Makefile
TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c
TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -282,14 +284,16 @@
+@@ -331,14 +333,16 @@
ALL: all date
@@ -83,7 +82,7 @@ diff -Naur src/Makefile src-p/Makefile
$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
-rm -f $(MANDIR)/man3/newctime.3 \
$(MANDIR)/man3/newtzset.3 \
-@@ -298,13 +302,11 @@
+@@ -347,13 +351,11 @@
$(MANDIR)/man8/zdump.8 \
$(MANDIR)/man8/zic.8
cp newctime.3 newtzset.3 $(MANDIR)/man3/.
@@ -99,7 +98,7 @@ diff -Naur src/Makefile src-p/Makefile
-rm -f $(MANDIR)/man1/date.1
cp date.1 $(MANDIR)/man1/.
-@@ -334,9 +336,9 @@
+@@ -388,9 +390,9 @@
# You must replace all of $(TZDIR) to switch from not using leap seconds
# to using them, or vice versa.
other_two: zic leapseconds $(TDATA)
@@ -111,21 +110,12 @@ diff -Naur src/Makefile src-p/Makefile
posix_right: posix_only other_two
-@@ -367,7 +369,7 @@
+@@ -418,7 +420,7 @@
<$? >$@
chmod +x $@
--check: check_tables check_web
-+check: check_tables
-
- check_tables: checktab.awk $(PRIMARY_YDATA)
- $(AWK) -f checktab.awk $(PRIMARY_YDATA)
-diff -Naur src/tzselect.ksh src-p/tzselect.ksh
---- src/tzselect.ksh 2007-08-20 16:47:42.000000000 +0200
-+++ src-p/tzselect.ksh 2007-10-02 04:07:44.000000000 +0200
-@@ -1,4 +1,4 @@
--#! /bin/ksh
-+#! /bin/bash
-
- # '@(#)tzselect.ksh 8.1'
+-check: check_character_set check_tables check_web
++check: check_character_set check_tables
+ check_character_set: $(ENCHILADA)
+ sharp='#'; ! grep -n $(INVALID_CHAR) $(ENCHILADA)
--
GitLab