commit: effccc92577dea3468494080b9497be3de50384f
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sat Nov 12 01:05:09 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sat Nov 12 01:06:58 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=effccc92
sys-kernel/linux-headers: Update to 4.8
Drop r99 suffix
Add 4.8 portability patch (musl defines ethhdr)
sys-kernel/linux-headers/Manifest | 12 +-
...ecific-inclusion-of-sysinfo.h-in-kernel.h.patch | 12 --
.../linux-headers/files/libc-4.8-portability.patch | 176 +++++++++++++++++++++
...mpat.h-fix-some-issues-arising-from-in6.h.patch | 61 -------
...t.h-prevent-redefinition-of-struct-ethhdr.patch | 39 -----
...ers-4.3-r99.ebuild => linux-headers-4.3.ebuild} | 2 +-
...ers-4.5-r99.ebuild => linux-headers-4.8.ebuild} | 7 +-
7 files changed, 185 insertions(+), 124 deletions(-)
diff --git a/sys-kernel/linux-headers/Manifest
b/sys-kernel/linux-headers/Manifest
index cbed455..602f2ba 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,11 +1,9 @@
-AUX glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch 275 SHA256
eea3758ded887b84e3b15031e590975b4f94dbf7b03e7b135611339bcb8ca81c SHA512
8ff3af26ac01d402641d6c775ad54922a73e5eaf1e41efe842448d08c59f51ab9290104008283fafbdacd9eb1b8e48e9d2507210a8531d05a852c6ba84d2b60e
WHIRLPOOL
2cd90e18615df2f1be80c83d0d2e218d6d02437b2ea91ba3a61ced407357f972371bddfed140f18ec66817e7f6ddd61a1c85da7f9b14be04f71ca3e64c8fb687
AUX libc-4.3-portability.patch 3908 SHA256
cdd4a603361bb3e3e776b360460ce5df8247aa64fb06d62801fec2761ac0ae0c SHA512
7b577f7b0a489274685fc9af9234cd6fd00a033342e62c38601b3e663798b1af8e053f7df2a6d78fadcbf2e582ca25bfcc45259f01bc08c46d3d846a2b397eb3
WHIRLPOOL
415fb348b873dc3138e4cd2265b6be9a47bb92f05a8bc38c317edf1e0257312a169958774a3c03c621977769436027ca8768d868459e484392afff9f54149a25
-AUX libc-compat.h-fix-some-issues-arising-from-in6.h.patch 2051 SHA256
9dc049392ba3b79453baa809f0aafb47283293046b84511b5ae8519a86716048 SHA512
6d6107974dcf9671dd0f1a747160adf85a22c27216b1200ce40fd410f6fc5fd47956b8b5b51055cfda4b97cc9f172cd3850ccb4daa73e4eda449e6e77c0840ca
WHIRLPOOL
4245b157fd91ecba39f42126e603a166eab74ff4abc7487639ea191de22376876de25db35b295e1227da4990e2ae04bcc6bab34a1b583ef10fda4fe30341a1c1
-AUX libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch 1037 SHA256
3297454dd7bdc3417d36f448ca2091e39a6acf475e22c6eb67ee5819d7b73c8f SHA512
895e23a36d0736ff624ad960e8a26e221d990e50910cc96b1a151789f97b94288f3e801ad76d141e421901e66422c480e511b2e20798e91a15b9e298c72533d6
WHIRLPOOL
25fc05bd3d942c27e12ede60fe07953d3c35adfb7154ee1b99cc8f02946264a4f91df9c5cce089c90bb08c5aec104c6217d55c8f7c07b454f3a4c32b4ee2f61f
+AUX libc-4.8-portability.patch 6471 SHA256
e8bd0da130161340e347714f633a17e077e9e932f70b7d7c7df3b5afdc1f9125 SHA512
9ca54f7f3f00ce5764f7c943e53fd19a824e6c8160c91344cee550b70e3752d9128fa0eb45a82a7b8063faffbb23f4f4bb223044b3ffbdb2d514f3abe2d4ff9e
WHIRLPOOL
58b9b61ae89c38db86808215214ee094d163eb294ca30faec7e895779aed34f7638566072b3bbda42cda4e76312ca70bf8961d81d2e5afa5580beb1c1be4f12b
DIST gentoo-headers-4.3-1.tar.xz 6336 SHA256
dbe99afe8b96b181f1b065b4d91969913eb23750c1fdf5c05f86667a314ca726 SHA512
55310299ccf6fc013b26b28df52740188ea68547617141af45a1278d0028c8db47e43e230f08fff399793e420028ed1602438a73bad6f4ffb6f3c43f9f28002d
WHIRLPOOL
a87198b9f868d913c14a2578c5cd452fd0f041576141fc8089d4a3eef0840929923d95de188fac8a6f1115d588f2a17dd51ddcaae90871131d39458c90afe956
-DIST gentoo-headers-4.5-1.tar.xz 6388 SHA256
7edb535fcff4d0aa02334840f7afc4049018c479e0fe81036abc5fc2b4532298 SHA512
48b19592bce8176bb6a363fb383fa4f88b3f1d30712339ba215c1246a59c9463423c53e77967039703adc5b7eb32cee532686715cc61cab95bd0694f283a76de
WHIRLPOOL
57abea28dc4dc50b393ce7c1bd00d7d2e4a19a5ed24282a74065efb4d61550ac389cee45ff917d3cc56d0687172da0bfe678fb21c28758767a8b4445098fc54e
+DIST gentoo-headers-4.8-1.tar.xz 6332 SHA256
8d3076b8908d2503c1d34c7a02ba5e8373af124cc587eff4304b64a48295dec1 SHA512
4c4fab57f764c02150cd3f57c4e2410247f5a1d2aca66deebe6d218e30e6c9a065d15a6757a325d96125a51a65e5cba484ded295dcbe346323e8e11975b8a623
WHIRLPOOL
73b1c2783cdb5624f766cd93b9900bf139f21298ba7f1ca96d0554601415dee06a5cf7d2d694d1bcde88689f0ad8d82183bf9b8f9172761bd1cf5cb5bf592ec9
DIST gentoo-headers-base-4.3.tar.xz 3892104 SHA256
5add8ce264a85ced6222060d962c079821bb15b4dc015091425f609fd8db4629 SHA512
fed69490e15b2add489fe55225b98641135d4d7f10b4a8fa716ab039c79e74172168b90a4c3c154bbac14abddbde1dfb901e35527a76c898afba32a2d76b6f48
WHIRLPOOL
b1193f24ae4a31c12e5fcddfb62ce73d1434e18048a6ae67dbeb4e0bb6b514c7350faaafe6d9b5ecd4cdd43468ec88e1ba8109da6f1eb83c26a9d1e360bff565
-DIST gentoo-headers-base-4.5.tar.xz 3915016 SHA256
cec11abb1afbe966e1e2abf828adeb7989547129147528e32bbddcac83f416fd SHA512
fee3d986d0fa25beda7b04e971810903c1a4dd50b82167a511f65cba8e6b5fdf08005578663b36841c75168e144330004561c24d827c9b4b734e08bbab4608e2
WHIRLPOOL
b9272bd4e00d430a4c62a3fdd92865798c1460e59ba88a1fd28747b1ef1947c982daf915db38db061dd33e25b2dfffa2636034f6f5dc6cfe904801bb5f476cb9
-EBUILD linux-headers-4.3-r99.ebuild 1492 SHA256
b547f411c42b84b78b535746677168dc8f27b096854f804300b5a383939ee56b SHA512
6aed22ebec4ab14a0a11a7fce7eefb119ae18e68ddd2d7e99ff4f5a7118ea64b03ff72f859f0f8cce3b58056061cdc7ec42f0963449180ee57b0a978fc8be920
WHIRLPOOL
0a71435f9dcd9d718ea6a5718a5f06e1eda5c53a8750033f276cebdfdbf7300b1d548f5260861fbdb21ad8c19ac2a96846ae1653f74e1d23188b32a6a05b37e7
-EBUILD linux-headers-4.5-r99.ebuild 1496 SHA256
f1c9c89a7c07f444bb5bd82a5fd04aae1a33daad01da1d99beb03cf8aabb7a4f SHA512
958df17d5389672931c36134c1a192f0199a81705bc06787b384a5dc72051a88f6c061a3d2b1786850669ceab4f778ffb652925d13c9b69d916e45eae2d92dc2
WHIRLPOOL
0c113ee1de2a17d9900d38d29313e42e66963198dbb4e1dfdb1e6f3a2338ef70c789a2763f8b4c021fd88b582bf4ac0419c9c171926486395b968293442a47d5
+DIST gentoo-headers-base-4.8.tar.xz 4025544 SHA256
ab6a8276da6c691db2eb12c83d3277be26d86660a52f813562db6c2dd79c481f SHA512
379d4ef9b14c1a2277c996df2683b9e21b591ef3b77c8a4e593d7e687c298196fadd032c96d442a67e227bb8a70a15763e832e2f70da9a819911e9e678c46733
WHIRLPOOL
d2786dd580daf3227c7fa9ad460c3d50702b94c5b6f37677a08587855e367dbe3423dff9865e6f7db4ca9943334dab8233e6f375a6c931ba5b94a1b0278b0598
+EBUILD linux-headers-4.3.ebuild 1574 SHA256
6eee4973da0d615b7f492cce814bd60ebdb0891daaa5aab698a866c90a596b4f SHA512
6e0e93908cb4ab438fb83ab1e4445f9776d0287455ba486981c3b4107199db868e5fb7b81a4eba6d024f4d6ca9410f5f454dc5d835777c7524c73ee1ace82e7c
WHIRLPOOL
ae9b24193e5b760872e7c53803d4bd4e44e61f43c87f82694d5d08a62c1148628af54c0438066306995f6bad215cf30de0f24dfddbefd7b84b437c78490ff7b3
+EBUILD linux-headers-4.8.ebuild 1580 SHA256
40c5325aaefcb53fe9f3df69d6a96557f780684fd191e41db1867a1db69432e2 SHA512
dfe8337398f709eb3b63c73535ba38bca5272e6737acaed7c37cee9bd1e98c2c5f5c03acb1b55278b79661413f1cb53f57d95fe760391662153726253436a6d6
WHIRLPOOL
28f447a009aee2f3970f7587db0fc930fdc8e413cf5b7f59d4a3396d52fe233468012a89e01787a17aa4f4b51f4001b4bc3e66963359616461d0e58fecb7ece1
MISC metadata.xml 344 SHA256
9a1be7c7cda2e8f30ea65c0abc9b3663e8efecd6d8d383b28a55de2ff7071d10 SHA512
4dfc3a4130e5ae01c17510c693c4f2bd81fb019cf003e866c7f359213b58c6e36ed59699d6a458464e1dabd73c8f4a24eada8ced06d7ac513ec3553c0179f164
WHIRLPOOL
df2e1ce9fe16c663dca50b97b9e8f3c80ada9b8feceb9381ca256a052f1c7176c56439ca61c5d734e22d04386c8efd9462758d2aa1f12d24a73425b9f1a6a6dc
diff --git
a/sys-kernel/linux-headers/files/glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
b/sys-kernel/linux-headers/files/glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
deleted file mode 100644
index 0b4cfb1..0000000
---
a/sys-kernel/linux-headers/files/glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./include/uapi/linux/kernel.h.orig
-+++ ./include/uapi/linux/kernel.h
-@@ -1,7 +1,9 @@
- #ifndef _UAPI_LINUX_KERNEL_H
- #define _UAPI_LINUX_KERNEL_H
-
-+#ifdef __GLIBC__
- #include <linux/sysinfo.h>
-+#endif
-
- /*
- * 'kernel.h' contains some often-used function prototypes etc
diff --git a/sys-kernel/linux-headers/files/libc-4.8-portability.patch
b/sys-kernel/linux-headers/files/libc-4.8-portability.patch
new file mode 100644
index 0000000..f03d8e0
--- /dev/null
+++ b/sys-kernel/linux-headers/files/libc-4.8-portability.patch
@@ -0,0 +1,176 @@
+diff -Naur gentoo-headers-base-4.8.orig/include/uapi/linux/if_ether.h
gentoo-headers-base-4.8/include/uapi/linux/if_ether.h
+--- gentoo-headers-base-4.8.orig/include/uapi/linux/if_ether.h 2016-11-10
14:47:20.000000000 -0800
++++ gentoo-headers-base-4.8/include/uapi/linux/if_ether.h 2016-11-11
16:50:19.820253766 -0800
+@@ -22,6 +22,7 @@
+ #define _UAPI_LINUX_IF_ETHER_H
+
+ #include <linux/types.h>
++#include <linux/libc-compat.h>
+
+ /*
+ * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
+@@ -138,11 +139,13 @@
+ * This is an Ethernet frame header.
+ */
+
++#if __UAPI_DEF_ETHHDR
+ struct ethhdr {
+ unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
+ unsigned char h_source[ETH_ALEN]; /* source ether addr */
+ __be16 h_proto; /* packet type ID field */
+ } __attribute__((packed));
++#endif
+
+
+ #endif /* _UAPI_LINUX_IF_ETHER_H */
+diff -Naur gentoo-headers-base-4.8.orig/include/uapi/linux/kernel.h
gentoo-headers-base-4.8/include/uapi/linux/kernel.h
+--- gentoo-headers-base-4.8.orig/include/uapi/linux/kernel.h 2016-11-10
14:47:20.000000000 -0800
++++ gentoo-headers-base-4.8/include/uapi/linux/kernel.h 2016-11-11
16:50:48.052507106 -0800
+@@ -1,7 +1,9 @@
+ #ifndef _UAPI_LINUX_KERNEL_H
+ #define _UAPI_LINUX_KERNEL_H
+
++#ifdef __GLIBC__
+ #include <linux/sysinfo.h>
++#endif
+
+ /*
+ * 'kernel.h' contains some often-used function prototypes etc
+diff -Naur gentoo-headers-base-4.8.orig/include/uapi/linux/libc-compat.h
gentoo-headers-base-4.8/include/uapi/linux/libc-compat.h
+--- gentoo-headers-base-4.8.orig/include/uapi/linux/libc-compat.h
2016-11-10 14:47:20.000000000 -0800
++++ gentoo-headers-base-4.8/include/uapi/linux/libc-compat.h 2016-11-11
17:01:06.673559738 -0800
+@@ -48,47 +48,57 @@
+ #ifndef _UAPI_LIBC_COMPAT_H
+ #define _UAPI_LIBC_COMPAT_H
+
+-/* We have included glibc headers... */
+-#if defined(__GLIBC__)
++/* We're used from userspace... */
++#if !defined(__KERNEL__)
+
+-/* Coordinate with glibc net/if.h header. */
++/* Coordinate with libc net/if.h header. */
+ #if defined(_NET_IF_H) && defined(__USE_MISC)
+
+-/* GLIBC headers included first so don't define anything
++/* libc headers included first so don't define anything
+ * that would already be defined. */
+
+ #define __UAPI_DEF_IF_IFCONF 0
+ #define __UAPI_DEF_IF_IFMAP 0
+ #define __UAPI_DEF_IF_IFNAMSIZ 0
+ #define __UAPI_DEF_IF_IFREQ 0
+-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0
+-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
++#if !defined(__GLIBC__)
++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
++#else
+ #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
+ #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
++#endif /* !defined(__GLIBC__) */
+
+ #else /* _NET_IF_H */
+
+ /* Linux headers included first, and we must define everything
+- * we need. The expectation is that glibc will check the
++ * we need. The expectation is that libc will check the
+ * __UAPI_DEF_* defines and adjust appropriately. */
+
+ #define __UAPI_DEF_IF_IFCONF 1
+ #define __UAPI_DEF_IF_IFMAP 1
+ #define __UAPI_DEF_IF_IFNAMSIZ 1
+ #define __UAPI_DEF_IF_IFREQ 1
+-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
+-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
+
+ #endif /* _NET_IF_H */
+
+-/* Coordinate with glibc netinet/in.h header. */
++/* Coordinate with libc netinet/if_ether.h */
++#ifdef _NETINET_IF_ETHER_H
++#define __UAPI_DEF_ETHHDR 0
++#else
++/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */
++#define __UAPI_DEF_ETHHDR 1
++#endif /* _NETINET_IF_ETHER_H */
++
++/* Coordinate with libc netinet/in.h header. */
+ #if defined(_NETINET_IN_H)
+
+-/* GLIBC headers included first so don't define anything
++/* libc headers included first so don't define anything
+ * that would already be defined. */
+ #define __UAPI_DEF_IN_ADDR 0
+ #define __UAPI_DEF_IN_IPPROTO 0
+@@ -98,15 +108,7 @@
+ #define __UAPI_DEF_IN_CLASS 0
+
+ #define __UAPI_DEF_IN6_ADDR 0
+-/* The exception is the in6_addr macros which must be defined
+- * if the glibc code didn't define them. This guard matches
+- * the guard in glibc/inet/netinet/in.h which defines the
+- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */
+-#if defined(__USE_MISC) || defined (__USE_GNU)
+ #define __UAPI_DEF_IN6_ADDR_ALT 0
+-#else
+-#define __UAPI_DEF_IN6_ADDR_ALT 1
+-#endif
+ #define __UAPI_DEF_SOCKADDR_IN6 0
+ #define __UAPI_DEF_IPV6_MREQ 0
+ #define __UAPI_DEF_IPPROTO_V6 0
+@@ -117,7 +119,7 @@
+ #else
+
+ /* Linux headers included first, and we must define everything
+- * we need. The expectation is that glibc will check the
++ * we need. The expectation is that libc will check the
+ * __UAPI_DEF_* defines and adjust appropriately. */
+ #define __UAPI_DEF_IN_ADDR 1
+ #define __UAPI_DEF_IN_IPPROTO 1
+@@ -127,7 +129,7 @@
+ #define __UAPI_DEF_IN_CLASS 1
+
+ #define __UAPI_DEF_IN6_ADDR 1
+-/* We unconditionally define the in6_addr macros and glibc must
++/* We unconditionally define the in6_addr macros and libc must
+ * coordinate. */
+ #define __UAPI_DEF_IN6_ADDR_ALT 1
+ #define __UAPI_DEF_SOCKADDR_IN6 1
+@@ -168,18 +170,20 @@
+ /* If we did not see any headers from any supported C libraries,
+ * or we are being included in the kernel, then define everything
+ * that we need. */
+-#else /* !defined(__GLIBC__) */
++#else /* defined(__KERNEL__) */
+
+ /* Definitions for if.h */
+ #define __UAPI_DEF_IF_IFCONF 1
+ #define __UAPI_DEF_IF_IFMAP 1
+ #define __UAPI_DEF_IF_IFNAMSIZ 1
+ #define __UAPI_DEF_IF_IFREQ 1
+-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
+-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
+
++/* Definitions for if/ether.h */
++#define __UAPI_DEF_ETHHDR 1
++
+ /* Definitions for in.h */
+ #define __UAPI_DEF_IN_ADDR 1
+ #define __UAPI_DEF_IN_IPPROTO 1
+@@ -208,6 +212,6 @@
+ /* Definitions for xattr.h */
+ #define __UAPI_DEF_XATTR 1
+
+-#endif /* __GLIBC__ */
++#endif /* defined(__KERNEL__) */
+
+ #endif /* _UAPI_LIBC_COMPAT_H */
diff --git
a/sys-kernel/linux-headers/files/libc-compat.h-fix-some-issues-arising-from-in6.h.patch
b/sys-kernel/linux-headers/files/libc-compat.h-fix-some-issues-arising-from-in6.h.patch
deleted file mode 100644
index e4ce3d6..0000000
---
a/sys-kernel/linux-headers/files/libc-compat.h-fix-some-issues-arising-from-in6.h.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- ./include/uapi/linux/libc-compat.h.orig
-+++ ./include/uapi/linux/libc-compat.h
-@@ -48,35 +48,26 @@
- #ifndef _UAPI_LIBC_COMPAT_H
- #define _UAPI_LIBC_COMPAT_H
-
--/* We have included glibc headers... */
--#if defined(__GLIBC__)
-+#ifndef __KERNEL__ /* we're used from userspace */
-
--/* Coordinate with glibc netinet/in.h header. */
--#if defined(_NETINET_IN_H)
-+/* Coordinate with libc netinet/in.h header. */
-+#ifdef _NETINET_IN_H
-
- /* GLIBC headers included first so don't define anything
- * that would already be defined. */
- #define __UAPI_DEF_IN6_ADDR 0
--/* The exception is the in6_addr macros which must be defined
-- * if the glibc code didn't define them. This guard matches
-- * the guard in glibc/inet/netinet/in.h which defines the
-- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */
--#if defined(__USE_MISC) || defined (__USE_GNU)
- #define __UAPI_DEF_IN6_ADDR_ALT 0
--#else
--#define __UAPI_DEF_IN6_ADDR_ALT 1
--#endif
- #define __UAPI_DEF_SOCKADDR_IN6 0
- #define __UAPI_DEF_IPV6_MREQ 0
- #define __UAPI_DEF_IPPROTO_V6 0
-
--#else
-+#else /* defined(_NETINET_IN_H) */
-
- /* Linux headers included first, and we must define everything
-- * we need. The expectation is that glibc will check the
-+ * we need. The expectation is that the libc will check the
- * __UAPI_DEF_* defines and adjust appropriately. */
- #define __UAPI_DEF_IN6_ADDR 1
--/* We unconditionally define the in6_addr macros and glibc must
-+/* We unconditionally define the in6_addr macros and the libc must
- * coordinate. */
- #define __UAPI_DEF_IN6_ADDR_ALT 1
- #define __UAPI_DEF_SOCKADDR_IN6 1
-@@ -89,7 +80,7 @@
- /* If we did not see any headers from any supported C libraries,
- * or we are being included in the kernel, then define everything
- * that we need. */
--#else /* !defined(__GLIBC__) */
-+#else /* __KERNEL__ */
-
- /* Definitions for in6.h */
- #define __UAPI_DEF_IN6_ADDR 1
-@@ -98,6 +89,6 @@
- #define __UAPI_DEF_IPV6_MREQ 1
- #define __UAPI_DEF_IPPROTO_V6 1
-
--#endif /* __GLIBC__ */
-+#endif /* __KERNEL__ */
-
- #endif /* _UAPI_LIBC_COMPAT_H */
diff --git
a/sys-kernel/linux-headers/files/libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch
b/sys-kernel/linux-headers/files/libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch
deleted file mode 100644
index b8ac94f..0000000
---
a/sys-kernel/linux-headers/files/libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./include/uapi/linux/if_ether.h.orig
-+++ ./include/uapi/linux/if_ether.h
-@@ -22,6 +22,7 @@
- #define _UAPI_LINUX_IF_ETHER_H
-
- #include <linux/types.h>
-+#include <linux/libc-compat.h>
-
- /*
- * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
-@@ -130,11 +131,12 @@
- * This is an Ethernet frame header.
- */
-
-+#if __UAPI_DEF_ETHHDR
- struct ethhdr {
- unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
- unsigned char h_source[ETH_ALEN]; /* source ether addr */
- __be16 h_proto; /* packet type ID field */
- } __attribute__((packed));
--
-+#endif
-
- #endif /* _UAPI_LINUX_IF_ETHER_H */
---- ./include/uapi/linux/libc-compat.h.orig
-+++ ./include/uapi/linux/libc-compat.h
-@@ -50,6 +50,12 @@
-
- #ifndef __KERNEL__ /* we're used from userspace */
-
-+#ifdef _NETINET_IF_ETHER_H /* musl */
-+#define __UAPI_DEF_ETHHDR 0
-+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */
-+#define __UAPI_DEF_ETHHDR 1
-+#endif
-+
- /* Coordinate with libc netinet/in.h header. */
- #ifdef _NETINET_IN_H
-
diff --git a/sys-kernel/linux-headers/linux-headers-4.3-r99.ebuild
b/sys-kernel/linux-headers/linux-headers-4.3.ebuild
similarity index 92%
rename from sys-kernel/linux-headers/linux-headers-4.3-r99.ebuild
rename to sys-kernel/linux-headers/linux-headers-4.3.ebuild
index 5207769..d4f6609 100644
--- a/sys-kernel/linux-headers/linux-headers-4.3-r99.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.3.ebuild
@@ -13,7 +13,7 @@ PATCH_VER="1"
SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
-KEYWORDS="amd64 arm ~mips ppc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc
x86 ~amd64-linux ~arm-linux ~x86-linux"
DEPEND="app-arch/xz-utils
dev-lang/perl"
diff --git a/sys-kernel/linux-headers/linux-headers-4.5-r99.ebuild
b/sys-kernel/linux-headers/linux-headers-4.8.ebuild
similarity index 88%
rename from sys-kernel/linux-headers/linux-headers-4.5-r99.ebuild
rename to sys-kernel/linux-headers/linux-headers-4.8.ebuild
index 5e85046..0f6f574 100644
--- a/sys-kernel/linux-headers/linux-headers-4.5-r99.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.8.ebuild
@@ -1,8 +1,7 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="4"
+EAPI="5"
ETYPE="headers"
H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa
ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390
score sh sparc tile x86 xtensa"
@@ -13,7 +12,7 @@ PATCH_VER="1"
SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
DEPEND="app-arch/xz-utils
dev-lang/perl"
@@ -27,7 +26,7 @@ src_unpack() {
src_prepare() {
[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
- epatch "${FILESDIR}"/libc-4.3-portability.patch
+ epatch "${FILESDIR}"/libc-4.8-portability.patch
}
src_install() {
