[clamav/el5: 3/4] Merge branch 'el6' into el5

[Nick Bebout]

commit 6fcce95a17620ae9e7e5513a5803906092001879
Merge: 4bca792 603c6c9
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Oct 18 19:57:25 2011 -0500

    Merge branch 'el6' into el5
    
    Conflicts:
    	clamav.spec

 .gitignore                |    2 ++
 clamav-0.97-clean.tar.bz2 |  Bin 40456202 -> 0 bytes
 clamav.spec               |   21 +++++++++++++++++----
 sources                   |    3 +--
 4 files changed, 20 insertions(+), 6 deletions(-)
---
diff --cc clamav.spec
index c12ad6e,bd8c933..b85ae02
--- a/clamav.spec
+++ b/clamav.spec
@@@ -407,11 -409,17 +409,22 @@@ rm -rf %{buildroot
  %exclude %{_libdir}/libclamav.la
  
  %changelog
+ * Tue Oct 18 2011 Nick Bebout <nb at fedoraproject.org> - 0.97.3-1
+ - Update to 0.97.3
+ - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3
+ 
+ * Thu Aug  4 2011 Jan-Frode Myklebuust <janfrode at tanso.net> - 0.97.2-5
+ - Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf.
+   (bz#727894)
+ 
+ * Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode at tanso.net> - 0.97.2-3
+ - include updated clamd-wrapper which get the PidFile setting from the
 -  service configuration file. 
++  service configuration file.
 +
 +* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode at tanso.net> - 0.97.2-3
 +- Handle xz archives in rpmbuilds < RHEL6.
 +
 +* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode at tanso.net> - 0.97.2-2
  - updated to 0.97.2
  - Build-require xz
  - CVE-2011-2721 Off-by-one error by scanning message hashes (#725694)