From: "Amy Liffey" <amynka@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/, sys-cluster/keepalived/files/
Date: Thu, 19 Apr 2018 08:12:12 +0000 (UTC) [thread overview]
Message-ID: <1524125418.c62ee8ee6a3c9741e43dcac41439d5f90ce19b47.amynka@gentoo> (raw)
commit: c62ee8ee6a3c9741e43dcac41439d5f90ce19b47
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 19 08:09:12 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Apr 19 08:10:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c62ee8ee
Revert "sys-cluster/keepalived: fix building with linux-headers-4.15"
This reverts commit f569763b63e3d0159bfb297d295d970e4a890d3c.
- Already in upstream fails to build
Requested-by: Tomas Mozes <hydrapolic <AT> gmail.com>
| 54 ----------------------
sys-cluster/keepalived/keepalived-1.4.2.ebuild | 4 --
2 files changed, 58 deletions(-)
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
deleted file mode 100644
index 542b1554ac0..00000000000
--- a/sys-cluster/keepalived/files/keepalived-fix-building-with-linux-headers-4.15.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 947248af144bcab6376ccddab8dc40f313b14281 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-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 <baruch@tkos.co.il>
----
- 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 <netinet/in.h>
- #include <net/ethernet.h>
- #include <net/if_arp.h>
-
-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 6b60cf23060..9ec3a8f5d74 100644
--- a/sys-cluster/keepalived/keepalived-1.4.2.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.4.2.ebuild
@@ -30,10 +30,6 @@ DOCS=(
doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
)
-PATCHES=(
- "${FILESDIR}/${PN}-fix-building-with-linux-headers-4.15.patch"
-)
-
src_prepare() {
default
next reply other threads:[~2018-04-19 8:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-19 8:12 Amy Liffey [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-05-20 9:51 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/, sys-cluster/keepalived/files/ Alexys Jacob
2018-11-15 13:49 Mikle Kolyada
2018-03-28 10:33 Patrice Clement
2018-01-18 10:15 Alexys Jacob
2017-04-21 14:45 Alexys Jacob
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1524125418.c62ee8ee6a3c9741e43dcac41439d5f90ce19b47.amynka@gentoo \
--to=amynka@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox