From 9e3458d13ae01591479732c1fe0cada8fd2259b7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 31 May 2014 15:41:54 +0200
Subject: update to latest upstream

---
 package/tzdata/patches/patch-localtime_c | 44 ++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 8 deletions(-)

(limited to 'package/tzdata/patches/patch-localtime_c')

diff --git a/package/tzdata/patches/patch-localtime_c b/package/tzdata/patches/patch-localtime_c
index 62ddda50c..548d10073 100644
--- a/package/tzdata/patches/patch-localtime_c
+++ b/package/tzdata/patches/patch-localtime_c
@@ -1,10 +1,38 @@
---- w-tzdata-2013d-1.orig/localtime.c	2013-05-28 06:26:18.000000000 +0200
-+++ w-tzdata-2013d-1/localtime.c	2013-10-04 11:35:35.000000000 +0200
-@@ -10,6 +10,7 @@
+--- w-tzdata-2014d-1.orig/localtime.c	2014-01-18 07:42:22.000000000 +0100
++++ w-tzdata-2014d-1/localtime.c	2014-05-30 09:09:35.130879741 +0200
+@@ -1329,7 +1329,7 @@ localsub(const time_t *const timep, cons
+ }
  
- /*LINTLIBRARY*/
+ struct tm *
+-localtime(const time_t *const timep)
++localtime_tz(const time_t *const timep)
+ {
+ 	tzset();
+ 	return localsub(timep, 0L, &tm);
+@@ -1550,7 +1550,7 @@ ctime(const time_t *const timep)
+ **	to local time in the form of a string. It is equivalent to
+ **		asctime(localtime(timer))
+ */
+-	return asctime(localtime(timep));
++	return asctime(localtime_tz(timep));
+ }
  
-+#include <stdint.h>
- #include "private.h"
- #include "tzfile.h"
- #include "fcntl.h"
+ char *
+@@ -1929,7 +1929,7 @@ time1(struct tm *const tmp,
+ }
+ 
+ time_t
+-mktime(struct tm *const tmp)
++mktime_tz(struct tm *const tmp)
+ {
+ 	tzset();
+ 	return time1(tmp, localsub, 0L);
+@@ -1973,7 +1973,7 @@ timeoff(struct tm *const tmp, const long
+ long
+ gtime(struct tm *const tmp)
+ {
+-	const time_t	t = mktime(tmp);
++	const time_t	t = mktime_tz(tmp);
+ 
+ 	if (t == WRONG)
+ 		return -1;
-- 
cgit v1.2.3