Mercurial > vanilla

annotate lib/libnl/musl.patch @ 1019:ddab65a5b3f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vanilla: use /bin/busybox sh as default shell
author David Demelier <markand@malikania.fr>
date Thu, 29 Aug 2019 23:35:00 +0200
parents 8ca04a2c9ed6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
551
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 diff -Naur libnl-3.3.0_rc1.orig/include/linux-private/linux/if_ether.h libnl-3.3.0_rc1/include/linux-private/linux/if_ether.h
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 --- libnl-3.3.0_rc1.orig/include/linux-private/linux/if_ether.h 2017-03-08 19:56:31.824516933 -0800
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 +++ libnl-3.3.0_rc1/include/linux-private/linux/if_ether.h 2017-03-08 20:07:01.938237767 -0800
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 @@ -22,6 +22,7 @@
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 #define _LINUX_IF_ETHER_H
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
6
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 #include <linux/types.h>
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 +#include <linux/libc-compat.h>
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
9
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 /*
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 @@ -117,10 +118,12 @@
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 * This is an Ethernet frame header.
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
15
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 +#if __UAPI_DEF_ETHHDR
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 struct ethhdr {
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 unsigned char h_source[ETH_ALEN]; /* source ether addr */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 __be16 h_proto; /* packet type ID field */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 } __attribute__((packed));
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
22 +#endif
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
23
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 #endif /* _LINUX_IF_ETHER_H */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 diff -Naur libnl-3.3.0_rc1.orig/include/linux-private/linux/libc-compat.h libnl-3.3.0_rc1/include/linux-private/linux/libc-compat.h
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 --- libnl-3.3.0_rc1.orig/include/linux-private/linux/libc-compat.h 2017-03-08 19:56:31.823516923 -0800
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 +++ libnl-3.3.0_rc1/include/linux-private/linux/libc-compat.h 2017-03-08 20:12:30.376843489 -0800
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
28 @@ -48,10 +48,18 @@
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
29 #ifndef _LIBC_COMPAT_H
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
30 #define _LIBC_COMPAT_H
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
31
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
32 -/* We have included glibc headers... */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
33 -#if defined(__GLIBC__)
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
34 +/* We're used from userspace... */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
35 +#if !defined(__KERNEL__)
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
36
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
37 -/* Coordinate with glibc netinet/in.h header. */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
38 +/* Coordinate with libc netinet/if_ether.h */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
39 +#ifdef _NETINET_IF_ETHER_H /* musl */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
40 +#define __UAPI_DEF_ETHHDR 0
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
41 +#else
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
42 +/* glibc uses __NETINET_IF_ETHER_H, and uses the uapi header. */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
43 +#define __UAPI_DEF_ETHHDR 1
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
44 +#endif
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
45 +
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
46 +/* Coordinate with libc netinet/in.h header. */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
47 #if defined(_NETINET_IN_H)
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
48
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
49 /* GLIBC headers included first so don't define anything
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
50 @@ -64,15 +72,7 @@
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
51 #define __UAPI_DEF_IN_CLASS 0
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
52
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
53 #define __UAPI_DEF_IN6_ADDR 0
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
54 -/* The exception is the in6_addr macros which must be defined
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
55 - * if the glibc code didn't define them. This guard matches
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
56 - * the guard in glibc/inet/netinet/in.h which defines the
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
57 - * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
58 -#if defined(__USE_MISC) || defined (__USE_GNU)
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
59 #define __UAPI_DEF_IN6_ADDR_ALT 0
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
60 -#else
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
61 -#define __UAPI_DEF_IN6_ADDR_ALT 1
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
62 -#endif
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
63 #define __UAPI_DEF_SOCKADDR_IN6 0
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
64 #define __UAPI_DEF_IPV6_MREQ 0
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
65 #define __UAPI_DEF_IPPROTO_V6 0
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
66 @@ -83,7 +83,7 @@
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
67 #else
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
68
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
69 /* Linux headers included first, and we must define everything
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
70 - * we need. The expectation is that glibc will check the
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
71 + * we need. The expectation is that libc will check the
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
72 * __UAPI_DEF_* defines and adjust appropriately. */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
73 #define __UAPI_DEF_IN_ADDR 1
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
74 #define __UAPI_DEF_IN_IPPROTO 1
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
75 @@ -93,7 +93,7 @@
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
76 #define __UAPI_DEF_IN_CLASS 1
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
77
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
78 #define __UAPI_DEF_IN6_ADDR 1
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
79 -/* We unconditionally define the in6_addr macros and glibc must
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
80 +/* We unconditionally define the in6_addr macros and libc must
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
81 * coordinate. */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
82 #define __UAPI_DEF_IN6_ADDR_ALT 1
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
83 #define __UAPI_DEF_SOCKADDR_IN6 1
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
84 @@ -115,7 +115,10 @@
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
85 /* If we did not see any headers from any supported C libraries,
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
86 * or we are being included in the kernel, then define everything
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
87 * that we need. */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
88 -#else /* !defined(__GLIBC__) */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
89 +#else /* defined(__KERNEL__) */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
90 +
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
91 +/* Definitions for if/ether.h */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
92 +#define __UAPI_DEF_ETHHDR 1
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
93
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
94 /* Definitions for in.h */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
95 #define __UAPI_DEF_IN_ADDR 1
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
96 @@ -138,6 +141,6 @@
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
97 /* Definitions for xattr.h */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
98 #define __UAPI_DEF_XATTR 1
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
99
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
100 -#endif /* __GLIBC__ */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
101 +#endif /* defined(__KERNEL__) */
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
102
8ca04a2c9ed6 lib/libnl: initial import, closes #1658
David Demelier <markand@malikania.fr>
parents:
diff changeset
103 #endif /* _LIBC_COMPAT_H */