Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/gentoo-headers/2.6.25: 07_all_pull-libc-headers-linux.patch
Date: Mon, 09 Jun 2008 09:48:09
Message-Id: E1K5dyt-0007zY-MW@stork.gentoo.org
1 vapier 08/06/09 09:48:03
2
3 Modified: 07_all_pull-libc-headers-linux.patch
4 Log:
5 remove s6_addr* defines to stop clobbering glibc #225505
6
7 Revision Changes Path
8 1.5 src/patchsets/gentoo-headers/2.6.25/07_all_pull-libc-headers-linux.patch
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.25/07_all_pull-libc-headers-linux.patch?rev=1.5&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.25/07_all_pull-libc-headers-linux.patch?rev=1.5&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.25/07_all_pull-libc-headers-linux.patch?r1=1.4&r2=1.5
13
14 Index: 07_all_pull-libc-headers-linux.patch
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/src/patchsets/gentoo-headers/2.6.25/07_all_pull-libc-headers-linux.patch,v
17 retrieving revision 1.4
18 retrieving revision 1.5
19 diff -u -r1.4 -r1.5
20 --- 07_all_pull-libc-headers-linux.patch 20 Apr 2008 20:43:20 -0000 1.4
21 +++ 07_all_pull-libc-headers-linux.patch 9 Jun 2008 09:48:03 -0000 1.5
22 @@ -147,9 +147,19 @@
23 {
24 union
25 {
26 +@@ -35,9 +37,6 @@ struct in6_addr
27 + __be16 u6_addr16[8];
28 + __be32 u6_addr32[4];
29 + } in6_u;
30 +-#define s6_addr in6_u.u6_addr8
31 +-#define s6_addr16 in6_u.u6_addr16
32 +-#define s6_addr32 in6_u.u6_addr32
33 + };
34 +
35 + /* IPv6 Wildcard Address (::) and Loopback Address (::1) defined in RFC2553
36 @@ -57,7 +59,7 @@ extern const struct in6_addr in6addr_linklocal_allrouters;
37 - { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } } }
38 - #endif
39 + extern const struct in6_addr in6addr_loopback;
40 + #define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
41
42 -struct sockaddr_in6 {
43 +struct kernel_sockaddr_in6 {
44
45
46
47 --
48 gentoo-commits@l.g.o mailing list