main/linux-headers: upgrade to 4.4.6

4 files changed, 7 insertions, 146 deletions

diff --git a/main/linux-headers/1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch b/main/linux-headers/1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
deleted file mode 100644
index 0b4cfb1220..0000000000
--- a/main/linux-headers/1-4-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/main/linux-headers/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch b/main/linux-headers/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch
deleted file mode 100644
index 0010d5e1f8..0000000000
--- a/main/linux-headers/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 3cd5b95ad2e9ca7d39e2dffe79f9198a36a0e68e Mon Sep 17 00:00:00 2001
-From: rofl0r <retnyg@gmx.net>
-Date: Wed, 22 Jan 2014 00:48:28 +0100
-Subject: [PATCH] libc-compat.h: fix some issues arising from in6.h
-
-namely redefinition of some structs provided by netinet/in.h.
----
- generic/include/linux/libc-compat.h | 23 +++++++----------------
- 1 file changed, 7 insertions(+), 16 deletions(-)
-
-Index: linux-4.1/include/uapi/linux/libc-compat.h
-===================================================================
---- linux-4.1.orig/include/uapi/linux/libc-compat.h
-+++ linux-4.1/include/uapi/linux/libc-compat.h
-@@ -48,24 +48,15 @@
- #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. */
-+/* 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_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
-@@ -73,13 +64,13 @@
- #define __UAPI_DEF_IN6_PKTINFO		0
- #define __UAPI_DEF_IP6_MTUINFO		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 libc must
-  * coordinate. */
- #define __UAPI_DEF_IN6_ADDR_ALT		1
- #define __UAPI_DEF_SOCKADDR_IN6		1
-@@ -101,7 +92,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
-@@ -116,6 +107,6 @@
- /* Definitions for xattr.h */
- #define __UAPI_DEF_XATTR		1
- 
--#endif /* __GLIBC__ */
-+#endif /* __KERNEL__ */
- 
- #endif /* _UAPI_LIBC_COMPAT_H */
diff --git a/main/linux-headers/4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/main/linux-headers/4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch
deleted file mode 100644
index b8ac94fb07..0000000000
--- a/main/linux-headers/4-4-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/main/linux-headers/APKBUILD b/main/linux-headers/APKBUILD
index 443da1e9f2..73abf76d81 100644
--- a/main/linux-headers/APKBUILD
+++ b/main/linux-headers/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=linux-headers
-pkgver=4.1.12
+pkgver=4.4.6
 _kernver=${pkgver%.*}
 pkgrel=0
 pkgdesc="Linux system headers"
@@ -11,9 +11,6 @@ makedepends="perl"
 options="!strip !tracedeps"
 source="http://www.kernel.org/pub/linux/kernel/v4.x/linux-$_kernver.tar.xz
 	http://www.kernel.org/pub/linux/kernel/v4.x/patch-$pkgver.xz
-	1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
-	3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch
-	4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch
 	"
 
 prepare() {
@@ -50,18 +47,9 @@ package() {
 	rm -rf "$pkgdir"/usr/include/drm
 }
 
-md5sums="fe9dc0f6729f36400ea81aa41d614c37  linux-4.1.tar.xz
-e790ae84e0109a3d95cc617be448171b  patch-4.1.12.xz
-e67087052d36eeb372d3da38a5c9486e  1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
-c4297d8072a3b01d665b1b65b6595421  3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch
-81247cedb2fe3337edb946d9e8a812c2  4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch"
-sha256sums="caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f  linux-4.1.tar.xz
-f3520b06e6a2b9929173c680de75f11cde9f0a380e04195d538b5de820a549ae  patch-4.1.12.xz
-eea3758ded887b84e3b15031e590975b4f94dbf7b03e7b135611339bcb8ca81c  1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
-3c6208bd19ec6c4bd4f2d579c4d1668edb7e5f1f659ddcb76a693217cac27a2d  3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch
-3297454dd7bdc3417d36f448ca2091e39a6acf475e22c6eb67ee5819d7b73c8f  4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch"
-sha512sums="168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0  linux-4.1.tar.xz
-164f216faa8fef6a28fe03bdb69c7bee5ff99cf560271264b52e62aec63c1d4d6475d4a6f2b4b4c02d235568ebe8bafd3b36be75c8a505cde8edbb70136d89b4  patch-4.1.12.xz
-8ff3af26ac01d402641d6c775ad54922a73e5eaf1e41efe842448d08c59f51ab9290104008283fafbdacd9eb1b8e48e9d2507210a8531d05a852c6ba84d2b60e  1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
-6c56153110eb090039b7ff011c48f610bef1cc849d6bfc959ead938e938f8efc603c5f023379318dfa66dc41df68a38239337979ef4ab9a3d05e45abbca29839  3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch
-895e23a36d0736ff624ad960e8a26e221d990e50910cc96b1a151789f97b94288f3e801ad76d141e421901e66422c480e511b2e20798e91a15b9e298c72533d6  4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch"
+md5sums="9a78fa2eb6c68ca5a40ed5af08142599  linux-4.4.tar.xz
+d48f09bf61f2500d70f839e190dc7c5a  patch-4.4.6.xz"
+sha256sums="401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2  linux-4.4.tar.xz
+efea93ff30955d445344a83c36678fa8e64111219eeafea2a41fd4ee11f79d68  patch-4.4.6.xz"
+sha512sums="13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e  linux-4.4.tar.xz
+73da057476eb31d818eed4b66c883f5ceec65f18ec8ea60d64e48334c7681af4ed4cf7eb8684481f705446a59fd124de9449d22e28805bc9617b6608ecec491d  patch-4.4.6.xz"