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

[Jan Šafránek]

commit b65d28ef8b937b5a2a0865f626c90cba4e1dfc88
Merge: 9123b7f dd3b71f
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Thu Dec 5 13:26:39 2013 +0100

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

 net-snmp-5.5-agentx-disconnect-crash.patch |  270 ++++++++++++++++++++++++++++
 net-snmp-5.7-agentx-crash.patch            |   57 ++++++
 net-snmp.spec                              |   12 +-
 3 files changed, 337 insertions(+), 2 deletions(-)
---
diff --cc net-snmp.spec
index 6da14f7,59bef63..36a3a9f
--- 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: 15%{?dist}
 -Release: 13%{?dist}
++Release: 16%{?dist}
  Epoch: 1
  
  License: BSD
@@@ -505,16 -509,10 +509,20 @@@ rm -rf ${RPM_BUILD_ROOT
  %{_initrddir}/snmptrapd
  
  %changelog
 -* 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)
+ 
 +* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:5.7.2-15
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 +
 +* Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 1:5.7.2-14
 +- Perl 5.18 rebuild
 +
 +* Thu Jun 27 2013 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-13
 +- set permissions of snmpd.conf and snmptrapd conf to 0600 to prevent
 +  users from reading passwords and community strings.
-   
++
  * Tue May 21 2013 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-12
  - added btrfs support to hrFSTable (#965348)