[net-snmp/f17: 12/12] Merge branch 'f16' into f17

[Jan Šafránek]

commit 8086ba9a5bde6928c60c0284ce2b3719ddd4f9fd
Merge: 194463f a151384
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Mon Oct 22 10:31:21 2012 +0200

    Merge branch 'f16' into f17
    
    Conflicts:
    	net-snmp.spec
    	snmpd.service
    	snmptrapd.service

 net-snmp-5.7-CVE-2012-2141.patch   |   21 +++++++++++++++
 net-snmp-5.7-hrStorage-units.patch |   51 ++++++++++++++++++++++++++++++++++++
 net-snmp.spec                      |   11 +++++++-
 3 files changed, 82 insertions(+), 1 deletions(-)
---
diff --cc net-snmp.spec
index 264d5c3,9600feb..de75d85
--- 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.1
- Release: 4%{?dist}
 -Release: 3%{?dist}
++Release: 5%{?dist}
  Epoch: 1
  
  License: BSD
@@@ -507,13 -509,14 +511,18 @@@ rm -rf ${RPM_BUILD_ROOT
  %defattr(-,root,root)
  %{_initrddir}/snmpd
  %{_initrddir}/snmptrapd
 -%config(noreplace,missingok) %{_sysconfdir}/sysconfig/snmpd
 -%config(noreplace,missingok) %{_sysconfdir}/sysconfig/snmptrapd
  
  %changelog
 -* Mon Oct 22 2012 Jan Safranek <jsafrane at redhat.com> - 1:5.7.1-3
++* Mon Oct 22 2012 Jan Safranek <jsafrane at redhat.com> - 1:5.7.1-5
+ - fixed units in hrStorageTable and hrFSTable (#789441)
+ - fixed CVE-2012-2141: Array index error, leading to out-of heap-based
+   buffer read
++  
 +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:5.7.1-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
 +* Mon Nov 28 2011 Jan Safranek <jsafrane at redhat.com> - 1:5.7.1-3
 +- re-introduced /etc/sysconfig files (#752821)
  
  * Wed Oct  5 2011 Jan Safranek <jsafrane at redhat.com> - 1:5.7.1-2
  - fixed perl linking (#742678)