GNU C Library master sources branch, master, updated. glibc-2.15-769-gb9f1922

[aj at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  b9f1922d7e7d67e8559664b266b2a6b35121d6af (commit)
       via  1db86e88458d3f9cd159cebbda7f773ba29bacb2 (commit)
      from  ee0db19075ebc3428291934df429365a5abaea47 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b9f1922d7e7d67e8559664b266b2a6b35121d6af

commit b9f1922d7e7d67e8559664b266b2a6b35121d6af
Author: Ian Wienand <ianw@vmware.com>
Date:   Wed May 9 06:13:29 2012 +0200

    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.

diff --git a/ChangeLog b/ChangeLog
index 3a1eb32..81d17c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-08  Ian Wienand  <ianw@vmware.com>
+
+	[BZ #14080]
+	* time/tzset.c (__tzset_parse_tz): Update default rules for
+	daylight time changes in the Energy Policy Act of 2005.
+
 2012-05-09  Andreas Jaeger  <aj@suse.de>
 
 	[BZ #13983]
diff --git a/NEWS b/NEWS
index 18f63c5..ca1f753 100644
--- a/NEWS
+++ b/NEWS
@@ -24,7 +24,7 @@ Version 2.16
   13895, 13908, 13910, 13911, 13912, 13913, 13914, 13915, 13916, 13917,
   13918, 13919, 13920, 13921, 13922, 13923, 13924, 13926, 13927, 13928,
   13938, 13941, 13942, 13963, 13967, 13970, 13973, 13979, 13983, 14027,
-  14033, 14034, 14040, 14049, 14055, 14064
+  14033, 14034, 14040, 14049, 14055, 14064, 14080
 
 * ISO C11 support:
 
diff --git a/time/tzset.c b/time/tzset.c
index a2d2972..5704437 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;
 	    }
 	}

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1db86e88458d3f9cd159cebbda7f773ba29bacb2

commit 1db86e88458d3f9cd159cebbda7f773ba29bacb2
Author: Andreas Jaeger <jaegerandi@gmail.com>
Date:   Wed May 9 06:08:28 2012 +0200

    Make ldconfig message clearer
    
    [BZ #13983]
    Let not confuse the user and think there's an error instead of
    a warning.

diff --git a/ChangeLog b/ChangeLog
index ad116e5..3a1eb32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-09  Andreas Jaeger  <aj@suse.de>
+
+	[BZ #13983]
+	* elf/ldconfig.c (parse_conf): Change string to make clear that
+	ldconfig only issued a warning if ld.so.conf does not exist.
+
 2012-05-08  David S. Miller  <davem@davemloft.net>
 
 	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_floor-vis3.S: Use
diff --git a/NEWS b/NEWS
index ec7eb92..18f63c5 100644
--- a/NEWS
+++ b/NEWS
@@ -23,8 +23,8 @@ Version 2.16
   13854, 13871, 13872, 13873, 13879, 13883, 13884, 13885, 13886, 13892,
   13895, 13908, 13910, 13911, 13912, 13913, 13914, 13915, 13916, 13917,
   13918, 13919, 13920, 13921, 13922, 13923, 13924, 13926, 13927, 13928,
-  13938, 13941, 13942, 13963, 13967, 13970, 13973, 13979, 14027, 14033,
-  14034, 14040, 14049, 14055, 14064
+  13938, 13941, 13942, 13963, 13967, 13970, 13973, 13979, 13983, 14027,
+  14033, 14034, 14040, 14049, 14055, 14064
 
 * ISO C11 support:
 
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index aa97213..8d6e77f 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 1999.
 
@@ -1061,7 +1061,9 @@ parse_conf (const char *filename, bool do_chroot)
 
   if (file == NULL)
     {
-      error (0, errno, _("Can't open configuration file %s"), canon);
+      error (0, errno, _("\
+Warning: ignoring configuration file that cannot be opened: %s"),
+	     canon);
       if (canon != filename)
 	free ((char *) canon);
       return;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |   12 ++++++++++++
 NEWS           |    4 ++--
 elf/ldconfig.c |    6 ++++--
 time/tzset.c   |   18 ++++++++++++------
 4 files changed, 30 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources