summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2015-09-17 07:53:17 +0000
committerEray Aslan <eras@gentoo.org>2015-09-17 07:53:17 +0000
commit230b16f55913585e623266d38898eda684165c02 (patch)
tree3eb8e3971eee7085b758743d6598f7e618a0927d /net-proxy/squid/files
parentdev-haskell/time-compat: add missing dependency on old-time (diff)
downloadgentoo-230b16f55913585e623266d38898eda684165c02.tar.gz
gentoo-230b16f55913585e623266d38898eda684165c02.tar.bz2
gentoo-230b16f55913585e623266d38898eda684165c02.zip
net-proxy/squid: Version bump to squid-3.5.8
Fix building with linux-headers-4.2 Gentoo-Bug: 559584 Package-Manager: portage-2.2.20.1
Diffstat (limited to 'net-proxy/squid/files')
-rw-r--r--net-proxy/squid/files/squid-kernel-headers-4.2.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/net-proxy/squid/files/squid-kernel-headers-4.2.patch b/net-proxy/squid/files/squid-kernel-headers-4.2.patch
new file mode 100644
index 000000000000..f56a57e19775
--- /dev/null
+++ b/net-proxy/squid/files/squid-kernel-headers-4.2.patch
@@ -0,0 +1,14 @@
+--- a/src/ip/Intercept.cc 2015-08-01 09:08:17.000000000 +0300
++++ b/src/ip/Intercept.cc 2015-09-12 10:03:37.000000000 +0300
+@@ -88,7 +88,10 @@
+ /* <climits> must be before including netfilter_ipv4.h */
+ #include <climits>
+ #include <linux/if.h>
+-#include <linux/netfilter_ipv4.h>
++//#include <linux/netfilter_ipv4.h>
++#if !defined(SO_ORIGINAL_DST)
++#define SO_ORIGINAL_DST 80
++#endif
+ #if HAVE_LINUX_NETFILTER_IPV6_IP6_TABLES_H
+ /* 2013-07-01: Pablo the Netfilter maintainer is rejecting patches
+ * which will enable C++ compilers to build the Netfilter public headers.