From 217e7b931e322ebc305a251a02a6f24d9166b844 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 25 Apr 2006 09:20:28 +0000
Subject: Updated to fedora-glibc-20060425T0903

---
 ChangeLog             | 11 +++++++++++
 fedora/branch.mk      |  4 ++--
 posix/tst-rfc3484-2.c |  5 +++++
 posix/tst-rfc3484.c   |  2 ++
 version.h             |  2 +-
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fdfd3ff811..66ed5061c4 100644
--- 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 5e2763d345..09345d02cc 100644
--- 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 b3987c8cd5..c25b0c2172 100644
--- 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 abfb76d543..8d273aec84 100644
--- 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 b25fae485e..b24e2fcd99 100644
--- 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"
-- 
cgit v1.2.3-70-g09d2