update to latest upstream version

3 files changed, 24 insertions, 23 deletions

diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile
index 5effefd74..68f9cd035 100644
--- a/package/tzdata/Makefile
+++ b/package/tzdata/Makefile
@@ -4,17 +4,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		tzdata
-PKG_VERSION:=		2010o
+PKG_VERSION:=		2013d
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		5cae5c56fad81dc29f8fcd933a05768e a7a776a5713831993e814fe0c05f9fd5
+PKG_MD5SUM:=		65b6818162230fc02f86f293376c73df 4616a9560270f180eeb9a08540636890
 PKG_DESCR:=		Timezone data (/usr/share/zoneinfo)
 PKG_SECTION:=		utils
-PKG_URL:=		ftp://elsie.nci.nih.gov/pub/
-PKG_SITES:=		ftp://elsie.nci.nih.gov/pub/
+PKG_URL:=		http://www.iana.org/time-zones/
+PKG_SITES:=		http://www.iana.org/time-zones/repository/releases/
 PKG_NOPARALLEL:=	1
 
-# Note that tzcode does NOT have the same version as tzdata does :[
-DISTFILES:=             ${PKG_NAME}${PKG_VERSION}.tar.gz tzcode2010n.tar.gz
+DISTFILES:=             ${PKG_NAME}${PKG_VERSION}.tar.gz tzcode${PKG_VERSION}.tar.gz
 # both archives do not extract into subdirectories
 WRKDIST=		${WRKDIR}
 
diff --git a/package/tzdata/patches/patch-Makefile b/package/tzdata/patches/patch-Makefile
index d8b759a8c..1938011c5 100644
--- a/package/tzdata/patches/patch-Makefile
+++ b/package/tzdata/patches/patch-Makefile
@@ -1,22 +1,24 @@
---- w-tzdata-2010o-1.orig/Makefile	2010-10-12 18:36:50.000000000 +0200
-+++ w-tzdata-2010o-1/Makefile	2011-01-22 22:10:00.358658180 +0100
-@@ -212,13 +212,13 @@ GCC_DEBUG_FLAGS = -Dlint -g -O -fno-comm
+--- w-tzdata-2013d-1.orig/Makefile	2013-07-05 16:38:01.000000000 +0200
++++ w-tzdata-2013d-1/Makefile	2013-08-14 12:58:49.000000000 +0200
+@@ -231,7 +231,7 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-co
  # before the first Monday in January when a "%V" format is used and January 1
  # falls on a Friday, Saturday, or Sunday.
  
 -CFLAGS=
 +CFLAGS?=
  
- # If you want zic's -s option used when installing, uncomment the next line
- # ZFLAGS=	-s
+ # Linker flags.  Default to $(LFLAGS) for backwards compatibility
+ # to tzcode2012h and earlier.
+@@ -239,7 +239,7 @@ CFLAGS=
+ LDFLAGS=	$(LFLAGS)
  
  zic=		./zic
 -ZIC=		$(zic) $(ZFLAGS)
 +ZIC=		./zic_for_build $(ZFLAGS)
  
  # The name of a Posix-compliant `awk' on your system.
- AWK=		nawk
-@@ -279,7 +279,7 @@ ENCHILADA=	$(DOCS) $(SOURCES) $(DATA) $(
+ AWK=		awk
+@@ -330,7 +330,7 @@ ENCHILADA=	$(COMMON) $(DOCS) $(SOURCES)
  
  SHELL=		/bin/sh
  
@@ -25,11 +27,11 @@
  
  ALL:		all date
  
-@@ -309,6 +309,14 @@ INSTALL:	ALL install date.1
- 		-rm -f $(MANDIR)/man1/date.1
- 		cp date.1 $(MANDIR)/man1/.
+@@ -365,6 +365,14 @@ version.h:
+ 		 echo 'static char const TZVERSION[]="$(VERSION)";' && \
+ 		 echo 'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";') >$@
  
-+zic_for_build:
++zic_for_build: version.h
 +		$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) zic.c -o zic_build.o
 +		$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) localtime.c -o localtime_build.o
 +		$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) asctime.c -o asctime_build.o
@@ -38,9 +40,9 @@
 +		$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ zic_build.o localtime_build.o asctime_build.o scheck_build.o ialloc_build.o 
 +
  zdump:		$(TZDOBJS)
- 		$(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
+ 		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS)
  
-@@ -319,10 +327,10 @@ yearistype:	yearistype.sh
+@@ -375,10 +383,10 @@ yearistype:	yearistype.sh
  		cp yearistype.sh yearistype
  		chmod +x yearistype
  
@@ -53,7 +55,7 @@
  		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA)
  
  # In earlier versions of this makefile, the other two directories were
-@@ -334,7 +342,7 @@ right_only:	zic leapseconds $(TDATA)
+@@ -390,7 +398,7 @@ right_only:	zic leapseconds $(TDATA)
  # Therefore, the other two directories are now siblings of $(TZDIR).
  # You must replace all of $(TZDIR) to switch from not using leap seconds
  # to using them, or vice versa.
diff --git a/package/tzdata/patches/patch-date_c b/package/tzdata/patches/patch-date_c
index dbdeb3aed..1f93988b2 100644
--- a/package/tzdata/patches/patch-date_c
+++ b/package/tzdata/patches/patch-date_c
@@ -1,7 +1,7 @@
 strchr() is false defined here
---- w-tzdata-2010o-1.orig/date.c	2010-10-12 18:36:51.000000000 +0200
-+++ w-tzdata-2010o-1/date.c	2011-02-28 00:57:57.274000374 +0100
-@@ -69,7 +69,6 @@ extern char *		getlogin();
+--- w-tzdata-2013d-1.orig/date.c	2013-05-28 06:26:18.000000000 +0200
++++ w-tzdata-2013d-1/date.c	2013-08-14 12:54:54.000000000 +0200
+@@ -60,7 +60,6 @@ extern char *		getlogin();
  extern time_t		mktime();
  extern char *		optarg;
  extern int		optind;