File localtime-2039.patch of Package glibc.10668

2018-05-18  Joseph Myers  <joseph@codesourcery.com>

	[BZ #22639]
	* time/tzset.c (SECSPERDAY): Cast to time_t.
	* time/tst-y2039.c: New file.
	* time/Makefile (tests): Add tst-y2039.

Index: glibc-2.26/time/Makefile
===================================================================
--- glibc-2.26.orig/time/Makefile
+++ glibc-2.26/time/Makefile
@@ -43,7 +43,7 @@ tests	:= test_time clocktest tst-posixtz
 	   tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \
 	   tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \
 	   tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \
-	   tst-tzname
+	   tst-tzname tst-y2039
 
 include ../Rules
 
Index: glibc-2.26/time/tst-y2039.c
===================================================================
--- /dev/null
+++ glibc-2.26/time/tst-y2039.c
@@ -0,0 +1,46 @@
+/* Test for localtime bug in year 2039 (bug 22639).
+   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <time.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <support/check.h>
+
+static int
+do_test (void)
+{
+  TEST_VERIFY_EXIT (setenv ("TZ", "PST8PDT,M3.2.0,M11.1.0", 1) == 0);
+  tzset ();
+  if (sizeof (time_t) > 4)
+    {
+      time_t ouch = (time_t) 2187810000LL;
+      char buf[500];
+      struct tm *tm = localtime (&ouch);
+      TEST_VERIFY_EXIT (tm != NULL);
+      TEST_VERIFY_EXIT (strftime (buf, sizeof buf, "%Y-%m-%d %H:%M:%S %Z", tm)
+			> 0);
+      puts (buf);
+      TEST_VERIFY (strcmp (buf, "2039-04-30 14:00:00 PDT") == 0);
+    }
+  else
+    FAIL_UNSUPPORTED ("32-bit time_t");
+  return 0;
+}
+
+#include <support/test-driver.c>
Index: glibc-2.26/time/tzset.c
===================================================================
--- glibc-2.26.orig/time/tzset.c
+++ glibc-2.26/time/tzset.c
@@ -27,7 +27,7 @@
 
 #include <timezone/tzfile.h>
 
-#define SECSPERDAY 86400
+#define SECSPERDAY ((time_t) 86400)
 
 char *__tzname[2] = { (char *) "GMT", (char *) "GMT" };
 int __daylight = 0;
openSUSE Build Service is sponsored by