Date: Wed, 9 Sep 2015 19:36:50 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396528 - in head/net-mgmt/net-snmp: . files Message-ID: <201509091936.t89JaoCq057513@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Wed Sep 9 19:36:49 2015 New Revision: 396528 URL: https://svnweb.freebsd.org/changeset/ports/396528 Log: - Merge in fix for upsteam bug #2647 - Bump PORTREVISION Added: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_ucd-snmp_diskio.c (contents, props changed) Modified: head/net-mgmt/net-snmp/Makefile Modified: head/net-mgmt/net-snmp/Makefile ============================================================================== --- head/net-mgmt/net-snmp/Makefile Wed Sep 9 18:26:40 2015 (r396527) +++ head/net-mgmt/net-snmp/Makefile Wed Sep 9 19:36:49 2015 (r396528) @@ -3,7 +3,7 @@ PORTNAME= snmp PORTVERSION= 5.7.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-mgmt ipv6 MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= net- Added: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_ucd-snmp_diskio.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/net-snmp/files/patch-agent_mibgroup_ucd-snmp_diskio.c Wed Sep 9 19:36:49 2015 (r396528) @@ -0,0 +1,54 @@ +--- agent/mibgroup/ucd-snmp/diskio.c.orig 2014-12-08 20:23:22 UTC ++++ agent/mibgroup/ucd-snmp/diskio.c +@@ -944,14 +944,14 @@ var_diskio(struct variable * vp, + return (u_char *) stat->dinfo->devices[indx].device_name; + case DISKIO_NREAD: + #if HAVE_DEVSTAT_GETDEVS +- long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_READ]; ++ long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_READ] & 0xFFFFFFFF; + #else + long_ret = (signed long) stat->dinfo->devices[indx].bytes_read; + #endif + return (u_char *) & long_ret; + case DISKIO_NWRITTEN: + #if HAVE_DEVSTAT_GETDEVS +- long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE]; ++ long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE] & 0xFFFFFFFF; + #else + long_ret = (signed long) stat->dinfo->devices[indx].bytes_written; + #endif +@@ -959,7 +959,7 @@ var_diskio(struct variable * vp, + case DISKIO_NREADX: + *var_len = sizeof(struct counter64); + #if HAVE_DEVSTAT_GETDEVS +- longlong_ret = stat->dinfo->devices[indx].bytes[DEVSTAT_READ]; ++ longlong_ret = stat->dinfo->devices[indx].bytes[DEVSTAT_READ] & 0xFFFFFFFF; + #else + longlong_ret = stat->dinfo->devices[indx].bytes_read; + #endif +@@ -969,7 +969,7 @@ var_diskio(struct variable * vp, + case DISKIO_NWRITTENX: + *var_len = sizeof(struct counter64); + #if HAVE_DEVSTAT_GETDEVS +- longlong_ret = stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE]; ++ longlong_ret = stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE] & 0xFFFFFFFF; + #else + longlong_ret = stat->dinfo->devices[indx].bytes_written; + #endif +@@ -978,14 +978,14 @@ var_diskio(struct variable * vp, + return (u_char *) & c64_ret; + case DISKIO_READS: + #if HAVE_DEVSTAT_GETDEVS +- long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_READ]; ++ long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_READ] & 0xFFFFFFFF; + #else + long_ret = (signed long) stat->dinfo->devices[indx].num_reads; + #endif + return (u_char *) & long_ret; + case DISKIO_WRITES: + #if HAVE_DEVSTAT_GETDEVS +- long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_WRITE]; ++ long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_WRITE] & 0xFFFFFFFF; + #else + long_ret = (signed long) stat->dinfo->devices[indx].num_writes; + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509091936.t89JaoCq057513>