From 70eee1d5377eb17c2255cad31a2fa7b82acdacc1 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Mar 13 2012 15:23:57 +0000
Subject: Merge branch 'f15' into f16


---

diff --git a/.gitignore b/.gitignore
index c50cb10..fb09154 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /foomatic-filters-4.0.7.tar.gz
 /foomatic-db-engine-4.0.8.tar.gz
 /foomatic-filters-4.0.8.tar.gz
+/foomatic-filters-4.0.13.tar.gz
diff --git a/foomatic-filters-CVE-2011-2924.patch b/foomatic-filters-CVE-2011-2924.patch
deleted file mode 100644
index f5fb659..0000000
--- a/foomatic-filters-CVE-2011-2924.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -up foomatic-filters-4.0.8/foomaticrip.c.CVE-2011-2924 foomatic-filters-4.0.8/foomaticrip.c
---- foomatic-filters-4.0.8/foomaticrip.c.CVE-2011-2924	2011-08-18 16:27:57.277636643 +0100
-+++ foomatic-filters-4.0.8/foomaticrip.c	2011-08-18 16:33:37.680136675 +0100
-@@ -1188,9 +1188,13 @@ int main(int argc, char** argv)
-     if (arglist_remove_flag(arglist, "--debug"))
-         debug = 1;
- 
--    if (debug)
--        logh = fopen(LOG_FILE ".log", "w"); /* insecure, use for debugging only */
--    else if (quiet && !verbose)
-+    if (debug) {
-+	int fd = mkstemp (LOG_FILE "-XXXXXX.log");
-+	if (fd != -1)
-+	    logh = fdopen(fd, "w");
-+	else
-+	    logh = stderr;
-+    } else if (quiet && !verbose)
-         logh = NULL; /* Quiet mode, do not log */
-     else
-         logh = stderr; /* Default: log to stderr */
-diff -up foomatic-filters-4.0.8/renderer.c.CVE-2011-2924 foomatic-filters-4.0.8/renderer.c
---- foomatic-filters-4.0.8/renderer.c.CVE-2011-2924	2011-07-25 10:50:57.000000000 +0100
-+++ foomatic-filters-4.0.8/renderer.c	2011-08-18 14:36:14.120153309 +0100
-@@ -434,7 +434,7 @@ int exec_kid3(FILE *in, FILE *out, void 
-         }
- 
-         /* Save the data supposed to be fed into the renderer also into a file*/
--        dstrprepend(commandline, "tee -a " LOG_FILE ".ps | ( ");
-+        dstrprepend(commandline, "tee $(mktemp " LOG_FILE "-XXXXXX.ps) | ( ");
-         dstrcat(commandline, ")");
-     }
- 
diff --git a/foomatic.spec b/foomatic.spec
index a1136e9..b5ffc67 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,10 +1,10 @@
 %define enginever 4.0.8
-%define filtersver 4.0.8
+%define filtersver 4.0.13
 
 Summary: Tools for using the foomatic database of printers and printer drivers
 Name:       foomatic
 Version:    %{enginever}
-Release:    7%{?dist}
+Release:    8%{?dist}
 License:    GPLv2+
 Group: System Environment/Libraries
 
@@ -15,8 +15,7 @@ Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{engi
 Source1: http://www.openprinting.org/download/foomatic/foomatic-filters-%{filtersver}.tar.gz
 
 ## PATCHES FOR FOOMATIC-FILTERS (PATCHES 1 TO 100)
-Patch1: foomatic-filters-CVE-2011-2924.patch
-Patch2: foomatic-filters-debug-string.patch
+Patch1: foomatic-filters-debug-string.patch
 
 ## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200)
 
@@ -75,12 +74,8 @@ CUPS print filters for the foomatic package.
 %setup -q -c -a 1
 
 pushd foomatic-filters-%{filtersver}
-# Use mktemp when creating debug log file in foomatic-rip
-# (CVE-2011-2924, bug #726426).
-%patch1 -p1 -b .CVE-2011-2924
-
 # Too few arguments for format in a debugging string (bug #726384)
-%patch2 -p1 -b .debug-string
+%patch1 -p1 -b .debug-string
 
 aclocal
 automake --add-missing
@@ -147,7 +142,6 @@ exit 0
 
 
 %files
-%defattr(-,root,root)
 %doc --parents foomatic-db-engine-%{enginever}/COPYING
 %config(noreplace) %{_sysconfdir}/foomatic/defaultspooler
 %{_bindir}/foomatic-combo-xml
@@ -175,7 +169,6 @@ exit 0
 %{_var}/cache/foomatic
 
 %files filters
-%defattr(-,root,root,-)
 %doc --parents foomatic-filters-%{filtersver}/COPYING
 %dir %{_sysconfdir}/foomatic
 %config(noreplace) %{_sysconfdir}/foomatic/filter.conf
@@ -184,6 +177,9 @@ exit 0
 %{_mandir}/man1/foomatic-rip.1*
 
 %changelog
+* Tue Mar 13 2012 Jiri Popelka <jpopelka@redhat.com> - 4.0.8-8
+- Updated filters to 4.0.13
+
 * Mon Mar  5 2012 Tim Waugh <twaugh@redhat.com> - 4.0.8-7
 - Rebuilt to pick up new IEEE 1284 Device IDs.
 
diff --git a/sources b/sources
index 6b3f200..3b2b0d3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 5283cd5125a96dc0b35d896326512b1a  foomatic-db-engine-4.0.8.tar.gz
-752324ef037fbb0de18190aa26ceab7d  foomatic-filters-4.0.8.tar.gz
+97536d2d52d75d8019006aef14c7b973  foomatic-filters-4.0.13.tar.gz