[net-snmp: 3/3] Merge branch 'f20'

[Jan Šafránek]

commit 083e9edc66a2a5524f2aeace20f5bf1a5edccaaa
Merge: 3b0b54d bef9ac7
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Tue Mar 4 09:40:29 2014 +0100

    Merge branch 'f20'
    
    Conflicts:
    	net-snmp.spec

 net-snmp-5.7.2-icmp-mib.patch |  146 +++++++++++++++++++++++++++++++++++++++++
 net-snmp.spec                 |    7 ++-
 2 files changed, 152 insertions(+), 1 deletions(-)
---
diff --cc net-snmp.spec
index 4661827,b8f590f..ba8e1bf
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@@ -11,7 -11,7 +11,7 @@@
  Summary: A collection of SNMP protocol tools and libraries
  Name: net-snmp
  Version: 5.7.2
- Release: 18%{?dist}
 -Release: 17%{?dist}
++Release: 19%{?dist}
  Epoch: 1
  
  License: BSD
@@@ -509,12 -511,9 +511,15 @@@ rm -rf ${RPM_BUILD_ROOT
  %{_initrddir}/snmptrapd
  
  %changelog
 -* Tue Mar  4 2014 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-17
++* Tue Mar  4 2014 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-19
+ - Fixed buffer overflow in ICMP-MIB (#1071753)
+ 
 +* Wed Jan 15 2014 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-18
 +- Added support for ppc64le architecture (#1052431)
 +
 +* Thu Jan  9 2014 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-17
 +- Moved tmpfiles.d config file to /usr/lib
 +
  * Thu Dec  5 2013 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-16
  - Fixed snmpd crashing when AgentX subagent disconnects in the middle of
    request processing (#1038011)