| 1 |
vapier 08/04/20 20:43:21 |
| 2 |
|
| 3 |
Modified: 07_all_pull-libc-headers-linux.patch |
| 4 |
Log: |
| 5 |
use finer grain libc hacking |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.4 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.4&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.4&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.3&r2=1.4 |
| 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.3 |
| 18 |
retrieving revision 1.4 |
| 19 |
diff -u -r1.3 -r1.4 |
| 20 |
--- 07_all_pull-libc-headers-linux.patch 20 Apr 2008 20:02:17 -0000 1.3 |
| 21 |
+++ 07_all_pull-libc-headers-linux.patch 20 Apr 2008 20:43:20 -0000 1.4 |
| 22 |
@@ -60,32 +60,61 @@ |
| 23 |
|
| 24 |
--- a/include/linux/if.h |
| 25 |
+++ b/include/linux/if.h |
| 26 |
-@@ -17,6 +17,11 @@ |
| 27 |
- * 2 of the License, or (at your option) any later version. |
| 28 |
- */ |
| 29 |
+@@ -19,6 +19,8 @@ |
| 30 |
#ifndef _LINUX_IF_H |
| 31 |
-+# include <net/if.h> |
| 32 |
-+# define _LINUX_IF_H |
| 33 |
-+#endif |
| 34 |
-+ |
| 35 |
-+#ifndef _LINUX_IF_H |
| 36 |
#define _LINUX_IF_H |
| 37 |
|
| 38 |
++#include <net/if.h> |
| 39 |
++ |
| 40 |
#include <linux/types.h> /* for "__kernel_caddr_t" et al */ |
| 41 |
+ #include <linux/socket.h> /* for "struct sockaddr" et al */ |
| 42 |
+ #include <linux/compiler.h> /* for "__user" et al */ |
| 43 |
+@@ -119,7 +121,7 @@ enum { |
| 44 |
+ * being very small might be worth keeping for clean configuration. |
| 45 |
+ */ |
| 46 |
+ |
| 47 |
+-struct ifmap |
| 48 |
++struct kernel_ifmap |
| 49 |
+ { |
| 50 |
+ unsigned long mem_start; |
| 51 |
+ unsigned long mem_end; |
| 52 |
+@@ -155,7 +157,7 @@ struct if_settings |
| 53 |
+ * remainder may be interface specific. |
| 54 |
+ */ |
| 55 |
+ |
| 56 |
+-struct ifreq |
| 57 |
++struct kernel_ifreq |
| 58 |
+ { |
| 59 |
+ #define IFHWADDRLEN 6 |
| 60 |
+ union |
| 61 |
+@@ -205,7 +207,7 @@ struct ifreq |
| 62 |
+ * must know all networks accessible). |
| 63 |
+ */ |
| 64 |
+ |
| 65 |
+-struct ifconf |
| 66 |
++struct kernel_ifconf |
| 67 |
+ { |
| 68 |
+ int ifc_len; /* size of buffer */ |
| 69 |
+ union |
| 70 |
--- a/include/linux/ip.h |
| 71 |
+++ b/include/linux/ip.h |
| 72 |
-@@ -15,6 +15,11 @@ |
| 73 |
- * 2 of the License, or (at your option) any later version. |
| 74 |
+@@ -16,6 +16,7 @@ |
| 75 |
*/ |
| 76 |
#ifndef _LINUX_IP_H |
| 77 |
-+# include <netinet/ip.h> |
| 78 |
-+# define _LINUX_IP_H |
| 79 |
-+#endif |
| 80 |
-+ |
| 81 |
-+#ifndef _LINUX_IP_H |
| 82 |
#define _LINUX_IP_H |
| 83 |
++#include <netinet/ip.h> |
| 84 |
#include <linux/types.h> |
| 85 |
#include <asm/byteorder.h> |
| 86 |
+ |
| 87 |
+@@ -82,7 +83,7 @@ |
| 88 |
+ |
| 89 |
+ #define IPV4_BEET_PHMAXLEN 8 |
| 90 |
+ |
| 91 |
+-struct iphdr { |
| 92 |
++struct kernel_iphdr { |
| 93 |
+ #if defined(__LITTLE_ENDIAN_BITFIELD) |
| 94 |
+ __u8 ihl:4, |
| 95 |
+ version:4; |
| 96 |
--- a/include/linux/cdrom.h |
| 97 |
+++ b/include/linux/cdrom.h |
| 98 |
@@ -11,6 +11,10 @@ |
| 99 |
@@ -99,30 +128,205 @@ |
| 100 |
#include <asm/byteorder.h> |
| 101 |
|
| 102 |
/******************************************************* |
| 103 |
+--- a/include/linux/in6.h |
| 104 |
++++ b/include/linux/in6.h |
| 105 |
+@@ -21,13 +21,15 @@ |
| 106 |
+ #ifndef _LINUX_IN6_H |
| 107 |
+ #define _LINUX_IN6_H |
| 108 |
+ |
| 109 |
++#include <netinet/in.h> |
| 110 |
++ |
| 111 |
+ #include <linux/types.h> |
| 112 |
+ |
| 113 |
+ /* |
| 114 |
+ * IPv6 address structure |
| 115 |
+ */ |
| 116 |
+ |
| 117 |
+-struct in6_addr |
| 118 |
++struct kernel_in6_addr |
| 119 |
+ { |
| 120 |
+ union |
| 121 |
+ { |
| 122 |
+@@ -57,7 +59,7 @@ extern const struct in6_addr in6addr_linklocal_allrouters; |
| 123 |
+ { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } } } |
| 124 |
+ #endif |
| 125 |
+ |
| 126 |
+-struct sockaddr_in6 { |
| 127 |
++struct kernel_sockaddr_in6 { |
| 128 |
+ unsigned short int sin6_family; /* AF_INET6 */ |
| 129 |
+ __be16 sin6_port; /* Transport layer port # */ |
| 130 |
+ __be32 sin6_flowinfo; /* IPv6 flow information */ |
| 131 |
+@@ -65,7 +67,7 @@ struct sockaddr_in6 { |
| 132 |
+ __u32 sin6_scope_id; /* scope id (new in RFC2553) */ |
| 133 |
+ }; |
| 134 |
+ |
| 135 |
+-struct ipv6_mreq { |
| 136 |
++struct kernel_ipv6_mreq { |
| 137 |
+ /* IPv6 multicast address of group */ |
| 138 |
+ struct in6_addr ipv6mr_multiaddr; |
| 139 |
+ |
| 140 |
--- a/include/linux/in.h |
| 141 |
+++ b/include/linux/in.h |
| 142 |
-@@ -16,6 +16,11 @@ |
| 143 |
- * 2 of the License, or (at your option) any later version. |
| 144 |
- */ |
| 145 |
+@@ -18,42 +18,88 @@ |
| 146 |
#ifndef _LINUX_IN_H |
| 147 |
-+# include <netinet/in.h> |
| 148 |
-+# define _LINUX_IN_H |
| 149 |
-+#endif |
| 150 |
-+ |
| 151 |
-+#ifndef _LINUX_IN_H |
| 152 |
#define _LINUX_IN_H |
| 153 |
|
| 154 |
++#include <netinet/in.h> |
| 155 |
++ |
| 156 |
#include <linux/types.h> |
| 157 |
---- a/include/linux/in6.h |
| 158 |
-+++ b/include/linux/in6.h |
| 159 |
-@@ -17,6 +17,10 @@ |
| 160 |
- * as published by the Free Software Foundation; either version |
| 161 |
- * 2 of the License, or (at your option) any later version. |
| 162 |
- */ |
| 163 |
-+#ifndef _LINUX_IN6_H |
| 164 |
-+# include <netinet/in.h> |
| 165 |
-+# define _LINUX_IN6_H |
| 166 |
+ #include <linux/socket.h> |
| 167 |
+ |
| 168 |
+ /* Standard well-defined IP protocols. */ |
| 169 |
+ enum { |
| 170 |
++#ifndef IPPROTO_IP |
| 171 |
+ IPPROTO_IP = 0, /* Dummy protocol for TCP */ |
| 172 |
++#endif |
| 173 |
++#ifndef IPPROTO_ICMP |
| 174 |
+ IPPROTO_ICMP = 1, /* Internet Control Message Protocol */ |
| 175 |
++#endif |
| 176 |
++#ifndef IPPROTO_IGMP |
| 177 |
+ IPPROTO_IGMP = 2, /* Internet Group Management Protocol */ |
| 178 |
++#endif |
| 179 |
++#ifndef IPPROTO_IPIP |
| 180 |
+ IPPROTO_IPIP = 4, /* IPIP tunnels (older KA9Q tunnels use 94) */ |
| 181 |
++#endif |
| 182 |
++#ifndef IPPROTO_TCP |
| 183 |
+ IPPROTO_TCP = 6, /* Transmission Control Protocol */ |
| 184 |
++#endif |
| 185 |
++#ifndef IPPROTO_EGP |
| 186 |
+ IPPROTO_EGP = 8, /* Exterior Gateway Protocol */ |
| 187 |
++#endif |
| 188 |
++#ifndef IPPROTO_PUP |
| 189 |
+ IPPROTO_PUP = 12, /* PUP protocol */ |
| 190 |
++#endif |
| 191 |
++#ifndef IPPROTO_UDP |
| 192 |
+ IPPROTO_UDP = 17, /* User Datagram Protocol */ |
| 193 |
++#endif |
| 194 |
++#ifndef IPPROTO_IDP |
| 195 |
+ IPPROTO_IDP = 22, /* XNS IDP protocol */ |
| 196 |
++#endif |
| 197 |
++#ifndef IPPROTO_DCCP |
| 198 |
+ IPPROTO_DCCP = 33, /* Datagram Congestion Control Protocol */ |
| 199 |
++#endif |
| 200 |
++#ifndef IPPROTO_RSVP |
| 201 |
+ IPPROTO_RSVP = 46, /* RSVP protocol */ |
| 202 |
++#endif |
| 203 |
++#ifndef IPPROTO_GRE |
| 204 |
+ IPPROTO_GRE = 47, /* Cisco GRE tunnels (rfc 1701,1702) */ |
| 205 |
+#endif |
| 206 |
|
| 207 |
- #ifndef _LINUX_IN6_H |
| 208 |
- #define _LINUX_IN6_H |
| 209 |
++#ifndef IPPROTO_IPV6 |
| 210 |
+ IPPROTO_IPV6 = 41, /* IPv6-in-IPv4 tunnelling */ |
| 211 |
++#endif |
| 212 |
+ |
| 213 |
++#ifndef IPPROTO_ESP |
| 214 |
+ IPPROTO_ESP = 50, /* Encapsulation Security Payload protocol */ |
| 215 |
++#endif |
| 216 |
++#ifndef IPPROTO_AH |
| 217 |
+ IPPROTO_AH = 51, /* Authentication Header protocol */ |
| 218 |
++#endif |
| 219 |
++#ifndef IPPROTO_BEETPH |
| 220 |
+ IPPROTO_BEETPH = 94, /* IP option pseudo header for BEET */ |
| 221 |
++#endif |
| 222 |
++#ifndef IPPROTO_PIM |
| 223 |
+ IPPROTO_PIM = 103, /* Protocol Independent Multicast */ |
| 224 |
++#endif |
| 225 |
+ |
| 226 |
++#ifndef IPPROTO_COMP |
| 227 |
+ IPPROTO_COMP = 108, /* Compression Header protocol */ |
| 228 |
++#endif |
| 229 |
++#ifndef IPPROTO_SCTP |
| 230 |
+ IPPROTO_SCTP = 132, /* Stream Control Transport Protocol */ |
| 231 |
++#endif |
| 232 |
++#ifndef IPPROTO_UDPLITE |
| 233 |
+ IPPROTO_UDPLITE = 136, /* UDP-Lite (RFC 3828) */ |
| 234 |
++#endif |
| 235 |
+ |
| 236 |
++#ifndef IPPROTO_RAW |
| 237 |
+ IPPROTO_RAW = 255, /* Raw IP packets */ |
| 238 |
++#endif |
| 239 |
++#if 0 |
| 240 |
+ IPPROTO_MAX |
| 241 |
++#endif |
| 242 |
+ }; |
| 243 |
+ |
| 244 |
+ |
| 245 |
+ /* Internet address. */ |
| 246 |
+-struct in_addr { |
| 247 |
++struct kernel_in_addr { |
| 248 |
+ __be32 s_addr; |
| 249 |
+ }; |
| 250 |
+ |
| 251 |
+@@ -112,26 +158,26 @@ struct in_addr { |
| 252 |
+ |
| 253 |
+ /* Request struct for multicast socket ops */ |
| 254 |
+ |
| 255 |
+-struct ip_mreq |
| 256 |
++struct kernel_ip_mreq |
| 257 |
+ { |
| 258 |
+ struct in_addr imr_multiaddr; /* IP multicast address of group */ |
| 259 |
+ struct in_addr imr_interface; /* local IP address of interface */ |
| 260 |
+ }; |
| 261 |
+ |
| 262 |
+-struct ip_mreqn |
| 263 |
++struct kernel_ip_mreqn |
| 264 |
+ { |
| 265 |
+ struct in_addr imr_multiaddr; /* IP multicast address of group */ |
| 266 |
+ struct in_addr imr_address; /* local IP address of interface */ |
| 267 |
+ int imr_ifindex; /* Interface index */ |
| 268 |
+ }; |
| 269 |
+ |
| 270 |
+-struct ip_mreq_source { |
| 271 |
++struct kernel_ip_mreq_source { |
| 272 |
+ __be32 imr_multiaddr; |
| 273 |
+ __be32 imr_interface; |
| 274 |
+ __be32 imr_sourceaddr; |
| 275 |
+ }; |
| 276 |
+ |
| 277 |
+-struct ip_msfilter { |
| 278 |
++struct kernel_ip_msfilter { |
| 279 |
+ __be32 imsf_multiaddr; |
| 280 |
+ __be32 imsf_interface; |
| 281 |
+ __u32 imsf_fmode; |
| 282 |
+@@ -143,20 +189,20 @@ struct ip_msfilter { |
| 283 |
+ (sizeof(struct ip_msfilter) - sizeof(__u32) \ |
| 284 |
+ + (numsrc) * sizeof(__u32)) |
| 285 |
+ |
| 286 |
+-struct group_req |
| 287 |
++struct kernel_group_req |
| 288 |
+ { |
| 289 |
+ __u32 gr_interface; /* interface index */ |
| 290 |
+ struct __kernel_sockaddr_storage gr_group; /* group address */ |
| 291 |
+ }; |
| 292 |
+ |
| 293 |
+-struct group_source_req |
| 294 |
++struct kernel_group_source_req |
| 295 |
+ { |
| 296 |
+ __u32 gsr_interface; /* interface index */ |
| 297 |
+ struct __kernel_sockaddr_storage gsr_group; /* group address */ |
| 298 |
+ struct __kernel_sockaddr_storage gsr_source; /* source address */ |
| 299 |
+ }; |
| 300 |
+ |
| 301 |
+-struct group_filter |
| 302 |
++struct kernel_group_filter |
| 303 |
+ { |
| 304 |
+ __u32 gf_interface; /* interface index */ |
| 305 |
+ struct __kernel_sockaddr_storage gf_group; /* multicast address */ |
| 306 |
+@@ -169,7 +215,7 @@ struct group_filter |
| 307 |
+ (sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \ |
| 308 |
+ + (numsrc) * sizeof(struct __kernel_sockaddr_storage)) |
| 309 |
+ |
| 310 |
+-struct in_pktinfo |
| 311 |
++struct kernel_in_pktinfo |
| 312 |
+ { |
| 313 |
+ int ipi_ifindex; |
| 314 |
+ struct in_addr ipi_spec_dst; |
| 315 |
+@@ -178,7 +224,7 @@ struct in_pktinfo |
| 316 |
+ |
| 317 |
+ /* Structure describing an Internet (IP) socket address. */ |
| 318 |
+ #define __SOCK_SIZE__ 16 /* sizeof(struct sockaddr) */ |
| 319 |
+-struct sockaddr_in { |
| 320 |
++struct kernel_sockaddr_in { |
| 321 |
+ sa_family_t sin_family; /* Address family */ |
| 322 |
+ __be16 sin_port; /* Port number */ |
| 323 |
+ struct in_addr sin_addr; /* Internet address */ |
| 324 |
|
| 325 |
|
| 326 |
|
| 327 |
-- |
| 328 |
gentoo-commits@l.g.o mailing list |
Archives