[cups: 3/3] Merge branch 'f14'

[Jiří Popelka]

commit f3762936fa9a436c18661a296c97f0e4784e1c50
Merge: 7177a9d 564a0cf
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Nov 12 14:56:07 2010 +0100

    Merge branch 'f14'
    
    Conflicts:
    	cups.spec

 .gitignore               |    1 +
 cups-CVE-2010-2941.patch |   47 -----------
 cups-avahi.patch         |   45 +++++-----
 cups-lspp.patch          |  203 +++++++++++++++++++++++-----------------------
 cups-page-label.patch    |   10 +-
 cups-str3608.patch       |   39 ---------
 cups.spec                |   23 ++----
 sources                  |    2 +-
 8 files changed, 139 insertions(+), 231 deletions(-)
---
diff --cc cups.spec
index e1f25f2,e6e7c8a..83748a6
--- a/cups.spec
+++ b/cups.spec
@@@ -584,7 -573,11 +573,11 @@@ rm -rf $RPM_BUILD_ROO
  %{php_extdir}/phpcups.so
  
  %changelog
+ * Fri Nov 12 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.5-1
+ - 1.4.5.
+ - No longer need CVE-2010-2941, str3608
+ 
 -* Thu Nov 11 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-11
 +* Thu Nov 11 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-12
  - 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).