Updated to fedora-glibc-20060425T0903

diff --git a/ChangeLog b/ChangeLog
index fdfd3ff8117abcbd1f4b4de96dd049adad05f4bb..66ed5061c4182f63aede0974ed472ed064a0a6d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-04-24  Ulrich Drepper  <drepper@redhat.com>
+
+       * posix/tst-rfc3484.c (do_test): Also initialize source_addr_flags
+       field.
+       * posix/tst-rfc3484-2.c (do_test): Likewise.
+
+       * posix/tst-rfc3484.c: Include <ifaddrs.h> early.
+       * posix/tst-rfc3484-2.c: Likewise.
+
+       * version.h (VERSION): Bunp to 2.4.90 for the trunk.
+
 2006-04-24  Jakub Jelinek  <jakub@redhat.com>
 
        * malloc/arena.c (ptmalloc_init): Don't call __malloc_check_init

diff --git a/fedora/branch.mk b/fedora/branch.mk
index 5e2763d345777dbc3f8d1d6c785b7fb0d5bc1719..09345d02ccac429848b977b900787b69d7dcfd6c 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-fc4
-fedora-sync-date := 2006-04-24 20:27 UTC
-fedora-sync-tag := fedora-glibc-20060424T2027
+fedora-sync-date := 2006-04-25 09:03 UTC
+fedora-sync-tag := fedora-glibc-20060425T0903

diff --git a/posix/tst-rfc3484-2.c b/posix/tst-rfc3484-2.c
index b3987c8cd59ce6053daae33545cf23885e8722a4..c25b0c2172d4e1b723f5d6260755c509c068ed49 100644 (file)
--- a/posix/tst-rfc3484-2.c
+++ b/posix/tst-rfc3484-2.c
@@ -1,5 +1,6 @@
 #include <stdbool.h>
 #include <stdio.h>
+#include <ifaddrs.h>
 
 /* Internal definitions used in the libc code.  */
 #define __getservbyname_r getservbyname_r
@@ -83,11 +84,13 @@ do_test (void)
   results[0].dest_addr = &ai1;
   results[0].got_source_addr = true;
   results[0].source_addr_len = sizeof (so1);
+  results[0].source_addr_flags = 0;
   memcpy (&results[0].source_addr, &so1, sizeof (so1));
 
   results[1].dest_addr = &ai2;
   results[1].got_source_addr = true;
   results[1].source_addr_len = sizeof (so2);
+  results[1].source_addr_flags = 0;
   memcpy (&results[1].source_addr, &so2, sizeof (so2));
 
 
@@ -105,11 +108,13 @@ do_test (void)
   results[1].dest_addr = &ai1;
   results[1].got_source_addr = true;
   results[1].source_addr_len = sizeof (so1);
+  results[1].source_addr_flags = 0;
   memcpy (&results[1].source_addr, &so1, sizeof (so1));
 
   results[0].dest_addr = &ai2;
   results[0].got_source_addr = true;
   results[0].source_addr_len = sizeof (so2);
+  results[0].source_addr_flags = 0;
   memcpy (&results[0].source_addr, &so2, sizeof (so2));
 
 

diff --git a/posix/tst-rfc3484.c b/posix/tst-rfc3484.c
index abfb76d543b9b7b394c34a422219d46e093fb40c..8d273aec840e4022c30069d4c9f8d36603b2d670 100644 (file)
--- a/posix/tst-rfc3484.c
+++ b/posix/tst-rfc3484.c
@@ -1,5 +1,6 @@
 #include <stdbool.h>
 #include <stdio.h>
+#include <ifaddrs.h>
 
 /* Internal definitions used in the libc code.  */
 #define __getservbyname_r getservbyname_r
@@ -78,6 +79,7 @@ do_test (void)
       results[i].got_source_addr = true;
       memcpy(&results[i].source_addr, &so, sizeof (so));
       results[i].source_addr_len = sizeof (so);
+      results[i].source_addr_flags = 0;
     }
 
   qsort (results, naddrs, sizeof (results[0]), rfc3484_sort);

diff --git a/version.h b/version.h
index b25fae485ec21425e3320ac0403bdd878fe8408e..b24e2fcd99afaefba8555ecdf50b12c1d482c4d0 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
 #define RELEASE "development"
-#define VERSION "2.4"
+#define VERSION "2.4.90"