summary refs log tree commit diff
path: root/time
diff options
context:
space:
mode:
authorIan Wienand <ianw@vmware.com>2012-05-09 06:13:29 +0200
committerAndreas Jaeger <jaegerandi@gmail.com>2012-05-09 06:15:56 +0200
commitb9f1922d7e7d67e8559664b266b2a6b35121d6af (patch)
tree65d89032f4307d1ed075c8f1304e1fa8b6e588f4 /time
parent1db86e88458d3f9cd159cebbda7f773ba29bacb2 (diff)
downloadglibc-b9f1922d7e7d67e8559664b266b2a6b35121d6af.tar.gz
glibc-b9f1922d7e7d67e8559664b266b2a6b35121d6af.tar.xz
glibc-b9f1922d7e7d67e8559664b266b2a6b35121d6af.zip
Fix daylight time change for the US
[BZ #14080]
	* time/tzset.c (__tzset_parse_tz): Update default rules for
	daylight time changes in the Energy Policy Act of 2005.
Diffstat (limited to 'time')
-rw-r--r--time/tzset.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/time/tzset.c b/time/tzset.c
index a2d29721a3..5704437d23 100644
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2002,2003,2004,2007,2009 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -333,18 +333,24 @@ __tzset_parse_tz (tz)
 	}
       else if (*tz == '\0')
 	{
-	  /* United States Federal Law, the equivalent of "M4.1.0,M10.5.0".  */
+         /* Daylight time rules in the U.S. are defined in the
+            U.S. Code, Title 15, Chapter 6, Subchapter IX - Standard
+            Time.  These dates were established by Congress in the
+            Energy Policy Act of 2005 [Pub. L. no. 109-58, 119 Stat 594
+            (2005)].
+	    Below is the equivalent of "M3.2.0,M11.1.0" [/2 not needed
+	    since 2:00AM is the default].  */
 	  tzr->type = M;
 	  if (tzr == &tz_rules[0])
 	    {
-	      tzr->m = 4;
-	      tzr->n = 1;
+	      tzr->m = 3;
+	      tzr->n = 2;
 	      tzr->d = 0;
 	    }
 	  else
 	    {
-	      tzr->m = 10;
-	      tzr->n = 5;
+	      tzr->m = 11;
+	      tzr->n = 1;
 	      tzr->d = 0;
 	    }
 	}