From c164209f9b6c0cef8730a2709adbdb630e45736f Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 4 May 2019 21:13:05 +0200 Subject: [PATCH] linux4.14: update to 4.14.116. --- .../linux4.14/patches/selinux_include.patch | 68 ------------------- srcpkgs/linux4.14/template | 4 +- 2 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 srcpkgs/linux4.14/patches/selinux_include.patch diff --git a/srcpkgs/linux4.14/patches/selinux_include.patch b/srcpkgs/linux4.14/patches/selinux_include.patch deleted file mode 100644 index 17ee500493f..00000000000 --- a/srcpkgs/linux4.14/patches/selinux_include.patch +++ /dev/null @@ -1,68 +0,0 @@ -From: Paulo Alcantara -To: selinux@vger.kernel.org -Cc: paul@paul-moore.com, Paulo Alcantara -Subject: [PATCH] selinux: use kernel linux/socket.h definitions for PF_MAX -Date: Sun, 24 Feb 2019 21:55:28 -0300 -Message-ID: <20190225005528.28371-1-paulo@paulo.ac> (raw) - -When compiling genheaders and mdp from a newer host kernel, the -following error happens: - - In file included from scripts/selinux/genheaders/genheaders.c:18: - ./security/selinux/include/classmap.h:238:2: error: #error New - address family defined, please update secclass_map. #error New - address family defined, please update secclass_map. ^~~~~ - make[3]: *** [scripts/Makefile.host:107: - scripts/selinux/genheaders/genheaders] Error 1 make[2]: *** - [scripts/Makefile.build:599: scripts/selinux/genheaders] Error 2 - make[1]: *** [scripts/Makefile.build:599: scripts/selinux] Error 2 - make[1]: *** Waiting for unfinished jobs.... - -Instead of relying on the host definition, include linux/socket.h in -classmap.h to have PF_MAX. - -Signed-off-by: Paulo Alcantara ---- - scripts/selinux/genheaders/genheaders.c | 1 - - scripts/selinux/mdp/mdp.c | 1 - - security/selinux/include/classmap.h | 1 + - 3 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c -index 1ceedea847dd..544ca126a8a8 100644 ---- a/scripts/selinux/genheaders/genheaders.c -+++ b/scripts/selinux/genheaders/genheaders.c -@@ -9,7 +9,6 @@ - #include - #include - #include --#include - - struct security_class_mapping { - const char *name; -diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c -index 073fe7537f6c..6d51b74bc679 100644 ---- a/scripts/selinux/mdp/mdp.c -+++ b/scripts/selinux/mdp/mdp.c -@@ -32,7 +32,6 @@ - #include - #include - #include --#include - - static void usage(char *name) - { -diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h -index bd5fe0d3204a..201f7e588a29 100644 ---- a/security/selinux/include/classmap.h -+++ b/security/selinux/include/classmap.h -@@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: GPL-2.0 */ - #include -+#include - - #define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \ - "getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map" --- -2.20.1 - diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template index bd096ec2fb5..17c562b9929 100644 --- a/srcpkgs/linux4.14/template +++ b/srcpkgs/linux4.14/template @@ -1,6 +1,6 @@ # Template file for 'linux4.14' pkgname=linux4.14 -version=4.14.115 +version=4.14.116 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=b7ae61711a1323053d68fd47911b92977afd526d302755518e42744251516186 +checksum=a05afa95163eab4ec76dabb51f54aea8c40ef63d5ea2d112ac04e6b79a8e8dbd nodebug=yes # -dbg package is generated below manually nostrip=yes