Use upstream patch (bug #546060).

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

diff --git a/net-analyzer/bmon/ChangeLog b/net-analyzer/bmon/ChangeLog
index a9b3bec8170b212905656a033d0e869e0fc82e99..d67a96fe5af6e79944c4fd8c84affa079aa04763 100644 (file)
--- 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/Manifest b/net-analyzer/bmon/Manifest
index 3da1b7c46b24be547566ac77ac8bfd59198c4047..9f5874ac0464294ebb7bf0368b9338d1065875b4 100644 (file)
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA256
 
 AUX bmon-3.6-docdir-examples.patch 235 SHA256 edca507e8736edc26ec82f67557e59568ea565fb17a5b50b90117b0d723356f0 SHA512 2b74637c6dacfa03e680774787d8287ae084ba426a3e0e178b74f1468179916509ee5de2e0c93f7abe04356d0146ad6dd8e191d9a66718ec8eaf50cb6126afc8 WHIRLPOOL c1e8b690df7949df26fed1db267234c019408eaf6a0c58d82560bde7e2e2630d551a68d114c914c6cdf7800cab69c4e2faecdf2739214dca721fa43ea99ca9a5
-AUX bmon-3.6-net_if.h.patch 198 SHA256 570c3cd89b73313e710a0ca5f58145b8b0b7ded8d1b10e09ec4f441718180e9e SHA512 ead8b37f5046d007d68c148bbdcb96047784cfcd1eab670c6e5c019163475b15e2774c7db28c71b0d546309699dcd29f89c827e03aca45ed979046ba11bd370b WHIRLPOOL eacefeeb34ab91b91fd9c3e1c6fdbcc82bfc50d44f3d259f99f3d0a7eca5b471d66ba8194f246e939f5eb04a00f082cda3180a9724db6d3176f489c26f6e080d
+AUX bmon-3.6-net_if.h.patch 250 SHA256 8f957e304425935fb454059e748f871d09fdaf00b7a022b2f4717c66632bb67f SHA512 1cd09d964998294f198f7ff65c4b2e62d2b066c42a0973d1c5ff77125b1af717e0762c5ec28947d711845cec620c03add771fddf8933e8426d60bceb4e0714fa WHIRLPOOL c4225702a07ae9f44354d9a37b9f65ab35af34f16f1a0de3846e68076a0bee426aec4d3db6fd8a743633312188013433ce423e903e4d61b661e128c7bb92f3c4
 DIST bmon-3.6.tar.gz 57883 SHA256 7d9d9b5af751cb61e267b43309506f03e82636282742fce89209f2378ae6a4b1 SHA512 e0c3d828d5391511ea52b1058a22f5eea250c5221664a7c05d7c36fabc361905dcc6cb97184ba0f366e4fe710e33816f72ad59a5856b90265a6b1a415de319e7 WHIRLPOOL d6eaf1b94f6a3dc7d16afe03146a2f8c67514c5fd9cf2956a89f5da6730d329e474b98d6cf3f6138e19e3e1d063aa4b69f325f478b63f8d4bb6fb6b708d13570
 EBUILD bmon-3.6-r1.ebuild 1071 SHA256 1303c9097eab48d14918f90926ae1c35d9ebb7e1aee73e05b8484879e4235465 SHA512 a054893a72ca651ab824430a3331c0141b0a1008ca635be9cda87fd8128defddbc5d30cd6fafb2cb5a7db460157d33d4a07e0fb33f626116c72ad66f5fa2710e WHIRLPOOL 3ada08de8384bc420a66d2e6e236b264063ef52bac3d5ae67a48e64a003529bd3d24950a5fd74f76e5592cd2986829348be90a836d4d07675141ea0651d2a266
-MISC ChangeLog 8491 SHA256 36e56a03aa7f71ac2097ecccbe7e638fdf779d300f2c9fcbfeab194ca5d65301 SHA512 f3385085ed8ccf927e665aacc1f9555fe335db9e8414ff800c2faabd76f5ce334d638d3fd6b7392b4958ea14d5406938c5663399c543c53645c4fc95267bf638 WHIRLPOOL 9db491b6d8c09556d0ee49af7dcfa5ba06909061b0468f0618a78801ab4f37680bc5365b2da8b96720000b6189638147af6bb10052c2bbab3e124e3bad31be27
+MISC ChangeLog 8606 SHA256 c887b653970aaa9a92e45456f1da21722b6751398b7580d0cf015e4784f227d0 SHA512 2edfc268e7a5c3d66a6d64f33f6fa582ca54816f1d47e9cf5260b26ac9b340950006e1eb3a52190768b630088a30537f1376dd524b1b95e6930edff6df939611 WHIRLPOOL c4070b29427f10fddb3dbae3820c82d5bf66e5fbbf6caf975971250d857ee0c6a440721ae373a429856f8707a71331765b894a5cc04397b15482261be925439b
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUoKG4ACgkQVWmRsqeSphO77wCfUZytGZHVFsq6qLEZ3Di7jGJ0
-dfwAnR9y4jwzjN9+bgMq8lnTgsKiCfhZ
-=mtwn
+iEYEAREIAAYFAlVK8zwACgkQVWmRsqeSphPnnwCfWU7xWNxHiWizizrBieQ3Kr6o
+ZMQAniEzyoFSDasnfnd0BxtsG1NfsYqc
+=BPXH
 -----END PGP SIGNATURE-----

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 65c58c127140de9c628c7fe4dd16f228e310b357..74a174b2f3810c6adc094c58568dc59304c60ab8 100644 (file)
--- 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>