[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r2837 - in /fsf/trunk/libc: ./ catgets/ elf/ iconv/ locale/programs/ malloc/ nscd/ posix/ sysdeps/unix/sysv/linux/
- To: commits@xxxxxxxxxx
- Subject: [commits] r2837 - in /fsf/trunk/libc: ./ catgets/ elf/ iconv/ locale/programs/ malloc/ nscd/ posix/ sysdeps/unix/sysv/linux/
- From: eglibc@xxxxxxxxxx
- Date: Mon, 16 Jul 2007 07:03:08 -0000
Author: eglibc
Date: Mon Jul 16 00:03:05 2007
New Revision: 2837
Log:
Import glibc-mainline for 2007-07-16
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/catgets/gencat.c
fsf/trunk/libc/elf/cache.c
fsf/trunk/libc/elf/chroot_canon.c
fsf/trunk/libc/elf/ldconfig.c
fsf/trunk/libc/elf/readlib.c
fsf/trunk/libc/iconv/dummy-repertoire.c
fsf/trunk/libc/iconv/iconv_charmap.c
fsf/trunk/libc/iconv/iconv_prog.c
fsf/trunk/libc/iconv/iconvconfig.c
fsf/trunk/libc/locale/programs/3level.h
fsf/trunk/libc/locale/programs/charmap-dir.c
fsf/trunk/libc/locale/programs/charmap-dir.h
fsf/trunk/libc/locale/programs/charmap-kw.gperf
fsf/trunk/libc/locale/programs/charmap-kw.h
fsf/trunk/libc/locale/programs/charmap.c
fsf/trunk/libc/locale/programs/charmap.h
fsf/trunk/libc/locale/programs/config.h
fsf/trunk/libc/locale/programs/ld-address.c
fsf/trunk/libc/locale/programs/ld-collate.c
fsf/trunk/libc/locale/programs/ld-ctype.c
fsf/trunk/libc/locale/programs/ld-identification.c
fsf/trunk/libc/locale/programs/ld-measurement.c
fsf/trunk/libc/locale/programs/ld-messages.c
fsf/trunk/libc/locale/programs/ld-monetary.c
fsf/trunk/libc/locale/programs/ld-name.c
fsf/trunk/libc/locale/programs/ld-numeric.c
fsf/trunk/libc/locale/programs/ld-paper.c
fsf/trunk/libc/locale/programs/ld-telephone.c
fsf/trunk/libc/locale/programs/ld-time.c
fsf/trunk/libc/locale/programs/linereader.c
fsf/trunk/libc/locale/programs/linereader.h
fsf/trunk/libc/locale/programs/locale-spec.c
fsf/trunk/libc/locale/programs/locale.c
fsf/trunk/libc/locale/programs/localedef.c
fsf/trunk/libc/locale/programs/localedef.h
fsf/trunk/libc/locale/programs/locarchive.c
fsf/trunk/libc/locale/programs/locfile-kw.gperf
fsf/trunk/libc/locale/programs/locfile-kw.h
fsf/trunk/libc/locale/programs/locfile-token.h
fsf/trunk/libc/locale/programs/locfile.c
fsf/trunk/libc/locale/programs/locfile.h
fsf/trunk/libc/locale/programs/repertoire.c
fsf/trunk/libc/locale/programs/repertoire.h
fsf/trunk/libc/locale/programs/simple-hash.c
fsf/trunk/libc/locale/programs/simple-hash.h
fsf/trunk/libc/locale/programs/xmalloc.c
fsf/trunk/libc/locale/programs/xstrdup.c
fsf/trunk/libc/malloc/memusagestat.c
fsf/trunk/libc/nscd/aicache.c
fsf/trunk/libc/nscd/cache.c
fsf/trunk/libc/nscd/connections.c
fsf/trunk/libc/nscd/dbg_log.c
fsf/trunk/libc/nscd/gai.c
fsf/trunk/libc/nscd/getgrgid_r.c
fsf/trunk/libc/nscd/getgrnam_r.c
fsf/trunk/libc/nscd/gethstbyad_r.c
fsf/trunk/libc/nscd/gethstbynm2_r.c
fsf/trunk/libc/nscd/getpwnam_r.c
fsf/trunk/libc/nscd/getpwuid_r.c
fsf/trunk/libc/nscd/getsrvbynm_r.c
fsf/trunk/libc/nscd/getsrvbypt_r.c
fsf/trunk/libc/nscd/grpcache.c
fsf/trunk/libc/nscd/hstcache.c
fsf/trunk/libc/nscd/initgrcache.c
fsf/trunk/libc/nscd/mem.c
fsf/trunk/libc/nscd/nscd.c
fsf/trunk/libc/nscd/nscd_conf.c
fsf/trunk/libc/nscd/nscd_setup_thread.c
fsf/trunk/libc/nscd/pwdcache.c
fsf/trunk/libc/nscd/servicescache.c
fsf/trunk/libc/posix/getconf.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/nscd_setup_thread.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon Jul 16 00:03:05 2007
@@ -1,3 +1,78 @@
+2007-07-14 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * elf/ldconfig.c: Allow GPLv2 or any later version.
+ * elf/readlib.c: Likewise.
+ * elf/chroot_canon.c: Likewise.
+ * elf/cache.c: Likewise.
+ * nscd/mem.c: Likewise.
+ * nscd/getpwuid_r.c: Likewise.
+ * nscd/grpcache.c: Likewise.
+ * nscd/aicache.c: Likewise.
+ * nscd/getsrvbynm_r.c: Likewise.
+ * nscd/nscd.c: Likewise.
+ * nscd/servicescache.c: Likewise.
+ * nscd/getsrvbypt_r.c: Likewise.
+ * nscd/initgrcache.c: Likewise.
+ * nscd/gethstbyad_r.c: Likewise.
+ * nscd/gethstbynm2_r.c: Likewise.
+ * nscd/getgrnam_r.c: Likewise.
+ * nscd/nscd_setup_thread.c: Likewise.
+ * nscd/getpwnam_r.c: Likewise.
+ * nscd/gai.c: Likewise.
+ * nscd/connections.c: Likewise.
+ * nscd/dbg_log.c: Likewise.
+ * nscd/cache.c: Likewise.
+ * nscd/hstcache.c: Likewise.
+ * nscd/nscd_conf.c: Likewise.
+ * nscd/getgrgid_r.c: Likewise.
+ * nscd/pwdcache.c: Likewise.
+ * catgets/gencat.c: Likewise.
+ * locale/programs/linereader.h: Likewise.
+ * locale/programs/locarchive.c: Likewise.
+ * locale/programs/ld-paper.c: Likewise.
+ * locale/programs/locfile-kw.h: Likewise.
+ * locale/programs/ld-address.c: Likewise.
+ * locale/programs/xmalloc.c: Likewise.
+ * locale/programs/ld-time.c: Likewise.
+ * locale/programs/localedef.c: Likewise.
+ * locale/programs/simple-hash.c: Likewise.
+ * locale/programs/xstrdup.c: Likewise.
+ * locale/programs/ld-numeric.c: Likewise.
+ * locale/programs/locfile-kw.gperf: Likewise.
+ * locale/programs/ld-collate.c: Likewise.
+ * locale/programs/charmap-kw.gperf: Likewise.
+ * locale/programs/charmap.h: Likewise.
+ * locale/programs/charmap-kw.h: Likewise.
+ * locale/programs/config.h: Likewise.
+ * locale/programs/locfile.c: Likewise.
+ * locale/programs/ld-ctype.c: Likewise.
+ * locale/programs/charmap.c: Likewise.
+ * locale/programs/ld-messages.c: Likewise.
+ * locale/programs/repertoire.h: Likewise.
+ * locale/programs/locale.c: Likewise.
+ * locale/programs/ld-name.c: Likewise.
+ * locale/programs/linereader.c: Likewise.
+ * locale/programs/locfile.h: Likewise.
+ * locale/programs/3level.h: Likewise.
+ * locale/programs/ld-monetary.c: Likewise.
+ * locale/programs/ld-measurement.c: Likewise.
+ * locale/programs/charmap-dir.c: Likewise.
+ * locale/programs/ld-identification.c: Likewise.
+ * locale/programs/localedef.h: Likewise.
+ * locale/programs/charmap-dir.h: Likewise.
+ * locale/programs/repertoire.c: Likewise.
+ * locale/programs/simple-hash.h: Likewise.
+ * locale/programs/ld-telephone.c: Likewise.
+ * locale/programs/locale-spec.c: Likewise.
+ * locale/programs/locfile-token.h: Likewise.
+ * posix/getconf.c: Likewise.
+ * iconv/dummy-repertoire.c: Likewise.
+ * iconv/iconv_charmap.c: Likewise.
+ * iconv/iconvconfig.c: Likewise.
+ * iconv/iconv_prog.c: Likewise.
+ * malloc/memusagestat.c: Likewise.
+ * sysdeps/unix/sysv/linux/nscd_setup_thread.c: Likewise.
+
2007-07-06 Kaz Kojima <kkojima@xxxxxxxxxxxxxx>
* sysdeps/sh/bsd-setjmp.S (setjmp): Use correct argument registers.
Modified: fsf/trunk/libc/catgets/gencat.c
==============================================================================
--- fsf/trunk/libc/catgets/gencat.c (original)
+++ fsf/trunk/libc/catgets/gencat.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/elf/cache.c
==============================================================================
--- fsf/trunk/libc/elf/cache.c (original)
+++ fsf/trunk/libc/elf/cache.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Andreas Jaeger <aj@xxxxxxx>, 1999.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/elf/chroot_canon.c
==============================================================================
--- fsf/trunk/libc/elf/chroot_canon.c (original)
+++ fsf/trunk/libc/elf/chroot_canon.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/elf/ldconfig.c
==============================================================================
--- fsf/trunk/libc/elf/ldconfig.c (original)
+++ fsf/trunk/libc/elf/ldconfig.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Andreas Jaeger <aj@xxxxxxx>, 1999.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/elf/readlib.c
==============================================================================
--- fsf/trunk/libc/elf/readlib.c (original)
+++ fsf/trunk/libc/elf/readlib.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Jakub Jelinek <jakub@xxxxxxxxxx>, 1999.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/iconv/dummy-repertoire.c
==============================================================================
--- fsf/trunk/libc/iconv/dummy-repertoire.c (original)
+++ fsf/trunk/libc/iconv/dummy-repertoire.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2001.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/iconv/iconv_charmap.c
==============================================================================
--- fsf/trunk/libc/iconv/iconv_charmap.c (original)
+++ fsf/trunk/libc/iconv/iconv_charmap.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2001.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/iconv/iconv_prog.c
==============================================================================
--- fsf/trunk/libc/iconv/iconv_prog.c (original)
+++ fsf/trunk/libc/iconv/iconv_prog.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/iconv/iconvconfig.c
==============================================================================
--- fsf/trunk/libc/iconv/iconvconfig.c (original)
+++ fsf/trunk/libc/iconv/iconvconfig.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2000.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/3level.h
==============================================================================
--- fsf/trunk/libc/locale/programs/3level.h (original)
+++ fsf/trunk/libc/locale/programs/3level.h Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Bruno Haible <haible@xxxxxxxxxxxxxx>, 2000.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/charmap-dir.c
==============================================================================
--- fsf/trunk/libc/locale/programs/charmap-dir.c (original)
+++ fsf/trunk/libc/locale/programs/charmap-dir.c Mon Jul 16 00:03:05 2007
@@ -2,8 +2,9 @@
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/charmap-dir.h
==============================================================================
--- fsf/trunk/libc/locale/programs/charmap-dir.h (original)
+++ fsf/trunk/libc/locale/programs/charmap-dir.h Mon Jul 16 00:03:05 2007
@@ -2,8 +2,9 @@
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/charmap-kw.gperf
==============================================================================
--- fsf/trunk/libc/locale/programs/charmap-kw.gperf (original)
+++ fsf/trunk/libc/locale/programs/charmap-kw.gperf Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper, <drepper@xxxxxxx>.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/charmap-kw.h
==============================================================================
--- fsf/trunk/libc/locale/programs/charmap-kw.h (original)
+++ fsf/trunk/libc/locale/programs/charmap-kw.h Mon Jul 16 00:03:05 2007
@@ -35,8 +35,9 @@
Contributed by Ulrich Drepper, <drepper@xxxxxxx>.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/charmap.c
==============================================================================
--- fsf/trunk/libc/locale/programs/charmap.c (original)
+++ fsf/trunk/libc/locale/programs/charmap.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/charmap.h
==============================================================================
--- fsf/trunk/libc/locale/programs/charmap.h (original)
+++ fsf/trunk/libc/locale/programs/charmap.h Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/config.h
==============================================================================
--- fsf/trunk/libc/locale/programs/config.h (original)
+++ fsf/trunk/libc/locale/programs/config.h Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1995.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/ld-address.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-address.c (original)
+++ fsf/trunk/libc/locale/programs/ld-address.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/ld-collate.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-collate.c (original)
+++ fsf/trunk/libc/locale/programs/ld-collate.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1995.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/ld-ctype.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-ctype.c (original)
+++ fsf/trunk/libc/locale/programs/ld-ctype.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1995.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/ld-identification.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-identification.c (original)
+++ fsf/trunk/libc/locale/programs/ld-identification.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/ld-measurement.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-measurement.c (original)
+++ fsf/trunk/libc/locale/programs/ld-measurement.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/ld-messages.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-messages.c (original)
+++ fsf/trunk/libc/locale/programs/ld-messages.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1995.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/ld-monetary.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-monetary.c (original)
+++ fsf/trunk/libc/locale/programs/ld-monetary.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1995.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/ld-name.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-name.c (original)
+++ fsf/trunk/libc/locale/programs/ld-name.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/ld-numeric.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-numeric.c (original)
+++ fsf/trunk/libc/locale/programs/ld-numeric.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1995.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/ld-paper.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-paper.c (original)
+++ fsf/trunk/libc/locale/programs/ld-paper.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/ld-telephone.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-telephone.c (original)
+++ fsf/trunk/libc/locale/programs/ld-telephone.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/ld-time.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-time.c (original)
+++ fsf/trunk/libc/locale/programs/ld-time.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1995.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/linereader.c
==============================================================================
--- fsf/trunk/libc/locale/programs/linereader.c (original)
+++ fsf/trunk/libc/locale/programs/linereader.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/linereader.h
==============================================================================
--- fsf/trunk/libc/locale/programs/linereader.h (original)
+++ fsf/trunk/libc/locale/programs/linereader.h Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper, <drepper@xxxxxxx>.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/locale-spec.c
==============================================================================
--- fsf/trunk/libc/locale/programs/locale-spec.c (original)
+++ fsf/trunk/libc/locale/programs/locale-spec.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/locale.c
==============================================================================
--- fsf/trunk/libc/locale/programs/locale.c (original)
+++ fsf/trunk/libc/locale/programs/locale.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1995.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/localedef.c
==============================================================================
--- fsf/trunk/libc/locale/programs/localedef.c (original)
+++ fsf/trunk/libc/locale/programs/localedef.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1995.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/localedef.h
==============================================================================
--- fsf/trunk/libc/locale/programs/localedef.h (original)
+++ fsf/trunk/libc/locale/programs/localedef.h Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/locarchive.c
==============================================================================
--- fsf/trunk/libc/locale/programs/locarchive.c (original)
+++ fsf/trunk/libc/locale/programs/locarchive.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/locfile-kw.gperf
==============================================================================
--- fsf/trunk/libc/locale/programs/locfile-kw.gperf (original)
+++ fsf/trunk/libc/locale/programs/locfile-kw.gperf Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/locfile-kw.h
==============================================================================
--- fsf/trunk/libc/locale/programs/locfile-kw.h (original)
+++ fsf/trunk/libc/locale/programs/locfile-kw.h Mon Jul 16 00:03:05 2007
@@ -35,8 +35,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/locfile-token.h
==============================================================================
--- fsf/trunk/libc/locale/programs/locfile-token.h (original)
+++ fsf/trunk/libc/locale/programs/locfile-token.h Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/locfile.c
==============================================================================
--- fsf/trunk/libc/locale/programs/locfile.c (original)
+++ fsf/trunk/libc/locale/programs/locfile.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/locfile.h
==============================================================================
--- fsf/trunk/libc/locale/programs/locfile.h (original)
+++ fsf/trunk/libc/locale/programs/locfile.h Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/repertoire.c
==============================================================================
--- fsf/trunk/libc/locale/programs/repertoire.c (original)
+++ fsf/trunk/libc/locale/programs/repertoire.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/repertoire.h
==============================================================================
--- fsf/trunk/libc/locale/programs/repertoire.h (original)
+++ fsf/trunk/libc/locale/programs/repertoire.h Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/simple-hash.c
==============================================================================
--- fsf/trunk/libc/locale/programs/simple-hash.c (original)
+++ fsf/trunk/libc/locale/programs/simple-hash.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Written by Ulrich Drepper <drepper@xxxxxxxxxxxxxx>, October 1994.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/simple-hash.h
==============================================================================
--- fsf/trunk/libc/locale/programs/simple-hash.h (original)
+++ fsf/trunk/libc/locale/programs/simple-hash.h Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1995.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/xmalloc.c
==============================================================================
--- fsf/trunk/libc/locale/programs/xmalloc.c (original)
+++ fsf/trunk/libc/locale/programs/xmalloc.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/locale/programs/xstrdup.c
==============================================================================
--- fsf/trunk/libc/locale/programs/xstrdup.c (original)
+++ fsf/trunk/libc/locale/programs/xstrdup.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/malloc/memusagestat.c
==============================================================================
--- fsf/trunk/libc/malloc/memusagestat.c (original)
+++ fsf/trunk/libc/malloc/memusagestat.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/aicache.c
==============================================================================
--- fsf/trunk/libc/nscd/aicache.c (original)
+++ fsf/trunk/libc/nscd/aicache.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2004.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/cache.c
==============================================================================
--- fsf/trunk/libc/nscd/cache.c (original)
+++ fsf/trunk/libc/nscd/cache.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/connections.c
==============================================================================
--- fsf/trunk/libc/nscd/connections.c (original)
+++ fsf/trunk/libc/nscd/connections.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/dbg_log.c
==============================================================================
--- fsf/trunk/libc/nscd/dbg_log.c (original)
+++ fsf/trunk/libc/nscd/dbg_log.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Thorsten Kukuk <kukuk@xxxxxxxxxxxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/gai.c
==============================================================================
--- fsf/trunk/libc/nscd/gai.c (original)
+++ fsf/trunk/libc/nscd/gai.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2004.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/getgrgid_r.c
==============================================================================
--- fsf/trunk/libc/nscd/getgrgid_r.c (original)
+++ fsf/trunk/libc/nscd/getgrgid_r.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/getgrnam_r.c
==============================================================================
--- fsf/trunk/libc/nscd/getgrnam_r.c (original)
+++ fsf/trunk/libc/nscd/getgrnam_r.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/gethstbyad_r.c
==============================================================================
--- fsf/trunk/libc/nscd/gethstbyad_r.c (original)
+++ fsf/trunk/libc/nscd/gethstbyad_r.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/gethstbynm2_r.c
==============================================================================
--- fsf/trunk/libc/nscd/gethstbynm2_r.c (original)
+++ fsf/trunk/libc/nscd/gethstbynm2_r.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/getpwnam_r.c
==============================================================================
--- fsf/trunk/libc/nscd/getpwnam_r.c (original)
+++ fsf/trunk/libc/nscd/getpwnam_r.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/getpwuid_r.c
==============================================================================
--- fsf/trunk/libc/nscd/getpwuid_r.c (original)
+++ fsf/trunk/libc/nscd/getpwuid_r.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/getsrvbynm_r.c
==============================================================================
--- fsf/trunk/libc/nscd/getsrvbynm_r.c (original)
+++ fsf/trunk/libc/nscd/getsrvbynm_r.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/getsrvbypt_r.c
==============================================================================
--- fsf/trunk/libc/nscd/getsrvbypt_r.c (original)
+++ fsf/trunk/libc/nscd/getsrvbypt_r.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/grpcache.c
==============================================================================
--- fsf/trunk/libc/nscd/grpcache.c (original)
+++ fsf/trunk/libc/nscd/grpcache.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/hstcache.c
==============================================================================
--- fsf/trunk/libc/nscd/hstcache.c (original)
+++ fsf/trunk/libc/nscd/hstcache.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/initgrcache.c
==============================================================================
--- fsf/trunk/libc/nscd/initgrcache.c (original)
+++ fsf/trunk/libc/nscd/initgrcache.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2004.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/mem.c
==============================================================================
--- fsf/trunk/libc/nscd/mem.c (original)
+++ fsf/trunk/libc/nscd/mem.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2004.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/nscd.c
==============================================================================
--- fsf/trunk/libc/nscd/nscd.c (original)
+++ fsf/trunk/libc/nscd/nscd.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Thorsten Kukuk <kukuk@xxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/nscd_conf.c
==============================================================================
--- fsf/trunk/libc/nscd/nscd_conf.c (original)
+++ fsf/trunk/libc/nscd/nscd_conf.c Mon Jul 16 00:03:05 2007
@@ -3,8 +3,9 @@
Contributed by Thorsten Kukuk <kukuk@xxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/nscd_setup_thread.c
==============================================================================
--- fsf/trunk/libc/nscd/nscd_setup_thread.c (original)
+++ fsf/trunk/libc/nscd/nscd_setup_thread.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2004.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/pwdcache.c
==============================================================================
--- fsf/trunk/libc/nscd/pwdcache.c (original)
+++ fsf/trunk/libc/nscd/pwdcache.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/nscd/servicescache.c
==============================================================================
--- fsf/trunk/libc/nscd/servicescache.c (original)
+++ fsf/trunk/libc/nscd/servicescache.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxxx>, 2007.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/posix/getconf.c
==============================================================================
--- fsf/trunk/libc/posix/getconf.c (original)
+++ fsf/trunk/libc/posix/getconf.c Mon Jul 16 00:03:05 2007
@@ -2,8 +2,9 @@
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/nscd_setup_thread.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/nscd_setup_thread.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/nscd_setup_thread.c Mon Jul 16 00:03:05 2007
@@ -4,8 +4,9 @@
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2004.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 2 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of