summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Vinson <nvinson234@gmail.com>2016-03-28 05:53:17 -0700
committerIan Delaney <idella4@gentoo.org>2016-03-29 21:29:00 +0800
commitaca92bb5062e3d4f796e8ffa263b5bb3600409c1 (patch)
treeb5c25f55c35a4abde7aa24e28d9b818a0959e777 /net-misc/connman
parentsys-kernel/gentoo-sources: Update 1500_XATTR_USER_PREFIX.patch for the new st... (diff)
downloadgentoo-aca92bb5062e3d4f796e8ffa263b5bb3600409c1.tar.gz
gentoo-aca92bb5062e3d4f796e8ffa263b5bb3600409c1.tar.bz2
gentoo-aca92bb5062e3d4f796e8ffa263b5bb3600409c1.zip
net-misc/connman: Disable compatibility logic to kernels < 4.5
The compatiblity logic is only needed for kernel headers 4.5 or newer. The older headers don't need this fix. Make sure the fix is not applied for them. Gentoo-bug: 578404 Package-Manager: portage-2.2.28 Closes: https://github.com/gentoo/gentoo/pull/1154 Signed-off-by: Ian Delaney <idella4@gentoo.org>
Diffstat (limited to 'net-misc/connman')
-rw-r--r--net-misc/connman/files/connman-1.31-xtables.patch8
1 files changed, 7 insertions, 1 deletions
diff --git a/net-misc/connman/files/connman-1.31-xtables.patch b/net-misc/connman/files/connman-1.31-xtables.patch
index 10bdecdd2b7b..5fdb6489cef0 100644
--- a/net-misc/connman/files/connman-1.31-xtables.patch
+++ b/net-misc/connman/files/connman-1.31-xtables.patch
@@ -30,9 +30,14 @@
#define CHAIN_PREFIX "connman-"
--- /dev/null 2016-03-18 06:21:16.372989086 -0700
+++ connman-1.31/include/connman_xtables.h 2016-03-22 21:32:21.349504786 -0700
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,20 @@
+#ifndef CONNMAN_XTABLES_H
+#define CONNMAN_XTABLES_H
++
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
++#include <xtables.h>
++#else
+#ifdef __USE_MISC
+#define GENTOO_USE_MISC __USE_MISC
+#undef __USE_MISC
@@ -45,3 +50,4 @@
+#undef GENTOO_USE_MISC
+#endif
+#endif
++#endif