[arch-commits] Commit in isatapd/trunk (isatapd-linux-4.8.patch)

[Antonio Rojas]

    Date: Wednesday, June 13, 2018 @ 07:44:27
  Author: arojas
Revision: 342871

Add missing patch (FS#58994)

Added:
  isatapd/trunk/isatapd-linux-4.8.patch

-------------------------+
 isatapd-linux-4.8.patch |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

Added: isatapd-linux-4.8.patch
===================================================================
--- isatapd-linux-4.8.patch	                        (rev 0)
+++ isatapd-linux-4.8.patch	2018-06-13 07:44:27 UTC (rev 342871)
@@ -0,0 +1,25 @@
+From: Bernhard Schmidt <berni at debian.org>
+Subject: Fix FTBFS with headers from Linux 4.8+
+Bug-Debian: https://bugs.debian.org/844869
+
+Linux 4.8+ adds a few includes to linux/if_tunnel.h, which conflict with
+concurrent use of netinet/ip.h. Drop the latter and manually define IP_DF
+which is not found anywhere else
+--- a/src/tunnel.c
++++ b/src/tunnel.c
+@@ -18,10 +18,13 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+-#include <netinet/ip.h>
+ #include <net/if.h>
+ #include <linux/if_tunnel.h>
+ 
++#ifndef IP_DF
++	#define IP_DF	0x4000		/* dont fragment flag */
++#endif
++
+ #ifdef HAVE_CONFIG_H
+ 	#include <config.h>
+ #endif
+