packages: net-snmp/net-snmp.spec, net-snmp/bug-3460364.patch (NEW)=?UTF-8?Q?=20?=- backpo...

[glen]

Author: glen                         Date: Mon May 21 14:04:56 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- backport bug 3460364 (Fix use of block factor when detecting error conditions)

---- Files affected:
packages/net-snmp:
   net-snmp.spec (1.193 -> 1.194) , bug-3460364.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/net-snmp/net-snmp.spec
diff -u packages/net-snmp/net-snmp.spec:1.193 packages/net-snmp/net-snmp.spec:1.194
--- packages/net-snmp/net-snmp.spec:1.193	Thu Feb  2 22:12:48 2012
+++ packages/net-snmp/net-snmp.spec	Mon May 21 16:04:51 2012
@@ -27,7 +27,7 @@
 Summary(uk.UTF-8):	Набір утиліт для протоколу SNMP від UC-Davis
 Name:		net-snmp
 Version:	5.7.1
-Release:	6
+Release:	7
 License:	BSD-like
 Group:		Networking/Daemons
 Source0:	http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
@@ -58,7 +58,8 @@
 Patch14:	%{name}-libnl.patch
 Patch15:	%{name}-libpci-init.patch
 Patch16:	%{name}-recognize-reiserfs.patch
-Patch17:	net-snmp-logging.patch
+Patch17:	%{name}-logging.patch
+Patch18:	bug-3460364.patch
 URL:		http://www.net-snmp.org/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake
@@ -440,6 +441,7 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 %{__libtoolize}
@@ -821,6 +823,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.194  2012/05/21 14:04:51  glen
+- backport bug 3460364 (Fix use of block factor when detecting error conditions)
+
 Revision 1.193  2012/02/02 21:12:48  glen
 - do not allow hrSWInstalledTable query to use dpkg-query even if it finds it; REL 6
 

================================================================
Index: packages/net-snmp/bug-3460364.patch
diff -u /dev/null packages/net-snmp/bug-3460364.patch:1.1
--- /dev/null	Mon May 21 16:04:56 2012
+++ packages/net-snmp/bug-3460364.patch	Mon May 21 16:04:51 2012
@@ -0,0 +1,40 @@
+From: Dave Shield <D.T.Shield at liverpool.ac.uk>
+Date: Tue, 28 Feb 2012 10:44:41 +0000 (+0000)
+Subject: CHANGES: snmpd: BUGS: 3460364: Fix use of block factor when detecting error conditions
+X-Git-Tag: v5.6.2.pre1~18
+X-Git-Url: http://net-snmp.git.sourceforge.net/git/gitweb.cgi?p=net-snmp%2Fnet-snmp;a=commitdiff_plain;h=879bf7079d34fa46f6fcf54a01c8500beaece59a
+
+CHANGES: snmpd: BUGS: 3460364: Fix use of block factor when detecting error conditions
+---
+
+diff --git a/agent/mibgroup/ucd-snmp/disk_hw.c b/agent/mibgroup/ucd-snmp/disk_hw.c
+index ba26479..2b80476 100644
+--- a/agent/mibgroup/ucd-snmp/disk_hw.c
++++ b/agent/mibgroup/ucd-snmp/disk_hw.c
+@@ -389,8 +389,9 @@ tryAgain:
+ 
+     case ERRORFLAG:
+         long_ret = 0;
++        val = netsnmp_fsys_avail_ull(entry);
+         if (( entry->minspace >= 0 ) &&
+-            ( entry->avail < entry->minspace ))
++            ( val < entry->minspace ))
+             long_ret = 1;
+         else if (( entry->minpercent >= 0 ) &&
+                  (_percent( entry->avail, entry->size ) < entry->minpercent ))
+@@ -399,12 +400,13 @@ tryAgain:
+ 
+     case ERRORMSG:
+         errmsg[0] = 0;
++        val = netsnmp_fsys_avail_ull(entry);
+         if (( entry->minspace >= 0 ) &&
+-            ( entry->avail < entry->minspace ))
++            ( val < entry->minspace ))
+                 snprintf(errmsg, sizeof(errmsg),
+                         "%s: less than %d free (= %d)",
+                         entry->path, entry->minspace,
+-                        (int) entry->avail);
++                        (int) val);
+         else if (( entry->minpercent >= 0 ) &&
+                  (_percent( entry->avail, entry->size ) < entry->minpercent ))
+                 snprintf(errmsg, sizeof(errmsg),
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/net-snmp/net-snmp.spec?r1=1.193&r2=1.194