diff options
| author |   Nicholas Vinson <nvinson234@gmail.com> | 2016-03-26 15:41:16 -0700 |
|---|---|---|
| committer |   Ian Delaney <idella4@gentoo.org> | 2016-03-27 13:12:16 +0800 |
| commit | 9df5a7e55212f98ea227493da7ff244aebca4e65 (patch) | |
| tree | b679d1ee9d59c4e3409115d4c02a0e5374dde265 /net-misc/connman/files/connman-1.31-xtables.patch | |
| parent | net-misc/connman: Remove outdated versions (diff) | |
| download | gentoo-9df5a7e55212f98ea227493da7ff244aebca4e65.tar.gz gentoo-9df5a7e55212f98ea227493da7ff244aebca4e65.tar.bz2 gentoo-9df5a7e55212f98ea227493da7ff244aebca4e65.zip | |
net-misc/connman: Fix iptables and xtables issues
Fixes issues with iptables, xtables, and glibc when building and running
connan. Specifically, the patch, connman-1.31-iptables-1.6.0.patch,
fixes the icompatibilities between iptables and connman (due to an ABI
break in iptables-1.6.0). The patch, connman-1.31-xtables.patch, uses
some preprocessor tricks to route around incompatibilies seen between
newer Linux kernels and glibc when both net/if.h and linu/if.h are
included in the same source.
Gentoo-bug: #573174, #577584
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1144
Diffstat (limited to 'net-misc/connman/files/connman-1.31-xtables.patch')
| -rw-r--r-- | net-misc/connman/files/connman-1.31-xtables.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/net-misc/connman/files/connman-1.31-xtables.patch b/net-misc/connman/files/connman-1.31-xtables.patch new file mode 100644 index 000000000000..10bdecdd2b7b --- /dev/null +++ b/net-misc/connman/files/connman-1.31-xtables.patch @@ -0,0 +1,47 @@ +--- connman-1.31/src/iptables.c.old 2016-03-22 20:12:47.829460752 -0700 ++++ connman-1.31/src/iptables.c 2016-03-22 21:33:36.835384724 -0700 +@@ -28,11 +28,11 @@ + #include <stdio.h> + #include <string.h> + #include <unistd.h> + #include <sys/errno.h> + #include <sys/socket.h> +-#include <xtables.h> ++#include "connman_xtables.h" + #include <inttypes.h> + + #include <linux/netfilter_ipv4/ip_tables.h> + + #include "connman.h" +--- connman-1.31/src/firewall.c.old 2016-03-22 21:29:01.959472262 -0700 ++++ connman-1.31/src/firewall.c 2016-03-22 21:33:53.048144181 -0700 +@@ -23,11 +23,11 @@ + #include <config.h> + #endif + + #include <errno.h> + +-#include <xtables.h> ++#include "connman_xtables.h" + #include <linux/netfilter_ipv4/ip_tables.h> + + #include "connman.h" + + #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 @@ ++#ifndef CONNMAN_XTABLES_H ++#define CONNMAN_XTABLES_H ++#ifdef __USE_MISC ++#define GENTOO_USE_MISC __USE_MISC ++#undef __USE_MISC ++#endif ++ ++#include <xtables.h> ++ ++#ifdef GENTOO_USE_MISC ++#define __USE_MISC GENTOO_USE_MISC ++#undef GENTOO_USE_MISC ++#endif ++#endif |