package/keepalived/0001-Fix-build-with-Linux-kernel-headers-v4.15.patch

   1 From 15f93dd90484532e25c8f3e43fb34a361a79d7f2 Mon Sep 17 00:00:00 2001
   2 From: Baruch Siach <baruch@tkos.co.il>
   3 Date: Fri, 9 Feb 2018 11:55:19 +0200
   4 Subject: [PATCH] Fix build with Linux kernel headers v4.15
   5
   6 Linux kernel version 4.15 changed the libc/kernel headers suppression
   7 logic in a way that introduces collisions:
   8
   9 In file included from ./../include/vrrp_ipaddress.h:32:0,
  10                  from ./../include/vrrp_arp.h:31,
  11                  from vrrp.c:29:
  12 /home/peko/autobuild/instance-1/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/linux/in.h:29:3: error: redeclaration of enumerator 'IPPROTO_IP'
  13    IPPROTO_IP = 0,  /* Dummy protocol for TCP  */
  14    ^
  15 /home/peko/autobuild/instance-1/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/netinet/in.h:33:5: note: previous definition of 'IPPROTO_IP' was here
  16      IPPROTO_IP = 0,    /* Dummy protocol for TCP.  */
  17      ^~~~~~~~~~
  18
  19 Include the libc netinet/in.h header first to suppress the kernel
  20 header.
  21
  22 In addition, add _GNU_SOURCE to vrrp.c for the libc provided in6_pktinfo
  23 definition.
  24
  25 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
  26 ---
  27 Upstream status: https://github.com/acassen/keepalived/pull/777
  28
  29  keepalived/include/vrrp_arp.h | 1 +
  30  keepalived/vrrp/vrrp.c        | 1 +
  31  2 files changed, 2 insertions(+)
  32
  33 diff --git a/keepalived/include/vrrp_arp.h b/keepalived/include/vrrp_arp.h
  34 index 77a26c450b12..a103ab075c1d 100644
  35 --- a/keepalived/include/vrrp_arp.h
  36 +++ b/keepalived/include/vrrp_arp.h
  37 @@ -24,6 +24,7 @@
  38  #define _VRRP_ARP_H
  39
  40  /* system includes */
  41 +#include <netinet/in.h>
  42  #include <net/ethernet.h>
  43  #include <net/if_arp.h>
  44
  45 diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c
  46 index 3d2bfe41ab4f..435a4b54b2a9 100644
  47 --- a/keepalived/vrrp/vrrp.c
  48 +++ b/keepalived/vrrp/vrrp.c
  49 @@ -26,6 +26,7 @@
  50  #include "config.h"
  51
  52  /* local include */
  53 +#define _GNU_SOURCE
  54  #include "vrrp_arp.h"
  55  #include "vrrp_ndisc.h"
  56  #include "vrrp_scheduler.h"
  57 --
  58 2.15.1
  59