[foomatic: 4/4] Merge branch 'f15'

[Tim Waugh]

commit 1e8b4fa2725789dfe2c15adde467f6b2d380da6f
Merge: f303906 4002fef
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Jul 20 11:06:06 2011 +0100

    Merge branch 'f15'

 foomatic-filters-CVE-2011-2697.patch |  209 ++++++++++++++++++++++++++++++++++
 foomatic.spec                        |   11 ++-
 2 files changed, 219 insertions(+), 1 deletions(-)
---
diff --cc foomatic.spec
index 0e30455,6128f6b..c9e6bda
--- 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:    4%{?dist}
 -Release:    3%{?dist}
++Release:    5%{?dist}
  License:    GPLv2+
  Group: System Environment/Libraries
  
@@@ -22,9 -22,10 +22,13 @@@ Patch1: foomatic-filters-libdir.patc
  # Use mkstemp, not mktemp.
  Patch2: foomatic-mkstemp.patch
  
 +# Use colord
 +Patch3: foomatic-colord.patch
 +
+ # Fix improper sanitization of command line options (bug #721001,
+ # CVE-2011-2697).
 -Patch3: foomatic-filters-CVE-2011-2697.patch
++Patch4: foomatic-filters-CVE-2011-2697.patch
+ 
  ## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200)
  
  # Use libdir.
@@@ -90,9 -89,9 +94,10 @@@ CUPS print filters for the foomatic pac
  pushd foomatic-filters-%{filtersver}
  %patch1 -p1 -b .libdir
  %patch2 -p1 -b .mkstemp
 -%patch3 -p1 -b .CVE-2011-2697
 +%patch3 -p1 -b .colord
++%patch4 -p1 -b .CVE-2011-2697
  aclocal
 -automake
 +automake --add-missing
  autoconf
  popd
  
@@@ -199,14 -198,12 +204,18 @@@ 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-3
++* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> - 4.0.7-5
+ - 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.
 +* Thu Jun 16 2011 Marcela Mašláňová <mmaslano at redhat.com> - 4.0.7-4
 +- Perl mass rebuild
 +
 +* Mon Mar 07 2011 Richard Hughes <rhughes at redhat.com> - 4.0.7-3
 +- Added BR dbus-devel.
 +
 +* Fri Mar 04 2011 Richard Hughes <rhughes at redhat.com> - 4.0.7-2
 +- Added colord support.
  
  * Mon Feb 21 2011 Jiri Popelka <jpopelka at redhat.com> - 4.0.7-1
  - 4.0.7