From 0c99a24061577ea491c8420dfaf36b2c229ad250 Mon Sep 17 00:00:00 2001
From: roland <roland@fedoraproject.org>
Date: Mar 06 2005 21:04:43 +0000
Subject: auto-import glibc-2.3.4-13 on branch devel from glibc-2.3.4-13.src.rpm


---

diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index 4c95fb5..35804a2 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -2029,7 +2029,7 @@
 +         __chk_fail ();							      \
 +       getcwd (buf, __size_val); }))
 --- glibc-20050303T1335/socket/bits/socket2.h	1 Mar 2005 21:33:39 -0000	1.2
-+++ glibc-20050303T1335-fedora/socket/bits/socket2.h	3 Mar 2005 16:52:27 -0000	1.2.2.2
++++ glibc-20050303T1335-fedora/socket/bits/socket2.h	6 Mar 2005 20:54:57 -0000	1.2.2.3
 @@ -21,18 +21,17 @@
  # error "Never include <bits/socket2.h> directly; use <sys/socket.h> instead."
  #endif
@@ -2042,10 +2042,10 @@
 -   ? __recv_chk (fd, buf, n, __bos0 (buf), flags)			      \
 -   : recv (fd, buf, n, flags))
 +  (__extension__							      \
-+    ({ size_t __n_val = (__n);				  		      \
++    ({ size_t __n_val = (n);				  		      \
 +       if (__bos0 (buf) != (size_t) -1 && __bos0 (buf) < __n_val)	      \
 +         __chk_fail ();							      \
-+       recv (fd, buf, __n_val, flags); }))
++       recv ((fd), (buf), __n_val, (flags)); }))
  
 -extern ssize_t __recvfrom_chk (int __fd, void *__restrict __buf, size_t __n,
 -			       size_t __buflen, int __flags,
@@ -2056,10 +2056,10 @@
 -   ? __recvfrom_chk (fd, buf, n, __bos0 (buf), flags, addr, addr_len)	      \
 -   : recvfrom (fd, buf, n, flags, addr, addr_len))
 +  (__extension__							      \
-+    ({ size_t __n_val = (__n);				  		      \
++    ({ size_t __n_val = (n);				  		      \
 +       if (__bos0 (buf) != (size_t) -1 && __bos0 (buf) < __n_val)	      \
 +         __chk_fail ();							      \
-+       recvfrom (fd, buf, __n_val, flags, addr, addr_len); }))
++       recvfrom ((fd, (buf), __n_val, (flags), (addr), (addr_len)); }))
 --- glibc-20050303T1335/sysdeps/arm/dl-machine.h	1 Mar 2005 20:34:40 -0000	1.50
 +++ glibc-20050303T1335-fedora/sysdeps/arm/dl-machine.h	5 Mar 2005 13:03:35 -0000	1.48.2.3
 @@ -353,9 +353,7 @@ elf_machine_plt_value (struct link_map *
diff --git a/glibc.spec b/glibc.spec
index fc5b920..1f5457b 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,7 +1,7 @@
 %define glibcdate 20050303T1335
 %define glibcname glibc
 %define glibcversion 2.3.4
-%define glibcrelease 12
+%define glibcrelease 13
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
@@ -1277,6 +1277,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Sun Mar  6 2005 Roland McGrath <roland@redhat.com> 2.3.4-13
+- fix bits/socket2.h macro typos
+
 * Sat Mar  5 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-12
 - fix tst-chk{2,3}
 - fix up AS_NEEDED directive in /usr/%{_lib}/libc.so
diff --git a/sources b/sources
index a723d6f..4854449 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7a4382a993de6f65c4bfb86d78828c3d  glibc-20050303T1335.tar.bz2
-ecef68cc19f97e8a6c1f6b4fffa4d9fe  glibc-fedora-20050303T1335.tar.bz2
+a3e26707cc2584b7a8974e4bdc7a772e  glibc-20050303T1335.tar.bz2
+2d0a9067c060944223ed613e7b3aa1a8  glibc-fedora-20050303T1335.tar.bz2