From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 51460138331 for ; Mon, 2 Apr 2018 17:13:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D1E2E0C5A; Mon, 2 Apr 2018 17:13:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 33818E0C58 for ; Mon, 2 Apr 2018 17:13:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3569335DD1 for ; Mon, 2 Apr 2018 17:13:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 49C74274 for ; Mon, 2 Apr 2018 17:13:28 +0000 (UTC) From: "Alexys Jacob" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexys Jacob" Message-ID: <1522689097.f569763b63e3d0159bfb297d295d970e4a890d3c.ultrabug@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/files/, sys-cluster/keepalived/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/keepalived/files/keepalived-fix-building-with-linux-headers-4.15.patch sys-cluster/keepalived/keepalived-1.4.2.ebuild X-VCS-Directories: sys-cluster/keepalived/ sys-cluster/keepalived/files/ X-VCS-Committer: ultrabug X-VCS-Committer-Name: Alexys Jacob X-VCS-Revision: f569763b63e3d0159bfb297d295d970e4a890d3c X-VCS-Branch: master Date: Mon, 2 Apr 2018 17:13:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2260aed6-cda8-4fd9-8436-a1abcebfaee6 X-Archives-Hash: 7560fe04ded931e20707f3a9ca473dcf commit: f569763b63e3d0159bfb297d295d970e4a890d3c Author: Tomas Mozes gmail com> AuthorDate: Tue Feb 20 11:31:42 2018 +0000 Commit: Alexys Jacob gentoo org> CommitDate: Mon Apr 2 17:11:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f569763b sys-cluster/keepalived: fix building with linux-headers-4.15 Closes: https://bugs.gentoo.org/648252 Package-Manager: Portage-2.3.24, Repoman-2.3.6 ...ived-fix-building-with-linux-headers-4.15.patch | 54 ++++++++++++++++++++++ sys-cluster/keepalived/keepalived-1.4.2.ebuild | 4 ++ 2 files changed, 58 insertions(+) diff --git a/sys-cluster/keepalived/files/keepalived-fix-building-with-linux-headers-4.15.patch b/sys-cluster/keepalived/files/keepalived-fix-building-with-linux-headers-4.15.patch new file mode 100644 index 00000000000..542b1554ac0 --- /dev/null +++ b/sys-cluster/keepalived/files/keepalived-fix-building-with-linux-headers-4.15.patch @@ -0,0 +1,54 @@ +From 947248af144bcab6376ccddab8dc40f313b14281 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Fri, 9 Feb 2018 11:55:19 +0200 +Subject: [PATCH] Fix build with Linux kernel headers v4.15 + +Linux kernel version 4.15 changed the libc/kernel headers suppression +logic in a way that introduces collisions: + +In file included from ./../include/vrrp_ipaddress.h:32:0, + from ./../include/vrrp_arp.h:31, + from vrrp.c:29: +/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' + IPPROTO_IP = 0, /* Dummy protocol for TCP */ + ^ +/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 + IPPROTO_IP = 0, /* Dummy protocol for TCP. */ + ^~~~~~~~~~ + +Include the libc netinet/in.h header first to suppress the kernel +header. + +In addition, add _GNU_SOURCE to vrrp.c for the libc provided in6_pktinfo +definition. + +Signed-off-by: Baruch Siach +--- + keepalived/include/vrrp_arp.h | 1 + + keepalived/vrrp/vrrp.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/keepalived/include/vrrp_arp.h b/keepalived/include/vrrp_arp.h +index c2b4e6b5..9dd68f63 100644 +--- a/keepalived/include/vrrp_arp.h ++++ b/keepalived/include/vrrp_arp.h +@@ -24,6 +24,7 @@ + #define _VRRP_ARP_H + + /* system includes */ ++#include + #include + #include + +diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c +index 56395363..eaa9c567 100644 +--- a/keepalived/vrrp/vrrp.c ++++ b/keepalived/vrrp/vrrp.c +@@ -26,6 +26,7 @@ + #include "config.h" + + /* local include */ ++#define _GNU_SOURCE + #include "vrrp_arp.h" + #include "vrrp_ndisc.h" + #include "vrrp_scheduler.h" diff --git a/sys-cluster/keepalived/keepalived-1.4.2.ebuild b/sys-cluster/keepalived/keepalived-1.4.2.ebuild index 9ec3a8f5d74..6b60cf23060 100644 --- a/sys-cluster/keepalived/keepalived-1.4.2.ebuild +++ b/sys-cluster/keepalived/keepalived-1.4.2.ebuild @@ -30,6 +30,10 @@ DOCS=( doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt ) +PATCHES=( + "${FILESDIR}/${PN}-fix-building-with-linux-headers-4.15.patch" +) + src_prepare() { default