[exim/f13: 19/19] Merge ../f14 into f13

[David Woodhouse]

commit 141b1083eeb3551488cee26607cf340491552f62
Merge: 0817dba 9ac538a
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sun May 15 22:39:52 2011 +0100

    Merge ../f14 into f13
    
    Conflicts:
    	.gitignore
    	exim.spec
    	sources

 .gitignore                                       |    2 +
 exim-4.71-dynlookup.patch                        | 3228 ----------------------
 exim-4.50-config.patch => exim-4.73-config.patch |   87 +-
 exim.spec                                        |   18 +-
 sources                                          |    3 +-
 trusted-configs                                  |    6 +
 6 files changed, 67 insertions(+), 3277 deletions(-)
---
diff --cc exim.spec
index ccd7af9,aa27ba2..b9bc380
--- a/exim.spec
+++ b/exim.spec
@@@ -501,8 -500,17 +500,11 @@@ test "$1"  = 0 || %{_initrddir}/clamd.e
  %{_sysconfdir}/cron.daily/greylist-tidy.sh
  
  %changelog
+ * Sun May 15 2011 David Woodhouse <David.Woodhouse at intel.com> - 4.76-1
+ - Update to 4.76 (fixes CVE-2011-1407, CVE-2011-1764) (#702474)
+ 
 -* Sat Aug 07 2010 David Woodhouse <David.Woodhouse at intel.com> - 4.72-2
 -- Fedora infrastructure ate my package; bump release and rebuild
 -
  * Thu Jun 03 2010 David Woodhouse <David.Woodhouse at intel.com> - 4.72-1
--- Update to 4.72 (fixes CVE-2010-2023, CVS-2010-2024)
 -
 -* Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 4.71-4
 -- Mass rebuild with perl-5.12.0
++- Update to 4.72 (fixes CVE-2010-2023, CVE-2010-2024)
  
  * Thu Mar 18 2010 Miroslav Lichvar <mlichvar at redhat.com> - 4.71-3
  - follow guidelines for alternatives (#570800)