[cups/f14/master: 4/4] Merge branch 'f13' into f14

[Tim Waugh]

commit a2e546c6f43dfad33c0fc73c474c35452c2ef1da
Merge: 6d4832a fdb76c9
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Nov 11 11:40:10 2010 +0000

    Merge branch 'f13' into f14

 cups-CVE-2010-2941.patch  |   47 +++++++++++++++++++++++++++++++++++++++++++++
 cups-autotype-crash.patch |   15 ++++++++++++++
 cups.spec                 |   13 +++++++++++-
 3 files changed, 74 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index b0cc9d4,4764593..ae5b5c2
--- a/cups.spec
+++ b/cups.spec
@@@ -578,9 -584,11 +584,14 @@@ rm -rf $RPM_BUILD_ROO
  %{php_extdir}/phpcups.so
  
  %changelog
+ * Thu Nov 11 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-11
+ - Applied patch to fix cupsd memory corruption vulnerability
+   (CVE-2010-2941, bug #652161).
+ - Don't crash when MIME database could not be loaded (bug #610088).
+ 
 +* Wed Sep 29 2010 jkeating - 1:1.4.4-10.1
 +- Rebuilt for gcc bug 634757
 +
  * Fri Sep 17 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-10
  - Perform locking for gnutls and avoid libgcrypt's broken
    locking (bug #607159).