| Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 1 | From 52f4b58c14a2788ca08b7d8884d586724d86fc66 Mon Sep 17 00:00:00 2001 |
| 2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> |
| 3 | Date: Mon, 19 Aug 2019 14:46:02 +0000 |
| 4 | Subject: [PATCH] dnsmasq: fix build against 5.2 headers |
| 5 | |
| 6 | Upstream linux y2038 work has moved some definitions SIOCGSTAMP is |
| 7 | defined in linux/sockios.h, not asm/sockios.h now. So we need to |
| 8 | add that include to fix the build. |
| 9 | |
| 10 | Upstream-status: backport of http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=3052ce208acf602f0163166dcefb7330d537cedb |
| 11 | |
| 12 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> |
| 13 | --- |
| 14 | a/src/dnsmasq.h | 1 + |
| 15 | 1 file changed, 1 insertion(+) |
| 16 | |
| 17 | diff --git a/build/tmp/work/core2-64-poky-linux/dnsmasq/2.80-r0/dnsmasq-2.80/src/dnsmasq.h b/build/tmp/work/core2-64-poky-linux/dnsmasq/2.80-r0/dnsmasq-2.80/src/dnsmasq.h |
| 18 | index f53e9a5be6..d9225ea473 100644 |
| 19 | --- a/src/dnsmasq.h |
| 20 | +++ b/src/dnsmasq.h |
| 21 | @@ -138,6 +138,7 @@ typedef unsigned long long u64; |
| 22 | #endif |
| 23 | |
| 24 | #if defined(HAVE_LINUX_NETWORK) |
| 25 | +#include <linux/sockios.h> |
| 26 | #include <linux/capability.h> |
| 27 | /* There doesn't seem to be a universally-available |
| 28 | userspace header for these. */ |
| 29 | -- |
| 30 | 2.19.1 |
| 31 | |