diff options
| -rw-r--r-- | net-mgmt/net-snmp/Makefile | 6 | ||||
| -rw-r--r-- | net-mgmt/net-snmp/files/patch-agent-mibgroup-hardware-fsys-fsys_getfsstats.c | 11 | ||||
| -rw-r--r-- | net-mgmt/net-snmp/files/patch-include-net-snmp_net-snmp-config.h.in | 11 | ||||
| -rw-r--r-- | net-mgmt/net-snmp/pkg-plist | 4 |
4 files changed, 28 insertions, 4 deletions
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index 8006433514da..2dd030394a60 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -7,7 +7,7 @@ PORTNAME= snmp PORTVERSION= 5.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt ipv6 MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= net- @@ -40,7 +40,6 @@ CONFIGURE_ARGS+=--enable-shared --enable-internal-md5 \ --with-sys-location="${NET_SNMP_SYS_LOCATION}" \ --with-logfile="${NET_SNMP_LOGFILE}" \ --with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" \ - --with-mib-modules="host disman/event-mib smux mibII/mta_sendmail mibII/tcpTable ucd-snmp/diskio" \ --with-gnu-ld --with-libwrap --with-ldflags="-lm -lkvm -ldevstat" .if defined(BATCH) @@ -106,6 +105,7 @@ NET_SNMP_SYS_CONTACT?= nobody@nowhere.invalid NET_SNMP_SYS_LOCATION?= somewhere NET_SNMP_LOGFILE?= /var/log/snmpd.log NET_SNMP_PERSISTENTDIR?=/var/net-snmp +NET_SNMP_WITH_MIB_MODULE_LIST+= host disman/event-mib smux mibII/mta_sendmail mibII/tcpTable ucd-snmp/diskio .if ${OSVERSION} >= 700028 NET_SNMP_WITH_MIB_MODULE_LIST+= sctp-mib @@ -117,7 +117,7 @@ CONFIGURE_ARGS+= --with-libs="-lssp_nonshared" .if defined(WITH_MFD_REWRITES) CONFIGURE_ARGS+=--enable-mfd-rewrites -NET_SNMP_WITH_MIB_MODULE_LIST+= if-mib +NET_SNMP_WITH_MIB_MODULE_LIST+= if-mib .endif .if defined(NET_SNMP_WITH_MIB_MODULE_LIST) && \ 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 new file mode 100644 index 000000000000..b019ff11c926 --- /dev/null +++ b/net-mgmt/net-snmp/files/patch-agent-mibgroup-hardware-fsys-fsys_getfsstats.c @@ -0,0 +1,11 @@ +--- ./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 @@ + entry->device[sizeof(entry->device)-1] = '\0'; + entry->units = stats[i].f_bsize; /* or f_frsize */ + entry->size = stats[i].f_blocks; +- entry->used = stats[i].f_bfree; ++ 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 diff --git a/net-mgmt/net-snmp/files/patch-include-net-snmp_net-snmp-config.h.in b/net-mgmt/net-snmp/files/patch-include-net-snmp_net-snmp-config.h.in new file mode 100644 index 000000000000..e90cc37cf8bb --- /dev/null +++ b/net-mgmt/net-snmp/files/patch-include-net-snmp_net-snmp-config.h.in @@ -0,0 +1,11 @@ +--- include/net-snmp/net-snmp-config.h.in.orig 2011-08-12 21:05:41.000000000 -0300 ++++ include/net-snmp/net-snmp-config.h.in 2011-08-12 21:07:03.000000000 -0300 +@@ -2061,7 +2061,7 @@ + #define UCD_SNMP_LIBRARY 1 + + /* final conclusion on nlist usage */ +-#if defined(HAVE_NLIST) && defined(HAVE_STRUCT_NLIST_N_VALUE) && !defined(NETSNMP_DONT_USE_NLIST) && defined(HAVE_KMEM) && !defined(NETSNMP_NO_KMEM_USAGE) ++#if defined(HAVE_NLIST) && defined(HAVE_STRUCT_NLIST_N_VALUE) && !defined(NETSNMP_DONT_USE_NLIST) && !defined(NETSNMP_NO_KMEM_USAGE) + #define NETSNMP_CAN_USE_NLIST + #endif + diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist index 4e37abcc280e..3fb0c95986b0 100644 --- a/net-mgmt/net-snmp/pkg-plist +++ b/net-mgmt/net-snmp/pkg-plist @@ -132,7 +132,7 @@ include/net-snmp/library/snmp_transport.h include/net-snmp/library/snmpusm.h include/net-snmp/library/snmpv3-security-includes.h include/net-snmp/library/snmpv3.h -include/net-snmp/library/snmpIPv6BaseDomain.h +%%WITH_IPV6%%include/net-snmp/library/snmpIPv6BaseDomain.h include/net-snmp/library/snmpUDPBaseDomain.h include/net-snmp/library/snmpUDPIPv4BaseDomain.h include/net-snmp/library/snmpTCPBaseDomain.h @@ -384,6 +384,8 @@ sbin/snmptrapd %%DATADIR%%/mibs/IPV6-TC.txt %%DATADIR%%/mibs/IPV6-TCP-MIB.txt %%DATADIR%%/mibs/IPV6-UDP-MIB.txt +%%DATADIR%%/mibs/MTA-MIB.txt +%%DATADIR%%/mibs/NETWORK-SERVICES-MIB.txt %%DATADIR%%/mibs/NET-SNMP-AGENT-MIB.txt %%DATADIR%%/mibs/NET-SNMP-EXAMPLES-MIB.txt %%DATADIR%%/mibs/NET-SNMP-EXTEND-MIB.txt |