Gentoo Archives: gentoo-commits

From: Ian Delaney <idella4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/
Date: Tue, 29 Mar 2016 13:29:19
Message-Id: 1459258140.aca92bb5062e3d4f796e8ffa263b5bb3600409c1.idella4@gentoo
1 commit: aca92bb5062e3d4f796e8ffa263b5bb3600409c1
2 Author: Nicholas Vinson <nvinson234 <AT> gmail <DOT> com>
3 AuthorDate: Mon Mar 28 12:53:17 2016 +0000
4 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 29 13:29:00 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca92bb5
7
8 net-misc/connman: Disable compatibility logic to kernels < 4.5
9
10 The compatiblity logic is only needed for kernel headers 4.5 or newer.
11 The older headers don't need this fix. Make sure the fix is not applied
12 for them.
13
14 Gentoo-bug: 578404
15
16 Package-Manager: portage-2.2.28
17 Closes: https://github.com/gentoo/gentoo/pull/1154
18
19 Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org>
20
21 net-misc/connman/files/connman-1.31-xtables.patch | 8 +++++++-
22 1 file changed, 7 insertions(+), 1 deletion(-)
23
24 diff --git a/net-misc/connman/files/connman-1.31-xtables.patch b/net-misc/connman/files/connman-1.31-xtables.patch
25 index 10bdecd..5fdb648 100644
26 --- a/net-misc/connman/files/connman-1.31-xtables.patch
27 +++ b/net-misc/connman/files/connman-1.31-xtables.patch
28 @@ -30,9 +30,14 @@
29 #define CHAIN_PREFIX "connman-"
30 --- /dev/null 2016-03-18 06:21:16.372989086 -0700
31 +++ connman-1.31/include/connman_xtables.h 2016-03-22 21:32:21.349504786 -0700
32 -@@ -0,0 +1,14 @@
33 +@@ -0,0 +1,20 @@
34 +#ifndef CONNMAN_XTABLES_H
35 +#define CONNMAN_XTABLES_H
36 ++
37 ++#include <linux/version.h>
38 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
39 ++#include <xtables.h>
40 ++#else
41 +#ifdef __USE_MISC
42 +#define GENTOO_USE_MISC __USE_MISC
43 +#undef __USE_MISC
44 @@ -45,3 +50,4 @@
45 +#undef GENTOO_USE_MISC
46 +#endif
47 +#endif
48 ++#endif