[cups/f13/master: 3/3] Merge branch 'f12' into f13

[Tim Waugh]

commit fdb76c9047405356c70aac76b7201fdee9a24b9f
Merge: bdfb23b e2e55c5
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Nov 11 11:38:58 2010 +0000

    Merge branch 'f12' into f13

 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 68800fb,9e7c5e0..4764593
--- a/cups.spec
+++ b/cups.spec
@@@ -578,13 -591,20 +584,18 @@@ 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).
 -
 -* Fri Oct 15 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-10
+ - Don't crash when MIME database could not be loaded (bug #610088).
+ 
 -* Fri Sep 17 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-9
 +* 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).
 -
 -* Wed Sep 15 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-8
  - Build with --enable-threads again (bug #607159).
  - Force the use of gnutls despite thread-safety concerns (bug #607159).
 +
 +* Wed Sep 15 2010 Tim Waugh <twaugh at redhat.com>
  - Fixed serverbin-compat patch to avoid misleading "filter not
    available" messages (bug #633779).