libc (4.3+4) unstable; urgency=medium

  * Added libelf-no-clobber-warning.patch
  * Added use-posix-functions.patch
  * Added zic-enable-leapsecond.patch
  * Added TZDIR.patch
  * Added etc-timezone.patch

4 files changed, 50 insertions, 0 deletions

diff --git a/libc/debian/patches/TZDIR.patch b/libc/debian/patches/TZDIR.patch
new file mode 100644
index 0000000..b68bc32
--- /dev/null
+++ b/libc/debian/patches/TZDIR.patch
@@ -0,0 +1,16 @@
+Description: Debian default
+Index: libc/usr/src/lib/libc/port/gen/localtime.c
+===================================================================
+--- libc.orig/usr/src/lib/libc/port/gen/localtime.c
++++ libc/usr/src/lib/libc/port/gen/localtime.c
+@@ -90,6 +90,10 @@
+ 
+ #pragma weak _tzset = tzset
+ 
++#undef TZDIR
++#define TZDIR "/usr/share/zoneinfo"
++/* ^^^ tzfile.h should respect our choice */
++
+ #include "lint.h"
+ #include "libc.h"
+ #include "tsd.h"
diff --git a/libc/debian/patches/etc-timezone.patch b/libc/debian/patches/etc-timezone.patch
new file mode 100644
index 0000000..a0bafd5
--- /dev/null
+++ b/libc/debian/patches/etc-timezone.patch
@@ -0,0 +1,16 @@
+Descriptiob: get TZ from /etc/timezone (like in Debian)
+Index: libc/usr/src/lib/libc/port/gen/localtime.c
+===================================================================
+--- libc.orig/usr/src/lib/libc/port/gen/localtime.c
++++ libc/usr/src/lib/libc/port/gen/localtime.c
+@@ -120,8 +120,8 @@
+ /* JAN_01_1902 cast to (int) - negative number of seconds from 1970 */
+ #define	JAN_01_1902		(int)0x8017E880
+ #define	LEN_TZDIR		(sizeof (TZDIR) - 1)
+-#define	TIMEZONE		"/etc/default/init"
+-#define	TZSTRING		"TZ="
++#define	TIMEZONE		"/etc/timezone"
++#define	TZSTRING		""
+ #define	HASHTABLE		31
+ 
+ #define	LEAPS_THRU_END_OF(y)	((y) / 4 - (y) / 100 + (y) / 400)
diff --git a/libc/debian/patches/series b/libc/debian/patches/series
index e2d43ff..29a0194 100644
--- a/libc/debian/patches/series
+++ b/libc/debian/patches/series
@@ -108,3 +108,6 @@ libnsl-illumos-updates.patch
 libc-malloc_usable_size.patch
 libelf-no-clobber-warning.patch
 use-posix-functions.patch
+zic-enable-leapsecond.patch
+TZDIR.patch
+etc-timezone.patch
diff --git a/libc/debian/patches/zic-enable-leapsecond.patch b/libc/debian/patches/zic-enable-leapsecond.patch
new file mode 100644
index 0000000..2a8c4a0
--- /dev/null
+++ b/libc/debian/patches/zic-enable-leapsecond.patch
@@ -0,0 +1,15 @@
+Index: libc/usr/src/cmd/zic/zic.c
+===================================================================
+--- libc.orig/usr/src/cmd/zic/zic.c
++++ libc/usr/src/cmd/zic/zic.c
+@@ -6,9 +6,7 @@
+ 
+ static char	elsieid[] = "@(#)zic.c	7.128.1";
+ 
+-/*
+- * #define	LEAPSECOND_SUPPORT
+- */
++#define	LEAPSECOND_SUPPORT
+ 
+ /*
+  * Regardless of the type of time_t, we do our work using this type.