- fix selinux tools build on glibc 2.29

- rel 2

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 71d0ad988fb716a9a9da946910aa7ef99ee84424..f8bfc6c0751e2574aba31fb542b4ad74439199be 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -150,3 +150,18 @@ index 76c92e31afc0..abb5d382f64d 100644
 -- 
 cgit 1.2-0.3.lf.el7
 
+--- linux-4.14/security/selinux/include/classmap.h     2017-11-12 19:46:13.000000000 +0100
++++ linux-4.20/security/selinux/include/classmap.h     2018-12-24 00:55:59.000000000 +0100
+@@ -238,9 +238,11 @@
+         { "access", NULL } },
+       { "infiniband_endport",
+         { "manage_subnet", NULL } },
++      { "xdp_socket",
++        { COMMON_SOCK_PERMS, NULL } },
+       { NULL }
+   };
+ 
+-#if PF_MAX > 44
++#if PF_MAX > 45
+ #error New address family defined, please update secclass_map.
+ #endif

diff --git a/kernel.spec b/kernel.spec
index 20f5a195bd55967d231285235c38f673becc3e88..cbc2ce37bae23acda9b70e1a544bf7d92b2c1090 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,7 +68,7 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             1
+%define                rel             2
 %define                basever         4.14
 %define                postver         .98