diff --git a/net-snmp-5.7.2-fix-mib-representation-of-timeout-values.patch b/net-snmp-5.7.2-fix-mib-representation-of-timeout-values.patch new file mode 100644 index 0000000..900d695 --- /dev/null +++ b/net-snmp-5.7.2-fix-mib-representation-of-timeout-values.patch @@ -0,0 +1,57 @@ +commit 78dac6e37943d1ad99841898806ea60b0eede636 +Author: Wes Hardaker +Date: Mon Jul 22 12:39:00 2013 -0700 + + fix bug number #a2478: fix mib representation of timeout values + +commit 390303059fbd98b1ee7621ddd4ad4c11d100fff9 +Author: Magnus Fromreide +Date: Sun Jul 28 21:28:14 2013 +0200 + + Revert 78dac6e37943d1ad99841898806ea60b0eede636 and resolve a2478 in a way that avoids truncating snmpTargetAddrTimeout. + +commit 96302af7fc3108c208227432f0f0b75f3e7b906d +Author: Magnus Fromreide +Date: Wed Aug 28 10:59:05 2013 +0200 + + Correct conversion factor from microseconds to centiseconds. + +Index: net-snmp-5.7.2/agent/mibgroup/target/snmpTargetAddrEntry.h +=================================================================== +--- net-snmp-5.7.2.orig/agent/mibgroup/target/snmpTargetAddrEntry.h ++++ net-snmp-5.7.2/agent/mibgroup/target/snmpTargetAddrEntry.h +@@ -51,7 +51,7 @@ config_add_mib(SNMPv2-TM) + int tDomainLen; + unsigned char *tAddress; + size_t tAddressLen; +- int timeout; ++ int timeout; /* Timeout in centiseconds */ + int retryCount; + char *tagList; + char *params; +Index: net-snmp-5.7.2/agent/mibgroup/target/target.c +=================================================================== +--- net-snmp-5.7.2.orig/agent/mibgroup/target/target.c ++++ net-snmp-5.7.2/agent/mibgroup/target/target.c +@@ -240,7 +240,7 @@ get_target_sessions(char *taglist, Targe + } + #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", +Index: net-snmp-5.7.2/agent/mibgroup/notification/snmpNotifyTable.c +=================================================================== +--- net-snmp-5.7.2.orig/agent/mibgroup/notification/snmpNotifyTable.c ++++ net-snmp-5.7.2/agent/mibgroup/notification/snmpNotifyTable.c +@@ -331,7 +331,7 @@ notifyTable_register_notifications(int m + 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 --git a/net-snmp-5.7.2.1.tar.gz b/net-snmp-5.7.2.1.tar.gz new file mode 100644 index 0000000..b28c128 --- /dev/null +++ b/net-snmp-5.7.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2df7583c04bfcb560e564083661f7b98e88eb08a45cb8e5010beb57f4b28054 +size 6281445 diff --git a/net-snmp-5.7.2.tar.gz b/net-snmp-5.7.2.tar.gz deleted file mode 100644 index 38501f8..0000000 --- a/net-snmp-5.7.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09ed31b4cc1f3c0411ef9a16eff79ef3b30d89c32ca46d5a01a41826c4ceb816 -size 6281352 diff --git a/net-snmp.changes b/net-snmp.changes index 1c22d76..a4810be 100644 --- a/net-snmp.changes +++ b/net-snmp.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Sat May 17 18:57:58 UTC 2014 - coolo@suse.de + +- recompress .tar.gz - it has trailing garbage, hope we can readd + source url on next update + +------------------------------------------------------------------- +Fri May 16 12:25:59 UTC 2014 - lchiquitto@suse.com + +- update to upstream version 5.7.2.1, fixing one security issue: + * A denial of service attack vector was discovered on the Linux + implementation of the ICMP-MIB. (CVE-2014-2284, bnc#866942) + +------------------------------------------------------------------- +Wed May 14 22:06:00 CEST 2014 - lchiquitto@suse.com + +- net-snmp-5.7.2-fix-mib-representation-of-timeout-values.patch: + fix mib representation of timeout values (bnc#833153) + +------------------------------------------------------------------- +Thu May 8 11:47:01 CEST 2014 - ro@suse.de + +- use _rundir macro + ------------------------------------------------------------------- Tue Feb 18 15:40:15 UTC 2014 - lchiquitto@suse.com diff --git a/net-snmp.spec b/net-snmp.spec index 85c0031..4e24d50 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -26,11 +26,14 @@ %endif %define netsnmp_check 1 %define netsnmp_logfile /var/log/net-snmpd.log -%define netsnmp_agentx_socket_dir_fhs /var/run/agentx +%if ! %{defined _rundir} +%define _rundir %{_localstatedir}/run +%endif +%define netsnmp_agentx_socket_dir_fhs %{_rundir}/agentx %define netsnmp_agentx_socket_dir_rfc /var/agentx Name: net-snmp -Version: 5.7.2 +Version: 5.7.2.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: openssl-devel @@ -46,7 +49,8 @@ Requires: perl-SNMP = %{version} Requires: perl-TermReadKey PreReq: %insserv_prereq %fillup_prereq /sbin/chkconfig Url: http://sourceforge.net/projects/net-snmp -Source: http://sourceforge.net/projects/net-snmp/files/net-snmp/%{version}/%{pkg_name}-%{version}.tar.gz +#Source: http://sourceforge.net/projects/net-snmp/files/net-snmp/%{version}/%{pkg_name}-%{version}.tar.gz +Source: %{pkg_name}-%{version}.tar.gz Source1: rc.snmpd Source2: snmpd.conf Source3: README.SUSE @@ -63,7 +67,8 @@ Patch5: net-snmp-5.7.2-net-snmp-config-headercheck.patch Patch6: net-snmp-5.7.2-perl-tk-warning.patch Patch7: net-snmp-5.7.2-velocity-mib.patch Patch8: net-snmp-5.7.2-build-fix-for-strlcat.patch -Patch23: net-snmp-5.7.2-fix-snmpd-crashing-when-an-agentx-disconnects.patch +Patch9: net-snmp-5.7.2-fix-snmpd-crashing-when-an-agentx-disconnects.patch +Patch10: net-snmp-5.7.2-fix-mib-representation-of-timeout-values.patch # Summary: SNMP Daemon License: BSD-3-Clause and MIT @@ -86,10 +91,6 @@ renamed from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp to net-snmp in November 2000. -Authors: --------- - Wes Hardaker - %define library_name libsnmp30 %package -n libsnmp30 @@ -114,11 +115,6 @@ and SNMP v3 using both IPv4 and IPv6. The suite includes: This package holds the shared libraries from the net-snmp package. - -Authors: --------- - Wes Hardaker - %package devel Requires: %{library_name} = %{version} # for mib2c @@ -152,10 +148,6 @@ This package holds the development headers, libraries and API documentation from the net-snmp package. -Authors: --------- - Wes Hardaker - %package -n snmp-mibs # Summary: MIB files from net-snmp @@ -177,10 +169,6 @@ and SNMP v3 using both IPv4 and IPv6. The suite includes: This package holds the MIB files from the net-snmp package. -Authors: --------- - Wes Hardaker - %package -n perl-SNMP Requires: %{pkg_name} = %{version} Requires: perl-base = %{perl_version} @@ -193,10 +181,6 @@ Group: Development/Libraries/Perl The Perl5 'SNMP' Extension Module v3.1.0 for the UCD SNMPv3 library. -Authors: --------- - G.S. Marzot - %package python Summary: The Python 'netsnmp' module for the Net-SNMP License: BSD-3-Clause and MIT @@ -208,11 +192,6 @@ SNMPv2c, SNMPv1) client API. The 'netsnmp' module internals rely on the Net-SNMP toolkit library. -Authors: --------- - G.S. Marzot - - %prep %setup -q -n %{pkg_name}-%{version} %patch1 -p1 @@ -222,7 +201,8 @@ Authors: %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch23 -p1 +%patch9 -p1 +%patch10 -p1 %build MIBS="misc/ipfwacc ucd-snmp/diskio etherlike-mib rmon-mib velocity smux \