Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 384921 - net-analyzer/munin: merge request for two more patches
Summary: net-analyzer/munin: merge request for two more patches
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Robin Johnson
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-09-29 11:41 UTC by Diego Elio Pettenò (RETIRED)
Modified: 2011-11-03 18:11 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
apc_nis patch (0001-apc_nis-support-rewriting-host-and-port-in-configura.patch,2.27 KB, patch)
2011-09-29 11:41 UTC, Diego Elio Pettenò (RETIRED)
Details | Diff
if_ and if_err_ patch (munin-if-hardened.patch,5.21 KB, patch)
2011-09-29 11:43 UTC, Diego Elio Pettenò (RETIRED)
Details | Diff
Fixed if_ patch (munin-if.patch,3.97 KB, text/plain)
2011-09-29 23:03 UTC, Diego Elio Pettenò (RETIRED)
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Diego Elio Pettenò (RETIRED) gentoo-dev 2011-09-29 11:41:25 UTC
Created attachment 288217 [details, diff]
apc_nis patch

It's that time of the month again, sorry :)

I've got two patches here that should be fine to be merged: one has been applied as-is by upstream, while the other is a squashed copy of what upstream committed of two patches of mine (fixed as well).

The first patch, for apc_nis plugin, allows to choose which APCUPSD instance to connect to, as the original plugin only allows one.

The second patch uses /sys to fetch network interface data, if accessible. This allows a) to get the interface speed without running the plugin as root; b) to actually get the in/out bytes data without running as root on grsec-enabled systems (as /proc is not accessible there).

HTH!
Diego
Comment 1 Diego Elio Pettenò (RETIRED) gentoo-dev 2011-09-29 11:43:04 UTC
Created attachment 288219 [details, diff]
if_ and if_err_ patch
Comment 2 Robin Johnson archtester Gentoo Infrastructure gentoo-dev Security 2011-09-29 19:23:18 UTC
diego: your if_ gets it wrong on my wireless card.
It needs to read the iw/iwconfig speed first, then try sysfs.
+1 otherwise.
Comment 3 Diego Elio Pettenò (RETIRED) gentoo-dev 2011-09-29 19:44:14 UTC
I'll see to report it upstream then (since this is what would otherwise go in 2.0 ^^;;).
Comment 4 Diego Elio Pettenò (RETIRED) gentoo-dev 2011-09-29 23:03:37 UTC
Created attachment 288293 [details]
Fixed if_ patch

Here we go, this should be working fine :)
Comment 5 Robin Johnson archtester Gentoo Infrastructure gentoo-dev Security 2011-09-29 23:05:27 UTC
+1
Comment 6 Diego Elio Pettenò (RETIRED) gentoo-dev 2011-11-03 18:11:45 UTC
Committed this myself.