[net-snmp/f20: 2/4] Merge branch 'f19' into f20

[Jan Šafránek]

commit 974e9f3f3cbcdc20197a3d0f50c642bf88804192
Merge: bef9ac7 68adcc5
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Mon Sep 1 10:42:56 2014 +0200

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

 net-snmp-CVE-2014-3565.patch |  446 ++++++++++++++++++++++++++++++++++++++++++
 net-snmp.spec                |    7 +-
 2 files changed, 452 insertions(+), 1 deletions(-)
---
diff --cc net-snmp.spec
index b8f590f,ce0f067..e5d7cd9
--- 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: 17%{?dist}
 -Release: 15%{?dist}
++Release: 18%{?dist}
  Epoch: 1
  
  License: BSD
@@@ -511,10 -513,13 +513,13 @@@ rm -rf ${RPM_BUILD_ROOT
  %{_initrddir}/snmptrapd
  
  %changelog
 -* Mon Sep  1 2014 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-15
++* Mon Sep  1 2014 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-18
+ - Fixed CVE-2014-3565
+ 
 -* Tue Mar  4 2014 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-14
 +* Tue Mar  4 2014 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-17
  - Fixed buffer overflow in ICMP-MIB (#1071753)
  
 -* Thu Dec  5 2013 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-13
 +* 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)