aboutsummaryrefslogtreecommitdiffstats
path: root/net-mgmt/net-snmp
diff options
context:
space:
mode:
authorzi <zi@FreeBSD.org>2012-02-20 22:22:17 +0800
committerzi <zi@FreeBSD.org>2012-02-20 22:22:17 +0800
commit85100038c5fab7761c262290f5cadfbff553bae7 (patch)
treec531a7fc85981e7460026d713e80efb376c034e8 /net-mgmt/net-snmp
parent70009902ccf25278b1b933512b77ddd715107747 (diff)
downloadfreebsd-ports-gnome-85100038c5fab7761c262290f5cadfbff553bae7.tar.gz
freebsd-ports-gnome-85100038c5fab7761c262290f5cadfbff553bae7.tar.zst
freebsd-ports-gnome-85100038c5fab7761c262290f5cadfbff553bae7.zip
- Resolve issue where local filesystems were displayed as remote file systems.
PR: ports/164817 Submitted by: Rainer Duffner <rainer@ultra-secure.de> Obtained from: Mel Flynn <rflynn@acsalaska.net>
Diffstat (limited to 'net-mgmt/net-snmp')
-rw-r--r--net-mgmt/net-snmp/Makefile2
-rw-r--r--net-mgmt/net-snmp/files/patch-agent-mibgroup-hardware-fsys-fsys_getfsstats.c18
-rw-r--r--net-mgmt/net-snmp/files/patch-agent__mibgroup__ucd-snmp__disk_hw.c13
3 files changed, 27 insertions, 6 deletions
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 5ae09ec2fae2..e3e8bd0f16ec 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= snmp
PORTVERSION= 5.7.1
-PORTREVISION= 4
+PORTREVISION= 5
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 a12b8bb30e4d..604c9d2a6039 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,5 +1,5 @@
---- ./agent/mibgroup/hardware/fsys/fsys_getfsstats.c.orig 2011-09-28 00:53:47.000000000 -0400
-+++ ./agent/mibgroup/hardware/fsys/fsys_getfsstats.c 2011-12-07 17:33:47.000000000 -0500
+--- agent/mibgroup/hardware/fsys/fsys_getfsstats.c.orig 2011-09-27 20:53:47.000000000 -0800
++++ agent/mibgroup/hardware/fsys/fsys_getfsstats.c 2012-02-20 01:39:38.000000000 -0900
@@ -150,9 +150,9 @@
if (!entry)
continue;
@@ -12,9 +12,21 @@
entry->device[sizeof(entry->device)-1] = '\0';
entry->units = stats[i].f_bsize; /* or f_frsize */
entry->size = stats[i].f_blocks;
-@@ -175,4 +175,5 @@
+@@ -164,7 +164,7 @@
+ entry->type = _fs_type( stats[i].f_fstypename );
+ entry->flags |= NETSNMP_FS_FLAG_ACTIVE;
+
+- if (! stats[i].NSFS_FLAGS & MNT_LOCAL ) {
++ if (! (stats[i].NSFS_FLAGS & MNT_LOCAL) ) {
+ entry->flags |= NETSNMP_FS_FLAG_REMOTE;
+ }
+ if ( stats[i].NSFS_FLAGS & MNT_RDONLY ) {
+@@ -174,5 +174,8 @@
+ entry->flags |= NETSNMP_FS_FLAG_BOOTABLE;
}
netsnmp_fsys_calculate32(entry);
++ DEBUGMSGTL(("fsys:path", "flags on entry %s: 0x%08x\n", entry->path,
++ entry->flags));
}
+ 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 c09349804c6d..3fd748d01a01 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,5 +1,5 @@
---- ./agent/mibgroup/ucd-snmp/disk_hw.c.orig 2011-09-28 00:53:47.000000000 -0400
-+++ ./agent/mibgroup/ucd-snmp/disk_hw.c 2012-02-13 11:07:08.000000000 -0500
+--- agent/mibgroup/ucd-snmp/disk_hw.c.orig 2011-09-27 20:53:47.000000000 -0800
++++ agent/mibgroup/ucd-snmp/disk_hw.c 2012-02-19 16:21:29.000000000 -0900
@@ -137,6 +137,7 @@
if (disks) {
free( disks );
@@ -8,6 +8,15 @@
}
allDisksIncluded = 0;
}
+@@ -189,7 +190,7 @@
+ if ( entry ) {
+ entry->minspace = minspace;
+ entry->minpercent = minpercent;
+- entry->flags |= ~NETSNMP_FS_FLAG_UCD;
++ entry->flags |= NETSNMP_FS_FLAG_UCD;
+ disks[numdisks++] = entry;
+ }
+ }
@@ -321,7 +322,7 @@
switch (vp->magic) {