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/3.13: 00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch 00_all_0002-uapi-dn-pull-in-ioctl.h-header.patch 00_all_0003-netfilter-pull-in-limits.h.patch 00_all_0004-convert-PAGE_SIZE-usage.patch 00_all_0005-asm-generic-fcntl.h-namespace-kernel-file-structs.patch 00_all_0006-unifdef-drop-unused-errno.h-include.patch 00_all_0007-x86-make-stat-statfs-64-bit-for-x86_64-kernels.patch 00_all_0008-uapi-convert-u64-to-__u64-in-exported-headers.patch 00_all_0009-uapi-netfilter_arp-use-__u8-instead-of-u_int8_t.patch 00_all_0010-uapi-ppp-ioctl.h-pull-in-ppp_defs.h.patch
Date: Wed, 22 Jan 2014 05:11:04
Message-Id: 20140122051100.A8D662004C@flycatcher.gentoo.org
1 vapier 14/01/22 05:11:00
2
3 Added:
4 00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch
5 00_all_0002-uapi-dn-pull-in-ioctl.h-header.patch
6 00_all_0003-netfilter-pull-in-limits.h.patch
7 00_all_0004-convert-PAGE_SIZE-usage.patch
8 00_all_0005-asm-generic-fcntl.h-namespace-kernel-file-structs.patch
9 00_all_0006-unifdef-drop-unused-errno.h-include.patch
10 00_all_0007-x86-make-stat-statfs-64-bit-for-x86_64-kernels.patch
11 00_all_0008-uapi-convert-u64-to-__u64-in-exported-headers.patch
12 00_all_0009-uapi-netfilter_arp-use-__u8-instead-of-u_int8_t.patch
13 00_all_0010-uapi-ppp-ioctl.h-pull-in-ppp_defs.h.patch
14 Log:
15 initial 3.13 patchset based on last 3.12 patchset
16
17 Revision Changes Path
18 1.1 src/patchsets/gentoo-headers/3.13/00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch
19
20 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch?rev=1.1&view=markup
21 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch?rev=1.1&content-type=text/plain
22
23 Index: 00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch
24 ===================================================================
25 From 7b27049ffbc8c6ae398cd2096b1f5d565b49104a Mon Sep 17 00:00:00 2001
26 From: Mike Frysinger <vapier@g.o>
27 Date: Mon, 29 Dec 2008 06:52:59 -0500
28 Subject: [PATCH 01/10] linux/stat.h: remove __GLIBC__ checks
29
30 Only check __KERNEL__ so we don't assume the C library is glibc.
31
32 Signed-off-by: Mike Frysinger <vapier@g.o>
33 ---
34 include/uapi/linux/stat.h | 2 +-
35 1 file changed, 1 insertion(+), 1 deletion(-)
36
37 diff --git a/include/uapi/linux/stat.h b/include/uapi/linux/stat.h
38 index 7fec7e3..256ad24 100644
39 --- a/include/uapi/linux/stat.h
40 +++ b/include/uapi/linux/stat.h
41 @@ -2,7 +2,7 @@
42 #define _UAPI_LINUX_STAT_H
43
44
45 -#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
46 +#if defined(__KERNEL__)
47
48 #define S_IFMT 00170000
49 #define S_IFSOCK 0140000
50 --
51 1.8.4.3
52
53
54
55
56 1.1 src/patchsets/gentoo-headers/3.13/00_all_0002-uapi-dn-pull-in-ioctl.h-header.patch
57
58 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0002-uapi-dn-pull-in-ioctl.h-header.patch?rev=1.1&view=markup
59 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0002-uapi-dn-pull-in-ioctl.h-header.patch?rev=1.1&content-type=text/plain
60
61 Index: 00_all_0002-uapi-dn-pull-in-ioctl.h-header.patch
62 ===================================================================
63 From 8d0275ae7c9c043c62f6b7481480e782024c9dee Mon Sep 17 00:00:00 2001
64 From: Mike Frysinger <vapier@g.o>
65 Date: Mon, 29 Dec 2008 07:41:01 -0500
66 Subject: [PATCH 02/10] uapi: dn: pull in ioctl.h header
67
68 This header uses _IOW/_IOR defines but doesn't include ioctl.h for it.
69 If you try to use this w/out including ioctl.h yourself, it can fail
70 to build, so add the explicit include.
71
72 Signed-off-by: Mike Frysinger <vapier@g.o>
73 ---
74 include/uapi/linux/dn.h | 1 +
75 1 file changed, 1 insertion(+)
76
77 diff --git a/include/uapi/linux/dn.h b/include/uapi/linux/dn.h
78 index 5fbdd3d..4295c74 100644
79 --- a/include/uapi/linux/dn.h
80 +++ b/include/uapi/linux/dn.h
81 @@ -1,6 +1,7 @@
82 #ifndef _LINUX_DN_H
83 #define _LINUX_DN_H
84
85 +#include <linux/ioctl.h>
86 #include <linux/types.h>
87 #include <linux/if_ether.h>
88
89 --
90 1.8.4.3
91
92
93
94
95 1.1 src/patchsets/gentoo-headers/3.13/00_all_0003-netfilter-pull-in-limits.h.patch
96
97 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0003-netfilter-pull-in-limits.h.patch?rev=1.1&view=markup
98 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0003-netfilter-pull-in-limits.h.patch?rev=1.1&content-type=text/plain
99
100 Index: 00_all_0003-netfilter-pull-in-limits.h.patch
101 ===================================================================
102 From 612f2f71194d3d87dd0bcb321671314e77d4faf6 Mon Sep 17 00:00:00 2001
103 From: Mike Frysinger <vapier@g.o>
104 Date: Sat, 9 May 2009 17:30:35 -0400
105 Subject: [PATCH 03/10] netfilter: pull in limits.h
106
107 A few netfilter sub-headers use INT_MAX which is in limits.h.
108
109 URL: http://bugs.gentoo.org/246160
110 Signed-off-by: Mike Frysinger <vapier@g.o>
111 ---
112 include/uapi/linux/netfilter.h | 1 +
113 1 file changed, 1 insertion(+)
114
115 diff --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h
116 index f7dc0eb..fcb9748 100644
117 --- a/include/uapi/linux/netfilter.h
118 +++ b/include/uapi/linux/netfilter.h
119 @@ -4,6 +4,7 @@
120 #include <linux/types.h>
121 #include <linux/compiler.h>
122 #include <linux/sysctl.h>
123 +#include <limits.h>
124
125
126 /* Responses from hook functions. */
127 --
128 1.8.4.3
129
130
131
132
133 1.1 src/patchsets/gentoo-headers/3.13/00_all_0004-convert-PAGE_SIZE-usage.patch
134
135 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0004-convert-PAGE_SIZE-usage.patch?rev=1.1&view=markup
136 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0004-convert-PAGE_SIZE-usage.patch?rev=1.1&content-type=text/plain
137
138 Index: 00_all_0004-convert-PAGE_SIZE-usage.patch
139 ===================================================================
140 From 193986dd3340ae3f6a9447d2c3b4d9cee81087ed Mon Sep 17 00:00:00 2001
141 From: Mike Frysinger <vapier@g.o>
142 Date: Sat, 13 Feb 2010 03:09:23 -0500
143 Subject: [PATCH 04/10] convert PAGE_SIZE usage
144
145 The size of a page may change at runtime or based on kernel settings, so
146 a static value at compile time doesn't work. More importantly, no one
147 exports PAGE_SIZE to user space anymore.
148
149 URL: http://bugs.gentoo.org/301431
150 Signed-off-by: Mike Frysinger <vapier@g.o>
151 ---
152 include/uapi/linux/binfmts.h | 3 ++-
153 include/uapi/linux/resource.h | 3 ++-
154 2 files changed, 4 insertions(+), 2 deletions(-)
155
156 diff --git a/include/uapi/linux/binfmts.h b/include/uapi/linux/binfmts.h
157 index 4eb5972..516bfcf 100644
158 --- a/include/uapi/linux/binfmts.h
159 +++ b/include/uapi/linux/binfmts.h
160 @@ -1,6 +1,7 @@
161 #ifndef _UAPI_LINUX_BINFMTS_H
162 #define _UAPI_LINUX_BINFMTS_H
163
164 +#include <unistd.h>
165 #include <linux/capability.h>
166
167 struct pt_regs;
168 @@ -11,7 +12,7 @@ struct pt_regs;
169 * prevent the kernel from being unduly impacted by misaddressed pointers.
170 * MAX_ARG_STRINGS is chosen to fit in a signed 32-bit integer.
171 */
172 -#define MAX_ARG_STRLEN (PAGE_SIZE * 32)
173 +#define MAX_ARG_STRLEN (sysconf(_SC_PAGESIZE) * 32)
174 #define MAX_ARG_STRINGS 0x7FFFFFFF
175
176 /* sizeof(linux_binprm->buf) */
177 diff --git a/include/uapi/linux/resource.h b/include/uapi/linux/resource.h
178 index e0ed284..db8acf3 100644
179 --- a/include/uapi/linux/resource.h
180 +++ b/include/uapi/linux/resource.h
181 @@ -68,7 +68,8 @@ struct rlimit64 {
182 * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
183 * and other sensitive information are never written to disk.
184 */
185 -#define MLOCK_LIMIT ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)
186 +/* No one currently defines PAGE_SIZE bigger than 64kB */
187 +#define MLOCK_LIMIT (64 * 1024)
188
189 /*
190 * Due to binary compatibility, the actual resource numbers
191 --
192 1.8.4.3
193
194
195
196
197 1.1 src/patchsets/gentoo-headers/3.13/00_all_0005-asm-generic-fcntl.h-namespace-kernel-file-structs.patch
198
199 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0005-asm-generic-fcntl.h-namespace-kernel-file-structs.patch?rev=1.1&view=markup
200 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0005-asm-generic-fcntl.h-namespace-kernel-file-structs.patch?rev=1.1&content-type=text/plain
201
202 Index: 00_all_0005-asm-generic-fcntl.h-namespace-kernel-file-structs.patch
203 ===================================================================
204 From 610819803c2db35f203e75d14272b04c0756ead6 Mon Sep 17 00:00:00 2001
205 From: Mike Frysinger <vapier@g.o>
206 Date: Mon, 29 Dec 2008 07:39:14 -0500
207 Subject: [PATCH 05/10] asm-generic/fcntl.h: namespace kernel file structs
208
209 No one should be using these structs, but just in case they are,
210 keep them available in the __kernel_ namespace.
211
212 Otherwise, trying to include something like:
213 #include <fcntl.h>
214 #include <linux/inotify.h>
215 leads to horrible failure.
216
217 URL: http://bugs.gentoo.org/244470
218 URL: http://bugs.gentoo.org/388633
219 Signed-off-by: Mike Frysinger <vapier@g.o>
220 ---
221 include/uapi/asm-generic/fcntl.h | 6 +++---
222 1 file changed, 3 insertions(+), 3 deletions(-)
223
224 diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h
225 index 95e46c8..92c2df2 100644
226 --- a/include/uapi/asm-generic/fcntl.h
227 +++ b/include/uapi/asm-generic/fcntl.h
228 @@ -136,7 +136,7 @@
229 #define F_OWNER_PID 1
230 #define F_OWNER_PGRP 2
231
232 -struct f_owner_ex {
233 +struct __kernel_f_owner_ex {
234 int type;
235 __kernel_pid_t pid;
236 };
237 @@ -176,7 +176,7 @@ struct f_owner_ex {
238 #define __ARCH_FLOCK_PAD
239 #endif
240
241 -struct flock {
242 +struct __kernel_flock {
243 short l_type;
244 short l_whence;
245 __kernel_off_t l_start;
246 @@ -193,7 +193,7 @@ struct flock {
247 #define __ARCH_FLOCK64_PAD
248 #endif
249
250 -struct flock64 {
251 +struct __kernel_flock64 {
252 short l_type;
253 short l_whence;
254 __kernel_loff_t l_start;
255 --
256 1.8.4.3
257
258
259
260
261 1.1 src/patchsets/gentoo-headers/3.13/00_all_0006-unifdef-drop-unused-errno.h-include.patch
262
263 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0006-unifdef-drop-unused-errno.h-include.patch?rev=1.1&view=markup
264 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0006-unifdef-drop-unused-errno.h-include.patch?rev=1.1&content-type=text/plain
265
266 Index: 00_all_0006-unifdef-drop-unused-errno.h-include.patch
267 ===================================================================
268 From 46da3e67a3d8fc565f98c535d44ab87bc4be9954 Mon Sep 17 00:00:00 2001
269 From: Mike Frysinger <vapier@g.o>
270 Date: Tue, 6 Dec 2011 17:22:42 -0500
271 Subject: [PATCH 06/10] unifdef: drop unused errno.h include
272
273 This is the only header on my system that ends up requiring kernel
274 headers, so if the kernel headers aren't available, we end up being
275 unable to install kernel headers :).
276
277 Since this file doesn't actually use anything from errno.h, drop
278 the include so it at least makes us a bit more robust on glibc.
279
280 Signed-off-by: Mike Frysinger <vapier@g.o>
281 ---
282 scripts/unifdef.c | 1 -
283 1 file changed, 1 deletion(-)
284
285 diff --git a/scripts/unifdef.c b/scripts/unifdef.c
286 index 7493c0e..c5dfae5 100644
287 --- a/scripts/unifdef.c
288 +++ b/scripts/unifdef.c
289 @@ -48,7 +48,6 @@
290
291 #include <ctype.h>
292 #include <err.h>
293 -#include <errno.h>
294 #include <stdarg.h>
295 #include <stdbool.h>
296 #include <stdio.h>
297 --
298 1.8.4.3
299
300
301
302
303 1.1 src/patchsets/gentoo-headers/3.13/00_all_0007-x86-make-stat-statfs-64-bit-for-x86_64-kernels.patch
304
305 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0007-x86-make-stat-statfs-64-bit-for-x86_64-kernels.patch?rev=1.1&view=markup
306 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0007-x86-make-stat-statfs-64-bit-for-x86_64-kernels.patch?rev=1.1&content-type=text/plain
307
308 Index: 00_all_0007-x86-make-stat-statfs-64-bit-for-x86_64-kernels.patch
309 ===================================================================
310 From af585a67479b80336cf615fd563fcd1e56050cf2 Mon Sep 17 00:00:00 2001
311 From: Mike Frysinger <vapier@g.o>
312 Date: Mon, 25 Mar 2013 16:38:47 -0400
313 Subject: [PATCH 07/10] x86: make stat/statfs 64-bit for x86_64 kernels
314
315 When including these headers in the x32 ABI, the structs get declared
316 with 32bit sizes which is incorrect. Use long long and such to make
317 it work both with x32 and x86_64.
318
319 Signed-off-by: Mike Frysinger <vapier@g.o>
320 ---
321 arch/x86/include/uapi/asm/stat.h | 38 +++++++++++++++++++-------------------
322 arch/x86/include/uapi/asm/statfs.h | 5 +++++
323 2 files changed, 24 insertions(+), 19 deletions(-)
324
325 diff --git a/arch/x86/include/uapi/asm/stat.h b/arch/x86/include/uapi/asm/stat.h
326 index 7b3ddc3..e9d6951 100644
327 --- a/arch/x86/include/uapi/asm/stat.h
328 +++ b/arch/x86/include/uapi/asm/stat.h
329 @@ -78,26 +78,26 @@ struct stat64 {
330 #else /* __i386__ */
331
332 struct stat {
333 - unsigned long st_dev;
334 - unsigned long st_ino;
335 - unsigned long st_nlink;
336 -
337 - unsigned int st_mode;
338 - unsigned int st_uid;
339 - unsigned int st_gid;
340 - unsigned int __pad0;
341 - unsigned long st_rdev;
342 - long st_size;
343 - long st_blksize;
344 - long st_blocks; /* Number 512-byte blocks allocated. */
345 + unsigned long long st_dev;
346 + unsigned long long st_ino;
347 + unsigned long long st_nlink;
348
349 - unsigned long st_atime;
350 - unsigned long st_atime_nsec;
351 - unsigned long st_mtime;
352 - unsigned long st_mtime_nsec;
353 - unsigned long st_ctime;
354 - unsigned long st_ctime_nsec;
355 - long __unused[3];
356 + unsigned int st_mode;
357 + unsigned int st_uid;
358 + unsigned int st_gid;
359 + unsigned int __pad0;
360 + unsigned long long st_rdev;
361 + long long st_size;
362 + long long st_blksize;
363 + long long st_blocks; /* Number 512-byte blocks allocated. */
364 +
365 + unsigned long long st_atime;
366 + unsigned long long st_atime_nsec;
367 + unsigned long long st_mtime;
368 + unsigned long long st_mtime_nsec;
369 + unsigned long long st_ctime;
370 + unsigned long long st_ctime_nsec;
371 + long long __unused[3];
372 };
373
374 /* We don't need to memset the whole thing just to initialize the padding */
375 diff --git a/arch/x86/include/uapi/asm/statfs.h b/arch/x86/include/uapi/asm/statfs.h
376 index 2d0adbf..3cb5744 100644
377 --- a/arch/x86/include/uapi/asm/statfs.h
378 +++ b/arch/x86/include/uapi/asm/statfs.h
379 @@ -8,5 +8,10 @@
380 */
381 #define ARCH_PACK_COMPAT_STATFS64 __attribute__((packed,aligned(4)))
382
383 +/* For x86-64, both the 64bit and x32 ABIs have 64bit fields. */
384 +#ifdef __x86_64__
385 +#define __statfs_word __u64
386 +#endif
387 +
388 #include <asm-generic/statfs.h>
389 #endif /* _ASM_X86_STATFS_H */
390 --
391 1.8.4.3
392
393
394
395
396 1.1 src/patchsets/gentoo-headers/3.13/00_all_0008-uapi-convert-u64-to-__u64-in-exported-headers.patch
397
398 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0008-uapi-convert-u64-to-__u64-in-exported-headers.patch?rev=1.1&view=markup
399 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0008-uapi-convert-u64-to-__u64-in-exported-headers.patch?rev=1.1&content-type=text/plain
400
401 Index: 00_all_0008-uapi-convert-u64-to-__u64-in-exported-headers.patch
402 ===================================================================
403 From aee839248366d0735581c76eb4002cc9dcddac4e Mon Sep 17 00:00:00 2001
404 From: Mike Frysinger <vapier@g.o>
405 Date: Tue, 21 Jan 2014 21:35:36 -0500
406 Subject: [PATCH 08/10] uapi: convert u64 to __u64 in exported headers
407
408 The u64 type is not defined in any exported kernel headers, so trying
409 to use it will lead to build failures.
410
411 Signed-off-by: Mike Frysinger <vapier@g.o>
412 ---
413 include/uapi/linux/nfs4.h | 2 +-
414 include/uapi/linux/perf_event.h | 2 +-
415 2 files changed, 2 insertions(+), 2 deletions(-)
416
417 diff --git a/include/uapi/linux/nfs4.h b/include/uapi/linux/nfs4.h
418 index 788128e..35f5f4c 100644
419 --- a/include/uapi/linux/nfs4.h
420 +++ b/include/uapi/linux/nfs4.h
421 @@ -150,7 +150,7 @@
422 #define NFS4_SECINFO_STYLE4_CURRENT_FH 0
423 #define NFS4_SECINFO_STYLE4_PARENT 1
424
425 -#define NFS4_MAX_UINT64 (~(u64)0)
426 +#define NFS4_MAX_UINT64 (~(__u64)0)
427
428 /* An NFS4 sessions server must support at least NFS4_MAX_OPS operations.
429 * If a compound requires more operations, adjust NFS4_MAX_OPS accordingly.
430 diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
431 index 959d454..7a3fed5 100644
432 --- a/include/uapi/linux/perf_event.h
433 +++ b/include/uapi/linux/perf_event.h
434 @@ -787,7 +787,7 @@ union perf_mem_data_src {
435 #define PERF_MEM_TLB_SHIFT 26
436
437 #define PERF_MEM_S(a, s) \
438 - (((u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)
439 + (((__u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)
440
441 /*
442 * single taken branch record layout:
443 --
444 1.8.4.3
445
446
447
448
449 1.1 src/patchsets/gentoo-headers/3.13/00_all_0009-uapi-netfilter_arp-use-__u8-instead-of-u_int8_t.patch
450
451 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0009-uapi-netfilter_arp-use-__u8-instead-of-u_int8_t.patch?rev=1.1&view=markup
452 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0009-uapi-netfilter_arp-use-__u8-instead-of-u_int8_t.patch?rev=1.1&content-type=text/plain
453
454 Index: 00_all_0009-uapi-netfilter_arp-use-__u8-instead-of-u_int8_t.patch
455 ===================================================================
456 From 16a0678e4b3a39b1a73b7eb52b57f9d2fb17c6bc Mon Sep 17 00:00:00 2001
457 From: Mike Frysinger <vapier@g.o>
458 Date: Tue, 21 Jan 2014 21:39:24 -0500
459 Subject: [PATCH 09/10] uapi: netfilter_arp: use __u8 instead of u_int8_t
460
461 Similarly, the u_int8_t type is non-standard and not defined. Change
462 it to use __u8 like the rest of the netfilter headers.
463
464 Signed-off-by: Mike Frysinger <vapier@g.o>
465 ---
466 include/uapi/linux/netfilter_arp/arpt_mangle.h | 2 +-
467 1 file changed, 1 insertion(+), 1 deletion(-)
468
469 diff --git a/include/uapi/linux/netfilter_arp/arpt_mangle.h b/include/uapi/linux/netfilter_arp/arpt_mangle.h
470 index 250f502..8c2b16a 100644
471 --- a/include/uapi/linux/netfilter_arp/arpt_mangle.h
472 +++ b/include/uapi/linux/netfilter_arp/arpt_mangle.h
473 @@ -13,7 +13,7 @@ struct arpt_mangle
474 union {
475 struct in_addr tgt_ip;
476 } u_t;
477 - u_int8_t flags;
478 + __u8 flags;
479 int target;
480 };
481
482 --
483 1.8.4.3
484
485
486
487
488 1.1 src/patchsets/gentoo-headers/3.13/00_all_0010-uapi-ppp-ioctl.h-pull-in-ppp_defs.h.patch
489
490 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0010-uapi-ppp-ioctl.h-pull-in-ppp_defs.h.patch?rev=1.1&view=markup
491 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.13/00_all_0010-uapi-ppp-ioctl.h-pull-in-ppp_defs.h.patch?rev=1.1&content-type=text/plain
492
493 Index: 00_all_0010-uapi-ppp-ioctl.h-pull-in-ppp_defs.h.patch
494 ===================================================================
495 From af0b5417dc16a45cb88e0046a61d28c0d89e9f73 Mon Sep 17 00:00:00 2001
496 From: Mike Frysinger <vapier@g.o>
497 Date: Tue, 21 Jan 2014 21:43:26 -0500
498 Subject: [PATCH 10/10] uapi: ppp-ioctl.h: pull in ppp_defs.h
499
500 This header uses enum NPmode but doesn't include ppp_defs.h. If you try
501 to use this header w/out including the defs header first, it leads to a
502 build failure. So add the explicit include to fix it.
503
504 Don't know of any packages directly impacted, but noticed while building
505 some ppp code by hand.
506
507 Signed-off-by: Mike Frysinger <vapier@g.o>
508 ---
509 include/uapi/linux/ppp-ioctl.h | 1 +
510 1 file changed, 1 insertion(+)
511
512 diff --git a/include/uapi/linux/ppp-ioctl.h b/include/uapi/linux/ppp-ioctl.h
513 index 2d9a885..63a23a3 100644
514 --- a/include/uapi/linux/ppp-ioctl.h
515 +++ b/include/uapi/linux/ppp-ioctl.h
516 @@ -12,6 +12,7 @@
517
518 #include <linux/types.h>
519 #include <linux/compiler.h>
520 +#include <linux/ppp_defs.h>
521
522 /*
523 * Bit definitions for flags argument to PPPIOCGFLAGS/PPPIOCSFLAGS.
524 --
525 1.8.4.3