------------------------------------------------------------ revno: 13922 revision-id: squid3@treenet.co.nz-20150926235659-jcvuxekckicgxvh6 parent: squid3@treenet.co.nz-20150924095936-rhv9czr20d36d9vk fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4323 author: Francesco Chemolli committer: Amos Jeffries branch nick: 3.5 timestamp: Sat 2015-09-26 16:56:59 -0700 message: Bug 4323: Netfilter broken cross-includes with Linux 4.2 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20150926235659-jcvuxekckicgxvh6 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 0a6da4b02e4a71227ebaccf84e4fcfcb183f4f53 # timestamp: 2015-09-27 00:15:05 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20150924095936-\ # rhv9czr20d36d9vk # # Begin patch === modified file 'compat/os/linux.h' --- compat/os/linux.h 2015-01-13 09:13:49 +0000 +++ compat/os/linux.h 2015-09-26 23:56:59 +0000 @@ -30,6 +30,21 @@ #endif /* + * Netfilter header madness. (see Bug 4323) + * + * Netfilter have a history of defining their own versions of network protocol + * primitives without sufficient protection against the POSIX defines which are + * aways present in Linux. + * + * netinet/in.h must be included before any other sys header in order to properly + * activate include guards in the kernel maintainers added + * to workaround it. + */ +#if HAVE_NETINET_IN_H +#include +#endif + +/* * sys/capability.h is only needed in Linux apparently. * * HACK: LIBCAP_BROKEN Ugly glue to get around linux header madness colliding with glibc