[leaf-commits] src/bering-uclibc4/source/net-snmp net-snmp-5.4.3-no-vmstat.patch, NONE, 1.1 net-snmp-5.4.3.tar.gz, NONE, 1.1 buildtool.cfg, 1.1.1.1, 1.2 buildtool.mk, 1.3, 1.4 net-snmp-5.4.2.1-no-vmstat.patch, 1.1.1.1, NONE net-snmp-5.4.2.1.tar.gz, 1.1.1.1, NONE
Andrew <[email protected]>
| Newsgroups | gmane.linux.leaf.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/leaf/src/bering-uclibc4/source/net-snmp
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19249
Modified Files:
buildtool.cfg buildtool.mk
Added Files:
net-snmp-5.4.3-no-vmstat.patch net-snmp-5.4.3.tar.gz
Removed Files:
net-snmp-5.4.2.1-no-vmstat.patch net-snmp-5.4.2.1.tar.gz
Log Message:
Updated net-snmp to 5.4.3
--- NEW FILE: net-snmp-5.4.3-no-vmstat.patch ---
diff -aur orig/agent/mibgroup/hardware/cpu/cpu_linux.c net-snmp-5.4.3/agent/mibgroup/hardware/cpu/cpu_linux.c
--- orig/agent/mibgroup/hardware/cpu/cpu_linux.c.orig 2009-03-18 12:52:30.000000000 +0200
+++ net-snmp-5.4.3/agent/mibgroup/hardware/cpu/cpu_linux.c 2010-07-22 21:45:10.801705510 +0300
@@ -199,7 +199,7 @@
static int has_vmstat = 1;
static char *vmbuff = NULL;
static int vmbsize = 0;
- static int first = 1;
+ static int first = 0;
int bytes_read, vmstatfd;
char *b;
unsigned long long pin, pout, swpin, swpout;
diff -aur orig/agent/mibgroup/ucd-snmp/vmstat_linux.c net-snmp-5.4.3/agent/mibgroup/ucd-snmp/vmstat_linux.c
--- orig/agent/mibgroup/ucd-snmp/vmstat_linux.c 2006-09-15 03:48:50.000000000 +0300
+++ net-snmp-5.4.3/agent/mibgroup/ucd-snmp/vmstat_linux.c 2010-03-25 22:03:54.000000000 +0200
@@ -281,32 +281,32 @@
if (b)
sscanf(b, "pgpgin %u", pin);
else {
- if (first)
- snmp_log(LOG_ERR, "No pgpgin line in %s\n", VMSTAT_FILE);
+// if (first)
+// snmp_log(LOG_ERR, "No pgpgin line in %s\n", VMSTAT_FILE);
*pin = 0;
}
b = strstr(vmbuff, "pgpgout ");
if (b)
sscanf(b, "pgpgout %u", pout);
else {
- if (first)
- snmp_log(LOG_ERR, "No pgpgout line in %s\n", VMSTAT_FILE);
+// if (first)
+// snmp_log(LOG_ERR, "No pgpgout line in %s\n", VMSTAT_FILE);
*pout = 0;
}
b = strstr(vmbuff, "pswpin ");
if (b)
sscanf(b, "pswpin %u", swpin);
else {
- if (first)
- snmp_log(LOG_ERR, "No pswpin line in %s\n", VMSTAT_FILE);
+// if (first)
+// snmp_log(LOG_ERR, "No pswpin line in %s\n", VMSTAT_FILE);
*swpin = 0;
}
b = strstr(vmbuff, "pswpout ");
if (b)
sscanf(b, "pswpout %u", swpout);
else {
- if (first)
- snmp_log(LOG_ERR, "No pswpout line in %s\n", VMSTAT_FILE);
+// if (first)
+// snmp_log(LOG_ERR, "No pswpout line in %s\n", VMSTAT_FILE);
*swpout = 0;
}
}
--- net-snmp-5.4.2.1.tar.gz DELETED ---
--- NEW FILE: net-snmp-5.4.3.tar.gz ---
(This appears to be a binary file; contents omitted.)
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/net-snmp/buildtool.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.mk 3 Jun 2010 20:46:16 -0000 1.3
--- buildtool.mk 22 Jul 2010 19:14:00 -0000 1.4
***************
*** 8,12 ****
include $(MASTERMAKEFILE)
! SNMP_DIR:=net-snmp-5.4.2.1
SNMP_TARGET_DIR:=$(BT_BUILD_DIR)/net-snmp
--- 8,12 ----
include $(MASTERMAKEFILE)
! SNMP_DIR:=net-snmp-5.4.3
SNMP_TARGET_DIR:=$(BT_BUILD_DIR)/net-snmp
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/net-snmp/buildtool.cfg,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** buildtool.cfg 26 Apr 2010 09:02:52 -0000 1.1.1.1
--- buildtool.cfg 22 Jul 2010 19:13:59 -0000 1.2
***************
*** 5,9 ****
</File>
! <File net-snmp-5.4.2.1.tar.gz>
Server = cvs4-sourceforge
envname = SNMP_SOURCE
--- 5,9 ----
</File>
! <File net-snmp-5.4.3.tar.gz>
Server = cvs4-sourceforge
envname = SNMP_SOURCE
***************
*** 62,66 ****
</File>
! <File net-snmp-5.4.2.1-no-vmstat.patch>
Server = cvs4-sourceforge
envname = SNMP_PATCH3
--- 62,66 ----
</File>
! <File net-snmp-5.4.3-no-vmstat.patch>
Server = cvs4-sourceforge
envname = SNMP_PATCH3
***************
*** 71,76 ****
<Package>
<snmpmibs>
! Version = 5.4.2.1
! Revision = 1
Help <<EOF
--- 71,76 ----
<Package>
<snmpmibs>
! Version = 5.4.3
! Revision = 2
Help <<EOF
***************
*** 100,105 ****
</snmpmibs>
<netsnmpu>
! Version = 5.4.2.1
! Revision = 1
Help <<EOF
--- 100,105 ----
</snmpmibs>
<netsnmpu>
! Version = 5.4.3
! Revision = 2
Help <<EOF
***************
*** 232,237 ****
</netsnmpu>
<libsnmp>
! Version = 5.4.2.1
! Revision = 1
Help <<EOF
--- 232,237 ----
</netsnmpu>
<libsnmp>
! Version = 5.4.3
! Revision = 2
Help <<EOF
***************
*** 351,356 ****
</libsnmp>
<nettrapd>
! Version = 5.4.2.1
! Revision = 1
Help <<EOF
--- 351,356 ----
</libsnmp>
<nettrapd>
! Version = 5.4.3
! Revision = 2
Help <<EOF
***************
*** 406,411 ****
</nettrapd>
<netsnmpd>
! Version = 5.4.2.1
! Revision = 1
Help <<EOF
--- 406,411 ----
</nettrapd>
<netsnmpd>
! Version = 5.4.3
! Revision = 2
Help <<EOF
--- net-snmp-5.4.2.1-no-vmstat.patch DELETED ---
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first