diff options
| author | Ryan Steinmetz <zi@FreeBSD.org> | 2011-11-01 22:31:03 +0000 |
|---|---|---|
| committer | Ryan Steinmetz <zi@FreeBSD.org> | 2011-11-01 22:31:03 +0000 |
| commit | 83fbcf01f9775822b7f8d00ef4ec7a27dc8202ae (patch) | |
| tree | 8ce3412d7ae75521adb6c2c24a2fa64e470e00b0 /net-mgmt/net-snmp | |
| parent | 30184cb9ff5d53ed278378d441819631c3171892 (diff) | |
| download | ports-83fbcf01f9775822b7f8d00ef4ec7a27dc8202ae.tar.gz ports-83fbcf01f9775822b7f8d00ef4ec7a27dc8202ae.zip | |
Notes
Diffstat (limited to 'net-mgmt/net-snmp')
3 files changed, 25 insertions, 9 deletions
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index a55fe298ebe2..1b435b1d8839 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -7,7 +7,7 @@ PORTNAME= snmp PORTVERSION= 5.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt ipv6 MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= net- diff --git a/net-mgmt/net-snmp/files/patch-agent-mibgroup-hardware-fsys-fsys_getfsstats.c b/net-mgmt/net-snmp/files/patch-agent-mibgroup-hardware-fsys-fsys_getfsstats.c index b019ff11c926..8850d5eadc14 100644 --- a/net-mgmt/net-snmp/files/patch-agent-mibgroup-hardware-fsys-fsys_getfsstats.c +++ b/net-mgmt/net-snmp/files/patch-agent-mibgroup-hardware-fsys-fsys_getfsstats.c @@ -1,6 +1,14 @@ ---- ./agent/mibgroup/hardware/fsys/fsys_getfsstats.c.orig 2011-08-05 10:20:55.000000000 +0200 -+++ ./agent/mibgroup/hardware/fsys/fsys_getfsstats.c 2011-08-05 10:21:38.000000000 +0200 -@@ -156,7 +156,7 @@ +--- agent/mibgroup/hardware/fsys/fsys_getfsstats.c.orig 2011-07-02 00:35:46.000000000 +0200 ++++ agent/mibgroup/hardware/fsys/fsys_getfsstats.c 2011-10-27 17:32:32.000000000 +0200 +@@ -150,13 +150,13 @@ + if (!entry) + continue; + +- memcpy( entry->path, stats[i].f_mntonname, sizeof(entry->path) ); ++ strncpy( entry->path, stats[i].f_mntonname, sizeof(entry->path) ); + entry->path[sizeof(entry->path)-1] = '\0'; +- memcpy( entry->device, stats[i].f_mntfromname, sizeof(entry->device)); ++ strncpy( entry->device, stats[i].f_mntfromname, sizeof(entry->device)); entry->device[sizeof(entry->device)-1] = '\0'; entry->units = stats[i].f_bsize; /* or f_frsize */ entry->size = stats[i].f_blocks; @@ -8,4 +16,10 @@ + entry->used = stats[i].f_blocks - stats[i].f_bfree; entry->avail = stats[i].f_bavail; entry->inums_total = stats[i].f_files; - entry->inums_avail = stats[i].f_ffree;
\ No newline at end of file + entry->inums_avail = stats[i].f_ffree; +@@ -175,4 +175,5 @@ + } + netsnmp_fsys_calculate32(entry); + } ++ free(stats); + } diff --git a/net-mgmt/net-snmp/files/patch-agent-mibgroup-ucd-snmp_disk_hw.c b/net-mgmt/net-snmp/files/patch-agent-mibgroup-ucd-snmp_disk_hw.c index db9cbd1dff78..1bd4bb1371d8 100644 --- a/net-mgmt/net-snmp/files/patch-agent-mibgroup-ucd-snmp_disk_hw.c +++ b/net-mgmt/net-snmp/files/patch-agent-mibgroup-ucd-snmp_disk_hw.c @@ -1,11 +1,13 @@ ---- agent/mibgroup/ucd-snmp/disk_hw.c.orig 2011-09-06 22:38:43.000000000 -0300 -+++ agent/mibgroup/ucd-snmp/disk_hw.c 2011-09-06 22:40:13.000000000 -0300 -@@ -245,7 +245,7 @@ +--- agent/mibgroup/ucd-snmp/disk_hw.c.orig 2011-07-02 00:35:46.000000000 +0200 ++++ agent/mibgroup/ucd-snmp/disk_hw.c 2011-10-06 19:17:46.000000000 +0200 +@@ -245,7 +245,9 @@ static int _percent( int value, int total ) { - return (int)( value * 100 ) / total; -+ return (int)( value / (total / 100)); ++ if (!total) ++ return 100; ++ return (int)(( (int64_t) value * 100 ) / total); } static netsnmp_fsys_info ** |