summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Vinson <nvinson234@gmail.com>2016-05-18 06:38:36 -0700
committerSam Jorna <wraeth@gentoo.org>2016-05-19 00:32:09 +1000
commitf8f65155cda9182554dcbaba8f16b3f89592f598 (patch)
tree410a1b4c6ce867de61293726f09de6518e869185 /net-misc/connman
parentkde-apps: Version bump KDE Applications 16.04.1 (diff)
downloadgentoo-f8f65155cda9182554dcbaba8f16b3f89592f598.tar.gz
gentoo-f8f65155cda9182554dcbaba8f16b3f89592f598.tar.bz2
gentoo-f8f65155cda9182554dcbaba8f16b3f89592f598.zip
net-misc/connman: Update xtables patch for kernel versions >= 4.6.0
Gentoo-bug: 583402 Package-Manager: portage-2.3.0_rc1 Signed-off-by: Sam Jorna <wraeth@gentoo.org>
Diffstat (limited to 'net-misc/connman')
-rw-r--r--net-misc/connman/files/connman-1.31-xtables.patch5
1 files changed, 3 insertions, 2 deletions
diff --git a/net-misc/connman/files/connman-1.31-xtables.patch b/net-misc/connman/files/connman-1.31-xtables.patch
index 5fdb6489cef0..84f4445e8da1 100644
--- a/net-misc/connman/files/connman-1.31-xtables.patch
+++ b/net-misc/connman/files/connman-1.31-xtables.patch
@@ -30,12 +30,13 @@
#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,20 @@
+@@ -0,0 +1,21 @@
+#ifndef CONNMAN_XTABLES_H
+#define CONNMAN_XTABLES_H
+
+#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) || \
++ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
+#include <xtables.h>
+#else
+#ifdef __USE_MISC