[net-snmp/f19: 5/5] Merge branch 'f18' into f19

[Jan Šafránek]

commit dd3b71fad00d93c39eed657cd1f7b855fc6d8768
Merge: 2e6497a 9b8b0d0
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Thu Dec 5 13:24:35 2013 +0100

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

 net-snmp-5.5-agentx-disconnect-crash.patch |  270 ++++++++++++++++++++++++++++
 net-snmp-5.7-agentx-crash.patch            |   57 ++++++
 net-snmp.spec                              |   10 +-
 3 files changed, 336 insertions(+), 1 deletions(-)
---
diff --cc net-snmp.spec
index b0e3201,a2d1d04..59bef63
--- 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: 12%{?dist}
 -Release: 7%{?dist}
++Release: 13%{?dist}
  Epoch: 1
  
  License: BSD
@@@ -34,12 -34,13 +34,14 @@@ Patch1: net-snmp-5.7.2-pie.patc
  Patch2: net-snmp-5.5-dir-fix.patch
  Patch3: net-snmp-5.6-multilib.patch
  Patch4: net-snmp-5.5-apsl-copying.patch
 -Patch5: net-snmp-5.5-perl-linking.patch
 -Patch6: net-snmp-5.6-test-debug.patch
 -Patch7: net-snmp-5.7.2-systemd.patch
 -Patch8: net-snmp-5.7.2-python-ipaddress-size.patch
 -Patch9: net-snmp-5.7.2-btrfs.patch
 -Patch10: net-snmp-5.7-agentx-crash.patch
 -Patch11: net-snmp-5.5-agentx-disconnect-crash.patch
 +Patch5: net-snmp-5.6-test-debug.patch
 +Patch6: net-snmp-5.7.2-systemd.patch
 +Patch7: net-snmp-5.7.2-python-ipaddress-size.patch
 +Patch8: net-snmp-5.7.2-create-user-multilib.patch
 +Patch9: net-snmp-5.7.2-autoreconf.patch
 +Patch10: net-snmp-5.7.2-btrfs.patch
++Patch11: net-snmp-5.7-agentx-crash.patch
++Patch12: net-snmp-5.5-agentx-disconnect-crash.patch
  
  Requires(post): chkconfig
  Requires(preun): chkconfig
@@@ -198,12 -196,17 +200,14 @@@ cp %{SOURCE12} 
  %patch2 -p1 -b .dir-fix
  %patch3 -p1 -b .multilib
  %patch4 -p1 -b .apsl
 -# Following patch removes -Wl,-rpath,/usr/lib64/perl5/CORE from 
 -# net-snmp-config --agent-libs output. As for Fedora 15, this
 -# rpath is needed to link subagents, because libperl.so is in
 -# non-default directory - so leave the rpath there.
 -#%patch5 -p1 -b .perl-linking
 -%patch6 -p1
 -%patch7 -p1 -b .systemd
 -%patch8 -p1 -b .ipaddress-size
 -%patch9 -p1 -b .btrfs
 -%patch10 -p1 -b .agentx-crash
 -%patch11 -p1 -b .agentx-disconnect-crash
 +%patch5 -p1
 +%patch6 -p1 -b .systemd
 +%patch7 -p1 -b .ipaddress-size
 +%patch8 -p1 -b .multilib
 +%patch9 -p1 -b .autoreconf
 +%patch10 -p1 -b .btrfs
++%patch11 -p1 -b .agentx-crash
++%patch12 -p1 -b .agentx-disconnect-crash
  
  %ifarch sparc64 s390 s390x
  # disable failing test - see https://bugzilla.redhat.com/show_bug.cgi?id=680697
@@@ -505,31 -501,16 +509,35 @@@ rm -rf ${RPM_BUILD_ROOT
  %{_initrddir}/snmptrapd
  
  %changelog
 -* Thu Dec  5 2013 Jan Safranek <jsafrane at redhat.com> 1:5.7.2-7
++* Thu Dec  5 2013 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-13
+ - Fixed snmpd crashing when AgentX subagent disconnects in the middle of
+   request processing (#1038011)
+ 
 -* Fri Nov  8 2013 Jan Safranek <jsafrane at redhat.com> 1:5.7.2-6
 -- Added btrfs support to hrFSTable
 +* Tue May 21 2013 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-12
 +- added btrfs support to hrFSTable (#965348)
 +
 +* Mon May  6 2013 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-11
 +- added aarch64 to multilib architectures.
  
 -* Thu Feb 14 2013 Tom Callaway <spot at fedoraproject.org> 1:5.7.2-5.1
 +* Mon Apr 22 2013 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-10
 +- moved agentxtrap utility to net-snmp subpackage,
 +  it needs libraries provided by net-snmp-agent-libs.
 +  
 +* Thu Apr 18 2013 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-9
 +- moved agentxtrap utility to net-snmp-utils subpackage,
 +  it's an utility, not a daemon.
 +
 +* Mon Mar 25 2013 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-8
 +- added autoreconf to be able to build on aarch64 (#926223)
 +
 +* Thu Feb 14 2013 Tom Callaway <spot at fedoraproject.org> 1:5.7.2-7
  - add missing IETF MIB license text (BSD)
  
 +* Thu Feb  7 2013 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-6
 +- fixed net-snmp-create-v3-user to have the same content on all architectures
 +- /var/lib/net-snmp/mib_indexes and cert_indexes added to net-snmp-libs
 +  (#906761)
 +
  * Thu Jan 17 2013 Jan Safranek <jsafrane at redhat.com> - 1:5.7.2-5
  - Python: fixed IPADDRESS size on 64-bit systems (#895357)