diff options
author | Li xin <lixin.fnst@cn.fujitsu.com> | 2015-08-21 18:08:04 +0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2015-09-11 11:52:15 -0400 |
commit | 858d7a83cbad77eb6d0b2edadcf2269a3c85e234 (patch) | |
tree | db761c7cda571b6cdd5b7901a512b06c0c1be758 /meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-mib-timeout-values.patch | |
parent | 28233847aa0f0a12f01da4782ab5b3ffefab51cd (diff) | |
download | meta-openembedded-contrib-858d7a83cbad77eb6d0b2edadcf2269a3c85e234.tar.gz |
net-snmp: upgrade 5.7.2.1 -> 5.7.3
* Dropped backported patches
--ifmib.patch
--0001-Added-checks-for-printing-variables-with-wrong-types.patch
--0001-Fix-CVE-2014-2285.patch
--net-snmp-5.7.2-fix-mib-timeout-values.patch
* Update patches
--dont-return-incompletely-parsed-varbinds.patch
--systemd-support.patch
* Add a new patch to avoid build Errors.
--0001-config_os_headers-Error-Fix.patch
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-mib-timeout-values.patch')
-rw-r--r-- | meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-mib-timeout-values.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-mib-timeout-values.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-mib-timeout-values.patch deleted file mode 100644 index 324d1c05ca..0000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-mib-timeout-values.patch +++ /dev/null @@ -1,56 +0,0 @@ -net-snmp: fix mib representation of timeout values - -The patch comes from the follow three commits on upstream: -78dac6e37943d1ad99841898806ea60b0eede636 -390303059fbd98b1ee7621ddd4ad4c11d100fff9 -96302af7fc3108c208227432f0f0b75f3e7b906d - -The first commit: -Fix bug number #a2478: fix mib representation of timeout values. -The second commit: -Reverts 78dac6e37943d1ad99841898806ea60b0eede636 and resolve a2478 -in a way that avoids truncating -The third commit: -Corrects conversion factor from microseconds to centiseconds. - -Upstream-Status: Backport - -Signed-off-by: Per Hallsmark <per.hallsmark@windriver.com> -Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> - -diff -uarN net-snmp-5.7.2-org/agent/mibgroup/notification/snmpNotifyTable.c net-snmp-5.7.2/agent/mibgroup/notification/snmpNotifyTable.c ---- net-snmp-5.7.2-org/agent/mibgroup/notification/snmpNotifyTable.c 2015-04-09 15:24:18.393570318 +0800 -+++ net-snmp-5.7.2/agent/mibgroup/notification/snmpNotifyTable.c 2015-04-09 15:25:23.547569858 +0800 -@@ -331,7 +331,7 @@ - ptr->tAddressLen = t->remote_length; - ptr->tAddress = t->remote; - -- ptr->timeout = ss->timeout / 1000; -+ ptr->timeout = ss->timeout / 10000; - ptr->retryCount = ss->retries; - SNMP_FREE(ptr->tagList); - ptr->tagList = strdup(ptr->name); -diff -uarN net-snmp-5.7.2-org/agent/mibgroup/target/snmpTargetAddrEntry.h net-snmp-5.7.2/agent/mibgroup/target/snmpTargetAddrEntry.h ---- net-snmp-5.7.2-org/agent/mibgroup/target/snmpTargetAddrEntry.h 2015-04-09 15:24:18.593570085 +0800 -+++ net-snmp-5.7.2/agent/mibgroup/target/snmpTargetAddrEntry.h 2015-04-09 15:26:41.250570178 +0800 -@@ -51,7 +51,7 @@ - int tDomainLen; - unsigned char *tAddress; - size_t tAddressLen; -- int timeout; -+ int timeout; /* Timeout in centiseconds */ - int retryCount; - char *tagList; - char *params; -diff -uarN net-snmp-5.7.2-org/agent/mibgroup/target/target.c net-snmp-5.7.2/agent/mibgroup/target/target.c ---- net-snmp-5.7.2-org/agent/mibgroup/target/target.c 2015-04-09 15:24:18.592569768 +0800 -+++ net-snmp-5.7.2/agent/mibgroup/target/target.c 2015-04-09 15:25:52.586569961 +0800 -@@ -240,7 +240,7 @@ - } - #endif - memset(&thissess, 0, sizeof(thissess)); -- thissess.timeout = (targaddrs->timeout) * 1000; -+ thissess.timeout = (targaddrs->timeout) * 10000; - thissess.retries = targaddrs->retryCount; - DEBUGMSGTL(("target_sessions", - "timeout: %d -> %ld\n", |