From 41395d31a10fe74bb207ea0fcc97a90d66004252 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 28 Oct 2015 08:19:16 +0000 Subject: main/linux-headers: upgrade to 4.1.12 --- ...mpat.h-fix-some-issues-arising-from-in6.h.patch | 37 +++++++++++++++------- main/linux-headers/APKBUILD | 26 +++++++-------- 2 files changed, 39 insertions(+), 24 deletions(-) (limited to 'main/linux-headers') 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 index e4ce3d6547..0010d5e1f8 100644 --- 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 @@ -1,6 +1,18 @@ ---- ./include/uapi/linux/libc-compat.h.orig -+++ ./include/uapi/linux/libc-compat.h -@@ -48,35 +48,26 @@ +From 3cd5b95ad2e9ca7d39e2dffe79f9198a36a0e68e Mon Sep 17 00:00:00 2001 +From: rofl0r +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 @@ -9,11 +21,11 @@ +#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 + #if defined(_NETINET_IN_H) - /* GLIBC headers included first so don't define anything +-/* 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 @@ -28,6 +40,9 @@ #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) */ @@ -38,11 +53,11 @@ * __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 ++/* We unconditionally define the in6_addr macros and libc must * coordinate. */ #define __UAPI_DEF_IN6_ADDR_ALT 1 #define __UAPI_DEF_SOCKADDR_IN6 1 -@@ -89,7 +80,7 @@ +@@ -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. */ @@ -51,9 +66,9 @@ /* 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 +@@ -116,6 +107,6 @@ + /* Definitions for xattr.h */ + #define __UAPI_DEF_XATTR 1 -#endif /* __GLIBC__ */ +#endif /* __KERNEL__ */ diff --git a/main/linux-headers/APKBUILD b/main/linux-headers/APKBUILD index 9a4a5c470f..443da1e9f2 100644 --- a/main/linux-headers/APKBUILD +++ b/main/linux-headers/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=linux-headers -pkgver=3.18.5 +pkgver=4.1.12 _kernver=${pkgver%.*} pkgrel=0 pkgdesc="Linux system headers" @@ -9,8 +9,8 @@ arch="all" license='GPL2' makedepends="perl" options="!strip !tracedeps" -source="http://www.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz - http://www.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz +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 @@ -19,7 +19,7 @@ source="http://www.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz prepare() { cd "$srcdir"/linux-$_kernver if [ "$_kernver" != "$pkgver" ]; then - bunzip2 -c < "$srcdir"/patch-$pkgver.bz2 | patch -p1 || return 1 + unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1 || return 1 fi for i in $source; do case $i in @@ -50,18 +50,18 @@ package() { rm -rf "$pkgdir"/usr/include/drm } -md5sums="9e854df51ca3fef8bfe566dbd7b89241 linux-3.18.tar.xz -e8563b2feaa6c33d20d23ac7add9d385 patch-3.18.5.xz +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 -c26b88cbf5389c2033d404a0fb58d8d2 3-4-libc-compat.h-fix-some-issues-arising-from-in6.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="becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd linux-3.18.tar.xz -9e261632e11f629705c3f1b2f07c611284e5f9972c42f6740131e8e2471c349a patch-3.18.5.xz +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 -9dc049392ba3b79453baa809f0aafb47283293046b84511b5ae8519a86716048 3-4-libc-compat.h-fix-some-issues-arising-from-in6.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="2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 linux-3.18.tar.xz -273b5e4917bcd8520d8c81869f41572275a181ae4cb2c3d7309507d47da29903eb2104703e4402f07f6c20477665a82ef57d8a1c34e19ecc10b0e1a4c0f8fd14 patch-3.18.5.xz +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 -6d6107974dcf9671dd0f1a747160adf85a22c27216b1200ce40fd410f6fc5fd47956b8b5b51055cfda4b97cc9f172cd3850ccb4daa73e4eda449e6e77c0840ca 3-4-libc-compat.h-fix-some-issues-arising-from-in6.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" -- cgit v1.2.3