commit: f8f65155cda9182554dcbaba8f16b3f89592f598 Author: Nicholas Vinson <nvinson234 <AT> gmail <DOT> com> AuthorDate: Wed May 18 13:38:36 2016 +0000 Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org> CommitDate: Wed May 18 14:32:09 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8f65155
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 <AT> gentoo.org> net-misc/connman/files/connman-1.31-xtables.patch | 5 +++-- 1 file 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 5fdb648..84f4445 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