Updated to fedora-glibc-20080103T1958

diff --git a/ChangeLog b/ChangeLog
index 8f9ff963aeaba5e76fe74e0c94c0cb796723cdf4..3a98c7a938b1f34d444723024900fcdfbb833f42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2008-01-03  Jakub Jelinek  <jakub@redhat.com>
+
+       * ctype/ctype.h (__ctype_b_loc, __ctype_tolower_loc,
+       __ctype_toupper_loc): Add __THROW.
+
+2008-01-02  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/check_pf.c (make_request): Fix
+       recognition of interface family.
+
+       * posix/getconf.c: Update copyright year.
+       * nss/getent.c: Likewise.
+       * iconv/iconvconfig.c: Likewise.
+       * iconv/iconv_prog.c: Likewise.
+       * elf/ldconfig.c: Likewise.
+       * catgets/gencat.c: Likewise.
+       * csu/version.c: Likewise.
+       * elf/ldd.bash.in: Likewise.
+       * elf/sprof.c (print_version): Likewise.
+       * locale/programs/locale.c: Likewise.
+       * locale/programs/localedef.c: Likewise.
+       * nscd/nscd.c (print_version): Likewise.
+       * debug/xtrace.sh: Likewise.
+       * malloc/memusage.sh: Likewise.
+       * malloc/mtrace.pl: Likewise.
+       * debug/catchsegv.sh: Likewise.
+
 2007-12-26  Ulrich Drepper  <drepper@redhat.com>
 
        * nss/nsswitch.c (__nss_lookup): Actually use alternative name in

diff --git a/catgets/gencat.c b/catgets/gencat.c
index d8ce7af72d50158cf7052aaa686f9aa72a51c547..d9d03fb6a21d0e6b80f317a0c7a97d635f776294 100644 (file)
--- a/catgets/gencat.c
+++ b/catgets/gencat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2005, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2005, 2006, 2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 1996.
 
@@ -247,7 +247,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2007");
+"), "2008");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 

diff --git a/csu/version.c b/csu/version.c
index f7a8fb35e93baff8e98af205c6b278238e72e209..9b4edd834b29889af206a069c8ea0bad9332d09a 100644 (file)
--- a/csu/version.c
+++ b/csu/version.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2006, 2007, 2008 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
@@ -25,7 +25,7 @@ static const char __libc_version[] = VERSION;
 
 static const char banner[] =
 "GNU C Library "RELEASE" release version "VERSION", by Roland McGrath et al.\n\
-Copyright (C) 2007 Free Software Foundation, Inc.\n\
+Copyright (C) 2008 Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
 PARTICULAR PURPOSE.\n\

diff --git a/ctype/ctype.h b/ctype/ctype.h
index 9ae7fb6088284b696d6c0388f6af79c92d6271a6..301e25d4d191ef64b411cd1bf3e8a1ca9a4b42b9 100644 (file)
--- a/ctype/ctype.h
+++ b/ctype/ctype.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,95,96,97,98,99,2001,2002,2004,2007
+/* Copyright (C) 1991,92,93,95,96,97,98,99,2001,2002,2004,2007,2008
        Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -79,11 +79,11 @@ enum
    doesn't fit into an `unsigned char'.  But today more important is that
    the arrays are also used for multi-byte character sets.  */
 extern __const unsigned short int **__ctype_b_loc (void)
-     __attribute__ ((__const));
+     __THROW __attribute__ ((__const));
 extern __const __int32_t **__ctype_tolower_loc (void)
-     __attribute__ ((__const));
+     __THROW __attribute__ ((__const));
 extern __const __int32_t **__ctype_toupper_loc (void)
-     __attribute__ ((__const));
+     __THROW __attribute__ ((__const));
 
 #define __isctype(c, type) \
   ((*__ctype_b_loc ())[(int) (c)] & (unsigned short int) type)

diff --git a/debug/catchsegv.sh b/debug/catchsegv.sh
index 6f47fab42a2250900362a5c2607be79e86b48097..68fcb69898b156896e548e16139ebadaedd5afa2 100755 (executable)
--- a/debug/catchsegv.sh
+++ b/debug/catchsegv.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1998,1999,2001,2003,2004,2006,2007
+# Copyright (C) 1998,1999,2001,2003,2004,2006,2007,2008
 # Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -40,7 +40,7 @@ if test $# -eq 0; then
       ;;
     --v | --ve | --ver | --vers | --versi | --versio | --version)
       echo 'catchsegv (GNU libc) @VERSION@'
-      echo 'Copyright (C) 2007 Free Software Foundation, Inc.
+      echo 'Copyright (C) 2008 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 Written by Ulrich Drepper.'

diff --git a/debug/xtrace.sh b/debug/xtrace.sh
index b392d7cdd4f32a4a423780c4623e6f90c2aaaad8..6902c4f4c475202227fa319c113facfc8586c9b2 100755 (executable)
--- a/debug/xtrace.sh
+++ b/debug/xtrace.sh
@@ -1,5 +1,5 @@
 #! @BASH@
-# Copyright (C) 1999, 2001-2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001-2006, 2007, 2008 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Ulrich Drepper <drepper@gnu.org>, 1999.
 
@@ -64,7 +64,7 @@ do_version() {
   printf $"Copyright (C) %s Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-" "2007"
+" "2008"
   printf $"Written by %s.
 " "Ulrich Drepper"
   exit 0

diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index cb1851e4be87774a2351675fad82a79336ee3735..8794179e2fbaa20be7f28987948cf5eac3232565 100644 (file)
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 1999.
 
@@ -297,7 +297,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2007");
+"), "2008");
   fprintf (stream, gettext ("Written by %s.\n"),
           "Andreas Jaeger");
 }

diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
index 05282fe99be206299209a762c17716284c5966ff..7cf0747d33c41df3d0b3184984c208a2868f6936 100644 (file)
--- a/elf/ldd.bash.in
+++ b/elf/ldd.bash.in
@@ -1,5 +1,5 @@
 #! @BASH@
-# Copyright (C) 1996-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1996-2007, 2008 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
@@ -39,7 +39,7 @@ while test $# -gt 0; do
     printf $"Copyright (C) %s Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-" "2007"
+" "2008"
     printf $"Written by %s and %s.
 " "Roland McGrath" "Ulrich Drepper"
     exit 0

diff --git a/elf/sprof.c b/elf/sprof.c
index 01d27e1efff0725cdbea8e9fecaa4644c20be356..ce66cf8cc7e8876b34d59236b91c86432d8905b5 100644 (file)
--- a/elf/sprof.c
+++ b/elf/sprof.c
@@ -1,5 +1,5 @@
 /* Read and display shared object profiling data.
-   Copyright (C) 1997-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1997-2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -357,7 +357,7 @@ Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 "),
-          "2007");
+          "2008");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 

diff --git a/fedora/branch.mk b/fedora/branch.mk
index c4e0c988b5683c95d3a35f5ec376fd48fae34d53..4351f00d72de34055639b1800c4509a204288a18 100644 (file)
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
 glibc-base := HEAD
 DIST_BRANCH := devel
 COLLECTION := dist-f8
-fedora-sync-date := 2007-12-27 09:08 UTC
-fedora-sync-tag := fedora-glibc-20071227T0908
+fedora-sync-date := 2008-01-03 19:58 UTC
+fedora-sync-tag := fedora-glibc-20080103T1958

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 89dd08d64dc2d26008b06db7c022a11ccef2476e..35677316d7eb467ff05efa1aeb748dff96d24291 100644 (file)
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 2
+%define glibcrelease 3
 %define run_glibc_tests 1
 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
 %define xenarches i686 athlon
@@ -1011,6 +1011,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Jan  3 2008 Jakub Jelinek <jakub@redhat.com> 2.7.90-3
+- update to trunk
+  - fix recognition of interface family (#425768)
+  - add __THROW to __ctype_{b,tolower,toupper}_loc prototypes
+
 * Thu Dec 27 2007 Jakub Jelinek <jakub@redhat.com> 2.7.90-2
 - update to trunk
   - nsswitch fix (#425768)

diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 24f6a51f1798f492147beebcb1c860c899e4a280..a1a2b1734c6bd5510244805bba47ec01b9a846f9 100644 (file)
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -1,5 +1,5 @@
 /* Convert text in given files from the specified from-set to the to-set.
-   Copyright (C) 1998-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1998-2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -427,7 +427,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2007");
+"), "2008");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 

diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
index ed72a5d4dfa9718c5019b18814a16ee352753e3a..450fd7198cc3ed641525131790cf94e25aacab4f 100644 (file)
--- a/iconv/iconvconfig.c
+++ b/iconv/iconvconfig.c
@@ -1,5 +1,5 @@
 /* Generate fastloading iconv module configuration files.
-   Copyright (C) 2000-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2000-2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
 
@@ -396,7 +396,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2007");
+"), "2008");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 

diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index 8322fc0d75b841e0a04757d126557f5271dad04f..5f770a1816a59548c2486bbd320e215ce2abe950 100644 (file)
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -1,5 +1,5 @@
 /* Implementation of the locale program according to POSIX 9945-2.
-   Copyright (C) 1995-1997, 1999-2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 1999-2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
@@ -276,7 +276,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2007");
+"), "2008");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 

diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 3e4d114fdc6ca67dca438ed49e1745ffa3dc5ea2..a1823acafaa39750cce0e4b7812a1bbd0ab5ecf1 100644 (file)
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
@@ -388,7 +388,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2007");
+"), "2008");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 

diff --git a/malloc/memusage.sh b/malloc/memusage.sh
index eace785cf4fdf89dd1fd0c54da41d5a42b03b091..c4e189a83c18a4db50696f60e95650b16edd5dcd 100755 (executable)
--- a/malloc/memusage.sh
+++ b/malloc/memusage.sh
@@ -1,5 +1,5 @@
 #! @BASH@
-# Copyright (C) 1999-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1999-2007, 2008 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Ulrich Drepper <drepper@gnu.org>, 1999.
 
@@ -71,7 +71,7 @@ do_version() {
   printf $"Copyright (C) %s Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-" "2007"
+" "2008"
   printf $"Written by %s.
 " "Ulrich Drepper"
   exit 0

diff --git a/malloc/mtrace.pl b/malloc/mtrace.pl
index 280b469d922a59b8d4871f272e8af3330217fd78..5e5e1ea0ab46f0bb145cb5d1b0460fe36d3f0abc 100644 (file)
--- a/malloc/mtrace.pl
+++ b/malloc/mtrace.pl
@@ -1,7 +1,7 @@
 #! @PERL@
 eval "exec @PERL@ -S $0 $*"
     if 0;
-# Copyright (C) 1997-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1997-2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Ulrich Drepper <drepper@gnu.org>, 1997.
 # Based on the mtrace.awk script.
@@ -45,7 +45,7 @@ arglist: while (@ARGV) {
        $ARGV[0] eq "--vers" || $ARGV[0] eq "--versi" ||
        $ARGV[0] eq "--versio" || $ARGV[0] eq "--version") {
        print "mtrace (GNU $PACKAGE) $VERSION\n";
-       print "Copyright (C) 2007 Free Software Foundation, Inc.\n";
+       print "Copyright (C) 2008 Free Software Foundation, Inc.\n";
        print "This is free software; see the source for copying conditions.  There is NO\n";
        print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
        print "Written by Ulrich Drepper <drepper\@gnu.org>\n";

diff --git a/nscd/nscd.c b/nscd/nscd.c
index e007694218b15306354f85352fc63b3ede52ad98..56c42c920a774d20b982375c2675fc641dad46c4 100644 (file)
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998-2006, 2007 Free Software Foundation, Inc.
+/* Copyright (c) 1998-2006, 2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
 
@@ -407,7 +407,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2007");
+"), "2008");
   fprintf (stream, gettext ("Written by %s.\n"),
           "Thorsten Kukuk and Ulrich Drepper");
 }

diff --git a/nss/getent.c b/nss/getent.c
index 8b9a9030ff36c3043db6be649799e9b2aefce5ba..28c6dce13bdfbd15b26f628267aea19e4f1bfa87 100644 (file)
--- a/nss/getent.c
+++ b/nss/getent.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998-2006, 2007 Free Software Foundation, Inc.
+/* Copyright (c) 1998-2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
 
@@ -84,7 +84,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2007");
+"), "2008");
   fprintf (stream, gettext ("Written by %s.\n"), "Thorsten Kukuk");
 }
 

diff --git a/posix/getconf.c b/posix/getconf.c
index 7e479a1685cacb719cfab29b56252b239560b2bf..61842922022f0f2a6a083e7344a7b170a7b35c1a 100644 (file)
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 1995-2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 1995-2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -1013,7 +1013,7 @@ main (int argc, char *argv[])
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2007");
+"), "2008");
       fprintf (stderr, gettext ("Written by %s.\n"), "Roland McGrath");
       return 0;
     }

diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
index d66f029ed9f0e0b5d259e37cf1c474bb0b3c6719..586f1cb169f2873e802048907d4c0f64c873b31d 100644 (file)
--- a/sysdeps/unix/sysv/linux/check_pf.c
+++ b/sysdeps/unix/sysv/linux/check_pf.c
@@ -1,5 +1,5 @@
 /* Determine protocol families for which interfaces exist.  Linux version.
-   Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2007, 2008 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
@@ -165,7 +165,7 @@ make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
                {
                  address = local;
                out:
-                 if (ifam->ifa_family != AF_INET)
+                 if (ifam->ifa_family == AF_INET)
                    {
                      if (*(const in_addr_t *) address
                          != htonl (INADDR_LOOPBACK))