[foomatic/f15: 2/2] Merge branch 'f14' into f15

[Tim Waugh]

commit 4002fefea5828960393f24b4c94701ea73546bed
Merge: 3deff21 b91dc0f
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Jul 20 11:05:05 2011 +0100

    Merge branch 'f14' into f15

 foomatic-filters-CVE-2011-2697.patch |  209 ++++++++++++++++++++++++++++++++++
 foomatic.spec                        |   11 ++-
 2 files changed, 219 insertions(+), 1 deletions(-)
---
diff --cc foomatic.spec
index 2e975f1,b8dfe0b..6128f6b
--- 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
  
@@@ -193,9 -198,10 +198,13 @@@ rm -fr %buildroot $RPM_BUILD_DIR/%{name
  %{_mandir}/man1/foomatic-rip.1*
  
  %changelog
 -* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> - 4.0.7-2
++* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> - 4.0.7-3
+ - Fix improper sanitization of command line options (bug #721001,
+   CVE-2011-2697).
+ 
 +* Mon Mar 14 2011 Tim Waugh <twaugh at redhat.com> - 4.0.7-2
 +- Rebuilt to pick up Device IDs from new foomatic-db package.
 +
  * Mon Feb 21 2011 Jiri Popelka <jpopelka at redhat.com> - 4.0.7-1
  - 4.0.7