[foomatic/f16: 3/3] Merge branch 'f15' into f16

[Tim Waugh]

commit 773b88b43014699fd88f8813c6c508d10f0a2b65
Merge: d686e5f 00cb2eb
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Aug 18 14:37:23 2011 +0100

    Merge branch 'f15' into f16

 foomatic-filters-CVE-2011-2924.patch |   12 ++++++++++++
 foomatic.spec                        |   11 ++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --cc foomatic.spec
index 78c8dfb,e5a1b2e..20fb54f
--- a/foomatic.spec
+++ b/foomatic.spec
@@@ -4,7 -4,7 +4,7 @@@
  Summary: Tools for using the foomatic database of printers and printer drivers
  Name:       foomatic
  Version:    %{enginever}
--Release:    2%{?dist}
++Release:    3%{?dist}
  License:    GPLv2+
  Group: System Environment/Libraries
  
@@@ -180,9 -184,10 +185,13 @@@ rm -fr %buildroot $RPM_BUILD_DIR/%{name
  %{_mandir}/man1/foomatic-rip.1*
  
  %changelog
 -* Tue Aug 18 2011 Tim Waugh <twaugh at redhat.com> - 4.0.8-2
++* Tue Aug 18 2011 Tim Waugh <twaugh at redhat.com> - 4.0.8-3
+ - Use mktemp when creating debug log file in foomatic-rip
+   (CVE-2011-2924, bug #726426).
+ 
 +* Wed Jul 27 2011 Petr Sabata <contyk at redhat.com> - 4.0.8-2
 +- Rebuild for perl5.14 (#725979)
 +
  * Mon Jul 25 2011 Jiri Popelka <jpopelka at redhat.com> - 4.0.8-1
  - 4.0.8 (all patches merged upstream)