summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2015-05-07 05:08:11 +0000
committerJeroen Roovers <jer@gentoo.org>2015-05-07 05:08:11 +0000
commit5b0dab02383de3aabe5f50c2dd80ffadbd64300d (patch)
treed4446f904ba2fe7a55f49ecce4e519ca27ac02ba /net-analyzer
parentStable for HPPA (bug #548638). (diff)
downloadgentoo-2-5b0dab02383de3aabe5f50c2dd80ffadbd64300d.tar.gz
gentoo-2-5b0dab02383de3aabe5f50c2dd80ffadbd64300d.tar.bz2
gentoo-2-5b0dab02383de3aabe5f50c2dd80ffadbd64300d.zip
Use upstream patch (bug #546060).
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/bmon/ChangeLog5
-rw-r--r--net-analyzer/bmon/files/bmon-3.6-net_if.h.patch13
2 files changed, 11 insertions, 7 deletions
diff --git a/net-analyzer/bmon/ChangeLog b/net-analyzer/bmon/ChangeLog
index a9b3bec8170b..d67a96fe5af6 100644
--- a/net-analyzer/bmon/ChangeLog
+++ b/net-analyzer/bmon/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/bmon
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.64 2015/04/10 19:45:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.65 2015/05/07 05:08:11 jer Exp $
+
+ 07 May 2015; Jeroen Roovers <jer@gentoo.org> files/bmon-3.6-net_if.h.patch:
+ Use upstream patch (bug #546060).
10 Apr 2015; Jeroen Roovers <jer@gentoo.org> bmon-3.6-r1.ebuild,
+files/bmon-3.6-net_if.h.patch:
diff --git a/net-analyzer/bmon/files/bmon-3.6-net_if.h.patch b/net-analyzer/bmon/files/bmon-3.6-net_if.h.patch
index 65c58c127140..74a174b2f381 100644
--- a/net-analyzer/bmon/files/bmon-3.6-net_if.h.patch
+++ b/net-analyzer/bmon/files/bmon-3.6-net_if.h.patch
@@ -1,10 +1,11 @@
--- a/src/in_netlink.c
+++ b/src/in_netlink.c
-@@ -23,6 +23,7 @@
- * DEALINGS IN THE SOFTWARE.
- */
+@@ -37,6 +37,8 @@
+ static struct element_group *grp;
+ static struct bmon_module netlink_ops;
+#include <net/if.h>
- #include <bmon/bmon.h>
- #include <bmon/input.h>
- #include <bmon/element.h>
++
+ #include <netlink/netlink.h>
+ #include <netlink/cache.h>
+ #include <netlink/utils.h>