GNU C Library master sources branch, master, updated. glibc-2.12-163-g315970f

[pasky 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  315970f6ca97a589c9220ed5481dbe000137373d (commit)
      from  44f91d3884e241e4402eb3e8b9b6dfa2acc9f80c (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=315970f6ca97a589c9220ed5481dbe000137373d

commit 315970f6ca97a589c9220ed5481dbe000137373d
Author: Petr Baudis <pasky@suse.cz>
Date:   Sat Sep 25 03:06:00 2010 +0200

    Add two forgotten licence exceptions
    
    The two files in debug/ are included in libc_nonshared.a and the
    functions may be included in linked executables. Use the same text
    as in other files going to libc_nonshared.a.

diff --git a/ChangeLog b/ChangeLog
index 99e5619..d7f0819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-24  Petr Baudis <pasky@suse.cz>
+
+	* debug/stack_chk_fail_local.c: Add missing licence exception.
+	* debug/warning-nop.c: Likewise.
+
 2010-09-15  Michael B. Brutman  <brutman@us.ibm.com>
 
 	* sysdeps/powerpc/powerpc32/ppca2/memcpy.S: New file.
diff --git a/debug/stack_chk_fail_local.c b/debug/stack_chk_fail_local.c
index de0de8f..113088d 100644
--- a/debug/stack_chk_fail_local.c
+++ b/debug/stack_chk_fail_local.c
@@ -6,6 +6,23 @@
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.
 
+   In addition to the permissions in the GNU Lesser General Public
+   License, the Free Software Foundation gives you unlimited
+   permission to link the compiled version of this file with other
+   programs, and to distribute those programs without any restriction
+   coming from the use of this file. (The GNU Lesser General Public
+   License restrictions do apply in other respects; for example, they
+   cover modification of the file, and distribution when not linked
+   into another program.)
+
+   Note that people who make modified versions of this file are not
+   obligated to grant this special exception for their modified
+   versions; it is their choice whether to do so. The GNU Lesser
+   General Public License gives permission to release a modified
+   version without this exception; this exception also makes it
+   possible to release a modified version which carries forward this
+   exception.
+
    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
diff --git a/debug/warning-nop.c b/debug/warning-nop.c
index 8f2f66e..74df8e7 100644
--- a/debug/warning-nop.c
+++ b/debug/warning-nop.c
@@ -7,6 +7,23 @@
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.
 
+   In addition to the permissions in the GNU Lesser General Public
+   License, the Free Software Foundation gives you unlimited
+   permission to link the compiled version of this file with other
+   programs, and to distribute those programs without any restriction
+   coming from the use of this file. (The GNU Lesser General Public
+   License restrictions do apply in other respects; for example, they
+   cover modification of the file, and distribution when not linked
+   into another program.)
+
+   Note that people who make modified versions of this file are not
+   obligated to grant this special exception for their modified
+   versions; it is their choice whether to do so. The GNU Lesser
+   General Public License gives permission to release a modified
+   version without this exception; this exception also makes it
+   possible to release a modified version which carries forward this
+   exception.
+
    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

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

Summary of changes:
 ChangeLog                    |    5 +++++
 debug/stack_chk_fail_local.c |   17 +++++++++++++++++
 debug/warning-nop.c          |   17 +++++++++++++++++
 3 files changed, 39 insertions(+), 0 deletions(-)


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